knife-spork 1.7.2 → 1.7.3

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

@@ -1,48 +1,48 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkNodeEdit < Chef::Knife
-
-    deps do
-      require 'chef/knife/core/node_editor'
-      require 'knife-spork/runner'
-    end
-
-    banner 'knife spork node edit NODE (options)'
-
-    option :all_attributes,
-           :short => "-a",
-           :long => "--all",
-           :boolean => true,
-           :description => "Display all attributes when editing"
-
-    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_nodeedit)
-      pre_node = load_node(@object_name)
-      node_edit
-      post_node = load_node(@object_name)
-      @object_difference = json_diff(pre_node,post_node).to_s
-      run_plugins(:after_nodeedit)
-    end
-
-    private
-    def node_edit
-      ne = Chef::Knife::NodeEdit.new
-      ne.name_args = @name_args
-      ne.config[:editor] = config[:editor]
-      ne.config[:all] = config[:all]
-      ne.run
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkNodeEdit < Chef::Knife
+
+    deps do
+      require 'chef/knife/core/node_editor'
+      require 'knife-spork/runner'
+    end
+
+    banner 'knife spork node edit NODE (options)'
+
+    option :all_attributes,
+           :short => "-a",
+           :long => "--all",
+           :boolean => true,
+           :description => "Display all attributes when editing"
+
+    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_nodeedit)
+      pre_node = load_node(@object_name)
+      node_edit
+      post_node = load_node(@object_name)
+      @object_difference = json_diff(pre_node,post_node).to_s
+      run_plugins(:after_nodeedit)
+    end
+
+    private
+    def node_edit
+      ne = Chef::Knife::NodeEdit.new
+      ne.name_args = @name_args
+      ne.config[:editor] = config[:editor]
+      ne.config[:all] = config[:all]
+      ne.run
+    end
+  end
+end

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

@@ -1,46 +1,46 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkNodeFromFile < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-    end
-
-    banner 'knife spork node from file FILE (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 filename")
-        exit 1
-      end
-
-      @object_name = JSON.parse(File.read(@name_args.first))["name"]
-      ui.info @object_name
-
-      run_plugins(:before_nodefromfile)
-      begin
-        pre_node = load_node(@object_name.gsub(".json",""))
-      rescue
-        pre_node = {}
-      end
-      node_fromfile
-      post_node = load_node(@object_name.gsub(".json",""))
-      @object_difference = json_diff(pre_node,post_node).to_s
-      run_plugins(:after_nodefromfile)
-    end
-
-    private
-    def node_fromfile
-      nff = Chef::Knife::NodeFromFile.new
-      nff.name_args = @name_args
-      nff.config[:editor] = config[:editor]
-      nff.run
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkNodeFromFile < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+    end
+
+    banner 'knife spork node from file FILE (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 filename")
+        exit 1
+      end
+
+      @object_name = JSON.parse(File.read(@name_args.first))["name"]
+      ui.info @object_name
+
+      run_plugins(:before_nodefromfile)
+      begin
+        pre_node = load_node(@object_name.gsub(".json",""))
+      rescue
+        pre_node = {}
+      end
+      node_fromfile
+      post_node = load_node(@object_name.gsub(".json",""))
+      @object_difference = json_diff(pre_node,post_node).to_s
+      run_plugins(:after_nodefromfile)
+    end
+
+    private
+    def node_fromfile
+      nff = Chef::Knife::NodeFromFile.new
+      nff.name_args = @name_args
+      nff.config[:editor] = config[:editor]
+      nff.run
+    end
+  end
+end

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

@@ -1,51 +1,51 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkNodeRunListAdd < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-    end
-
-    banner 'knife spork node run_list add [NODE] [ENTRY[,ENTRY]] (options)'
-
-
-    option :after,
-           :short => "-a ITEM",
-           :long  => "--after ITEM",
-           :description => "Place the ENTRY in the run list after ITEM"
-
-    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 and item to add")
-        exit 1
-      end
-
-      @object_name = @name_args.first
-
-      @object_secondary_name = @name_args[1..-1].map do |entry|
-        entry.split(',').map { |e| e.strip }
-      end.flatten.to_s
-
-      run_plugins(:before_noderunlistadd)
-      pre_node = load_node(@object_name)
-      node_runlistadd
-      post_node = load_node(@object_name)
-      @object_difference = json_diff(pre_node,post_node).to_s
-      run_plugins(:after_noderunlistadd)
-    end
-
-    private
-    def node_runlistadd
-      nrla = Chef::Knife::NodeRunListAdd.new
-      nrla.name_args = @name_args
-      nrla.config[:editor] = config[:editor]
-      nrla.config[:after] = config[:after]
-      nrla.run
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkNodeRunListAdd < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+    end
+
+    banner 'knife spork node run_list add [NODE] [ENTRY[,ENTRY]] (options)'
+
+
+    option :after,
+           :short => "-a ITEM",
+           :long  => "--after ITEM",
+           :description => "Place the ENTRY in the run list after ITEM"
+
+    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 and item to add")
+        exit 1
+      end
+
+      @object_name = @name_args.first
+
+      @object_secondary_name = @name_args[1..-1].map do |entry|
+        entry.split(',').map { |e| e.strip }
+      end.flatten.to_s
+
+      run_plugins(:before_noderunlistadd)
+      pre_node = load_node(@object_name)
+      node_runlistadd
+      post_node = load_node(@object_name)
+      @object_difference = json_diff(pre_node,post_node).to_s
+      run_plugins(:after_noderunlistadd)
+    end
+
+    private
+    def node_runlistadd
+      nrla = Chef::Knife::NodeRunListAdd.new
+      nrla.name_args = @name_args
+      nrla.config[:editor] = config[:editor]
+      nrla.config[:after] = config[:after]
+      nrla.run
+    end
+  end
+end

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

