diff --git a/.gitignore b/.gitignore index fdec93d..67e28cc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,13 @@ # Ignore geoip data file data/geoip.dat + +/pkg/ + +## Environment normalization: +/.bundle/ +/vendor/bundle +/lib/bundler/man/ + +# Misc +**/.DS_Store diff --git a/Dockerfile b/Dockerfile index 12fcd51..d212ed7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ FROM ubuntu:latest +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update RUN apt-get install -y \ ca-certificates \ diff --git a/Dockerfile.testing b/Dockerfile.testing index 7456e4a..43f823c 100644 --- a/Dockerfile.testing +++ b/Dockerfile.testing @@ -1,6 +1,8 @@ FROM ubuntu:18.04 ENV TEST_DIR /opt/bats_testing + +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update RUN apt-get install -y build-essential ca-certificates curl git jq libffi-dev libgeoip-dev libxml2-dev wget zlib1g-dev diff --git a/Gemfile b/Gemfile index 64d46af..1948c96 100644 --- a/Gemfile +++ b/Gemfile @@ -6,10 +6,10 @@ gem 'net-dns' gem 'bit-struct' gem 'geoip-c' gem 'maxmind-db', '~> 1.0.0' -gem 'recog', '>=2.3.0' +gem 'recog', '>=2.3.8' group :test do - gem 'rspec', '~> 3.1.0' + gem 'rspec', '~> 3.9.0' gem 'cucumber', '~> 1.3.16' gem 'aruba', '~> 0.6.1' end diff --git a/Gemfile.lock b/Gemfile.lock index 9d782f7..b49eb84 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,43 +6,42 @@ GEM cucumber (>= 1.1.1) rspec-expectations (>= 2.7.0) bit-struct (0.16) - builder (3.2.2) - childprocess (0.5.8) - ffi (~> 1.0, >= 1.0.11) + builder (3.2.4) + childprocess (3.0.0) cucumber (1.3.20) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) - diff-lcs (1.2.5) - ffi (1.11.3) + diff-lcs (1.3) geoip-c (0.9.1) gherkin (2.12.2) multi_json (~> 1.3) htmlentities (4.3.4) maxmind-db (1.0.0) mini_portile2 (2.4.0) - multi_json (1.11.2) + multi_json (1.14.1) multi_test (0.1.2) net-dns (0.9.0) - nokogiri (1.10.8) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) - oj (3.7.9) - recog (2.3.0) + oj (3.10.6) + recog (2.3.8) nokogiri - rspec (3.1.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-core (3.1.7) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.2) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.3) - rspec-support (~> 3.1.0) - rspec-support (3.1.2) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.3) PLATFORMS ruby @@ -56,8 +55,8 @@ DEPENDENCIES maxmind-db (~> 1.0.0) net-dns oj - recog (>= 2.3.0) - rspec (~> 3.1.0) + recog (>= 2.3.8) + rspec (~> 3.9.0) BUNDLED WITH - 2.0.1 + 2.0.2 diff --git a/Rakefile b/Rakefile index 2d237b9..7e4c853 100644 --- a/Rakefile +++ b/Rakefile @@ -19,4 +19,4 @@ Cucumber::Rake::Task.new(:features) do |t| end task :default => [ :spec, :features, :yard ] - +task :tests => [ :spec ] diff --git a/lib/dap/version.rb b/lib/dap/version.rb index cda64ef..36b69e1 100644 --- a/lib/dap/version.rb +++ b/lib/dap/version.rb @@ -1,3 +1,3 @@ module Dap - VERSION = "1.2.6" + VERSION = "1.2.7" end