knife-spork 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8d36ad90f20dbe5a5b2a473862a010b842ccbc8038d8437094b10f4c2107b09
-  data.tar.gz: 34ad1ffb10bbc77b02b9a3cd20235baf73d3a09d5e97244ac547a036da2d279c
+  metadata.gz: 4ae83cf6601495d0432b1bf24073d2e2ae0579b1e2d7d0da06a4d14c21846a54
+  data.tar.gz: 0cef1ae4aa4f1f8a9595ea173da77b1d5214a639c06e25e2fd3ea81128694091
 SHA512:
-  metadata.gz: 50630ebcc3d3183b04430cdfde3e01d30e76de268080b1dd62ff4cbd372569a91b71f59ae7a18cf3d7ae279e59dd4a569e893d0fd0c08f4dea865dcbfc863f33
-  data.tar.gz: 8520fc4d6359f811446fbc3d6112ef0ff26e9526c87651b7f1e6ac50afbdc6651c3252114d134822850c5673326fc56d05667c6e61590ebb4590a86f60b27adc
+  metadata.gz: 64f7a05346b2eb0ea29339d0c086ac452caa793f34db3d8f5b605aa8c900130d2d6d9d65cf621c65844d50eea1be74116fe4ed842df9027f3050c31e26687ef7
+  data.tar.gz: 52d66912a6d511443067a555dfd7411acf321749a304f4afbdb67ccec28b5ace54878a17e0ad82851c57cdea264f43b350e4de691c64748ecc69aa0c8da85242

data/LICENSE

@@ -1,35 +1,35 @@
-KnifeSpork
-----------
-Author:: Jon Cowie (<jonlives@gmail.com>)
-Copyright:: Copyright (c) 2011 Jon Cowie
-License:: GPL
-
-Plugin API
-----------
-Author:: Seth Vargo (<svargo@customink.com>)
-Copyright:: Copyright (c) 2012 Seth Vargo
-License:: GPL
-
-Other
------
-spork bump is based on the knife-cookbook-bump plugin by:
-Alalanta (no license specified)
-
-With snippets from:
-Author:: Adam Jacob (<adam@opscode.com>)
-Author:: Christopher Walters (<cw@opscode.com>)
-Author:: Nuo Yan (<yan.nuo@gmail.com>)
-Copyright:: Copyright (c) 2009, 2010 Opscode, Inc.
-License:: Apache License, Version 2.0
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+KnifeSpork
+----------
+Author:: Jon Cowie (<jonlives@gmail.com>)
+Copyright:: Copyright (c) 2011 Jon Cowie
+License:: GPL
+
+Plugin API
+----------
+Author:: Seth Vargo (<svargo@customink.com>)
+Copyright:: Copyright (c) 2012 Seth Vargo
+License:: GPL
+
+Other
+-----
+spork bump is based on the knife-cookbook-bump plugin by:
+Alalanta (no license specified)
+
+With snippets from:
+Author:: Adam Jacob (<adam@opscode.com>)
+Author:: Christopher Walters (<cw@opscode.com>)
+Author:: Nuo Yan (<yan.nuo@gmail.com>)
+Copyright:: Copyright (c) 2009, 2010 Opscode, Inc.
+License:: Apache License, Version 2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

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

