knife-spork 1.7.2 → 1.7.3

data/lib/chef/knife/spork-environment-delete.rb

@@ -1,38 +1,38 @@
-module KnifeSpork
-  class SporkEnvironmentDelete < Chef::Knife
-
-    deps do
-      require 'chef/knife'
-      require 'knife-spork/runner'
-    end
-
-    banner 'knife spork environment delete ENVIRONMENT (options)'
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      self.config = Chef::Config.merge!(config)
-
-      if @name_args.empty?
-        show_usage
-        ui.error("You must specify a environment name")
-        exit 1
-      end
-
-      @object_name = @name_args.first
-
-      run_plugins(:before_environmentdelete)
-      pre_environment = load_environment(@object_name)
-      environment_delete
-      post_environment = {}
-      @object_difference = json_diff(pre_environment,post_environment).to_s
-      run_plugins(:after_environmentdelete)
-    end
-
-    private
-    def environment_delete
-      rd = Chef::Knife::EnvironmentDelete.new
-      rd.name_args = @name_args
-      rd.run
-    end
-  end
-end
+module KnifeSpork
+  class SporkEnvironmentDelete < Chef::Knife
+
+    deps do
+      require 'chef/knife'
+      require 'knife-spork/runner'
+    end
+
+    banner 'knife spork environment delete ENVIRONMENT (options)'
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      self.config = Chef::Config.merge!(config)
+
+      if @name_args.empty?
+        show_usage
+        ui.error("You must specify a environment name")
+        exit 1
+      end
+
+      @object_name = @name_args.first
+
+      run_plugins(:before_environmentdelete)
+      pre_environment = load_environment(@object_name)
+      environment_delete
+      post_environment = {}
+      @object_difference = json_diff(pre_environment,post_environment).to_s
+      run_plugins(:after_environmentdelete)
+    end
+
+    private
+    def environment_delete
+      rd = Chef::Knife::EnvironmentDelete.new
+      rd.name_args = @name_args
+      rd.run
+    end
+  end
+end

data/lib/chef/knife/spork-environment-edit.rb

@@ -1,40 +1,40 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkEnvironmentEdit < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-    end
-
-    banner 'knife spork environment edit ENVIRONMENT (options)'
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      self.config = Chef::Config.merge!(config)
-
-      if @name_args.empty?
-        show_usage
-        ui.error("You must specify a environment name")
-        exit 1
-      end
-
-      @object_name = @name_args.first
-
-      run_plugins(:before_environmentedit)
-      pre_environment = load_environment(@object_name)
-      environment_edit
-      post_environment = load_environment(@object_name)
-      @object_difference = json_diff(pre_environment,post_environment).to_s
-      run_plugins(:after_environmentedit)
-    end
-
-    private
-    def environment_edit
-      re = Chef::Knife::EnvironmentEdit.new
-      re.name_args = @name_args
-      re.config[:editor] = config[:editor]
-      re.run
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkEnvironmentEdit < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+    end
+
+    banner 'knife spork environment edit ENVIRONMENT (options)'
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      self.config = Chef::Config.merge!(config)
+
+      if @name_args.empty?
+        show_usage
+        ui.error("You must specify a environment name")
+        exit 1
+      end
+
+      @object_name = @name_args.first
+
+      run_plugins(:before_environmentedit)
+      pre_environment = load_environment(@object_name)
+      environment_edit
+      post_environment = load_environment(@object_name)
+      @object_difference = json_diff(pre_environment,post_environment).to_s
+      run_plugins(:after_environmentedit)
+    end
+
+    private
+    def environment_edit
+      re = Chef::Knife::EnvironmentEdit.new
+      re.name_args = @name_args
+      re.config[:editor] = config[:editor]
+      re.run
+    end
+  end
+end

data/lib/chef/knife/spork-environment-fromfile.rb

@@ -1,46 +1,46 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkEnvironmentFromFile < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-      require 'json'
-      require 'chef/knife/environment_from_file'
-    end
-
-    banner 'knife spork environment from file FILENAME (options)'
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      self.config = Chef::Config.merge!(config)
-
-      if @name_args.empty?
-        show_usage
-        ui.error("You must specify a environment name")
-        exit 1
-      end
-
-      @name_args.each do |arg|
-        @object_name = arg.split("/").last
-        run_plugins(:before_environmentfromfile)
-        begin
-          pre_environment = load_environment(@object_name.gsub(".json","").gsub(".rb",""))
-        rescue Net::HTTPServerException => e
-          pre_environment = {}
-        end
-        environment_from_file
-        post_environment = load_environment(@object_name.gsub(".json","").gsub(".rb",""))
-        @object_difference = json_diff(pre_environment,post_environment).to_s
-        run_plugins(:after_environmentfromfile)
-      end
-    end
-
-    private
-    def environment_from_file
-      rff = Chef::Knife::EnvironmentFromFile.new
-      rff.name_args = @name_args
-      rff.run
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkEnvironmentFromFile < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+      require 'json'
+      require 'chef/knife/environment_from_file'
+    end
+
+    banner 'knife spork environment from file FILENAME (options)'
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      self.config = Chef::Config.merge!(config)
+
+      if @name_args.empty?
+        show_usage
+        ui.error("You must specify a environment name")
+        exit 1
+      end
+
+      @name_args.each do |arg|
+        @object_name = arg.split("/").last
+        run_plugins(:before_environmentfromfile)
+        begin
+          pre_environment = load_environment(@object_name.gsub(".json","").gsub(".rb",""))
+        rescue Net::HTTPServerException => e
+          pre_environment = {}
+        end
+        environment_from_file
+        post_environment = load_environment(@object_name.gsub(".json","").gsub(".rb",""))
+        @object_difference = json_diff(pre_environment,post_environment).to_s
+        run_plugins(:after_environmentfromfile)
+      end
+    end
+
+    private
+    def environment_from_file
+      rff = Chef::Knife::EnvironmentFromFile.new
+      rff.name_args = @name_args
+      rff.run
+    end
+  end
+end

