knife-spork 1.7.2 → 1.7.3

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

@@ -1,112 +1,112 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkOmni < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-      begin
-        require 'berkshelf'
-      rescue LoadError; end
-    end
-
-    banner 'knife spork omni COOKBOOK (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 :depends,
-           :short => '-D',
-           :long => '--include-dependencies',
-           :description => 'Also upload cookbook dependencies during the upload step'
-
-    option :bump_level,
-           :short => '-l',
-           :long  => '--bump-level [major|minor|patch]',
-           :description => 'Version level to bump the cookbook (defaults to patch)',
-           :default => nil
-
-    option :omni_environment,
-           :short => '-e',
-           :long  => '--environment ENVIRONMENT',
-           :description => 'Environment to promote the cookbook to',
-           :default => nil
-
-    option :remote,
-           :long  => '--remote',
-           :description => 'Make omni finish with promote --remote instead of a local promote',
-           :default => nil
-
-    option :berksfile,
-           :short => '-b',
-           :long => '--berksfile BERKSFILE',
-           :description => 'Path to a Berksfile to operate from',
-           :default => nil,
-           :proc => lambda { |o| o || File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME) }
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      self.config = Chef::Config.merge!(config)
-
-      if name_args.empty?
-        ui.fatal 'You must specify a cookbook name!'
-        show_usage
-        exit(1)
-      end
-
-      # Temporary fix for #138 to allow Berkshelf functionality
-      # to be bypassed until #85 has been completed and Berkshelf 3 support added
-      unload_berkshelf_if_specified
-
-      cookbook = name_args.first
-
-      run_plugins(:before_omni)
-      omni(cookbook)
-      run_plugins(:after_omni)
-    end
-
-    private
-
-    def bump(cookbook)
-      ui.msg "OMNI: Bumping #{cookbook}"
-      bump = SporkBump.new
-      bump.name_args = [cookbook,config[:bump_level]]
-      bump.run
-    end
-
-    def upload(cookbook)
-      ui.msg "OMNI: Uploading #{cookbook}"
-      upload = SporkUpload.new
-      upload.name_args = [cookbook]
-      upload.config[:cookbook_path] = config[:cookbook_path]
-      upload.config[:depends] = config[:depends]
-      upload.run
-    end
-
-    def promote(cookbook)
-      ui.msg "OMNI: Promoting #{cookbook}"
-      promote = SporkPromote.new
-      if config[:omni_environment]
-        promote.name_args = [config[:omni_environment],cookbook]
-      else
-        promote.name_args = [cookbook]
-      end
-      promote.config[:remote] = config[:remote]
-      if defined?(::Berkshelf)
-        promote.config[:berksfile] = config[:berksfile]
-      end
-      promote.run
-    end
-
-    def omni(cookbook)
-      bump(cookbook)
-      ui.msg ""
-      upload(cookbook)
-      ui.msg ""
-      promote(cookbook)
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkOmni < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+      begin
+        require 'berkshelf'
+      rescue LoadError; end
+    end
+
+    banner 'knife spork omni COOKBOOK (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 :depends,
+           :short => '-D',
+           :long => '--include-dependencies',
+           :description => 'Also upload cookbook dependencies during the upload step'
+
+    option :bump_level,
+           :short => '-l',
+           :long  => '--bump-level [major|minor|patch]',
+           :description => 'Version level to bump the cookbook (defaults to patch)',
+           :default => nil
+
+    option :omni_environment,
+           :short => '-e',
+           :long  => '--environment ENVIRONMENT',
+           :description => 'Environment to promote the cookbook to',
+           :default => nil
+
+    option :remote,
+           :long  => '--remote',
+           :description => 'Make omni finish with promote --remote instead of a local promote',
+           :default => nil
+
+    option :berksfile,
+           :short => '-b',
+           :long => '--berksfile BERKSFILE',
+           :description => 'Path to a Berksfile to operate from',
+           :default => nil,
+           :proc => lambda { |o| o || File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME) }
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      self.config = Chef::Config.merge!(config)
+
+      if name_args.empty?
+        ui.fatal 'You must specify a cookbook name!'
+        show_usage
+        exit(1)
+      end
+
+      # Temporary fix for #138 to allow Berkshelf functionality
+      # to be bypassed until #85 has been completed and Berkshelf 3 support added
+      unload_berkshelf_if_specified
+
+      cookbook = name_args.first
+
+      run_plugins(:before_omni)
+      omni(cookbook)
+      run_plugins(:after_omni)
+    end
+
+    private
+
+    def bump(cookbook)
+      ui.msg "OMNI: Bumping #{cookbook}"
+      bump = SporkBump.new
+      bump.name_args = [cookbook,config[:bump_level]]
+      bump.run
+    end
+
+    def upload(cookbook)
+      ui.msg "OMNI: Uploading #{cookbook}"
+      upload = SporkUpload.new
+      upload.name_args = [cookbook]
+      upload.config[:cookbook_path] = config[:cookbook_path]
+      upload.config[:depends] = config[:depends]
+      upload.run
+    end
+
+    def promote(cookbook)
+      ui.msg "OMNI: Promoting #{cookbook}"
+      promote = SporkPromote.new
+      if config[:omni_environment]
+        promote.name_args = [config[:omni_environment],cookbook]
+      else
+        promote.name_args = [cookbook]
+      end
+      promote.config[:remote] = config[:remote]
+      if defined?(::Berkshelf)
+        promote.config[:berksfile] = config[:berksfile]
+      end
+      promote.run
+    end
+
+    def omni(cookbook)
+      bump(cookbook)
+      ui.msg ""
+      upload(cookbook)
+      ui.msg ""
+      promote(cookbook)
+    end
+  end
+end

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