@@ -1,100 +1,100 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkBump < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-    end
-
-    TYPE_INDEX = { :major => 0, :minor => 1, :patch => 2, :manual => 3 }.freeze
-
-    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 :berksfile,
-      :short => '-b',
-      :long => 'berksfile',
-      :description => 'Path to a Berksfile to operate off of',
-      :default => nil,
-      :proc => lambda { |o| o || File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME) }
-
-    option :skip_dependencies,
-      :short => '-s',
-      :long => '--skip-dependencies',
-      :description => 'Berksfile skips resolving source cookbook dependencies',
-      :default => true
-
-    banner 'knife spork bump COOKBOOK [major|minor|patch|manual]'
-
-    def run
-      self.class.send(:include, KnifeSpork::Runner)
-      self.config = Chef::Config.merge!(config)
-      config[:cookbook_path] ||= Chef::Config[:cookbook_path]
-
-      cookbook_name = ""
-
-      if @name_args.empty? && File.exists?("#{Dir.pwd}/metadata.rb")
-        cookbook_name = File.read("#{Dir.pwd}/metadata.rb").split("\n").select{|l|l.start_with?("name")}.first.split.last.gsub("\"","").gsub("'","")
-        ui.info "Cookbook name omitted, but metadata.rb for cookbook #{cookbook_name} found - bumping that."
-      elsif @name_args.empty?
-        show_usage
-        ui.error("You must specify at least a cookbook name")
-        exit 1
-      else
-        cookbook_name = name_args.first
-      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
-      @cookbook = load_cookbook(cookbook_name)
-
-      run_plugins(:before_bump)
-
-      #Reload cookbook in case a VCS plugin found updates
-      @cookbook = load_cookbook(cookbook_name)
-      bump
-      run_plugins(:after_bump)
-    end
-
-    private
-
-    def bump
-      old_version = @cookbook.version
-
-      if bump_type == 3
-        # manual bump
-        version_array = manual_bump_version.split('.')
-      else
-        # major, minor, or patch bump
-        version_array = old_version.split('.').collect{ |i| i.to_i }
-        version_array[bump_type] += 1
-        ((bump_type+1)..2).each{ |i| version_array[i] = 0 } # reset all lower version numbers to 0
-      end
-
-      new_version = version_array.join('.')
-
-      metadata_file = "#{@cookbook.root_dir}/metadata.rb"
-      new_contents = File.read(metadata_file).gsub(/(version\s+['"])[0-9\.]+(['"])/, "\\1#{new_version}\\2")
-      File.open(metadata_file, 'w'){ |f| f.write(new_contents) }
-
-      ui.info "Successfully bumped #{@cookbook.name} to v#{new_version}!"
-    end
-
-    def bump_type
-      TYPE_INDEX[(name_args[1] || 'patch').to_sym]
-    end
-
-    def manual_bump_version
-      version = name_args.last
-      validate_version!(version)
-      version
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkBump < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+    end
+
+    TYPE_INDEX = { :major => 0, :minor => 1, :patch => 2, :manual => 3 }.freeze
+
+    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 :berksfile,
+      :short => '-b',
+      :long => 'berksfile',
+      :description => 'Path to a Berksfile to operate off of',
+      :default => nil,
+      :proc => lambda { |o| o || File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME) }
+
+    option :skip_dependencies,
+      :short => '-s',
+      :long => '--skip-dependencies',
+      :description => 'Berksfile skips resolving source cookbook dependencies',
+      :default => true
+
+    banner 'knife spork bump COOKBOOK [major|minor|patch|manual]'
+
+    def run
+      self.class.send(:include, KnifeSpork::Runner)
+      self.config = Chef::Config.merge!(config)
+      config[:cookbook_path] ||= Chef::Config[:cookbook_path]
+
+      cookbook_name = ""
+
+      if @name_args.empty? && File.exists?("#{Dir.pwd}/metadata.rb")
+        cookbook_name = File.read("#{Dir.pwd}/metadata.rb").split("\n").select{|l|l.start_with?("name")}.first.split.last.gsub("\"","").gsub("'","")
+        ui.info "Cookbook name omitted, but metadata.rb for cookbook #{cookbook_name} found - bumping that."
+      elsif @name_args.empty?
+        show_usage
+        ui.error("You must specify at least a cookbook name")
+        exit 1
+      else
+        cookbook_name = name_args.first
+      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
+      @cookbook = load_cookbook(cookbook_name)
+
+      run_plugins(:before_bump)
+
+      #Reload cookbook in case a VCS plugin found updates
+      @cookbook = load_cookbook(cookbook_name)
+      bump
+      run_plugins(:after_bump)
+    end
+
+    private
+
+    def bump
+      old_version = @cookbook.version
+
+      if bump_type == 3
+        # manual bump
+        version_array = manual_bump_version.split('.')
+      else
+        # major, minor, or patch bump
+        version_array = old_version.split('.').collect{ |i| i.to_i }
+        version_array[bump_type] += 1
+        ((bump_type+1)..2).each{ |i| version_array[i] = 0 } # reset all lower version numbers to 0
+      end
+
+      new_version = version_array.join('.')
+
+      metadata_file = "#{@cookbook.root_dir}/metadata.rb"
+      new_contents = File.read(metadata_file).gsub(/(version\s+['"])[0-9\.]+(['"])/, "\\1#{new_version}\\2")
+      File.open(metadata_file, 'w'){ |f| f.write(new_contents) }
+
+      ui.info "Successfully bumped #{@cookbook.name} to v#{new_version}!"
+    end
+
+    def bump_type
+      TYPE_INDEX[(name_args[1] || 'patch').to_sym]
+    end
+
+    def manual_bump_version
+      version = name_args.last
+      validate_version!(version)
+      version
+    end
+  end
+end

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

@@ -1,161 +1,165 @@
-require 'chef/knife'
-
-module KnifeSpork
-  class SporkCheck < Chef::Knife
-
-    deps do
-      require 'knife-spork/runner'
-    end
-
-    banner 'knife spork check COOKBOOK (options)'
-
-    option :all,
-      :short => '--a',
-      :long => '--all',
-      :description => 'Show all uploaded versions of the cookbook'
-
-    option :fail,
-      :long => "--fail",
-      :description => "If the check fails exit with non-zero exit code"
-
-    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 :berksfile,
-      :short => '-b',
-      :long => 'berksfile',
-      :description => 'Path to a Berksfile to operate off of',
-      :default => nil,
-      :proc => lambda { |o| o || File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME) }
-
-    option :skip_dependencies,
-      :short => '-s',
-      :long => '--skip-dependencies',
-      :description => 'Berksfile skips resolving source cookbook dependencies',
-      :default => true
-
-    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
-
-      #First load so plugins etc know what to work with
-      initial_load
-
-      run_plugins(:before_check)
-
-      #Reload cookbook in case a VCS plugin found updates
-      initial_load
-
-      check
-      run_plugins(:after_check)
-    end
-
-    private
-    def check
-      ui.msg "Checking versions for cookbook #{@cookbook.name}..."
-      ui.msg ""
-      ui.msg "Local Version:"
-      ui.msg "  #{local_version}"
-      ui.msg ""
-      ui.msg "Remote Versions: (* indicates frozen)"
-      remote_versions.each do |remote_version|
-        if frozen?(remote_version)
-          ui.msg " *#{remote_version}"
-        else
-          ui.msg "  #{remote_version}"
-        end
-      end
-      ui.msg ""
-
-      remote_versions.each do |remote_version|
-        if remote_version == local_version
-          if frozen?(remote_version)
-            message = "Your local version (#{local_version}) is frozen on the remote server. You'll need to bump before you can upload."
-            message_autobump = "Your local version (#{local_version}) is frozen on the remote server. Autobumping so you can upload."
-            if config[:fail]
-              fail_and_exit("#{message}")
-            else
-              answer = nil
-              unless config[:yes]
-                ui.warn("#{message}")
-                answer = ui.ask("Would you like to perform a patch-level bump on the #{@cookbook.name} cookbook now? (Y/N)")
-              else
-                ui.warn message_autobump
-              end
-              if config[:yes] or answer == "Y" or answer == "y"
-                bump = SporkBump.new
-                bump.name_args = [@cookbook.name,"patch"]
-                bump.run
-              else
-                ui.info "Skipping bump..."
-              end
-            end
-          else
-            message =  "The version #{local_version} exists on the server and is not frozen. Uploading will overwrite!"
-            config[:fail] ? fail_and_exit("#{message}") : ui.error("#{message}")
-          end
-
-          return
-        end
-      end
-
-      ui.msg 'Everything looks good!'
-    end
-
-    def initial_load
-      begin
-        @cookbook = load_cookbook(name_args.first)
-      rescue Chef::Exceptions::CookbookNotFoundInRepo => e
-        ui.error "#{name_args.first} does not exist locally in your cookbook path(s), Exiting."
-        exit(1)
-      end
-    end
-
-    def local_version
-      @cookbook.version
-    end
-
-    def remote_versions
-      @remote_versions ||= begin
-        environment = config[:environment]
-        api_endpoint = environment ? "environments/#{environment}/cookbooks/#{@cookbook.name}" : "cookbooks/#{@cookbook.name}"
-        cookbooks = rest.get_rest(api_endpoint)
-
-        versions = cookbooks[@cookbook.name.to_s]['versions']
-        (config[:all] ? versions : versions[0..4]).collect{|v| v['version']}
-      rescue Net::HTTPServerException => e
-        ui.info "#{@cookbook.name} does not yet exist on the Chef Server!"
-        return []
-      end
-    end
-
-    def frozen?(version)
-      @versions_cache ||= {}
-
-      @versions_cache[version.to_sym] ||= begin
-        environment = config[:environment]
-        api_endpoint = environment ? "environments/#{environment}/cookbooks/#{@cookbook.name}" : "cookbooks/#{@cookbook.name}/#{version}"
-        rest.get_rest(api_endpoint).to_hash['frozen?']
-      end
-    end
-
-    def fail_and_exit(message, options={})
-     	ui.fatal message
-     	show_usage if options[:show_usage]
-     	exit 1
-    end
-  end
-end
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkCheck < Chef::Knife
+
+    deps do
+      require 'knife-spork/runner'
+    end
+
+    banner 'knife spork check COOKBOOK (options)'
+
+    option :all,
+      :short => '--a',
+      :long => '--all',
+      :description => 'Show all uploaded versions of the cookbook'
+
+    option :fail,
+      :long => "--fail",
+      :description => "If the check fails exit with non-zero exit code"
+
+    option :fail_if_frozen,
+      :long => "--fail-if-frozen",
+      :description => "If the check fails exit with non-zero exit code when cookbook is frozen"
+
+    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 :berksfile,
+      :short => '-b',
+      :long => 'berksfile',
+      :description => 'Path to a Berksfile to operate off of',
+      :default => nil,
+      :proc => lambda { |o| o || File.join(Dir.pwd, ::Berkshelf::DEFAULT_FILENAME) }
+
+    option :skip_dependencies,
+      :short => '-s',
+      :long => '--skip-dependencies',
+      :description => 'Berksfile skips resolving source cookbook dependencies',
+      :default => true
+
+    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
+
+      #First load so plugins etc know what to work with
+      initial_load
+
+      run_plugins(:before_check)
+
+      #Reload cookbook in case a VCS plugin found updates
+      initial_load
+
+      check
+      run_plugins(:after_check)
+    end
+
+    private
+    def check
+      ui.msg "Checking versions for cookbook #{@cookbook.name}..."
+      ui.msg ""
+      ui.msg "Local Version:"
+      ui.msg "  #{local_version}"
+      ui.msg ""
+      ui.msg "Remote Versions: (* indicates frozen)"
+      remote_versions.each do |remote_version|
+        if frozen?(remote_version)
+          ui.msg " *#{remote_version}"
+        else
+          ui.msg "  #{remote_version}"
+        end
+      end
+      ui.msg ""
+
+      remote_versions.each do |remote_version|
+        if remote_version == local_version
+          if frozen?(remote_version)
+            message = "Your local version (#{local_version}) is frozen on the remote server. You'll need to bump before you can upload."
+            message_autobump = "Your local version (#{local_version}) is frozen on the remote server. Autobumping so you can upload."
+            if config[:fail] || config[:fail_if_frozen]
+              fail_and_exit("#{message}")
+            else
+              answer = nil
+              unless config[:yes]
+                ui.warn("#{message}")
+                answer = ui.ask("Would you like to perform a patch-level bump on the #{@cookbook.name} cookbook now? (Y/N)")
+              else
+                ui.warn message_autobump
+              end
+              if config[:yes] or answer == "Y" or answer == "y"
+                bump = SporkBump.new
+                bump.name_args = [@cookbook.name,"patch"]
+                bump.run
+              else
+                ui.info "Skipping bump..."
+              end
+            end
+          else
+            message = "The version #{local_version} exists on the server and is not frozen. Uploading will overwrite!"
+            config[:fail] ? fail_and_exit("#{message}") : ui.error("#{message}")
+          end
+
+          return
+        end
+      end
+
+      ui.msg 'Everything looks good!'
+    end
+
+    def initial_load
+      begin
+        @cookbook = load_cookbook(name_args.first)
+      rescue Chef::Exceptions::CookbookNotFoundInRepo => e
+        ui.error "#{name_args.first} does not exist locally in your cookbook path(s), Exiting."
+        exit(1)
+      end
+    end
+
+    def local_version
+      @cookbook.version
+    end
+
+    def remote_versions
+      @remote_versions ||= begin
+        environment = config[:environment]
+        api_endpoint = environment ? "environments/#{environment}/cookbooks/#{@cookbook.name}" : "cookbooks/#{@cookbook.name}"
+        cookbooks = rest.get_rest(api_endpoint)
+
+        versions = cookbooks[@cookbook.name.to_s]['versions']
+        (config[:all] ? versions : versions[0..4]).collect{|v| v['version']}
+      rescue Net::HTTPServerException => e
+        ui.info "#{@cookbook.name} does not yet exist on the Chef Server!"
+        return []
+      end
+    end
+
+    def frozen?(version)
+      @versions_cache ||= {}
+
+      @versions_cache[version.to_sym] ||= begin
+        environment = config[:environment]
+        api_endpoint = environment ? "environments/#{environment}/cookbooks/#{@cookbook.name}" : "cookbooks/#{@cookbook.name}/#{version}"
+        rest.get_rest(api_endpoint).to_hash['frozen?']
+      end
+    end
+
+    def fail_and_exit(message, options={})
+     	ui.fatal message
+     	show_usage if options[:show_usage]
+     	exit 1
+    end
+  end
+end