dradis-nmap 3.15.0 → 3.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8483ae7b858089caafea606939af8a707bb49ac6387c5a75a61bee27ca1b3047
-  data.tar.gz: cc910317146439cb1c1ff76ed16341ce45943754d8185b6f416ae6af8505f2be
+  metadata.gz: a110471150b27489da28e66a2823c61c9390194bef78e0adec44d96221c905e7
+  data.tar.gz: 760067acfb3c386063b17d8bb86f219d733a9ece916de394e9ac504de8c9fe99
 SHA512:
-  metadata.gz: ab3b7fd6354711c98340eaa47141d22603def36e238e2a5939c2ec6850ebea189006f025c4e8cfe6dd62d572cd3bbcea1cd29d4c6b38a6ba9c37ca1dc8403633
-  data.tar.gz: 5333cb33a15e4a382777440ace13289d4809d67d7a79bd374ab1849e510591e800f298eb20f3c0c7b5fc85744f896b3612acf32db530ad1dcb79cf18bea8d979
+  metadata.gz: 1c04804b0b7b458ef50c0c229545048b43518bb2aaf68821cc5dfa6a40d4190177e027237d00aa46618a0b3c6d183fb4275b3be3fbbfafd709b2b5f7251acc4e
+  data.tar.gz: 44b141ebf8e55c74882004375ed743a88e7c4a940f27f89b47fba47d6d2ea16b9d24adaca50aa0c72124e0c4c4ff68115d26da301cb5a2c72dbb41a4a404d947

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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 = 16
         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.16.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2020-02-26 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