knife-spork 1.3.2 → 1.3.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzAyZmY2MjljNzA5ZDRkOWQ4MTE4MWNiZGNmZjE1NjQ5MzA4MDg4Zg==
+    MDgxNDk5MzE2Mjc3NDc4NjVlOWNhYmExOTQyZDlmNjhkZTc1NDcyZg==
   data.tar.gz: !binary |-
-    ZGU1NWM1NDgxMjFiODRjYTM4NmY0ZjkwZDUyZGI3Mzk4M2NkMDdjMg==
+    YzE1ZWVmZGQwMTJiYTA2ZjIyNTU4YjU4OTQ5N2Y5YTM2MGJmZTMxZg==
 SHA512:
   metadata.gz: !binary |-
-    MzY1ZDU4NDRmMzgzNmY2NzEzOTI0YjIzYTNkYmUxNTY1MDYyY2Y0Mjc5ZTY1
-    ZmJiYjcyZTU2NDJkMTk0YTdkOWIxZTdlNmVjNWU3Yjg3ZWRlMzU1ZWZkYzk1
-    NTI4MTdiYTZiZmY1OTg4M2QzMTMxOTQ0YTY4NjU2Y2VhMjg4NTg=
+    MjVmNjkxMDQ1OTJlZTZhOTg4OWNhNmY1MjFkNDM5MGZhOWNhN2U4ZTAxZGFi
+    ZGI4YWEzZWQ1NDU4ZjBkNmMwYmIyYmJhNzg0MWU3MjFlNDVhMTcwNjVkZDA2
+    NDVjYWJkYmJlNjJkNTYzYTdhYTczMDBmMjUyMzdlYjEyNzNkOTc=
   data.tar.gz: !binary |-
