knife-spork 1.7.2 → 1.7.3

data/lib/knife-spork/plugins/rubocop.rb

@@ -1,56 +1,56 @@
-require 'knife-spork/plugins/plugin'
-
-module KnifeSpork
-  module Plugins
-    class Rubocop < Plugin
-      name :rubocop
-      hooks :after_check, :before_upload
-
-      def perform
-        if config.use_cookstyle
-          safe_require 'cookstyle'
-        else
-          safe_require 'rubocop'
-        end
-        safe_require 'rubocop/cli'
-        safe_require 'rubocop/config_store'
-
-        if Gem::Specification.find_all_by_name("rubocop").empty?
-          ui.fatal "The knife-spork rubocop plugin requires rubocop."
-          exit 1
-        end
-
-        base_options = []
-	base_options = base_options.concat([ "-D" ]) if config.show_name  # Lists the name of the offense along with the description
-	base_options = base_options.concat([ "--auto-correct" ]) if config.autocorrect
-	base_options = base_options.concat([ "--out", config.out_file ]) if config.out_file # Specify a file output rather than STDOUT for the specific errors
-	base_options = base_options.concat([ "--fail-level", config.sev_level ]) if config.sev_level # Specify a severity level for when rubocop should fail
-	base_options = base_options.concat([ "--lint"]) if config.lint  # Only run lint checks
-
-        cookbooks.each do |cookbook|
-          ui.info "Running rubocop against #{cookbook.name}@#{cookbook.version}..."
-
-          cookbook_path = cookbook.root_dir
-
-          ui.info cookbook_path
-
-          options = [ cookbook_path ]
-
-          cli = defined?(RuboCop) ? ::RuboCop::CLI.new : ::Rubocop::CLI.new
-          result = cli.run(options)
-
-          unless result  == 0
-            ui.error "Rubocop failed!"
-            exit(1) if config.epic_fail
-          else
-            ui.info "Passed!"
-          end
-        end
-      end
-
-      def epic_fail?
-        config.epic_fail.nil? ? 'true' : config.epic_fail
-      end
-    end
-  end
-end
+require 'knife-spork/plugins/plugin'
+
+module KnifeSpork
+  module Plugins
+    class Rubocop < Plugin
+      name :rubocop
+      hooks :after_check, :before_upload
+
+      def perform
+        if config.use_cookstyle
+          safe_require 'cookstyle'
+        else
+          safe_require 'rubocop'
+        end
+        safe_require 'rubocop/cli'
+        safe_require 'rubocop/config_store'
+
+        if Gem::Specification.find_all_by_name("rubocop").empty?
+          ui.fatal "The knife-spork rubocop plugin requires rubocop."
+          exit 1
+        end
+
+        base_options = []
+	base_options = base_options.concat([ "-D" ]) if config.show_name  # Lists the name of the offense along with the description
+	base_options = base_options.concat([ "--auto-correct" ]) if config.autocorrect
+	base_options = base_options.concat([ "--out", config.out_file ]) if config.out_file # Specify a file output rather than STDOUT for the specific errors
+	base_options = base_options.concat([ "--fail-level", config.sev_level ]) if config.sev_level # Specify a severity level for when rubocop should fail
+	base_options = base_options.concat([ "--lint"]) if config.lint  # Only run lint checks
+
+        cookbooks.each do |cookbook|
+          ui.info "Running rubocop against #{cookbook.name}@#{cookbook.version}..."
+
+          cookbook_path = cookbook.root_dir
+
+          ui.info cookbook_path
+
+          options = [ cookbook_path ]
+
+          cli = defined?(RuboCop) ? ::RuboCop::CLI.new : ::Rubocop::CLI.new
+          result = cli.run(options)
+
+          unless result  == 0
+            ui.error "Rubocop failed!"
+            exit(1) if config.epic_fail
+          else
+            ui.info "Passed!"
+          end
+        end
+      end
+
+      def epic_fail?
+        config.epic_fail.nil? ? 'true' : config.epic_fail
+      end
+    end
+  end
+end

data/lib/knife-spork/plugins/slack.rb