@@ -1,44 +1,44 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkNodeRunListRemove < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-    end
-
-    banner 'knife spork node run_list add [NODE] [ENTRY[,ENTRY]] (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 and item to remove")
-        exit 1
-      end
-
-      @object_name = @name_args.first
-
-      @object_secondary_name = @name_args[1..-1].map do |entry|
-        entry.split(',').map { |e| e.strip }
-      end.flatten.to_s
-
-      run_plugins(:before_noderunlistremove)
-      pre_node = load_node(@object_name)
-      node_runlistremove
-      post_node = load_node(@object_name)
-      @object_difference = json_diff(pre_node,post_node).to_s
-      run_plugins(:after_noderunlistremove)
-    end
-
-    private
-    def node_runlistremove
-      nrla = Chef::Knife::NodeRunListRemove.new
-      nrla.name_args = @name_args
-      nrla.config[:editor] = config[:editor]
-      nrla.run
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkNodeRunListRemove < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+    end
+
+    banner 'knife spork node run_list add [NODE] [ENTRY[,ENTRY]] (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 and item to remove")
+        exit 1
+      end
+
+      @object_name = @name_args.first
+
+      @object_secondary_name = @name_args[1..-1].map do |entry|
+        entry.split(',').map { |e| e.strip }
+      end.flatten.to_s
+
+      run_plugins(:before_noderunlistremove)
+      pre_node = load_node(@object_name)
+      node_runlistremove
+      post_node = load_node(@object_name)
+      @object_difference = json_diff(pre_node,post_node).to_s
+      run_plugins(:after_noderunlistremove)
+    end
+
+    private
+    def node_runlistremove
+      nrla = Chef::Knife::NodeRunListRemove.new
+      nrla.name_args = @name_args
+      nrla.config[:editor] = config[:editor]
+      nrla.run
+    end
+  end
+end

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

@@ -1,44 +1,44 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkNodeRunListSet < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-    end
-
-    banner 'knife spork node run_list set NODE ENTRIES (options)'
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      self.config = Chef::Config.merge!(config)
-
-      if @name_args.size < 2
-        ui.error "You must supply both a node name and a run list."
-        show_usage
-        exit 1
-      end
-
-      @object_name = @name_args.first
-
-      @object_secondary_name = @name_args[1..-1].map do |entry|
-        entry.split(',').map { |e| e.strip }
-      end.flatten.to_s
-
-      run_plugins(:before_noderunlistset)
-      pre_node = load_node(@object_name)
-      node_runlistset
-      post_node = load_node(@object_name)
-      @object_difference = json_diff(pre_node,post_node).to_s
-      run_plugins(:after_noderunlistset)
-    end
-
-    private
-    def node_runlistset
-      nrla = Chef::Knife::NodeRunListSet.new
-      nrla.name_args = @name_args
-      nrla.config[:editor] = config[:editor]
-      nrla.run
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkNodeRunListSet < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+    end
+
+    banner 'knife spork node run_list set NODE ENTRIES (options)'
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      self.config = Chef::Config.merge!(config)
+
+      if @name_args.size < 2
+        ui.error "You must supply both a node name and a run list."
+        show_usage
+        exit 1
+      end
+
+      @object_name = @name_args.first
+
+      @object_secondary_name = @name_args[1..-1].map do |entry|
+        entry.split(',').map { |e| e.strip }
+      end.flatten.to_s
+
+      run_plugins(:before_noderunlistset)
+      pre_node = load_node(@object_name)
+      node_runlistset
+      post_node = load_node(@object_name)
+      @object_difference = json_diff(pre_node,post_node).to_s
+      run_plugins(:after_noderunlistset)
+    end
+
+    private
+    def node_runlistset
+      nrla = Chef::Knife::NodeRunListSet.new
+      nrla.name_args = @name_args
+      nrla.config[:editor] = config[:editor]
+      nrla.run
+    end
+  end
+end