-    YTIyMDQwODRmN2QzMGQ1ODFiYWIzNTZhMWRkZjU5MGVmNGQ1MGYwZDhkZWI4
-    ZmRmZDc5OGI0ZGE1YmI2YTM3ZjRkYjVjNjJiNjA3ODY3OTRkMDVjMjM3OGEw
-    ZGQ0ZTg2NDViZTA4MTQ1ZGM0ZmY1Nzg0Y2EzZDY2MGZiZTM2YTk=
+    Yjg3MTg2YWM4YjBlNzA4NDA5YjkyYThlMmQ3YjdiZTU5ZTA3MWFiZGJlMDAx
+    NWQ5NjZiODVhMGIwMTA2MjkzMGU0NmQ2ODNiYTIyYjc4YWU5ZWVkOWQ3ZjIw
+    N2M4MjVmZmEzNzQwOGVhZTc4YjQ5ZmUzZmVkYTEzYThlOTZmOGM=

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.3.3 (nth May, 2014)
+
+Features:
+    - Added new preserve_constraint_operators config flag to make spork promote preserve existing version constraint operators (https://github.com/jonlives/knife-spork/issues/101)
+    - Have runner check Chef::Config for environment_path (Thanks to @cstewart87 https://github.com/jonlives/knife-spork/pull/114)
+    - Have spork check autobump when -y option given (Thanks to @slingcode https://github.com/jonlives/knife-spork/pull/108)
+    - Add ability to pass options to JSON.pretty_generate (Thanks to @halcyonCorsair https://github.com/jonlives/knife-spork/pull/105)
+    - Spork check environment command to validate constraints specified in environments (Thanks to @jperry https://github.com/jonlives/knife-spork/pull/115)
+
+Bugfixes:
+    - Fix exception when trying to load non existent role or env from file (Thanks to @jperry https://github.com/jonlives/knife-spork/pull/116)
+    - Fix incorrect error message when uploading frozen cookbook (https://github.com/jonlives/knife-spork/issues/117)
+    - Fix invalid API endpoint in cookbook upload check when environment specified in knife.rb (https://github.com/jonlives/knife-spork/issues/106)
+
 ## 1.3.2 (5th Feb, 2014)
 
 Features:

data/README.md

@@ -47,10 +47,13 @@ environment_groups:
     - user_testing
     - acceptance_testing
 version_change_threshold: 2
+preserve_constraint_operators: true
 environment_path: "/home/me/environments"
 role_path: "/home/me/roles"
 custom_plugin_path: "/home/me/spork-plugins"
 always_promote_remote: true
+json_options:
+  indent: "    "
 plugins:
   campfire:
     account: myaccount
@@ -96,9 +99,14 @@ The `environment_groups` directive allows you to specify a list of environments
 #### Version Change Threshold
 The `version_change_threshold` directive allows you to customise the threshold used by a safety check in spork promote which will prompt for confirmation if you're promoting a cookbook by more than version_change_threshold versions. This defaults to 2 if not set, ie promoting a cookbook from v1.0.1 to v 1.0.2 will not trip this check, wheras promoting from v1.0.1 to v1.0.3 will.
 
+#### Preserve Constraint Operators
+The `preserve_constraint_operators` directive causes spork promote to preserve existing version constraint operators in your environment files, only updating the version number. This directive is disabled by default, which causes spork to always use the `=` constraint.
+
 #### Always Promote Remote
 The `always_promote_remote` directive allows you to tell spork promote to always act as if the --remote option had been specified. This will also have the same effect on spork omni. This option should only be used if you're sure you want all changes to be uploaded to the server as soon as you run promote.
 
+#### JSON Options
+The `json_options` directive allows you to tell spork to pass options to [pretty_generate](http://www.ruby-doc.org/stdlib-1.9.3/libdoc/json/rdoc/JSON.html#method-i-pretty_generate) to control the format of the resulting json
 
 #### Environment Path
 The `environment_path` allows you to specify the path to where you store your chef environment json files. If this parameter is not specified, spork will default to using the first element of your cookbook_path, replacing the word "cookbooks" with "environments"
@@ -365,6 +373,59 @@ Saving changes to development.json
 Promotion complete. Don't forget to upload your changed development.json to Chef Server
 ```
 
+Spork Environnent Check
+-------------
+Environment check provides the ability to validate a local chef environment file is locked to versions that actually exist on the chef server.  Running this check prior to uploading your environment files is recommended as it can prevent your chef server from becoming unresponsive due to a version constraint that will never be valid.
+
+If you run environment check with no options it will collect all invalid cookbook versions before reporting a failure.
+
+Alternatively, you can specify any of the following options:
+
+```-f, --fatal```: Quit on first invalid constraint located
+
+#### Usage
+
+```bash
+knife spork environment check ENVIRONMENT (options)
+```
+
+#### Example of a passing chef environment check with no options
+
+```text
+$ knife spork environment check production
+
+Checking constraints for environment: production
+Environment production looks good
+```
+
+#### Example of multiple invalid cookbooks with no options
+
+```text
+$ knife spork environment check production
+
+Checking constraints for environment: production
+ERROR: mysql@10.2.0 does not exist on Chef Server! Upload the cookbook first by running:
+
+	knife spork upload mysql
+
+ERROR: rbenv@10.7.1 does not exist on Chef Server! Upload the cookbook first by running:
+
+	knife spork upload rbenv
+
+FATAL: Environment production has constraints that point to non existent cookbook versions.
+```
+
+#### Example of running with the --fatal flag with the same invalid cookbooks from previous example
+
+```text
+$ knife spork environment check production
+
+Checking constraints for environment: production
+FATAL: mysql@10.2.0 does not exist on Chef Server! Upload the cookbook first by running:
+
+	knife spork upload mysql
+```
+
 Spork Node / Role / Databag Commands
 -------------
 

data/knife-spork.gemspec

@@ -2,12 +2,13 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = 'knife-spork'
-  gem.version       = '1.3.2'
+  gem.version       = '1.3.3'
   gem.authors       = ["Jon Cowie"]
   gem.email         = 'jonlives@gmail.com'
   gem.homepage      = 'https://github.com/jonlives/knife-spork'
+  gem.licenses      = ['GPL']
   gem.summary       = "A workflow plugin to help many devs work with the same chef repo/server"
-  gem.description   = "A workflow plugin to help many devs work with the same chef repo/server"
+  gem.description   = "KnifeSpork is a workflow plugin for Chef::Knife which helps multiple developers work on the same Chef Server and repository without treading on each other's toes. This plugin was designed around the workflow we have here at Etsy, where several people are working on the Chef repository and Chef Server simultaneously."
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

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

@@ -1,9 +1,11 @@
 require 'chef/knife'
-require 'knife-spork/runner'
 
 module KnifeSpork
   class SporkBump < Chef::Knife
-    include KnifeSpork::Runner
+
+    deps do
+      require 'knife-spork/runner'
+    end
 
     TYPE_INDEX = { :major => 0, :minor => 1, :patch => 2, :manual => 3 }.freeze
 
@@ -30,6 +32,7 @@ module KnifeSpork
     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]
 
@@ -51,6 +54,7 @@ module KnifeSpork
     end
 
     private
+
     def bump
       old_version = @cookbook.version
 

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

@@ -1,9 +1,11 @@
 require 'chef/knife'
-require 'knife-spork/runner'
 
 module KnifeSpork
   class SporkCheck < Chef::Knife
-    include KnifeSpork::Runner
+
+    deps do
+      require 'knife-spork/runner'
+    end
 
     banner 'knife spork check COOKBOOK (options)'
 
@@ -11,10 +13,10 @@ module KnifeSpork
       :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,
+       :long => "--fail",
+       :description => "If the check fails exit with non-zero exit code"
 
     option :cookbook_path,
            :short => '-o PATH:PATH',
@@ -37,6 +39,7 @@ module KnifeSpork
     end
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       if name_args.empty?
@@ -78,14 +81,20 @@ module KnifeSpork
         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
-              ui.warn("#{message}")
-              answer = ui.ask("Would you like to perform a patch-level bump on the #{@cookbook.name} cookbook now? (Y/N)")
-              if answer == "Y" or answer == "y"
+              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]
+                bump.name_args = [@cookbook.name,"patch"]
                 bump.run
               else
                 ui.info "Skipping bump..."

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

@@ -1,12 +1,11 @@
 require 'chef/knife'
-require 'knife-spork/runner'
-require 'json'
 
 module KnifeSpork
   class SporkDataBagCreate < Chef::Knife
-    include KnifeSpork::Runner
 
     deps do
+      require 'knife-spork/runner'
+      require 'json'
       require 'chef/knife/data_bag_create'
     end
 
@@ -22,6 +21,7 @@ module KnifeSpork
            :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?

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

@@ -1,12 +1,11 @@
 require 'chef/knife'
-require 'knife-spork/runner'
-require 'json'
 
 module KnifeSpork
   class SporkDataBagDelete < Chef::Knife
-    include KnifeSpork::Runner
 
     deps do
+      require 'knife-spork/runner'
+      require 'json'
       require 'chef/knife/data_bag_delete'
     end
 
@@ -14,6 +13,7 @@ module KnifeSpork
 
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       if @name_args.length == 2

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

@@ -1,12 +1,11 @@
 require 'chef/knife'
-require 'knife-spork/runner'
-require 'json'
 
 module KnifeSpork
   class SporkDataBagEdit < Chef::Knife
-    include KnifeSpork::Runner
 
     deps do
+      require 'knife-spork/runner'
+      require 'json'
       require 'chef/knife/data_bag_edit'
     end
 
@@ -22,6 +21,7 @@ module KnifeSpork
            :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

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

@@ -1,12 +1,11 @@
 require 'chef/knife'
-require 'knife-spork/runner'
-require 'json'
 
 module KnifeSpork
   class SporkDataBagFromFile < Chef::Knife
-    include KnifeSpork::Runner
 
     deps do
+      require 'knife-spork/runner'
+      require 'json'
       require 'chef/knife/data_bag_from_file'
     end
 
@@ -27,6 +26,7 @@ module KnifeSpork
            :description => "Upload all data bags"
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       @object_name = @name_args.first

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

@@ -0,0 +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(environment, 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(environment, cookbook_name, version)
+      api_endpoint = environment ? "environments/#{environment}/cookbooks/#{cookbook_name}" : "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,9 +1,11 @@
 require 'chef/knife'
-require 'knife-spork/runner'
 
 module KnifeSpork
   class SporkEnvironmentCreate < Chef::Knife
-    include KnifeSpork::Runner
+
+    deps do
+      require 'knife-spork/runner'
+    end
 
     banner 'knife spork environment create ENVIRONMENT (options)'
 
@@ -13,6 +15,7 @@ module KnifeSpork
            :description => "The environment description"
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       if @name_args.empty?

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

@@ -1,13 +1,15 @@
-require 'chef/knife'
-require 'knife-spork/runner'
-
 module KnifeSpork
   class SporkEnvironmentDelete < Chef::Knife
-    include KnifeSpork::Runner
+
+    deps do
+      require 'chef/knife'
+      require 'knife-spork/runner'
+    end
 
     banner 'knife spork environment delete ENVIRONMENT (options)'
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       if @name_args.empty?

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

@@ -1,13 +1,16 @@
 require 'chef/knife'
-require 'knife-spork/runner'
 
 module KnifeSpork
   class SporkEnvironmentEdit < Chef::Knife
-    include KnifeSpork::Runner
+
+    deps do
+      require 'knife-spork/runner'
+    end
 
     banner 'knife spork environment edit ENVIRONMENT (options)'
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       if @name_args.empty?

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

@@ -1,18 +1,18 @@
 require 'chef/knife'
-require 'knife-spork/runner'
-require 'json'
 
 module KnifeSpork
   class SporkEnvironmentFromFile < Chef::Knife
-    include KnifeSpork::Runner
 
     deps do
+      require 'knife-spork/runner'
+      require 'json'
       require 'chef/knife/environment_from_file'
     end
 
     banner 'knife spork environment from file FILENAME (options)'
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       if @name_args.empty?
@@ -22,13 +22,17 @@ module KnifeSpork
       end
 
       @name_args.each do |arg|
-          @object_name = arg.split("/").last
-          run_plugins(:before_environmentfromfile)
+        @object_name = arg.split("/").last
+        run_plugins(:before_environmentfromfile)
+        begin
           pre_environment = load_environment(@object_name.gsub(".json","").gsub(".rb",""))
-          environment_from_file
-          post_environment = load_environment(@object_name.gsub(".json","").gsub(".rb",""))
-          @object_difference = json_diff(pre_environment,post_environment).to_s
-          run_plugins(:after_environmentfromfile)
+        rescue Net::HTTPServerException => e
+          pre_environment = {}
+        end
+        environment_from_file
+        post_environment = load_environment(@object_name.gsub(".json","").gsub(".rb",""))
+        @object_difference = json_diff(pre_environment,post_environment).to_s
+        run_plugins(:after_environmentfromfile)
       end
     end
 

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

@@ -1,13 +1,16 @@
 require 'chef/knife'
-require 'knife-spork/runner'
 
 module KnifeSpork
   class SporkInfo < Chef::Knife
-    include KnifeSpork::Runner
+
+    deps do
+      require 'knife-spork/runner'
+    end
 
     banner 'knife spork info'
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       run_plugins(:before_info)

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

@@ -1,14 +1,17 @@
 require 'chef/knife'
-require 'knife-spork/runner'
 
 module KnifeSpork
   class SporkNodeCreate < Chef::Knife
-    include KnifeSpork::Runner
+
+    deps do
+      require 'knife-spork/runner'
+    end
 
     banner 'knife spork node create NODE (options)'
 
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       if @name_args.empty?

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

@@ -1,14 +1,17 @@
 require 'chef/knife'
-require 'knife-spork/runner'
 
 module KnifeSpork
   class SporkNodeDelete < Chef::Knife
-    include KnifeSpork::Runner
+
+    deps do
+      require 'knife-spork/runner'
+    end
 
     banner 'knife spork node delete NODE (options)'
 
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       if @name_args.empty?

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

@@ -1,10 +1,12 @@
 require 'chef/knife'
-require 'chef/knife/core/node_editor'
-require 'knife-spork/runner'
 
 module KnifeSpork
   class SporkNodeEdit < Chef::Knife
-    include KnifeSpork::Runner
+
+    deps do
+      require 'chef/knife/core/node_editor'
+      require 'knife-spork/runner'
+    end
 
     banner 'knife spork node edit NODE (options)'
 
@@ -15,6 +17,7 @@ module KnifeSpork
            :description => "Display all attributes when editing"
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       if @name_args.empty?

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

@@ -1,14 +1,17 @@
 require 'chef/knife'
-require 'knife-spork/runner'
 
 module KnifeSpork
   class SporkNodeFromFile < Chef::Knife
-    include KnifeSpork::Runner
+
+    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?

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

@@ -1,9 +1,11 @@
 require 'chef/knife'
-require 'knife-spork/runner'
 
 module KnifeSpork
   class SporkNodeRunListAdd < Chef::Knife
-    include KnifeSpork::Runner
+
+    deps do
+      require 'knife-spork/runner'
+    end
 
     banner 'knife spork node run_list add [NODE] [ENTRY[,ENTRY]] (options)'
 
@@ -14,6 +16,7 @@ module KnifeSpork
            :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?

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

@@ -1,14 +1,16 @@
 require 'chef/knife'
-require 'knife-spork/runner'
 
 module KnifeSpork
   class SporkNodeRunListRemove < Chef::Knife
-    include KnifeSpork::Runner
 
-    banner 'knife spork node run_list add [NODE] [ENTRY[,ENTRY]] (options)'
+    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?

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

@@ -1,14 +1,16 @@
 require 'chef/knife'
-require 'knife-spork/runner'
 
 module KnifeSpork
   class SporkNodeRunListSet < Chef::Knife
-    include KnifeSpork::Runner
 
-    banner 'knife spork node run_list set NODE ENTRIES (options)'
+    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

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

@@ -1,13 +1,14 @@
 require 'chef/knife'
-require 'knife-spork/runner'
-
-begin
-  require 'berkshelf'
-rescue LoadError; end
 
 module KnifeSpork
   class SporkOmni < Chef::Knife
-    include KnifeSpork::Runner
+
+    deps do
+      require 'knife-spork/runner'
+      begin
+        require 'berkshelf'
+      rescue LoadError; end
+    end
 
     banner 'knife spork omni COOKBOOK (options)'
 
@@ -48,6 +49,7 @@ module KnifeSpork
     end
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       if name_args.empty?

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

@@ -1,14 +1,15 @@
 require 'chef/knife'
-require 'chef/exceptions'
-require 'knife-spork/runner'
-
-begin
-  require 'berkshelf'
-rescue LoadError; end
 
 module KnifeSpork
   class SporkPromote < Chef::Knife
-    include KnifeSpork::Runner
+
+    deps do
+      require 'chef/exceptions'
+      require 'knife-spork/runner'
+      begin
+        require 'berkshelf'
+      rescue LoadError; end
+    end
 
     banner 'knife spork promote ENVIRONMENT COOKBOOK (options)'
 
@@ -32,6 +33,7 @@ module KnifeSpork
     end
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       if @name_args.empty?
@@ -77,7 +79,13 @@ module KnifeSpork
 
     def update_version_constraints(environment, cookbook, new_version)
       validate_version!(new_version)
-      environment.cookbook_versions[cookbook] = "= #{new_version}"
+      if spork_config.preserve_constraint_operators
+        constraint_operator = environment.cookbook_versions[cookbook].split.first
+        ui.msg "Preserving existing version constraint operator: #{constraint_operator}"
+      else
+        constraint_operator = "="
+      end
+      environment.cookbook_versions[cookbook] = "#{constraint_operator} #{new_version}"
     end
 
     def save_environment_changes_remote(environment)
@@ -152,8 +160,7 @@ module KnifeSpork
       validate_version!(config[:version])
       version = config[:version] || load_cookbook(cookbook_name).version
 
-      environment = config[:environment]
-      api_endpoint = environment ? "environments/#{environment}/cookbooks/#{cookbook_name}/#{version}" : "cookbooks/#{cookbook_name}/#{version}"
+      api_endpoint = "cookbooks/#{cookbook_name}/#{version}"
 
       begin
         cookbooks = rest.get_rest(api_endpoint)

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

@@ -1,9 +1,11 @@
 require 'chef/knife'
-require 'knife-spork/runner'
 
 module KnifeSpork
   class SporkRoleCreate < Chef::Knife
-    include KnifeSpork::Runner
+
+    deps do
+      require 'knife-spork/runner'
+    end
 
     banner 'knife spork role create ROLE (options)'
 
@@ -13,6 +15,7 @@ module KnifeSpork
            :description => "The role description"
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       if @name_args.empty?

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

@@ -1,13 +1,16 @@
 require 'chef/knife'
-require 'knife-spork/runner'
 
 module KnifeSpork
   class SporkRoleDelete < Chef::Knife
-    include KnifeSpork::Runner
+
+    deps do
+      require 'knife-spork/runner'
+    end
 
     banner 'knife spork role delete ROLENAME (options)'
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       if @name_args.empty?

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

@@ -1,13 +1,16 @@
 require 'chef/knife'
-require 'knife-spork/runner'
 
 module KnifeSpork
   class SporkRoleEdit < Chef::Knife
-    include KnifeSpork::Runner
+
+    deps do
+      require 'knife-spork/runner'
+    end
 
     banner 'knife spork role edit ROLENAME (options)'
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       if @name_args.empty?

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

@@ -1,18 +1,18 @@
 require 'chef/knife'
-require 'knife-spork/runner'
-require 'json'
 
 module KnifeSpork
   class SporkRoleFromFile < Chef::Knife
-    include KnifeSpork::Runner
 
     deps do
+      require 'knife-spork/runner'
+      require 'json'
       require 'chef/knife/role_from_file'
     end
 
     banner 'knife spork role from file FILENAME (options)'
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
 
       if @name_args.empty?
@@ -24,7 +24,11 @@ module KnifeSpork
       @name_args.each do |arg|
           @object_name = arg.split("/").last
           run_plugins(:before_rolefromfile)
-          pre_role = load_role(@object_name.gsub(".json","").gsub(".rb",""))
+          begin
+            pre_role = load_role(@object_name.gsub(".json","").gsub(".rb",""))
+          rescue Net::HTTPServerException => e
+            pre_role = {}
+          end
           role_from_file
           post_role = load_role(@object_name.gsub(".json","").gsub(".rb",""))
           @object_difference = json_diff(pre_role,post_role).to_s

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

@@ -1,13 +1,15 @@
 require 'chef/knife'
-require 'chef/exceptions'
-require 'chef/cookbook_loader'
-require 'chef/cookbook_uploader'
-require 'knife-spork/runner'
-require 'socket'
 
 module KnifeSpork
   class SporkUpload < Chef::Knife
-    include KnifeSpork::Runner
+
+    deps do
+      require 'chef/exceptions'
+      require 'chef/cookbook_loader'
+      require 'chef/cookbook_uploader'
+      require 'knife-spork/runner'
+      require 'socket'
+    end
 
     CHECKSUM = 'checksum'
     MATCH_CHECKSUM = /[0-9a-f]{32,}/
@@ -39,6 +41,7 @@ module KnifeSpork
     end
 
     def run
+      self.class.send(:include, KnifeSpork::Runner)
       self.config = Chef::Config.merge!(config)
       config[:cookbook_path] ||= Chef::Config[:cookbook_path]
 
@@ -78,18 +81,23 @@ module KnifeSpork
           check_dependencies(cookbook)
           if name_args.include?(cookbook.name.to_s)
             uploader = Chef::CookbookUploader.new(cookbook, ::Chef::Config.cookbook_path)
-            if uploader.respond_to?(:upload_cookbooks)
-              # Chef >= 10.14.0
-              uploader.upload_cookbooks
-              ui.info "Freezing #{cookbook.name} at #{cookbook.version}..."
-              cookbook.freeze_version
-              uploader.upload_cookbooks
-            else
-              uploader.upload_cookbook
-              ui.info "Freezing #{cookbook.name} at #{cookbook.version}..."
-              cookbook.freeze_version
-              uploader.upload_cookbook
-
+            begin
+              if uploader.respond_to?(:upload_cookbooks)
+                # Chef >= 10.14.0
+                uploader.upload_cookbooks
+                ui.info "Freezing #{cookbook.name} at #{cookbook.version}..."
+                cookbook.freeze_version
+                uploader.upload_cookbooks
+              else
+                uploader.upload_cookbook
+                ui.info "Freezing #{cookbook.name} at #{cookbook.version}..."
+                cookbook.freeze_version
+                uploader.upload_cookbook
+
+              end
+            rescue Chef::Exceptions::CookbookFrozen => msg
+              ui.error "#{cookbook.name}@#{cookbook.version} is frozen. Please bump your version number before continuing!"
+              exit(1)
             end
           end
         rescue Net::HTTPServerException => e

data/lib/knife-spork/runner.rb

@@ -53,7 +53,7 @@ module KnifeSpork
       end
 
       def load_environments_and_cookbook
-        ensure_environment_provided!
+        ensure_environment_and_cookbook_provided!
 
         if @name_args.size == 2
           environments = load_specified_environment_group(@name_args[0])
@@ -63,6 +63,16 @@ module KnifeSpork
         end
       end
 
+      def verify_and_load_environments
+        ensure_environment_provided!
+
+        if @name_args.size == 0
+          default_environments
+        elsif @name_args.size == 1
+          [@name_args[0]]
+        end
+      end
+
       def load_specified_environment_group(name)
         if !spork_config.environment_groups.nil? && spork_config.environment_groups.keys.include?(name)
           spork_config.environment_groups[name]
@@ -71,19 +81,29 @@ module KnifeSpork
         end
       end
 
-      def ensure_environment_provided!
+      def ensure_environment_and_cookbook_provided!
         if default_environments.empty? && @name_args.size < 2
           ui.error('You must specify an environment or environment group and a cookbook name')
           exit(1)
         end
       end
 
+      def ensure_environment_provided!
+        if default_environments.empty? && @name_args.size < 1
+          ui.error('You must specify an environment or configure default environments.')
+          exit(1)
+        end
+      end
+
       def default_environments
         [ spork_config.default_environment || spork_config.default_environments ].flatten.compact
       end
 
       def pretty_print_json(json)
-        JSON.pretty_generate(json)
+        options = spork_config[:json_options] || {}
+        # generate requires a hash where the keys are symbols
+        options = Hash[ options.to_hash.map {|(k,v)| [k.to_sym,v] }] unless options == {}
+        JSON.pretty_generate(json, options.to_hash)
       end
 
       def valid_version?(version)
@@ -115,7 +135,7 @@ module KnifeSpork
       end
 
       def environment_path
-        spork_config[:environment_path] || cookbook_path.gsub("/cookbooks","/environments")
+        spork_config[:environment_path] || Chef::Config.environment_path.first || cookbook_path.gsub("/cookbooks","/environments")
       end
 
       def role_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-spork
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Jon Cowie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -66,7 +66,10 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.1
-description: A workflow plugin to help many devs work with the same chef repo/server
+description: KnifeSpork is a workflow plugin for Chef::Knife which helps multiple
+  developers work on the same Chef Server and repository without treading on each
+  other's toes. This plugin was designed around the workflow we have here at Etsy,
+  where several people are working on the Chef repository and Chef Server simultaneously.
 email: jonlives@gmail.com
 executables: []
 extensions: []
@@ -87,6 +90,7 @@ files:
 - lib/chef/knife/spork-databag-delete.rb
 - lib/chef/knife/spork-databag-edit.rb
 - lib/chef/knife/spork-databag-fromfile.rb
+- lib/chef/knife/spork-environment-check.rb
 - lib/chef/knife/spork-environment-create.rb
 - lib/chef/knife/spork-environment-delete.rb
 - lib/chef/knife/spork-environment-edit.rb
@@ -133,7 +137,8 @@ files:
 - plugins/StatusNet.md
 - plugins/Template.md
 homepage: https://github.com/jonlives/knife-spork
-licenses: []
+licenses:
+- GPL
 metadata: {}
 post_install_message: 
 rdoc_options: []