@@ -1,125 +1,125 @@
-require 'knife-spork/plugins/plugin'
-
-module KnifeSpork
-  module Plugins
-    class Slack < Plugin
-      name :slack
-
-      def perform; end
-
-      def after_upload
-        slack "#{organization}#{current_user} uploaded the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")}"
-      end
-
-      def after_delete
-        slack "#{organization}#{current_user} deleted the following cookbooks: #{misc_output}"
-      end
-
-      def after_promote_remote
-        slack "#{organization}#{current_user} promoted the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")} to #{environments.collect{ |e| "#{e.name}" }.join(", ")}"
-      end
-
-      def after_environmentfromfile
-        slack "#{organization}#{current_user} uploaded environment #{object_name}"
-      end
-
-      def after_environmentedit
-        slack "#{organization}#{current_user} edited environment #{object_name}"
-      end
-
-      def after_environmentcreate
-        slack "#{organization}#{current_user} created environment #{object_name}"
-      end
-
-      def after_environmentdelete
-        slack "#{organization}#{current_user} deleted environment #{object_name}"
-      end
-
-      def after_rolefromfile
-        slack "#{organization}#{current_user} uploaded role #{object_name}"
-      end
-
-      def after_roleedit
-        slack "#{organization}#{current_user} edited role #{object_name}"
-      end
-
-      def after_rolecreate
-        slack "#{organization}#{current_user} created role #{object_name}"
-      end
-
-      def after_roledelete
-        slack "#{organization}#{current_user} deleted role #{object_name}"
-      end
-
-      def after_databagedit
-        slack "#{organization}#{current_user} edited data bag item #{object_name}:#{object_secondary_name}"
-      end
-
-      def after_databagcreate
-        slack "#{organization}#{current_user} created data bag #{object_name}"
-      end
-
-      def after_databagdelete
-        slack "#{organization}#{current_user} deleted data bag item #{object_name}"
-      end
-
-      def after_databagitemdelete
-        slack "#{organization}#{current_user} deleted data bag item #{object_name}:#{object_secondary_name}"
-      end
-
-      def after_databagfromfile
-        slack "#{organization}#{current_user} uploaded data bag item #{object_name}:#{object_secondary_name}"
-      end
-
-      def after_nodeedit
-        slack "#{organization}#{current_user} edited node #{object_name}"
-      end
-
-      def after_nodedelete
-        slack "#{organization}#{current_user} deleted node #{object_name}"
-      end
-
-      def after_nodecreate
-        slack "#{organization}#{current_user} created node #{object_name}"
-      end
-
-      def after_nodefromfile
-        slack "#{organization}#{current_user} uploaded node #{object_name}"
-      end
-
-      def after_noderunlistadd
-        slack "#{organization}#{current_user} added run_list items to #{object_name}: #{object_secondary_name}"
-      end
-
-      def after_noderunlistremove
-        slack "#{organization}#{current_user} removed run_list items from #{object_name}: #{object_secondary_name}"
-      end
-
-      def after_noderunlistset
-        slack "#{organization}#{current_user} set the run_list for #{object_name} to #{object_secondary_name}"
-      end
-
-
-      private
-      def slack(message)
-        safe_require 'slack-notifier'
-        begin
-          notifier = ::Slack::Notifier.new( config.webhook_url, channel: channel, username: username, icon_url: config.icon_url)
-          notifier.ping message 
-        rescue Exception => e
-          ui.error 'Something went wrong sending to Slack.'
-          ui.error e.to_s
-        end
-      end
-
-      def channel
-        config.channel || '#random'
-      end
-
-      def username
-        config.username || 'KnifeSpork'
-      end
-
-    end
-  end
-end
+require 'knife-spork/plugins/plugin'
+
+module KnifeSpork
+  module Plugins
+    class Slack < Plugin
+      name :slack
+
+      def perform; end
+
+      def after_upload
+        slack "#{organization}#{current_user} uploaded the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")}"
+      end
+
+      def after_delete
+        slack "#{organization}#{current_user} deleted the following cookbooks: #{misc_output}"
+      end
+
+      def after_promote_remote
+        slack "#{organization}#{current_user} promoted the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")} to #{environments.collect{ |e| "#{e.name}" }.join(", ")}"
+      end
+
+      def after_environmentfromfile
+        slack "#{organization}#{current_user} uploaded environment #{object_name}"
+      end
+
+      def after_environmentedit
+        slack "#{organization}#{current_user} edited environment #{object_name}"
+      end
+
+      def after_environmentcreate
+        slack "#{organization}#{current_user} created environment #{object_name}"
+      end
+
+      def after_environmentdelete
+        slack "#{organization}#{current_user} deleted environment #{object_name}"
+      end
+
+      def after_rolefromfile
+        slack "#{organization}#{current_user} uploaded role #{object_name}"
+      end
+
+      def after_roleedit
+        slack "#{organization}#{current_user} edited role #{object_name}"
+      end
+
+      def after_rolecreate
+        slack "#{organization}#{current_user} created role #{object_name}"
+      end
+
+      def after_roledelete
+        slack "#{organization}#{current_user} deleted role #{object_name}"
+      end
+
+      def after_databagedit
+        slack "#{organization}#{current_user} edited data bag item #{object_name}:#{object_secondary_name}"
+      end
+
+      def after_databagcreate
+        slack "#{organization}#{current_user} created data bag #{object_name}"
+      end
+
+      def after_databagdelete
+        slack "#{organization}#{current_user} deleted data bag item #{object_name}"
+      end
+
+      def after_databagitemdelete
+        slack "#{organization}#{current_user} deleted data bag item #{object_name}:#{object_secondary_name}"
+      end
+
+      def after_databagfromfile
+        slack "#{organization}#{current_user} uploaded data bag item #{object_name}:#{object_secondary_name}"
+      end
+
+      def after_nodeedit
+        slack "#{organization}#{current_user} edited node #{object_name}"
+      end
+
+      def after_nodedelete
+        slack "#{organization}#{current_user} deleted node #{object_name}"
+      end
+
+      def after_nodecreate
+        slack "#{organization}#{current_user} created node #{object_name}"
+      end
+
+      def after_nodefromfile
+        slack "#{organization}#{current_user} uploaded node #{object_name}"
+      end
+
+      def after_noderunlistadd
+        slack "#{organization}#{current_user} added run_list items to #{object_name}: #{object_secondary_name}"
+      end
+
+      def after_noderunlistremove
+        slack "#{organization}#{current_user} removed run_list items from #{object_name}: #{object_secondary_name}"
+      end
+
+      def after_noderunlistset
+        slack "#{organization}#{current_user} set the run_list for #{object_name} to #{object_secondary_name}"
+      end
+
+
+      private
+      def slack(message)
+        safe_require 'slack-notifier'
+        begin
+          notifier = ::Slack::Notifier.new( config.webhook_url, channel: channel, username: username, icon_url: config.icon_url)
+          notifier.ping message 
+        rescue Exception => e
+          ui.error 'Something went wrong sending to Slack.'
+          ui.error e.to_s
+        end
+      end
+
+      def channel
+        config.channel || '#random'
+      end
+
+      def username
+        config.username || 'KnifeSpork'
+      end
+
+    end
+  end
+end

