dap 1.2.9 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 269ac8cdd229ae3024579e464a7328e0c03fd63475db4ea00f27062881b7a584
-  data.tar.gz: bb7eccc16da408a3612e425063391f04598fa9f2a2588d1e5bc76044d82ab966
+  metadata.gz: e1a23a5661dc9029223cea577a085c1089f639bd97d8ab32f29f0be9d7ad7c61
+  data.tar.gz: a4ebe748a2a14c6e48722ade5886ee5c87c23572dfbf9e06b66275699b981a69
 SHA512:
-  metadata.gz: 03df4ab5d19b8c9658fd00d74973d28fec5e7fafcdaa8c0b5f6b4f88eddd07d439918f133990a099b86b92ec2a7ccb6ee14e1167663b9583e90da493b71e73dc
-  data.tar.gz: ef55c2efa82bfafa533085895aed89a4dd0aeb059b6bc1fd9a054329d7f06873c130c46234bbb8d174df89add716dbb863e830717085a4119cbfff0c8a9c1187
+  metadata.gz: 4eaf16735fcac8f8096c8656888fda8c1214e85aad436905da7269e77792aeebeaba3e54436c6fc07f16f1a84ece982c17e48fbec09bc307a13597d06efed15a
+  data.tar.gz: 67fc3b87dc8ceca8bcb10a6719a3b0bc7263a3d8f0f13a09b89b2bae065c8c696234f39c65e461114cb15275ae7a25c0af88b4f37d24a6089a37a605085b48ae

data/.gitignore

@@ -1,3 +1,8 @@
+# Ruby and tooling specific
+.yardoc
+doc/
+/pkg/
+
 # Ignore rvm files
 .ruby-version
 .ruby-gemset
@@ -8,8 +13,6 @@ data/GeoLite2-ASN.mmdb
 data/GeoLite2-City.mmdb
 data/GeoLite2-Country.mmdb
 
-/pkg/
-
 ## Environment normalization:
 /.bundle/
 /vendor/bundle

data/CONTRIBUTING.md

@@ -81,9 +81,7 @@ Finally, submit the PR.  Navigate to ```https://github.com/<your-github-username
 
 ### Testing
 
-When your PR is submitted, it will be automatically subjected to the full run
-of tests in [Travis](https://travis-ci.org/rapid7/dap/), however you are
-encourage to perform testing _before_ submitting the PR.  There are two types of tests in place:
+You are encourage to perform testing _before_ submitting the PR.  There are two types of tests in place:
 run `bundle exec rspec spec`.  # Testing
 
 There are two testing frameworks in place.
@@ -91,10 +89,10 @@ There are two testing frameworks in place.
 * Ruby `rspec`
 * [bats](https://github.com/sstephenson/bats) integration tests
 
-To run these outside of travis-ci, run:
+To run these tests locally, run:
 ```
 docker build -t dap_testing -f Dockerfile.testing . && \
