dradis-plugins 3.0.0.pre → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b231853a8ff2f2abe085576c558a48258331c03
-  data.tar.gz: 47ca422c98df77c01578b824a222e851a58bb198
+  metadata.gz: ad5a0f1011a150397c1378acfe17ae79dfcc7118
+  data.tar.gz: 5a9b942df578368054a859030a42ab5e752d2369
 SHA512:
-  metadata.gz: ee50b07b08ea47999650868d2b056e1a259fd32a9ba3960f79b0062e224516140517ed84f65cf7a707d9019c654eeacb145e0b0466209d06440beee2596487c5
-  data.tar.gz: 0ba086c181e376c710c0bf814369e230f2d9462b452957b5de99e1c389b98d56f5ae74d2728984b3eaa5699f5e9e0be15b5bd33daf9b7bb32b952de7efdca89d
+  metadata.gz: c030f8c2e6a87f50a053100cf4f11343ff88958a719b7c81cabc8c8ec907cbb627df25a2b6c6aa890d1137fe27eb1c1787b1002425d24a0a71bd3efee83064ec
+  data.tar.gz: 58508d65a5d4cdd27c1bfd6263929533627569355f3a1185e28503e782f0ac3cd640d8e1e76f30f86047f7c3bc07feb9a22ccda8c3e9584e3ad87f00e87e7cdf

data/lib/dradis/plugins.rb

@@ -4,9 +4,12 @@ require 'dradis/plugins/version'
 require 'dradis/plugins/content_service'
 require 'dradis/plugins/template_service'
 
+require 'dradis/plugins/export'
 require 'dradis/plugins/import'
 require 'dradis/plugins/upload'
 
+require 'dradis/plugins/templates'
+
 module Dradis
   module Plugins
     module Base
@@ -19,19 +22,12 @@ module Dradis
           @name = 'Use plugin_info(args) with :name to provide a name for this plugin.'
           Plugins::register(self)
         end
+
+        # Extend the engine with other functionality
+        base.send :include, Dradis::Plugins::Templates
       end
 
       module ClassMethods
-        # def options(key)
-        #   @options[key]
-        # end
-        #
-        # def plugin_info(args={})
-        #   features = args.delete(:provides)
-        #   provides(features)
-        #   @options = args
-        # end
-
         def description(new_description)
           @description = new_description
         end

data/lib/dradis/plugins/content_service.rb

@@ -25,10 +25,18 @@ module Dradis
 
       def create_node(args={})
         label   = args[:label] || "create_node() invoked by #{plugin} without a :label parameter"
-        type_id = args[:type_id] || default_node_type
         parent  = args[:parent] || default_parent_node
+        type_id = begin
+          tmp_type = args[:type].to_s.upcase
+          class_for(:node)::Types::const_defined?(tmp_type) ? "#{class_for(:node)::Types}::#{tmp_type}".constantize : default_node_type
+        end
 
-        parent.children.find_or_create_by_label_and_type_id(label, type_id)
+        # FIXME: how ugly is this?
+        if Rails::VERSION::MAJOR == 3
+          parent.children.find_or_create_by_label_and_type_id(label, type_id)
+        else
+          parent.children.find_or_create_by(label: label, type_id: type_id)
+        end
       end
 
       def create_note(args={})
@@ -82,7 +90,7 @@ module Dradis
       end
 
       def default_parent_node
-        @default_parent_node ||= class_for(:node).create(label: 'plugin.output')
+        @default_parent_node ||= class_for(:node).find_or_create_by(label: 'plugin.output')
       end
 
       def issuelib

data/lib/dradis/plugins/export.rb

@@ -0,0 +1 @@
+require 'dradis/plugins/export/base'

data/lib/dradis/plugins/export/base.rb

@@ -0,0 +1,27 @@
+# This module contains basic Export plugin functions.
+#
+
+module Dradis
+  module Plugins
+    module Export
+      class Base
+        attr_accessor :logger
+
+        def initialize(args={})
+          @logger = args.fetch(:logger, Rails.logger)
+
+          post_initialize(args)
+        end
+
+        def export(args={})
+          raise "The export() method is not implemented in this plugin [#{self.class.name}]."
+        end
+
+        # This method can be overwriten by plugins to do initialization tasks.
+        def post_initialize(args={})
+        end
+      end # Base
+
+    end # Export
+  end # Plugins
+end # Core

data/lib/dradis/plugins/gem_version.rb

@@ -9,7 +9,7 @@ module Dradis
       MAJOR = 3
       MINOR = 0
       TINY = 0
-      PRE = 'pre'
+      PRE = nil
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
     end

data/lib/dradis/plugins/templates.rb

@@ -0,0 +1,41 @@
+module Dradis
+  module Plugins
+    module Templates
+      def self.included(base)
+        base.extend ClassMethods
+   
+        base.class_eval do
+          # Keep track of any templates the plugin defines
+          paths['dradis/templates'] = 'templates'
+        end
+      end
+
+      module ClassMethods
+        def copy_templates(args={})
+          destination = args[:to]
+
+          raise ArgumentError.new(':copy_templates called without a :to parameter') unless destination
+          FileUtils.mkdir_p(destination) if plugin_templates.any?
+
+          plugin_templates.each do |template|
+            destination_file = File.join(destination, File.basename(template))
+            next if File.exist?(destination_file)
+
+            Rails.logger.info{ "Updating templates for #{plugin_name} plugin. Destination: #{destination}" }
+            FileUtils.cp(template, destination_file)
+          end
+        end
+
+        def plugin_templates(args={})
+          @templates ||= begin
+            if paths['dradis/templates'].existent.any?
+              Dir["%s/*" % paths['dradis/templates'].existent]
+            else
+              []
+            end
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dradis-plugins
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre
+  version: 3.0.0
 platform: ruby
 authors:
 - Daniel Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,12 +56,15 @@ files:
 - lib/dradis/plugins.rb
 - lib/dradis/plugins/content_service.rb
 - lib/dradis/plugins/engine.rb
+- lib/dradis/plugins/export.rb
+- lib/dradis/plugins/export/base.rb
 - lib/dradis/plugins/gem_version.rb
 - lib/dradis/plugins/import.rb
 - lib/dradis/plugins/import/filters.rb
 - lib/dradis/plugins/import/filters/base.rb
 - lib/dradis/plugins/import/result.rb
 - lib/dradis/plugins/template_service.rb
+- lib/dradis/plugins/templates.rb
 - lib/dradis/plugins/upload.rb
 - lib/dradis/plugins/upload/base.rb
 - lib/dradis/plugins/upload/field_processor.rb
@@ -81,9 +84,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.3.0