dradis-projects 3.6.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cab66cd7298c8c99104ed76957913173bde0225
-  data.tar.gz: 7a230d20b6e4e54abba7962c2bee781d40753e91
+  metadata.gz: 25a395a59c0ca4e3b6f93229f6a26e0ba7c8e9c4
+  data.tar.gz: f819ec97349717710edc060fb4cf4f88e7d3ee41
 SHA512:
-  metadata.gz: 5c13c91fc60a01f1309dfb0e8071589e3fc8cac377542697c52e38eccb99e3aa314e4e4ef72a8bc35a4e7376900fecacc50c2de6c3689a0974ecf08e9d9bea40
-  data.tar.gz: 5da07252c8179dbfc343bf7134afe927a01b8e095a14a8ef85fcad4551ccff7c7bc6301a0321a293155a5c05550ccf1cf0b601becd8bc3d7e7fe27958baf9a20
+  metadata.gz: aa436c78584124948064ca23edf7f6130514391bf2e3bb9b1ee31dd06767bc10c6c4727121d110190da752d5c570f50c259634d43e5eec86fc46c44d8281da38
+  data.tar.gz: a99db48a1e47d88ab6580c24388c221a93bc677b291b13a0136e9d4ae752f714b82a7ef4327753b6d1946fb05971114a148b7847891344b158f3309732feab26

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Dradis Framework 3.7 (July, 2017) ##
+
+*   Skip closing the logger in thorfile   
+
 ## Dradis Framework 3.6 (March XX, 2017) ##
 
 *   Include file version in project template export.
@@ -7,4 +11,3 @@
 *   Make the project template exporter / uploader configurable.
 
 *   Break down the #export and #parse methods into smaller tasks.
-

data/dradis-projects.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
 
-  spec.add_dependency 'dradis-plugins', '~> 3.6'
+  spec.add_dependency 'dradis-plugins', '~> 3.7'
   spec.add_dependency 'rubyzip', '~> 1.2.1'
 end

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

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

data/lib/dradis/plugins/projects/upload/template.rb

@@ -63,6 +63,7 @@ module Dradis::Plugins::Projects::Upload
         parse_nodes(template)
         parse_issues(template)
         parse_methodologies(template)
+        parse_report_content(template)
         parse_tags(template)
         finalize(template)
         # FIXME: returning this is gross
@@ -80,6 +81,7 @@ module Dradis::Plugins::Projects::Upload
       def parse_issues(template);        raise NotImplementedError; end
       def parse_methodologies(template); raise NotImplementedError; end
       def parse_nodes(template);         raise NotImplementedError; end
+      def parse_report_content(template); raise NotImplementedError; end
       def parse_tags(template);          raise NotImplementedError; end
     end
   end

data/lib/dradis/plugins/projects/upload/v1/template.rb

@@ -249,7 +249,6 @@ module Dradis::Plugins::Projects::Upload::V1
       end
 
       def parse_nodes(template)
-
         logger.info { 'Processing Nodes...' }
 
         # Re generate the Node tree structure
@@ -329,8 +328,29 @@ module Dradis::Plugins::Projects::Upload::V1
         end
       end
 
-      def parse_tags(template)
+      def parse_report_content(template)
+        logger.info { 'Processing Report Content...' }
+
+        contentlib_type_id =
+          template.at_xpath(
+            "//nodes/node/type-id[text()='#{Node::Types::CONTENTLIB}']"
+          )
+
+        if contentlib_type_id
+          content_library_xml = contentlib_type_id.parent
+          document_properties =
+            JSON.parse(content_library_xml.at_xpath('properties').text)
 
+          content_library = Node.content_library
+          content_library.properties =
+            content_library.properties.merge(document_properties)
+          content_library.save
+        end
+
+        logger.info { 'Done.' }
+      end
+
+      def parse_tags(template)
         logger.info { 'Processing Tags...' }
 
         template.xpath('dradis-template/tags/tag').each do |xml_tag|

data/lib/tasks/thorfile.rb

@@ -10,14 +10,6 @@ class ExportTasks < Thor
   def template
     require 'config/environment'
 