data/lib/knife-spork/plugins/statusnet.rb

@@ -1,122 +1,122 @@
-require 'knife-spork/plugins/plugin'
-
-module KnifeSpork
-  module Plugins
-    class StatusNet < Plugin
-      name :statusnet
-
-      def perform; end
-
-      def after_upload
-        statusnet "#{organization}#{current_user} uploaded the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")}"
-      end
-
-      def after_delete
-        statusnet "#{organization}#{current_user} deleted the following cookbooks: #{misc_output}"
-      end
-
-      def after_promote_remote
-        statusnet "#{organization}#{current_user} promoted the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")} to #{environments.collect{ |e| "#{e.name}" }.join(", ")}"
-      end
-
-      def after_environmentfromfile
-        statusnet "#{organization}#{current_user} uploaded environment #{object_name}"
-      end
-
-      def after_environmentedit
-        statusnet "#{organization}#{current_user} edited environment #{object_name}"
-      end
-
-      def after_environmentcreate
-        statusnet "#{organization}#{current_user} created environment #{object_name}"
-      end
-
-      def after_environmentdelete
-        statusnet "#{organization}#{current_user} deleted environment #{object_name}"
-      end
-
-      def after_rolefromfile
-        statusnet "#{organization}#{current_user} uploaded role #{object_name}"
-      end
-
-      def after_roleedit
-        statusnet "#{organization}#{current_user} edited role #{object_name}"
-      end
-
-      def after_rolecreate
-        statusnet "#{organization}#{current_user} created role #{object_name}"
-      end
-
-      def after_roledelete
-        statusnet "#{organization}#{current_user} deleted role #{object_name}"
-      end
-
-      def after_databagedit
-        statusnet "#{organization}#{current_user} edited data bag item #{object_name}:#{object_secondary_name}"
-      end
-
-      def after_databagcreate
-        statusnet "#{organization}#{current_user} created data bag #{object_name}"
-      end
-
-      def after_databagdelete
-        statusnet "#{organization}#{current_user} deleted data bag #{object_name}"
-      end
-
-      def after_databagitemdelete
-        statusnet "#{organization}#{current_user} deleted data bag item #{object_name}:#{object_secondary_name}"
-      end
-
-      def after_databagfromfile
-        statusnet "#{organization}#{current_user} uploaded data bag item #{object_name}:#{object_secondary_name}"
-      end
-
-      def after_nodeedit
-        statusnet "#{organization}#{current_user} edited node #{object_name}"
-      end
-
-      def after_nodedelete
-        statusnet "#{organization}#{current_user} deleted node #{object_name}"
-      end
-
-      def after_nodecreate
-        statusnet "#{organization}#{current_user} created node #{object_name}"
-      end
-
-      def after_nodefromfile
-        statusnet "#{organization}#{current_user} uploaded node #{object_name}"
-      end
-
-      def after_noderunlistadd
-        statusnet "#{organization}#{current_user} added run_list items to #{object_name}: #{object_secondary_name}"
-      end
-
-      def after_noderunlistremove
-        statusnet "#{organization}#{current_user} removed run_list items from #{object_name}: #{object_secondary_name}"
-      end
-
-      def after_noderunlistset
-        statusnet "#{organization}#{current_user} set the run_list for #{object_name} to #{object_secondary_name}"
-      end
-
-      private
-
-      def statusnet(message)
-        safe_require 'curb'
-
-        begin
-          c = Curl::Easy.new(config.url)
-          c.http_auth_types = :basic
-          c.username = config.username
-          c.password = config.password
-          c.post_body = message
-          c.perform
-        rescue Exception => e
-          ui.error 'Something went wrong sending to StatusNet.'
-          ui.error e.to_s
-        end
-      end
-
-    end
-  end
-end
+require 'knife-spork/plugins/plugin'
+
+module KnifeSpork
+  module Plugins
+    class StatusNet < Plugin
+      name :statusnet
+
+      def perform; end
+
+      def after_upload
+        statusnet "#{organization}#{current_user} uploaded the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")}"
+      end
+
+      def after_delete
+        statusnet "#{organization}#{current_user} deleted the following cookbooks: #{misc_output}"
+      end
+
+      def after_promote_remote
+        statusnet "#{organization}#{current_user} promoted the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")} to #{environments.collect{ |e| "#{e.name}" }.join(", ")}"
+      end
+
+      def after_environmentfromfile
+        statusnet "#{organization}#{current_user} uploaded environment #{object_name}"
+      end
+
+      def after_environmentedit
+        statusnet "#{organization}#{current_user} edited environment #{object_name}"
+      end
+
+      def after_environmentcreate
+        statusnet "#{organization}#{current_user} created environment #{object_name}"
+      end
+
+      def after_environmentdelete
+        statusnet "#{organization}#{current_user} deleted environment #{object_name}"
+      end
+
+      def after_rolefromfile
+        statusnet "#{organization}#{current_user} uploaded role #{object_name}"
+      end
+
+      def after_roleedit
+        statusnet "#{organization}#{current_user} edited role #{object_name}"
+      end
+
+      def after_rolecreate
+        statusnet "#{organization}#{current_user} created role #{object_name}"
+      end
+
+      def after_roledelete
+        statusnet "#{organization}#{current_user} deleted role #{object_name}"
+      end
+
+      def after_databagedit
+        statusnet "#{organization}#{current_user} edited data bag item #{object_name}:#{object_secondary_name}"
+      end
+
+      def after_databagcreate
+        statusnet "#{organization}#{current_user} created data bag #{object_name}"
+      end
+
+      def after_databagdelete
+        statusnet "#{organization}#{current_user} deleted data bag #{object_name}"
+      end
+
+      def after_databagitemdelete
+        statusnet "#{organization}#{current_user} deleted data bag item #{object_name}:#{object_secondary_name}"
+      end
+
+      def after_databagfromfile
+        statusnet "#{organization}#{current_user} uploaded data bag item #{object_name}:#{object_secondary_name}"
+      end
+
+      def after_nodeedit
+        statusnet "#{organization}#{current_user} edited node #{object_name}"
+      end
+
+      def after_nodedelete
+        statusnet "#{organization}#{current_user} deleted node #{object_name}"
+      end
+
+      def after_nodecreate
+        statusnet "#{organization}#{current_user} created node #{object_name}"
+      end
+
+      def after_nodefromfile
+        statusnet "#{organization}#{current_user} uploaded node #{object_name}"
+      end
+
+      def after_noderunlistadd
+        statusnet "#{organization}#{current_user} added run_list items to #{object_name}: #{object_secondary_name}"
+      end
+
+      def after_noderunlistremove
+        statusnet "#{organization}#{current_user} removed run_list items from #{object_name}: #{object_secondary_name}"
+      end
+
+      def after_noderunlistset
+        statusnet "#{organization}#{current_user} set the run_list for #{object_name} to #{object_secondary_name}"
+      end
+
+      private
+
+      def statusnet(message)
+        safe_require 'curb'
+
+        begin
+          c = Curl::Easy.new(config.url)
+          c.http_auth_types = :basic
+          c.username = config.username
+          c.password = config.password
+          c.post_body = message
+          c.perform
+        rescue Exception => e
+          ui.error 'Something went wrong sending to StatusNet.'
+          ui.error e.to_s
+        end
+      end
+
+    end
+  end
+end