-docker run --rm --name dap_testing -it -e DAP_EXECUTABLE=dap dap_testing /bin/bash -l -c "rvm use 2.4.5 && gem build dap && gem install dap*.gem && bundle exec rspec spec && find /opt/bats_testing -name \*.bats | grep -v test/ test_helper/ | xargs -n1 bats"
+docker run --rm --name dap_testing -it -e DAP_EXECUTABLE=dap dap_testing /bin/bash -l -c "rvm use 2.7.6 && gem build dap && gem install dap*.gem && bundle exec rspec spec && find /opt/bats_testing -name \*.bats | grep -v test/test_helper/ | xargs -n1 bats"
 ```
 
 ## Landing PRs

data/Dockerfile.testing

@@ -11,10 +11,10 @@ RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import -
 RUN curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -
 RUN curl -sSL https://get.rvm.io | bash -s stable
 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 update --bundler && bundle install"
+RUN /bin/bash -l -c "rvm install 2.7.6"
+RUN /bin/bash -l -c "rvm use 2.7.6 && gem update --system && gem install bundler"
+COPY . $TEST_DIR/
+RUN /bin/bash -l -c "cd $TEST_DIR && rvm use 2.7.6 && bundle update --bundler && bundle install"
 
 # install maxmind legacy data
 RUN mkdir /var/lib/geoip
@@ -36,4 +36,3 @@ COPY test/test_data/geoip2/*.mmdb /var/lib/geoip2/
 RUN git clone https://github.com/sstephenson/bats.git && cd bats && ./install.sh /usr
 
 WORKDIR /opt/bats_testing
-COPY . .

data/Gemfile

@@ -1,15 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'oj'
-gem 'htmlentities'
-gem 'net-dns'
-gem 'bit-struct'
-gem 'geoip-c'
-gem 'maxmind-db', '~> 1.0.0'
-gem 'recog', '>=2.3.21'
-
-group :test do
-  gem 'rspec', '~> 3.9.0'
-  gem 'cucumber', '~> 4.0.0'
-  gem 'aruba', '~> 0.6.2'
-end
+gemspec

data/Gemfile.lock

@@ -1,102 +1,103 @@
+PATH
+  remote: .
+  specs:
+    dap (1.3.1)
+      bit-struct
+      geoip-c
+      htmlentities
+      maxmind-db
+      net-dns
+      nokogiri
+      oj
+      recog
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    aruba (0.6.2)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    bit-struct (0.16)
+    aruba (2.1.0)
+      bundler (>= 1.17, < 3.0)
+      childprocess (>= 2.0, < 5.0)
+      contracts (>= 0.16.0, < 0.18.0)
+      cucumber (>= 4.0, < 9.0)
+      rspec-expectations (~> 3.4)
+      thor (~> 1.0)
+    bit-struct (0.17)
     builder (3.2.4)
-    childprocess (4.0.0)
-    concurrent-ruby (1.1.7)
-    cucumber (4.0.1)
-      builder (~> 3.2, >= 3.2.3)
-      cucumber-core (~> 7.0, >= 7.0.0)
-      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
-      cucumber-gherkin (~> 13.0, >= 13.0.0)
-      cucumber-html-formatter (~> 6.0, >= 6.0.1)
-      cucumber-messages (~> 12.1, >= 12.1.1)
-      cucumber-wire (~> 3.0, >= 3.0.0)
-      diff-lcs (~> 1.3, >= 1.3, < 1.4)
-      multi_test (~> 0.1, >= 0.1.2)
-      sys-uname (~> 1.0, >= 1.0.2)
-    cucumber-core (7.0.0)
-      cucumber-gherkin (~> 13.0, >= 13.0.0)
-      cucumber-messages (~> 12.1, >= 12.1.1)
-      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
-    cucumber-cucumber-expressions (10.3.0)
-    cucumber-gherkin (13.0.0)
-      cucumber-messages (~> 12.0, >= 12.0.0)
-    cucumber-html-formatter (6.0.3)
-      cucumber-messages (~> 12.1, >= 12.1.1)
-    cucumber-messages (12.4.0)
-      protobuf-cucumber (~> 3.10, >= 3.10.8)
-    cucumber-tag-expressions (2.0.4)
-    cucumber-wire (3.0.0)
-      cucumber-core (~> 7.0, >= 7.0.0)
-      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
-      cucumber-messages (~> 12.1, >= 12.1.1)
-    diff-lcs (1.3)
-    ffi (1.13.1)
+    childprocess (4.1.0)
+    contracts (0.16.1)
+    cucumber (8.0.0)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-ci-environment (~> 9.0, >= 9.0.4)
+      cucumber-core (~> 11.0, >= 11.0.0)
+      cucumber-cucumber-expressions (~> 15.1, >= 15.1.1)
+      cucumber-gherkin (~> 23.0, >= 23.0.1)
+      cucumber-html-formatter (~> 19.1, >= 19.1.0)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+      diff-lcs (~> 1.5, >= 1.5.0)
+      mime-types (~> 3.4, >= 3.4.1)
+      multi_test (~> 1.1, >= 1.1.0)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-ci-environment (9.1.0)
+    cucumber-core (11.0.0)
+      cucumber-gherkin (~> 23.0, >= 23.0.1)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+      cucumber-tag-expressions (~> 4.1, >= 4.1.0)
+    cucumber-cucumber-expressions (15.2.0)
+    cucumber-gherkin (23.0.1)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+    cucumber-html-formatter (19.2.0)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+    cucumber-messages (18.0.0)
+    cucumber-tag-expressions (4.1.0)
+    diff-lcs (1.5.0)
+    ffi (1.15.5)
     geoip-c (0.9.1)
     htmlentities (4.3.4)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    maxmind-db (1.0.0)
-    middleware (0.1.0)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
-    multi_test (0.1.2)
+    maxmind-db (1.1.1)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
+    mini_portile2 (2.8.0)
+    multi_test (1.1.0)
     net-dns (0.9.0)
-    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.21)
+    nokogiri (1.13.9)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    oj (3.13.21)
+    racc (1.6.0)
+    rake (13.0.6)
+    recog (3.0.3)
       nokogiri
-    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.3)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.4)
-    sys-uname (1.2.1)
-      ffi (>= 1.0.0)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.1)
+    sys-uname (1.2.2)
+      ffi (~> 1.1)
+    thor (1.2.1)
+    webrick (1.7.0)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (~> 0.6.2)
-  bit-struct
-  cucumber (~> 4.0.0)
-  geoip-c
-  htmlentities
-  maxmind-db (~> 1.0.0)
-  net-dns
-  oj
-  recog (>= 2.3.21)
-  rspec (~> 3.9.0)
+  aruba
+  cucumber
+  dap!
+  rake
+  rspec
+  yard
 
 BUNDLED WITH
-   1.17.3
+   2.3.24

data/README.md

@@ -1,7 +1,6 @@
 # DAP: The Data Analysis Pipeline
 
 [![Gem Version](https://badge.fury.io/rb/dap.svg)](http://badge.fury.io/rb/dap)
-[![Build Status](https://travis-ci.org/rapid7/dap.svg?branch=master)](https://travis-ci.org/rapid7/dap)
 
 DAP was created to transform text-based data on the command-line, specializing in transforms that are annoying or difficult to do with existing tools.
 
@@ -13,7 +12,7 @@ DAP was written to process terabyte-sized public scan datasets, such as those pr
 
 ### Prerequisites
 
-DAP requires Ruby and is best suited for systems with a relatively current version with 2.4.x being the minimum requirement.
+DAP requires Ruby and is best suited for systems with a relatively current version with 2.6.x being the minimum requirement.
 Ideally, this will be managed with either
 [`rbenv`](https://github.com/rbenv/rbenv) or [`rvm`](https://rvm.io/) with the bundler gem also installed and up to date.
 Using system managed/installed Rubies is possible but fraught with peril.

data/Rakefile

@@ -2,7 +2,7 @@ require "bundler/gem_tasks"
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new do |t|
-    t.pattern = "spec/**/*_spec.rb"
+    t.pattern = 'spec/**/*_spec.rb'
 end
 
 require 'yard'
@@ -15,7 +15,7 @@ require 'cucumber'
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:features) do |t|
-    t.cucumber_opts = "features --format pretty"
+    t.cucumber_opts = %w(features --format pretty)
 end
 
 task :default => [ :spec, :features, :yard ]

data/dap.gemspec

@@ -5,7 +5,7 @@ require 'dap/version'
 Gem::Specification.new do |s|
   s.name        = 'dap'
   s.version     = Dap::VERSION
-  s.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = '>= 2.6'
   s.authors     = [
       'Rapid7 Research'
   ]
@@ -28,7 +28,9 @@ Gem::Specification.new do |s|
 
   # ---- Dependencies ----
 
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'yard'
   s.add_development_dependency 'cucumber'
   s.add_development_dependency 'aruba'
 

data/lib/dap/version.rb

@@ -1,3 +1,3 @@
 module Dap
-  VERSION = "1.2.9"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dap
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.3.1
 platform: ruby
 authors:
 - Rapid7 Research
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-04 00:00:00.000000000 Z
+date: 2022-10-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +207,6 @@ files:
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
-- ".travis.yml"
 - CONTRIBUTING.md
 - Dockerfile
 - Dockerfile.testing
@@ -275,14 +302,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: 'DAP: The Data Analysis Pipeline'

data/.travis.yml

@@ -1,11 +0,0 @@
-language: generic
-
-services:
-  - docker
-
-before_install:
-  - docker build -t dap_testing -f Dockerfile.testing .
-
-script:
-  - docker build -t dap_testing -f Dockerfile.testing .
-  - docker run --rm --name dap_testing -it -e DAP_EXECUTABLE=dap dap_testing /bin/bash -l -c "rvm use 2.4.5 && gem build dap && gem install dap*.gem && bundle exec rspec spec && find /opt/bats_testing -name \*.bats | grep -v test/test_helper/ | xargs -n1 bats"