@@ -1,197 +1,197 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkPromote < Chef::Knife
-
-    deps do
-      require 'chef/exceptions'
-      require 'knife-spork/runner'
-      begin
-        require 'berkshelf'
-      rescue LoadError; end
-    end
-
-    banner 'knife spork promote ENVIRONMENT COOKBOOK (options)'
-
-    option :version,
-      :short => '-v',
-      :long  => '--version VERSION',
-      :description => 'Set the environment\'s version constraint to the specified version',
-      :default => nil
-
-    option :remote,
-      :long  => '--remote',
-      :description => 'Save the environment to the chef server in addition to the local JSON file',
-      :default => nil
-
-    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(':') }
-
-    if defined?(::Berkshelf)
-      option :berksfile,
-        :short => '-b',
-        :long => '--berksfile BERKSFILE',
-        :description => 'Path to a Berksfile to operate off of',
-        :default => File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME)
-    end
-
-    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 the cookbook and environment to promote to")
-        exit 1
-      end
-
-      # Temporary fix for #138 to allow Berkshelf functionality
-      # to be bypassed until #85 has been completed and Berkshelf 3 support added
-      unload_berkshelf_if_specified
-
-      #First load so plugins etc know what to work with
-      @environments, @cookbook = load_environments_and_cookbook
-
-      run_plugins(:before_promote)
-
-      #Reload cookbook and env in case a VCS plugin found updates
-      @environments, @cookbook = load_environments_and_cookbook
-
-      check_cookbook_uploaded(@cookbook)
-      check_cookbook_latest(@cookbook)
-
-      @environments.each do |e|
-        environment = load_environment_from_file(e)
-
-
-        promote(environment, @cookbook)
-
-        ui.msg "Saving changes to #{e}.json"
-
-        new_environment_json = pretty_print_json(environment.to_hash)
-        save_environment_changes(e, new_environment_json)
-
-        if config[:remote] || spork_config.always_promote_remote
-          ui.msg "Uploading #{environment.name}.json to Chef Server"
-          save_environment_changes_remote(e)
-          ui.info "Promotion complete at #{Time.now}!"
-        else
-          ui.info "Promotion complete. Don't forget to upload your changed #{environment.name}.json to Chef Server"
-        end
-      end
-      run_plugins(:after_promote_local)
-      if config[:remote] || spork_config.always_promote_remote
-        run_plugins(:after_promote_remote)
-      end
-    end
-
-    def update_version_constraints(environment, cookbook, new_version)
-      validate_version!(new_version)
-      if spork_config.preserve_constraint_operators
-
-        cb_version = environment.cookbook_versions[cookbook]
-        if cb_version
-          if cb_version.length > 0
-            constraint_operator = cb_version.split.first
-          else
-            constraint_operator = "="
-          end
-          ui.msg "Preserving existing version constraint operator: #{constraint_operator}"
-        else
-          constraint_operator = "="
-        end
-      else
-        constraint_operator = "="
-      end
-      environment.cookbook_versions[cookbook] = "#{constraint_operator} #{new_version}"
-    end
-
-    def save_environment_changes_remote(environment)
-      local_environment = load_environment_from_file(environment)
-      remote_environment = load_remote_environment(environment)
-      @environment_diffs ||= Hash.new
-      @environment_diffs["#{environment}"] = environment_diff(local_environment, remote_environment)
-
-      version_change_threshold = spork_config.version_change_threshold || 2
-      env_constraints_diff = constraints_diff(@environment_diffs["#{environment}"]).select{|k,v| v > version_change_threshold}
-
-      if env_constraints_diff.size !=0 then
-        ui.warn 'You\'re about to promote a significant version number change to 1 or more cookbooks:'
-        ui.warn @environment_diffs["#{environment}"].select{|k,v|env_constraints_diff.has_key?(k)}.collect{|k,v| "\t#{k}: #{v}"}.join("\n")
-
-        begin
-          ui.confirm('Are you sure you want to continue?')
-        rescue SystemExit => e
-          if e.status == 3
-            ui.confirm("Would you like to reset your local #{environment}.json to match the remote server?")
-            tmp = Chef::Environment.load(environment)
-            save_environment_changes(environment, pretty_print_json(tmp))
-            ui.info "#{environment}.json was reset"
-          end
-
-          raise
-        end
-      end
-
-      if @environment_diffs["#{environment}"].size > 1
-        ui.msg ""
-        ui.warn "You're about to promote changes to several cookbooks at once:"
-        ui.warn @environment_diffs["#{environment}"].collect{|k,v| "\t#{k}: #{v}"}.join("\n")
-
-        begin
-          ui.confirm('Are you sure you want to continue?')
-        rescue SystemExit => e
-          if e.status == 3
-            ui.confirm("Would you like to reset your local #{environment}.json to match the remote server?")
-            tmp = Chef::Environment.load(environment)
-            save_environment_changes(environment, pretty_print_json(tmp))
-            ui.info "#{environment}.json was reset"
-          end
-
-          raise
-        end
-      end
-
-      local_environment.save
-    end
-
-    def promote(environment, cookbook_names)
-      cookbook_names = [cookbook_names].flatten
-
-      cookbook_names.each do |cookbook_name|
-        validate_version!(config[:version])
-        version = config[:version] || load_cookbook(cookbook_name).version
-
-        ui.msg "Adding version constraint #{cookbook_name} = #{version}"
-        update_version_constraints(environment, cookbook_name, version)
-      end
-    end
-
-    def check_cookbook_uploaded(cookbook_name)
-      validate_version!(config[:version])
-      version = config[:version] || load_cookbook(cookbook_name).version
-
-      api_endpoint = "cookbooks/#{cookbook_name}/#{version}"
-
-      begin
-        cookbooks = rest.get_rest(api_endpoint)
-      rescue Net::HTTPServerException => e
-        ui.error "#{cookbook_name}@#{version} does not exist on Chef Server! Upload the cookbook first by running:\n\n\tknife spork upload #{cookbook_name}\n\n"
-        exit(1)
-      end
-    end
-
-    def check_cookbook_latest(cookbook_name)
-      validate_version!(config[:version])
-      version = config[:version] || load_cookbook(cookbook_name).version
-      cb_latest = Chef::CookbookVersion.load(cookbook_name).metadata.version
-      # ui.msg "server: #{cb_latest} -- local: #{version}"
-      if cb_latest > version
-        ui.confirm "There is a later version of #{cookbook_name} on the chef server.  Would you still like to promote version #{version}"
-      end
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkPromote < Chef::Knife
+
+    deps do
+      require 'chef/exceptions'
+      require 'knife-spork/runner'
+      begin
+        require 'berkshelf'
+      rescue LoadError; end
+    end
+
+    banner 'knife spork promote ENVIRONMENT COOKBOOK (options)'
+
+    option :version,
+      :short => '-v',
+      :long  => '--version VERSION',
+      :description => 'Set the environment\'s version constraint to the specified version',
+      :default => nil
+
+    option :remote,
+      :long  => '--remote',
+      :description => 'Save the environment to the chef server in addition to the local JSON file',
+      :default => nil
+
+    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(':') }
+
+    if defined?(::Berkshelf)
+      option :berksfile,
+        :short => '-b',
+        :long => '--berksfile BERKSFILE',
+        :description => 'Path to a Berksfile to operate off of',
+        :default => File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME)
+    end
+
+    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 the cookbook and environment to promote to")
+        exit 1
+      end
+
+      # Temporary fix for #138 to allow Berkshelf functionality
+      # to be bypassed until #85 has been completed and Berkshelf 3 support added
+      unload_berkshelf_if_specified
+
+      #First load so plugins etc know what to work with
+      @environments, @cookbook = load_environments_and_cookbook
+
+      run_plugins(:before_promote)
+
+      #Reload cookbook and env in case a VCS plugin found updates
+      @environments, @cookbook = load_environments_and_cookbook
+
+      check_cookbook_uploaded(@cookbook)
+      check_cookbook_latest(@cookbook)
+
+      @environments.each do |e|
+        environment = load_environment_from_file(e)
+
+
+        promote(environment, @cookbook)
+
+        ui.msg "Saving changes to #{e}.json"
+
+        new_environment_json = pretty_print_json(environment.to_hash)
+        save_environment_changes(e, new_environment_json)
+
+        if config[:remote] || spork_config.always_promote_remote
+          ui.msg "Uploading #{environment.name}.json to Chef Server"
+          save_environment_changes_remote(e)
+          ui.info "Promotion complete at #{Time.now}!"
+        else
+          ui.info "Promotion complete. Don't forget to upload your changed #{environment.name}.json to Chef Server"
+        end
+      end
+      run_plugins(:after_promote_local)
+      if config[:remote] || spork_config.always_promote_remote
+        run_plugins(:after_promote_remote)
+      end
+    end
+
+    def update_version_constraints(environment, cookbook, new_version)
+      validate_version!(new_version)
+      if spork_config.preserve_constraint_operators
+
+        cb_version = environment.cookbook_versions[cookbook]
+        if cb_version
+          if cb_version.length > 0
+            constraint_operator = cb_version.split.first
+          else
+            constraint_operator = "="
+          end
+          ui.msg "Preserving existing version constraint operator: #{constraint_operator}"
+        else
+          constraint_operator = "="
+        end
+      else
+        constraint_operator = "="
+      end
+      environment.cookbook_versions[cookbook] = "#{constraint_operator} #{new_version}"
+    end
+
+    def save_environment_changes_remote(environment)
+      local_environment = load_environment_from_file(environment)
+      remote_environment = load_remote_environment(environment)
+      @environment_diffs ||= Hash.new
+      @environment_diffs["#{environment}"] = environment_diff(local_environment, remote_environment)
+
+      version_change_threshold = spork_config.version_change_threshold || 2
+      env_constraints_diff = constraints_diff(@environment_diffs["#{environment}"]).select{|k,v| v > version_change_threshold}
+
+      if env_constraints_diff.size !=0 then
+        ui.warn 'You\'re about to promote a significant version number change to 1 or more cookbooks:'
+        ui.warn @environment_diffs["#{environment}"].select{|k,v|env_constraints_diff.has_key?(k)}.collect{|k,v| "\t#{k}: #{v}"}.join("\n")
+
+        begin
+          ui.confirm('Are you sure you want to continue?')
+        rescue SystemExit => e
+          if e.status == 3
+            ui.confirm("Would you like to reset your local #{environment}.json to match the remote server?")
+            tmp = Chef::Environment.load(environment)
+            save_environment_changes(environment, pretty_print_json(tmp))
+            ui.info "#{environment}.json was reset"
+          end
+
+          raise
+        end
+      end
+
+      if @environment_diffs["#{environment}"].size > 1
+        ui.msg ""
+        ui.warn "You're about to promote changes to several cookbooks at once:"
+        ui.warn @environment_diffs["#{environment}"].collect{|k,v| "\t#{k}: #{v}"}.join("\n")
+
+        begin
+          ui.confirm('Are you sure you want to continue?')
+        rescue SystemExit => e
+          if e.status == 3
+            ui.confirm("Would you like to reset your local #{environment}.json to match the remote server?")
+            tmp = Chef::Environment.load(environment)
+            save_environment_changes(environment, pretty_print_json(tmp))
+            ui.info "#{environment}.json was reset"
+          end
+
+          raise
+        end
+      end
+
+      local_environment.save
+    end
+
+    def promote(environment, cookbook_names)
+      cookbook_names = [cookbook_names].flatten
+
+      cookbook_names.each do |cookbook_name|
+        validate_version!(config[:version])
+        version = config[:version] || load_cookbook(cookbook_name).version
+
+        ui.msg "Adding version constraint #{cookbook_name} = #{version}"
+        update_version_constraints(environment, cookbook_name, version)
+      end
+    end
+
+    def check_cookbook_uploaded(cookbook_name)
+      validate_version!(config[:version])
+      version = config[:version] || load_cookbook(cookbook_name).version
+
+      api_endpoint = "cookbooks/#{cookbook_name}/#{version}"
+
+      begin
+        cookbooks = rest.get_rest(api_endpoint)
+      rescue Net::HTTPServerException => e
+        ui.error "#{cookbook_name}@#{version} does not exist on Chef Server! Upload the cookbook first by running:\n\n\tknife spork upload #{cookbook_name}\n\n"
+        exit(1)
+      end
+    end
+
+    def check_cookbook_latest(cookbook_name)
+      validate_version!(config[:version])
+      version = config[:version] || load_cookbook(cookbook_name).version
+      cb_latest = Chef::CookbookVersion.load(cookbook_name).metadata.version
+      # ui.msg "server: #{cb_latest} -- local: #{version}"
+      if cb_latest > version
+        ui.confirm "There is a later version of #{cookbook_name} on the chef server.  Would you still like to promote version #{version}"
+      end
+    end
+  end
+end