knife-spork 1.7.2 → 1.7.3

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

@@ -1,54 +1,54 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkDataBagCreate < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-      require 'json'
-      require 'chef/knife/data_bag_create'
-    end
-
-    banner 'knife spork data bag create BAG [ITEM] (options)'
-
-    option :secret,
-           :short => "-s SECRET",
-           :long  => "--secret ",
-           :description => "The secret key to use to encrypt data bag item values"
-
-    option :secret_file,
-           :long => "--secret-file SECRET_FILE",
-           :description => "A file containing the secret key to use to encrypt data bag item values"
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      self.config = Chef::Config.merge!(config)
-
-      if @name_args.nil?
-        ui.error "You must specify a data bag name"
-        ui.error opt_parser
-        exit 1
-      end
-
-      @object_name = @name_args.first
-      @object_secondary_name = @name_args.last
-
-      run_plugins(:before_databagcreate)
-      pre_databag = {}
-      databag_create
-      post_databag = load_databag_item(@object_name, @object_secondary_name)
-      @object_difference = json_diff(pre_databag,post_databag).to_s
-      run_plugins(:after_databagcreate)
-    end
-
-    private
-    def databag_create
-      dbc = Chef::Knife::DataBagCreate.new
-      dbc.name_args = @name_args
-      dbc.config[:editor] = config[:editor]
-      dbc.config[:secret] = config[:secret]
-      dbc.config[:secret_file] = config[:secret_file]
-      dbc.run
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkDataBagCreate < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+      require 'json'
+      require 'chef/knife/data_bag_create'
+    end
+
+    banner 'knife spork data bag create BAG [ITEM] (options)'
+
+    option :secret,
+           :short => "-s SECRET",
+           :long  => "--secret ",
+           :description => "The secret key to use to encrypt data bag item values"
+
+    option :secret_file,
+           :long => "--secret-file SECRET_FILE",
+           :description => "A file containing the secret key to use to encrypt data bag item values"
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      self.config = Chef::Config.merge!(config)
+
+      if @name_args.nil?
+        ui.error "You must specify a data bag name"
+        ui.error opt_parser
+        exit 1
+      end
+
+      @object_name = @name_args.first
+      @object_secondary_name = @name_args.last
+
+      run_plugins(:before_databagcreate)
+      pre_databag = {}
+      databag_create
+      post_databag = load_databag_item(@object_name, @object_secondary_name)
+      @object_difference = json_diff(pre_databag,post_databag).to_s
+      run_plugins(:after_databagcreate)
+    end
+
+    private
+    def databag_create
+      dbc = Chef::Knife::DataBagCreate.new
+      dbc.name_args = @name_args
+      dbc.config[:editor] = config[:editor]
+      dbc.config[:secret] = config[:secret]
+      dbc.config[:secret_file] = config[:secret_file]
+      dbc.run
+    end
+  end
+end

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

@@ -1,51 +1,51 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkDataBagDelete < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-      require 'json'
-      require 'chef/knife/data_bag_delete'
-    end
-
-    banner 'knife spork data bag delete BAG [ITEM] (options)'
-
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      self.config = Chef::Config.merge!(config)
-
-      if @name_args.length == 2
-        @object_name = @name_args.first
-        @object_secondary_name = @name_args.last
-        run_plugins(:before_databagitemdelete)
-        pre_databag = load_databag_item(@object_name,@object_secondary_name)
-        databag_delete
-        post_databag = {}
-        @object_difference = json_diff(pre_databag,post_databag).to_s
-        run_plugins(:after_databagitemdelete)
-      elsif @name_args.length == 1
-        @object_name = @name_args.first
-        run_plugins(:before_databagdelete)
-        pre_databag = load_databag(@object_name)
-        databag_delete
-        post_databag =  {}
-        @object_difference = json_diff(pre_databag,post_databag).to_s
-        run_plugins(:after_databagdelete)
-      else
-        show_usage
-        ui.fatal("You must specify at least a data bag name")
-        exit 1
-      end
-    end
-
-    private
-    def databag_delete
-      dbd = Chef::Knife::DataBagDelete.new
-      dbd.name_args = @name_args
-      dbd.config[:editor] = config[:editor]
-      dbd.run
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkDataBagDelete < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+      require 'json'
+      require 'chef/knife/data_bag_delete'
+    end
+
+    banner 'knife spork data bag delete BAG [ITEM] (options)'
+
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      self.config = Chef::Config.merge!(config)
+
+      if @name_args.length == 2
+        @object_name = @name_args.first
+        @object_secondary_name = @name_args.last
+        run_plugins(:before_databagitemdelete)
+        pre_databag = load_databag_item(@object_name,@object_secondary_name)
+        databag_delete
+        post_databag = {}
+        @object_difference = json_diff(pre_databag,post_databag).to_s
+        run_plugins(:after_databagitemdelete)
+      elsif @name_args.length == 1
+        @object_name = @name_args.first
+        run_plugins(:before_databagdelete)
+        pre_databag = load_databag(@object_name)
+        databag_delete
+        post_databag =  {}
+        @object_difference = json_diff(pre_databag,post_databag).to_s
+        run_plugins(:after_databagdelete)
+      else
+        show_usage
+        ui.fatal("You must specify at least a data bag name")
+        exit 1
+      end
+    end
+
+    private
+    def databag_delete
+      dbd = Chef::Knife::DataBagDelete.new
+      dbd.name_args = @name_args
+      dbd.config[:editor] = config[:editor]
+      dbd.run
+    end
+  end
+end

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