data/lib/chef/knife/spork-info.rb

@@ -1,34 +1,34 @@
-require 'chef/knife'
-require 'yaml'
-
-module KnifeSpork
-  class SporkInfo < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-    end
-
-    banner 'knife spork info'
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      self.config = Chef::Config.merge!(config)
-
-      run_plugins(:before_info)
-      info
-      run_plugins(:after_info)
-    end
-
-    private
-    def info
-      ui.msg "Config Hash:"
-      ui.msg spork_config.to_yaml
-      ui.msg ""
-      ui.msg "Plugins:"
-      KnifeSpork::Plugins.klasses.each do |klass|
-        plugin = klass.new(:config => spork_config)
-        ui.msg "#{klass}: #{plugin.enabled? ? 'enabled' : 'disabled'}"
-      end
-    end
-  end
-end
+require 'chef/knife'
+require 'yaml'
+
+module KnifeSpork
+  class SporkInfo < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+    end
+
+    banner 'knife spork info'
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      self.config = Chef::Config.merge!(config)
+
+      run_plugins(:before_info)
+      info
+      run_plugins(:after_info)
+    end
+
+    private
+    def info
+      ui.msg "Config Hash:"
+      ui.msg spork_config.to_yaml
+      ui.msg ""
+      ui.msg "Plugins:"
+      KnifeSpork::Plugins.klasses.each do |klass|
+        plugin = klass.new(:config => spork_config)
+        ui.msg "#{klass}: #{plugin.enabled? ? 'enabled' : 'disabled'}"
+      end
+    end
+  end
+end

data/lib/chef/knife/spork-node-create.rb

@@ -1,41 +1,41 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkNodeCreate < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-    end
-
-    banner 'knife spork node create NODE (options)'
-
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      self.config = Chef::Config.merge!(config)
-
-      if @name_args.empty?
-        show_usage
-        ui.error("You must specify a node name")
-        exit 1
-      end
-
-      @object_name = @name_args.first
-
-      run_plugins(:before_nodecreate)
-      pre_node = {}
-      node_create
-      post_node = load_node(@object_name)
-      @object_difference = json_diff(pre_node,post_node).to_s
-      run_plugins(:after_nodecreate)
-    end
-
-    private
-    def node_create
-      ne = Chef::Knife::NodeCreate.new
-      ne.name_args = @name_args
-      ne.config[:editor] = config[:editor]
-      ne.run
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkNodeCreate < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+    end
+
+    banner 'knife spork node create NODE (options)'
+
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      self.config = Chef::Config.merge!(config)
+
+      if @name_args.empty?
+        show_usage
+        ui.error("You must specify a node name")
+        exit 1
+      end
+
+      @object_name = @name_args.first
+
+      run_plugins(:before_nodecreate)
+      pre_node = {}
+      node_create
+      post_node = load_node(@object_name)
+      @object_difference = json_diff(pre_node,post_node).to_s
+      run_plugins(:after_nodecreate)
+    end
+
+    private
+    def node_create
+      ne = Chef::Knife::NodeCreate.new
+      ne.name_args = @name_args
+      ne.config[:editor] = config[:editor]
+      ne.run
+    end
+  end
+end

data/lib/chef/knife/spork-node-delete.rb

@@ -1,41 +1,41 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkNodeDelete < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-    end
-
-    banner 'knife spork node delete NODE (options)'
-
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      self.config = Chef::Config.merge!(config)
-
-      if @name_args.empty?
-        show_usage
-        ui.error("You must specify a node name")
-        exit 1
-      end
-
-      @object_name = @name_args.first
-
-      run_plugins(:before_nodedelete)
-      pre_node = load_node(@object_name)
-      node_delete
-      post_node = {}
-      @object_difference = json_diff(pre_node,post_node).to_s
-      run_plugins(:after_nodedelete)
-    end
-
-    private
-    def node_delete
-      ne = Chef::Knife::NodeDelete.new
-      ne.name_args = @name_args
-      ne.config[:editor] = config[:editor]
-      ne.run
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkNodeDelete < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+    end
+
+    banner 'knife spork node delete NODE (options)'
+
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      self.config = Chef::Config.merge!(config)
+
+      if @name_args.empty?
+        show_usage
+        ui.error("You must specify a node name")
+        exit 1
+      end
+
+      @object_name = @name_args.first
+
+      run_plugins(:before_nodedelete)
+      pre_node = load_node(@object_name)
+      node_delete
+      post_node = {}
+      @object_difference = json_diff(pre_node,post_node).to_s
+      run_plugins(:after_nodedelete)
+    end
+
+    private
+    def node_delete
+      ne = Chef::Knife::NodeDelete.new
+      ne.name_args = @name_args
+      ne.config[:editor] = config[:editor]
+      ne.run
+    end
+  end
+end