-    # The options we'll end up passing to the Processor class
-    opts = {}
-
-    STDOUT.sync   = true
-    logger        = Logger.new(STDOUT)
-    logger.level  = Logger::DEBUG
-    opts[:logger] = logger
-
     template_path = options.file || Rails.root.join('backup').to_s
     FileUtils.mkdir_p(template_path) unless File.exist?(template_path)
 
@@ -33,13 +25,12 @@ class ExportTasks < Thor
     detect_and_set_project_scope
 
     exporter_class = Rails.application.config.dradis.projects.template_exporter
-    export_options = opts.merge(plugin: Dradis::Plugins::Projects)
+    export_options = task_options.merge(plugin: Dradis::Plugins::Projects)
     exporter       = exporter_class.new(export_options)
 
     File.open(template_path, 'w') { |f| f.write exporter.export() }
 
     logger.info { "Template file created at:\n\t#{ File.expand_path( template_path ) }" }
-    logger.close
   end
 
 
@@ -51,14 +42,6 @@ class ExportTasks < Thor
   def package
     require 'config/environment'
 
-    # The options we'll end up passing to the Processor class
-    opts = {}
-
-    STDOUT.sync   = true
-    logger        = Logger.new(STDOUT)
-    logger.level  = Logger::DEBUG
-    opts[:logger] = logger
-
     package_path  = options.file || Rails.root.join('backup')
     FileUtils.mkdir_p(package_path) unless File.exist?(package_path)
 
@@ -70,14 +53,12 @@ class ExportTasks < Thor
 
     detect_and_set_project_scope
 
-    export_options = opts.merge(plugin: Dradis::Plugins::Projects)
+    export_options = task_options.merge(plugin: Dradis::Plugins::Projects)
     Dradis::Plugins::Projects::Export::Package.new(export_options).
       export(filename: package_path)
 
     logger.info{ "Project package created at:\n\t#{ File.expand_path( package_path ) }" }
-    logger.close
   end
-
 end
 
 class UploadTasks < Thor
@@ -91,9 +72,6 @@ class UploadTasks < Thor
   def template(file_path)
     require 'config/environment'
 
-    logger = Logger.new(STDOUT)
-    logger.level = Logger::DEBUG
-
     unless File.exists?(file_path)
       $stderr.puts "** the file [#{file_path}] does not exist"
       exit -1
@@ -101,18 +79,10 @@ class UploadTasks < Thor
 
     detect_and_set_project_scope
 
-    content_service  = Dradis::Plugins::ContentService.new(plugin: Dradis::Plugins::Projects::Upload::Template)
-    template_service = Dradis::Plugins::TemplateService.new(plugin: Dradis::Plugins::Projects::Upload::Template)
-
-    importer = Dradis::Plugins::Projects::Upload::Template::Importer.new(
-      logger:           logger,
-      content_service:  content_service,
-      template_service: template_service
-    )
+    task_options.merge!(plugin: Dradis::Plugins::Projects::Upload::Template)
 
+    importer = Dradis::Plugins::Projects::Upload::Template::Importer.new(task_options)
     importer.import(file: file_path)
-
-    logger.close
   end
 
 
@@ -123,29 +93,17 @@ class UploadTasks < Thor
   def package(file_path)
     require 'config/environment'
 
-    logger = Logger.new(STDOUT)
-    logger.level = Logger::DEBUG
-
     unless File.exists?(file_path)
       $stderr.puts "** the file [#{file_path}] does not exist"
       exit -1
     end
 
-
     detect_and_set_project_scope
 
-    content_service  = Dradis::Plugins::ContentService.new(plugin: Dradis::Plugins::Projects::Upload::Package)
-    template_service = Dradis::Plugins::TemplateService.new(plugin: Dradis::Plugins::Projects::Upload::Package)
-
-    importer = Dradis::Plugins::Projects::Upload::Package::Importer.new(
-                logger: logger,
-       content_service: content_service,
-      template_service: template_service
-    )
+    task_options.merge!(plugin: Dradis::Plugins::Projects::Upload::Package)
 
+    importer = Dradis::Plugins::Projects::Upload::Package::Importer.new(task_options)
     importer.import(file: file_path)
-
-    logger.close
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-projects
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Project export/upload for the Dradis Framework.