@@ -1,54 +1,54 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkDataBagEdit < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-      require 'json'
-      require 'chef/knife/data_bag_edit'
-    end
-
-    banner 'knife spork data bag edit BAG ITEM (options)'
-
-    option :secret,
-           :short => "-s SECRET",
-           :long  => "--secret ",
-           :description => "The secret key to use to encrypt data bag item values"
-
-    option :secret_file,
-           :long => "--secret-file SECRET_FILE",
-           :description => "A file containing the secret key to use to encrypt data bag item values"
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      self.config = Chef::Config.merge!(config)
-
-      if @name_args.length != 2
-        ui.error "You must supply the data bag and an item to edit!"
-        ui.error opt_parser
-        exit 1
-      end
-
-      @object_name = @name_args.first
-      @object_secondary_name = @name_args.last
-
-      run_plugins(:before_databagedit)
-      pre_databag = load_databag_item(@object_name, @object_secondary_name)
-      databag_edit
-      post_databag = load_databag_item(@object_name, @object_secondary_name)
-      @object_difference = json_diff(pre_databag,post_databag).to_s
-      run_plugins(:after_databagedit)
-    end
-
-    private
-    def databag_edit
-      dbe = Chef::Knife::DataBagEdit.new
-      dbe.name_args = @name_args
-      dbe.config[:editor] = config[:editor]
-      dbe.config[:secret] = config[:secret]
-      dbe.config[:secret_file] = config[:secret_file]
-      dbe.run
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkDataBagEdit < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+      require 'json'
+      require 'chef/knife/data_bag_edit'
+    end
+
+    banner 'knife spork data bag edit BAG ITEM (options)'
+
+    option :secret,
+           :short => "-s SECRET",
+           :long  => "--secret ",
+           :description => "The secret key to use to encrypt data bag item values"
+
+    option :secret_file,
+           :long => "--secret-file SECRET_FILE",
+           :description => "A file containing the secret key to use to encrypt data bag item values"
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      self.config = Chef::Config.merge!(config)
+
+      if @name_args.length != 2
+        ui.error "You must supply the data bag and an item to edit!"
+        ui.error opt_parser
+        exit 1
+      end
+
+      @object_name = @name_args.first
+      @object_secondary_name = @name_args.last
+
+      run_plugins(:before_databagedit)
+      pre_databag = load_databag_item(@object_name, @object_secondary_name)
+      databag_edit
+      post_databag = load_databag_item(@object_name, @object_secondary_name)
+      @object_difference = json_diff(pre_databag,post_databag).to_s
+      run_plugins(:after_databagedit)
+    end
+
+    private
+    def databag_edit
+      dbe = Chef::Knife::DataBagEdit.new
+      dbe.name_args = @name_args
+      dbe.config[:editor] = config[:editor]
+      dbe.config[:secret] = config[:secret]
+      dbe.config[:secret_file] = config[:secret_file]
+      dbe.run
+    end
+  end
+end

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

@@ -1,88 +1,88 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkDataBagFromFile < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-      require 'json'
-      require 'chef/knife/data_bag_from_file'
-    end
-
-    banner 'knife spork data bag from file BAG FILE|FOLDER [FILE|FOLDER..] (options)'
-
-    option :secret,
-           :short => "-s SECRET",
-           :long  => "--secret ",
-           :description => "The secret key to use to encrypt data bag item values"
-
-    option :secret_file,
-           :long => "--secret-file SECRET_FILE",
-           :description => "A file containing the secret key to use to encrypt data bag item values"
-
-    option :all,
-           :short => "-a",
-           :long  => "--all",
-           :description => "Upload all data bags"
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      self.config = Chef::Config.merge!(config)
-
-      @object_name = @name_args.first
-      # This should be the data bag name. If it isn't, some poor soul forgot the data bag name.
-      # Check to see if there are any more arguments, and if not, warn about usage.
-      if @name_args.drop(1).size == 0
-        print "USAGE: #{banner}"
-        exit(1)
-      end
-
-      if config[:all] == true
-        test = Chef::Knife::DataBagFromFile.new
-        test.config[:verbosity] = 3
-        databags = test.send(:find_all_data_bags)
-        databags.each do |bag|
-          test.send(:find_all_data_bag_items,bag).each do |item|
-            @object_name = bag
-            @object_secondary_name = item.split("/").last
-            run_plugins(:before_databagfromfile)
-            begin
-              pre_databag = load_databag_item(@object_name, @object_secondary_name.gsub(".json",""))
-            rescue
-              pre_databag = {}
-            end
-            databag_from_file([@object_name,@object_secondary_name])
-            post_databag = load_databag_item(@object_name, @object_secondary_name.gsub(".json",""))
-            @object_difference = json_diff(pre_databag,post_databag).to_s
-            run_plugins(:after_databagfromfile)
-          end
-        end
-
-      else
-        @name_args[1..-1].each do |arg|
-            @object_secondary_name = arg.split("/").last
-            run_plugins(:before_databagfromfile)
-            begin
-              pre_databag = load_databag_item(@object_name, @object_secondary_name.gsub(".json",""))
-            rescue
-              pre_databag = {}
-            end
-            databag_from_file
-            post_databag = load_databag_item(@object_name, @object_secondary_name.gsub(".json",""))
-            @object_difference = json_diff(pre_databag,post_databag).to_s
-            run_plugins(:after_databagfromfile)
-        end
-      end
-    end
-
-    private
-    def databag_from_file(data_bag_names=nil)
-      dbff = Chef::Knife::DataBagFromFile.new
-      dbff.name_args = data_bag_names || @name_args
-      dbff.config[:editor] = config[:editor]
-      dbff.config[:secret] = config[:secret]
-      dbff.config[:secret_file] = config[:secret_file]
-      dbff.run
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkDataBagFromFile < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+      require 'json'
+      require 'chef/knife/data_bag_from_file'
+    end
+
+    banner 'knife spork data bag from file BAG FILE|FOLDER [FILE|FOLDER..] (options)'
+
+    option :secret,
+           :short => "-s SECRET",
+           :long  => "--secret ",
+           :description => "The secret key to use to encrypt data bag item values"
+
+    option :secret_file,
+           :long => "--secret-file SECRET_FILE",
+           :description => "A file containing the secret key to use to encrypt data bag item values"
+
+    option :all,
+           :short => "-a",
+           :long  => "--all",
+           :description => "Upload all data bags"
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      self.config = Chef::Config.merge!(config)
+
+      @object_name = @name_args.first
+      # This should be the data bag name. If it isn't, some poor soul forgot the data bag name.
+      # Check to see if there are any more arguments, and if not, warn about usage.
+      if @name_args.drop(1).size == 0
+        print "USAGE: #{banner}"
+        exit(1)
+      end
+
+      if config[:all] == true
+        test = Chef::Knife::DataBagFromFile.new
+        test.config[:verbosity] = 3
+        databags = test.send(:find_all_data_bags)
+        databags.each do |bag|
+          test.send(:find_all_data_bag_items,bag).each do |item|
+            @object_name = bag
+            @object_secondary_name = item.split("/").last
+            run_plugins(:before_databagfromfile)
+            begin
+              pre_databag = load_databag_item(@object_name, @object_secondary_name.gsub(".json",""))
+            rescue
+              pre_databag = {}
+            end
+            databag_from_file([@object_name,@object_secondary_name])
+            post_databag = load_databag_item(@object_name, @object_secondary_name.gsub(".json",""))
+            @object_difference = json_diff(pre_databag,post_databag).to_s
+            run_plugins(:after_databagfromfile)
+          end
+        end
+
+      else
+        @name_args[1..-1].each do |arg|
+            @object_secondary_name = arg.split("/").last
+            run_plugins(:before_databagfromfile)
+            begin
+              pre_databag = load_databag_item(@object_name, @object_secondary_name.gsub(".json",""))
+            rescue
+              pre_databag = {}
+            end
+            databag_from_file
+            post_databag = load_databag_item(@object_name, @object_secondary_name.gsub(".json",""))
+            @object_difference = json_diff(pre_databag,post_databag).to_s
+            run_plugins(:after_databagfromfile)
+        end
+      end
+    end
+
+    private
+    def databag_from_file(data_bag_names=nil)
+      dbff = Chef::Knife::DataBagFromFile.new
+      dbff.name_args = data_bag_names || @name_args
+      dbff.config[:editor] = config[:editor]
+      dbff.config[:secret] = config[:secret]
+      dbff.config[:secret_file] = config[:secret_file]
+      dbff.run
+    end
+  end
+end