Merge pull request #86 from tsellers-r7/bump_recog

Require Recog 2.3.21, bump for release of dap 1.2.9
rapid7 · Aug 4, 2021 · 5bfef22 · 5bfef22
2 parents e5ceb49 + fad7296
commit 5bfef22
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,9 @@
 
 # Ignore geoip data file
 data/geoip.dat
+data/GeoLite2-ASN.mmdb
+data/GeoLite2-City.mmdb
+data/GeoLite2-Country.mmdb
 
 /pkg/
 

diff --git a/Dockerfile.testing b/Dockerfile.testing
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV TEST_DIR /opt/bats_testing
 
@@ -14,7 +14,7 @@ RUN /bin/bash -l -c "rvm requirements"
 RUN /bin/bash -l -c "rvm install 2.4.5"
 RUN /bin/bash -l -c "rvm use 2.4.5 && gem update --system && gem install bundler"
 ADD Gemfile* $TEST_DIR/
-RUN /bin/bash -l -c "cd $TEST_DIR && rvm use 2.4.5 && bundle install"
+RUN /bin/bash -l -c "cd $TEST_DIR && rvm use 2.4.5 && bundle update --bundler && bundle install"
 
 # install maxmind legacy data
 RUN mkdir /var/lib/geoip

diff --git a/Gemfile b/Gemfile
@@ -6,7 +6,7 @@ gem 'net-dns'
 gem 'bit-struct'
 gem 'geoip-c'
 gem 'maxmind-db', '~> 1.0.0'
-gem 'recog', '>=2.3.8'
+gem 'recog', '>=2.3.21'
 
 group :test do
   gem 'rspec', '~> 3.9.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -53,15 +53,15 @@ GEM
     minitest (5.14.2)
     multi_test (0.1.2)
     net-dns (0.9.0)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     oj (3.10.6)
     protobuf-cucumber (3.10.8)
       activesupport (>= 3.2)
       middleware
       thor
       thread_safe
-    recog (2.3.8)
+    recog (2.3.21)
       nokogiri
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -95,7 +95,7 @@ DEPENDENCIES
   maxmind-db (~> 1.0.0)
   net-dns
   oj
-  recog (>= 2.3.8)
+  recog (>= 2.3.21)
   rspec (~> 3.9.0)
 
 BUNDLED WITH

diff --git a/lib/dap/version.rb b/lib/dap/version.rb
@@ -1,3 +1,3 @@
 module Dap
-  VERSION = "1.2.8"
+  VERSION = "1.2.9"
 end