dradis-nmap 3.15.0 → 3.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8483ae7b858089caafea606939af8a707bb49ac6387c5a75a61bee27ca1b3047
-  data.tar.gz: cc910317146439cb1c1ff76ed16341ce45943754d8185b6f416ae6af8505f2be
+  metadata.gz: 39489afd2533646be06086a1ef17d8dc8cbee03346d27ab519624e649807862f
+  data.tar.gz: db2796eaefcf480ea2a5e6976e3c85a85a747d0088c9c59fd0a1c44770065b87
 SHA512:
-  metadata.gz: ab3b7fd6354711c98340eaa47141d22603def36e238e2a5939c2ec6850ebea189006f025c4e8cfe6dd62d572cd3bbcea1cd29d4c6b38a6ba9c37ca1dc8403633
-  data.tar.gz: 5333cb33a15e4a382777440ace13289d4809d67d7a79bd374ab1849e510591e800f298eb20f3c0c7b5fc85744f896b3612acf32db530ad1dcb79cf18bea8d979
+  metadata.gz: bef77cc342d322970c06970a3daeca08aa36de0c1c103f4c24d7c323f49e9582289df8b4f434cc6712bb636e2bdda4ab61b65fb3f10453f45660eb1fa46142fc
+  data.tar.gz: 63ac1d241946c80bfe221fc5c8c2cfbee114faa333f9d158055ac756f191f68ac93fb6697da827994230814d3bda29bab25fcdb21addb66dce63c40cc274f92a

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## Dradis Framework 3.20 (December, 2020) ##
+
+*   No changes.
+
+## Dradis Framework 3.19 (September, 2020) ##
+
+*   No changes.
+
+## Dradis Framework 3.18 (July, 2020) ##
+
+*   No changes.
+
+## Dradis Framework 3.17 (May, 2020) ##
+
+*   No changes.
+
+## Dradis Framework 3.16 (February, 2020) ##
+
+*   No changes.
+
 ## Dradis Framework 3.15 (November, 2019) ##
 
 *   No changes.

data/dradis-nmap.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dradis-plugins', '~> 3.6'
   spec.add_dependency 'ruby-nmap', '~> 0.7'
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'combustion', '~> 0.5.2'

data/lib/dradis/plugins/nmap/gem_version.rb

@@ -8,7 +8,7 @@ module Dradis
 
       module VERSION
         MAJOR = 3
-        MINOR = 15
+        MINOR = 20
         TINY = 0
         PRE = nil
 

data/spec/nmap_upload_spec.rb

@@ -12,34 +12,11 @@ describe 'Nmap upload plugin' do
       # Init services
       plugin = Dradis::Plugins::Nmap
 
-      @content_service = Dradis::Plugins::ContentService.new(plugin: plugin)
-      template_service = Dradis::Plugins::TemplateService.new(plugin: plugin)
+      @content_service = Dradis::Plugins::ContentService::Base.new(plugin: plugin)
 
       @importer = plugin::Importer.new(
-        content_service: @content_service,
-        template_service: template_service
+        content_service: @content_service
       )
-
-      # Stub dradis-plugins methods
-      #
-      # They return their argument hashes as objects mimicking
-      # Nodes, Issues, etc
-      allow(@content_service).to receive(:create_node) do |args|
-        # puts "create_node: #{ args.inspect }"
-        OpenStruct.new(args)
-      end
-      allow(@content_service).to receive(:create_note) do |args|
-        # puts "create_note: #{ args.inspect }"
-        OpenStruct.new(args)
-      end
-      allow(@content_service).to receive(:create_issue) do |args|
-        # puts "create_issue: #{ args.inspect }"
-        OpenStruct.new(args)
-      end
-      allow(@content_service).to receive(:create_evidence) do |args|
-        # puts "create_evidence: #{ args.inspect }"
-        OpenStruct.new(args)
-      end
     end
 
     it "creates an error note when the xml is not valid" do
@@ -47,16 +24,20 @@ describe 'Nmap upload plugin' do
         expect(args[:text]).to include("#[Title]#\nInvalid file format")
         OpenStruct.new(args)
       end.once
+      
       # Run the import
       @importer.import(file: 'spec/fixtures/files/invalid.xml')
     end
 
     it "creates nodes, issues, notes and an evidences as needed" do
       expect(@content_service).to receive(:create_node) do |args|
-        # puts "create_node: #{ args.inspect }"
+        puts "create_node: #{ args.inspect }"
         expect(args[:label]).to eq('74.207.244.221')
         expect(args[:type]).to eq(:host)
-        OpenStruct.new(args)
+        obj = OpenStruct.new(args)
+        obj.define_singleton_method(:set_property) { |*| }
+        obj.define_singleton_method(:set_service) { |*| }
+        obj
       end.once
       expect(@content_service).to receive(:create_note) do |args|
         puts "create_note: #{ args.inspect }"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-nmap
 version: !ruby/object:Gem::Version
-  version: 3.15.0
+  version: 3.20.0
 platform: ruby
 authors:
 - Daniel Martin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dradis-plugins
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +136,7 @@ homepage: http://dradisframework.org
 licenses:
 - GPL-2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,8 +151,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.2.4
+signing_key:
 specification_version: 4
 summary: Nmap add-on for the Dradis Framework.
 test_files: