knife-spork 1.7.2 → 1.7.3

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

@@ -1,132 +1,132 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkDelete < Chef::Knife
-    deps do
-      require 'chef/exceptions'
-      require 'knife-spork/runner'
-      require 'socket'
-    end
-
-    ALL_NO_CONF = 'all_no_conf'.freeze
-    ALL_CONF = 'all_conf'.freeze
-    ONE_NO_CONF = 'one_no_conf'.freeze
-    ONE_CONF = 'one_conf'.freeze
-
-    banner 'knife spork delete [COOKBOOKS...] (options)'
-
-    option :cookbook_path,
-      :short => '-o PATH:PATH',
-      :long => '--cookbook-path PATH:PATH',
-      :description => 'A colon-separated path to look for cookbooks in',
-      :proc => lambda { |o| o.split(':') }
-
-    option :yes,
-      :short => '-y',
-      :long => '--yes',
-      :description => 'Say yes to all prompts for confirmation'
-
-    option :all,
-      :short => '-a',
-      :long => '--all',
-      :description => 'Delete all versions of the specified cookbooks'
-
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      self.config = Chef::Config.merge!(config)
-      config[:cookbook_path] ||= Chef::Config[:cookbook_path]
-
-      if @name_args.empty?
-        show_usage
-        ui.error("You must specify the --all flag or at least one cookbook name")
-        exit 1
-      end
-
-      delete
-      @misc_output = @deleted_cookbook_string
-      run_plugins(:after_delete)
-    end
-
-    private
-
-    def printable_version_string(version)
-      # The version variable might be a string or an array. The array might even be empty.
-      # Based on what it is, we will return a string that says something like "versions 1, 2" or "version 1" or "ALL versions"
-      # for more human-readable output.
-      if (version.class == Array and version.size == 0) or version == "ALL"
-        return "ALL versions"
-      elsif version.class == Array
-        if version.size > 1
-          return "versions #{version.join(', ')}"
-        else
-          return "version #{version.join(', ')}"
-        end
-      else
-        return "version #{version}"
-      end
-    end 
-
-    def run_knife_command(cookbook_name, command, version = [])
-      begin
-        ui.warn("Deleting cookbook #{cookbook_name}...")
-        case command
-        when ALL_NO_CONF
-          @knife.delete_all_without_confirmation
-        when ALL_CONF
-          @knife.delete_all_versions
-        when ONE_NO_CONF
-          @knife.delete_versions_without_confirmation(version)
-        when ONE_CONF
-          @knife.version = version
-          @knife.delete_explicit_version
-        end
-        ui.msg("Successfully deleted cookbook #{cookbook_name} #{printable_version_string(version)} from the Chef server")
-        true
-      rescue SystemExit
-        # The user said no at a confirmation prompt, just continue. But return false since we
-        # didn't actually delete anything.
-        false
-      rescue Exception => e
-        ui.error("Error deleting cookbook #{cookbook_name}: #{e}")
-        false
-      end
-    end
-
-    def delete
-      @deleted_cookbooks = []
-      name_args.each do |cookbook_name|
-        @knife = Chef::Knife::CookbookDelete.new
-        @knife.name_args = cookbook_name
-        @knife.cookbook_name = cookbook_name
-        if config[:all]
-          @knife.config[:all] = true
-          if config[:yes]
-            @deleted_cookbooks.push([cookbook_name, "ALL"]) if run_knife_command(cookbook_name, ALL_NO_CONF)
-          else
-            @deleted_cookbooks.push([cookbook_name, "ALL"]) if run_knife_command(cookbook_name, ALL_CONF)
-          end
-        else
-          begin
-            versions_to_delete = @knife.ask_which_versions_to_delete
-          rescue NoMethodError
-            # Rescuing this means the output from knife itself already gets printed, no need to duplicate that.
-            exit 1
-          end
-          if config[:yes]
-            @deleted_cookbooks.push([cookbook_name, versions_to_delete]) if run_knife_command(cookbook_name, ONE_NO_CONF, versions_to_delete)
-          else
-            versions_to_delete.each do |version|
-              @deleted_cookbooks.push([cookbook_name, version]) if run_knife_command(cookbook_name, ONE_CONF, version)
-            end  
-          end
-        end
-      end
-      # This is the formatted string that the plugins will use to print.
-      @deleted_cookbook_string = ""
-      @deleted_cookbooks.each {|cookbook, version| @deleted_cookbook_string << "#{cookbook}: #{printable_version_string(version)}, " }
-      @deleted_cookbook_string.chop!.chop! # Get rid of the trailing , chop chop!
-      ui.msg("Cookbooks deleted from chef server: #{@deleted_cookbook_string}")
-    end     
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkDelete < Chef::Knife
+    deps do
+      require 'chef/exceptions'
+      require 'knife-spork/runner'
+      require 'socket'
+    end
+
+    ALL_NO_CONF = 'all_no_conf'.freeze
+    ALL_CONF = 'all_conf'.freeze
+    ONE_NO_CONF = 'one_no_conf'.freeze
+    ONE_CONF = 'one_conf'.freeze
+
+    banner 'knife spork delete [COOKBOOKS...] (options)'
+
+    option :cookbook_path,
+      :short => '-o PATH:PATH',
+      :long => '--cookbook-path PATH:PATH',
+      :description => 'A colon-separated path to look for cookbooks in',
+      :proc => lambda { |o| o.split(':') }
+
+    option :yes,
+      :short => '-y',
+      :long => '--yes',
+      :description => 'Say yes to all prompts for confirmation'
+
+    option :all,
+      :short => '-a',
+      :long => '--all',
+      :description => 'Delete all versions of the specified cookbooks'
+
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      self.config = Chef::Config.merge!(config)
+      config[:cookbook_path] ||= Chef::Config[:cookbook_path]
+
+      if @name_args.empty?
+        show_usage
+        ui.error("You must specify the --all flag or at least one cookbook name")
+        exit 1
+      end
+
+      delete
+      @misc_output = @deleted_cookbook_string
+      run_plugins(:after_delete)
+    end
+
+    private
+
+    def printable_version_string(version)
+      # The version variable might be a string or an array. The array might even be empty.
+      # Based on what it is, we will return a string that says something like "versions 1, 2" or "version 1" or "ALL versions"
+      # for more human-readable output.
+      if (version.class == Array and version.size == 0) or version == "ALL"
+        return "ALL versions"
+      elsif version.class == Array
+        if version.size > 1
+          return "versions #{version.join(', ')}"
+        else
+          return "version #{version.join(', ')}"
+        end
+      else
+        return "version #{version}"
+      end
+    end 
+
+    def run_knife_command(cookbook_name, command, version = [])
+      begin
+        ui.warn("Deleting cookbook #{cookbook_name}...")
+        case command
+        when ALL_NO_CONF
+          @knife.delete_all_without_confirmation
+        when ALL_CONF
+          @knife.delete_all_versions
+        when ONE_NO_CONF
+          @knife.delete_versions_without_confirmation(version)
+        when ONE_CONF
+          @knife.version = version
+          @knife.delete_explicit_version
+        end
+        ui.msg("Successfully deleted cookbook #{cookbook_name} #{printable_version_string(version)} from the Chef server")
+        true
+      rescue SystemExit
+        # The user said no at a confirmation prompt, just continue. But return false since we
+        # didn't actually delete anything.
+        false
+      rescue Exception => e
+        ui.error("Error deleting cookbook #{cookbook_name}: #{e}")
+        false
+      end
+    end
+
+    def delete
+      @deleted_cookbooks = []
+      name_args.each do |cookbook_name|
+        @knife = Chef::Knife::CookbookDelete.new
+        @knife.name_args = cookbook_name
+        @knife.cookbook_name = cookbook_name
+        if config[:all]
+          @knife.config[:all] = true
+          if config[:yes]
+            @deleted_cookbooks.push([cookbook_name, "ALL"]) if run_knife_command(cookbook_name, ALL_NO_CONF)
+          else
+            @deleted_cookbooks.push([cookbook_name, "ALL"]) if run_knife_command(cookbook_name, ALL_CONF)
+          end
+        else
+          begin
+            versions_to_delete = @knife.ask_which_versions_to_delete
+          rescue NoMethodError
+            # Rescuing this means the output from knife itself already gets printed, no need to duplicate that.
+            exit 1
+          end
+          if config[:yes]
+            @deleted_cookbooks.push([cookbook_name, versions_to_delete]) if run_knife_command(cookbook_name, ONE_NO_CONF, versions_to_delete)
+          else
+            versions_to_delete.each do |version|
+              @deleted_cookbooks.push([cookbook_name, version]) if run_knife_command(cookbook_name, ONE_CONF, version)
+            end  
+          end
+        end
+      end
+      # This is the formatted string that the plugins will use to print.
+      @deleted_cookbook_string = ""
+      @deleted_cookbooks.each {|cookbook, version| @deleted_cookbook_string << "#{cookbook}: #{printable_version_string(version)}, " }
+      @deleted_cookbook_string.chop!.chop! # Get rid of the trailing , chop chop!
+      ui.msg("Cookbooks deleted from chef server: #{@deleted_cookbook_string}")
+    end     
+  end
+end

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

@@ -1,90 +1,90 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkEnvironmentCheck < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-      require 'chef/exceptions'
-    end
-
-    banner 'knife spork environment check ENVIRONMENT (options)'
-
-    option :fatal,
-           :short => '-f',
-           :long => '--fatal',
-           :description => 'Quit on first invalid constraint located'
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      self.config = Chef::Config.merge!(config)
-
-      #First load so plugins etc know what to work with
-      @environments = verify_and_load_environments
-
-      run_plugins(:before_environmentcheck)
-
-      #Reload cookbook and env in case a VCS plugin found updates
-      @environments = verify_and_load_environments
-
-      check_environments
-      run_plugins(:after_environmentcheck)
-    end
-
-    private
-
-    def check_environments
-      @environments.each do |e|
-        env_status = true
-        ui.info "\nChecking constraints for environment: #{e}\n"
-        environment = load_environment_from_file(e)
-        cookbook_versions = environment.cookbook_versions
-
-        cookbook_versions.each do |cookbook, version_constraint|
-          vc = Chef::VersionConstraint.new(version_constraint)
-          status = check_cookbook_uploaded(cookbook, vc.version)
-          if !status
-            fail_and_exit(cookbook, vc.version)
-            env_status = status
-          end
-        end
-
-        if env_status
-          ui.msg "Environment #{e} looks good"
-        else
-          ui.fatal "Environment #{e} has constraints that point to non existent cookbook versions."
-          exit 1
-        end
-      end
-    end
-
-    def check_cookbook_uploaded(cookbook_name, version)
-      api_endpoint = "cookbooks/#{cookbook_name}"
-
-      begin
-        cookbook = rest.get_rest(api_endpoint)
-        results = cookbook[cookbook_name]['versions'].any? do |cv|
-          cv['version'] == version.to_s
-        end
-
-        if results
-          return true
-        else
-          return false
-        end
-      rescue Net::HTTPServerException
-        false
-      end
-    end
-
-    def fail_and_exit(cookbook_name, version)
-      message = "#{cookbook_name}@#{version} does not exist on Chef Server! Upload the cookbook first by running:\n\n\tknife spork upload #{cookbook_name}\n\n"
-      if config[:fatal]
-        ui.fatal message
-        exit 1
-      else
-        ui.error message
-      end
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkEnvironmentCheck < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+      require 'chef/exceptions'
+    end
+
+    banner 'knife spork environment check ENVIRONMENT (options)'
+
+    option :fatal,
+           :short => '-f',
+           :long => '--fatal',
+           :description => 'Quit on first invalid constraint located'
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      self.config = Chef::Config.merge!(config)
+
+      #First load so plugins etc know what to work with
+      @environments = verify_and_load_environments
+
+      run_plugins(:before_environmentcheck)
+
+      #Reload cookbook and env in case a VCS plugin found updates
+      @environments = verify_and_load_environments
+
+      check_environments
+      run_plugins(:after_environmentcheck)
+    end
+
+    private
+
+    def check_environments
+      @environments.each do |e|
+        env_status = true
+        ui.info "\nChecking constraints for environment: #{e}\n"
+        environment = load_environment_from_file(e)
+        cookbook_versions = environment.cookbook_versions
+
+        cookbook_versions.each do |cookbook, version_constraint|
+          vc = Chef::VersionConstraint.new(version_constraint)
+          status = check_cookbook_uploaded(cookbook, vc.version)
+          if !status
+            fail_and_exit(cookbook, vc.version)
+            env_status = status
+          end
+        end
+
+        if env_status
+          ui.msg "Environment #{e} looks good"
+        else
+          ui.fatal "Environment #{e} has constraints that point to non existent cookbook versions."
+          exit 1
+        end
+      end
+    end
+
+    def check_cookbook_uploaded(cookbook_name, version)
+      api_endpoint = "cookbooks/#{cookbook_name}"
+
+      begin
+        cookbook = rest.get_rest(api_endpoint)
+        results = cookbook[cookbook_name]['versions'].any? do |cv|
+          cv['version'] == version.to_s
+        end
+
+        if results
+          return true
+        else
+          return false
+        end
+      rescue Net::HTTPServerException
+        false
+      end
+    end
+
+    def fail_and_exit(cookbook_name, version)
+      message = "#{cookbook_name}@#{version} does not exist on Chef Server! Upload the cookbook first by running:\n\n\tknife spork upload #{cookbook_name}\n\n"
+      if config[:fatal]
+        ui.fatal message
+        exit 1
+      else
+        ui.error message
+      end
+    end
+  end
+end

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

@@ -1,63 +1,63 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkEnvironmentCreate < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-    end
-
-    banner 'knife spork environment create ENVIRONMENT (options)'
-
-    option :description,
-           :short => "-d DESC",
-           :long => "--description DESC",
-           :description => "The environment description"
-
-    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_environmentcreate)
-
-      # Check if environment already exists
-      begin
-        check_environment = load_environment(@object_name)
-        if check_environment
-          ui.confirm("It looks like the environment #{@object_name} already exists. Are you sure you want to overwrite it")
-        end
-      rescue Net::HTTPServerException
-      end
-
-
-      pre_environment = {}
-      environment_create
-      post_environment = load_environment(@object_name)
-
-      if spork_config[:save_environment_locally_on_create]
-        ui.msg "Saving environment changes to #{@object_name}.json"
-        save_environment_changes(@object_name, pretty_print_json(post_environment))
-      end
-
-      @object_difference = json_diff(pre_environment,post_environment).to_s
-      run_plugins(:after_environmentcreate)
-    end
-
-    private
-    def environment_create
-      rc = Chef::Knife::EnvironmentCreate.new
-      rc.name_args = @name_args
-      rc.config[:editor] = config[:editor]
-      rc.config[:description] = config[:description]
-      rc.run
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkEnvironmentCreate < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+    end
+
+    banner 'knife spork environment create ENVIRONMENT (options)'
+
+    option :description,
+           :short => "-d DESC",
+           :long => "--description DESC",
+           :description => "The environment description"
+
+    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_environmentcreate)
+
+      # Check if environment already exists
+      begin
+        check_environment = load_environment(@object_name)
+        if check_environment
+          ui.confirm("It looks like the environment #{@object_name} already exists. Are you sure you want to overwrite it")
+        end
+      rescue Net::HTTPServerException
+      end
+
+
+      pre_environment = {}
+      environment_create
+      post_environment = load_environment(@object_name)
+
+      if spork_config[:save_environment_locally_on_create]
+        ui.msg "Saving environment changes to #{@object_name}.json"
+        save_environment_changes(@object_name, pretty_print_json(post_environment))
+      end
+
+      @object_difference = json_diff(pre_environment,post_environment).to_s
+      run_plugins(:after_environmentcreate)
+    end
+
+    private
+    def environment_create
+      rc = Chef::Knife::EnvironmentCreate.new
+      rc.name_args = @name_args
+      rc.config[:editor] = config[:editor]
+      rc.config[:description] = config[:description]
+      rc.run
+    end
+  end
+end