knife-spork 0.1.0

data/README.md

@@ -0,0 +1,151 @@
+# knife-spork
+
+A workflow plugin for Chef::Knife which helps multiple devs work on the same chef server and repo without treading on eachothers toes. This plugin was designed around the workflow we have here at Etsy, where several people are working on the chef repo and chef server at the same time. It contains several functions, documented below:
+
+# Spork Check
+
+This function is designed to help you avoid trampling on other people's cookbook versions, and to make sure that when you come to version your own work it's easy to see what version numbers have already been used and if the one you're using will overwrite anything.
+
+## Usage 
+
+````
+knife spork check COOKBOOK
+````
+
+## Example (Checking an Unfrozen Cookbook with version clash)
+
+````
+$ knife spork check apache
+Checking versions for cookbook apache...
+ 
+Current local version: 0.1.0
+ 
+Remote versions:
+*0.1.0, unfrozen
+0.0.0, unfrozen
+ 
+DANGER: Your local cookbook version number clashes with an unfrozen remote version.
+ 
+If you upload now, you'll overwrite it.
+````
+
+## Example (Checking a Frozen Cookbook with version clash)
+
+````
+$ knife spork check apache2
+Checking versions for cookbook apache2...
+ 
+Current local version: 1.0.6
+ 
+Remote versions:
+*1.0.6, frozen
+1.0.5, frozen
+1.0.4, frozen
+1.0.3, frozen
+1.0.2, frozen
+1.0.1, frozen
+1.0.0, frozen
+ 
+DANGER: Your local cookbook has same version number as the starred version above!
+ 
+Please bump your local version or you won't be able to upload.
+````
+
+## Example (No version clashes)
+
+````
+$ knife spork check apache2
+Checking versions for cookbook apache2...
+ 
+Current local version: 1.0.7
+ 
+Remote versions:
+1.0.6, frozen
+1.0.5, frozen
+1.0.4, frozen
+1.0.3, frozen
+1.0.2, frozen
+1.0.1, frozen
+1.0.0, frozen
+ 
+Everything looks fine, no version clashes. You can upload!
+````
+
+# Spork Bump
+
+This function lets you easily version your cookbooks without having to manually edit the cookbook's metadata.rb file. You can either specify the version level you'd like to bump (major, minor or patch), or you can manually specify a version number. This might be used if, for example, you want to jump several version numbers in one go and don't want to have to run knife bump once for each number.
+
+## Usage
+
+````
+knife bump COOKBOOK <MAJOR | MINOR | PATCH | MANUAL x.x.x>
+
+````
+
+## Example (Bumping patch level)
+
+````
+$ knife spork bump apache2 patch
+Bumping patch level of the apache2 cookbook from 1.0.6 to 1.0.7
+````
+
+## Example (Manually setting version)
+
+````
+$ knife spork bump apache2 manual 1.0.13
+Manually bumped version of the apache2 cookbook from 1.0.7 to 1.0.13
+````
+
+#Spork Upload
+
+This function works mostly the same as normal "knife cookbook upload" except that this version automatically freezes cookbooks when you upload them. If you don't want to have to remember to add "--freeze" to your "knife cookbook upload" commands, then use this version.
+
+## Usage
+
+````
+knife spork upload COOKBOOK
+````
+
+## Example
+
+````
+$ knife spork upload apache
+ 
+Uploading and freezing apache             [1.0.6]
+upload complete
+````
+
+# Spork Promote
+
+This function lets you easily set a version constraint in an environment for a particular cookbook. By default it will set the version constraint to whatever the local version of the specified cookbook is. Optionally, you can include a --version option which will set the version constraint for the specified cookbook to whatever version number you provide. You might want to use this if, for example, you pushed a version constraint for a cookbook version you don't want your nodes to use anymore, so you want to "roll back" the environment to a previous version. You can also specify the --remote option if you'd like to automatically upload your changed local environment file to the server.
+
+## Usage
+
+```` 
+knife spork promote ENVIRONMENT COOKBOOK (OPTIONS: --version, --remote)
+````
+
+## Example (Using local Cookbook version number, into environment "foo", uploading to chef server)
+
+````
+$ knife spork promote foo php --remote
+Adding version constraint php = 0.1.0
+ 
+Saving changes into foo.json
+
+Uploading foo to server
+ 
+Promotion complete! Please remember to upload your changed Environment file to the Chef Server.
+````
+
+## Example (Using manual version, into environment "foo", saving to local environment file only)
+
+````
+$ knife spork promote foo php -v 1.0.6
+Adding version constraint php = 1.0.6
+ 
+Saving changes into foo.json
+ 
+Promotion complete! Please remember to upload your changed Environment file to the Chef Server.
+````
+

data/Rakefile

@@ -0,0 +1,122 @@
+require 'rubygems'
+require 'rake'
+require 'date'
+
+#############################################################################
+#
+# Helper functions
+#
+#############################################################################
+
+def name
+  @name ||= Dir['*.gemspec'].first.split('.').first
+end
+
+def version
+  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
+end
+
+def date
+  Date.today.to_s
+end
+
+def rubyforge_project
+  name
+end
+
+def gemspec_file
+  "#{name}.gemspec"
+end
+
+def gem_file
+  "#{name}-#{version}.gem"
+end
+
+def replace_header(head, header_name)
+  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
+end
+
+#############################################################################
+#
+# Standard tasks
+#
+#############################################################################
+
+task :default => :validate
+
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -r ./lib/#{name}.rb"
+end
+
+#############################################################################
+#
+# Custom tasks (add your own tasks here)
+#
+#############################################################################
+
+
+
+#############################################################################
+#
+# Packaging tasks
+#
+#############################################################################
+
+desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
+task :release => :build do
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git tag v#{version}"
+  sh "git push origin master"
+  sh "git push origin v#{version}"
+  sh "gem push pkg/#{name}-#{version}.gem"
+end
+
+desc "Build #{gem_file} into the pkg directory"
+task :build => :gemspec do
+  sh "mkdir -p pkg"
+  sh "gem build #{gemspec_file}"
+  sh "mv #{gem_file} pkg"
+end
+
+desc "Generate #{gemspec_file}"
+task :gemspec => :validate do
+  # read spec file and split out manifest section
+  spec = File.read(gemspec_file)
+  head, manifest, tail = spec.split("  # = MANIFEST =\n")
+
+  # replace name version and date
+  replace_header(head, :name)
+  replace_header(head, :version)
+  replace_header(head, :date)
+  #comment this out if your rubyforge_project has a different name
+  replace_header(head, :rubyforge_project)
+
+  # determine file list from git ls-files
+  files = `git ls-files`.
+    split("\n").
+    sort.
+    reject { |file| file =~ /^\./ }.
+    reject { |file| file =~ /^(rdoc|pkg)/ }.
+    map { |file| "    #{file}" }.
+    join("\n")
+
+  # piece file back together and write
+  manifest = "  s.files = %w[\n#{files}\n  ]\n"
+  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
+  File.open(gemspec_file, 'w') { |io| io.write(spec) }
+  puts "Updated #{gemspec_file}"
+end
+
+desc "Validate #{gemspec_file}"
+task :validate do
+  unless Dir['VERSION*'].empty?
+    puts "A `VERSION` file at root level violates Gem best practices."
+    exit!
+  end
+end

data/knife-spork.gemspec

@@ -0,0 +1,65 @@
+## This is the rakegem gemspec template. Make sure you read and understand
+## all of the comments. Some sections require modification, and others can
+## be deleted if you don't need them. Once you understand the contents of
+## this file, feel free to delete any comments that begin with two hash marks.
+## You can find comprehensive Gem::Specification documentation, at
+## http://docs.rubygems.org/read/chapter/20
+Gem::Specification.new do |s|
+  s.specification_version = 2 if s.respond_to? :specification_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.rubygems_version = '1.3.5'
+
+  ## Leave these as is they will be modified for you by the rake gemspec task.
+  ## If your rubyforge_project name is different, then edit it and comment out
+  ## the sub! line in the Rakefile
+  s.name              = 'knife-spork'
+  s.version           = '0.1.0'
+  s.date              = '2012-01-28'
+  s.rubyforge_project = 'knife-spork'
+
+  ## Make sure your summary is short. The description may be as long
+  ## as you like.
+  s.summary     = "A workflow plugin to help many devs work with the same chef repo/server"
+  s.description = "A workflow plugin to help many devs work with the same chef repo/server"
+
+  ## List the primary authors. If there are a bunch of authors, it's probably
+  ## better to set the email to an email list or something. If you don't have
+  ## a custom homepage, consider using your GitHub URL or the like.
+  s.authors  = ["Jon Cowie"]
+  s.email    = 'jonlives@gmail.com'
+  s.homepage = 'https://github.com/jonlives/knife-spork'
+
+  ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
+  ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
+  s.require_paths = %w[lib]
+
+  ## Specify any RDoc options here. You'll want to add your README and
+  ## LICENSE files to the extra_rdoc_files list.
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.extra_rdoc_files = %w[README.md]
+
+  ## List your runtime dependencies here. Runtime dependencies are those
+  ## that are needed for an end user to actually USE your code.
+  s.add_dependency('chef', [">= 0.10.4"])
+  s.add_dependency('git', [">= 1.2.5"])
+
+  ## Leave this section as-is. It will be automatically generated from the
+  ## contents of your Git repository via the gemspec task. DO NOT REMOVE
+  ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
+  # = MANIFEST =
+  s.files = %w[
+    README.md
+    Rakefile
+    knife-spork.gemspec
+    lib/chef/knife/spork-bump.rb
+    lib/chef/knife/spork-check.rb
+    lib/chef/knife/spork-promote.rb
+    lib/chef/knife/spork-upload.rb
+    lib/knife-spork.rb
+  ]
+  # = MANIFEST =
+
+  ## Test files will be grabbed from the file list. Make sure the path glob
+  ## matches what you actually use.
+  s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
+end

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

@@ -0,0 +1,163 @@
+#
+# Modifying Author:: Jon Cowie (<jonlives@gmail.com>)
+# Copyright:: Copyright (c) 2011 Jon Cowie
+# License:: GPL
+
+# Based on the knife-cookbook-bump plugin by:
+# Alalanta (no license specified)
+
+require 'chef/knife'
+require 'chef/cookbook_loader'
+require 'chef/cookbook_uploader'
+
+module KnifeSpork
+  class SporkBump < Chef::Knife
+
+    TYPE_INDEX = { "major" => 0, "minor" => 1, "patch" => 2, "manual" => 3 }
+
+    banner "knife spork bump COOKBOOK [MAJOR|MINOR|PATCH|MANUAL]"
+
+      @@gitavail = true
+      deps do
+        begin
+          require "git"
+        rescue LoadError
+            @@gitavail = false
+        end
+      end
+
+    def run
+
+      bump_type=""
+
+      self.config = Chef::Config.merge!(config)
+      if config.has_key?(:cookbook_path)
+        cookbook_path = config["cookbook_path"]
+      else
+        ui.fatal "No default cookbook_path; Specify with -o or fix your knife.rb."
+        show_usage
+        exit 1
+      end
+
+      if name_args.size == 0
+        show_usage
+        exit 0
+      end
+
+      if name_args.size == 3
+        bump_type = name_args[1]
+      elsif name_args.size == 2
+        bump_type = name_args.last
+      else
+        ui.fatal "Please specify the cookbook whose version you which to bump, and the type of bump you wish to apply."
+        show_usage
+        exit 1
+      end
+
+      unless TYPE_INDEX.has_key?(bump_type)
+        ui.fatal "Sorry, '#{name_args.last}' isn't a valid bump type.  Specify one of 'major', 'minor', 'patch' or 'manual'"
+        show_usage
+        exit 1
+      end
+
+      if bump_type == "manual"
+        manual_version = name_args.last
+        cookbook = name_args.first
+        cookbook_path = Array(config[:cookbook_path]).first
+        patch_type = "manual"
+        patch_manual(cookbook_path, cookbook, manual_version)
+      else
+          cookbook = name_args.first
+          patch_type = name_args.last
+          cookbook_path = Array(config[:cookbook_path]).first
+          patch(cookbook_path, cookbook, patch_type)
+      end
+
+      if !@@gitavail
+          ui.msg "Git gem not available, skipping git add.\n\n"
+      else
+          git_add(cookbook)
+      end
+
+    end
+
+
+    def patch(cookbook_path, cookbook, type)
+      t = TYPE_INDEX[type]
+      current_version = get_version(cookbook_path, cookbook).split(".").map{|i| i.to_i}
+      bumped_version = current_version.clone
+      bumped_version[t] = bumped_version[t] + 1
+      while t < 2
+        t+=1
+        bumped_version[t] = 0
+      end
+      metadata_file = File.join(cookbook_path, cookbook, "metadata.rb")
+      old_version = current_version.join('.')
+      new_version = bumped_version.join('.')
+      update_metadata(old_version, new_version, metadata_file)
+      ui.msg("Bumping #{type} level of the #{cookbook} cookbook from #{old_version} to #{new_version}\n\n")
+    end
+
+    def patch_manual(cookbook_path, cookbook, version)
+      current_version = get_version(cookbook_path, cookbook)
+      v = version.split(".")
+      if v.size < 3 or v.size > 3
+        ui.msg "That isn't a valid version number to bump to."
+        exit 1
+      end
+
+      v.each do |v_comp|
+         if !v_comp.is_i?
+           ui.msg "That isn't a valid version number to bump to."
+           exit 1
+         end
+      end
+
+      metadata_file = File.join(cookbook_path, cookbook, "metadata.rb")
+      update_metadata(current_version, version, metadata_file)
+      ui.msg("Manually bumped version of the #{cookbook} cookbook from #{current_version} to #{version}")
+    end
+
+    def update_metadata(old_version, new_version, metadata_file)
+      open_file = File.open(metadata_file, "r")
+      body_of_file = open_file.read
+      open_file.close
+      body_of_file.gsub!(old_version, new_version)
+      File.open(metadata_file, "w") { |file| file << body_of_file }
+    end
+
+    def get_version(cookbook_path, cookbook)
+      loader = ::Chef::CookbookLoader.new(cookbook_path)
+      return loader[cookbook].version
+    end
+
+    def git_add(cookbook)
+      strio = StringIO.new
+      l = Logger.new strio
+      cookbook_path = config[:cookbook_path]
+      if cookbook_path.size > 1
+        ui.warn "It looks like you have multiple cookbook paths defined so I can't tell if you're running inside a git repo.\n\n"
+      else
+        begin
+          path = cookbook_path[0].gsub("cookbooks","")
+          ui.msg "Opening git repo #{path}\n\n"
+          g = Git.open(path, :log => Logger.new(strio))
+          ui.msg "Git add'ing #{path}cookbooks/#{cookbook}/metadata.rb\n\n"
+          g.add("#{path}cookbooks/#{cookbook}/metadata.rb")
+        rescue ArgumentError => e
+          puts "Git Error: The root of your chef repo doesn't look like it's a git repo. Skipping git add...\n\n"
+        rescue
+          puts "Git Error: Something went wrong, Dumping log info..."
+          puts "#{strio.string}"
+        end
+      end
+     end
+  end
+
+end
+
+class String
+    def is_i?
+       !!(self =~ /^[-+]?[0-9]+$/)
+    end
+end

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

@@ -0,0 +1,123 @@
+#
+# Author:: Jon Cowie (<jonlives@gmail.com>)
+# Copyright:: Copyright (c) 2011 Jon Cowie
+# License:: GPL
+
+
+require 'json'
+require 'chef/knife'
+require 'chef/cookbook_loader'
+
+module KnifeSpork
+  class SporkCheck < Chef::Knife
+
+    deps do
+         require 'chef/json_compat'
+         require 'uri'
+         require 'chef/cookbook_version'
+    end
+    banner "knife spork check COOKBOOK"
+
+    def run
+
+      self.config = Chef::Config.merge!(config)
+
+      if config.has_key?(:cookbook_path)
+        cookbook_path = config["cookbook_path"]
+      else
+        ui.fatal "No default cookbook_path; Specify with -o or fix your knife.rb."
+        show_usage
+        exit 1
+      end
+
+      if name_args.size == 0
+        show_usage
+        exit 0
+      end
+
+      unless name_args.size == 1
+        ui.fatal "Please specify the cookbook whose version you which to check."
+        show_usage
+        exit 1
+      end
+
+      cookbook = name_args.first
+      cookbook_path = Array(config[:cookbook_path]).first
+
+      local_version = get_local_cookbook_version(cookbook_path, cookbook)
+      remote_versions = get_remote_cookbook_versions(cookbook)
+
+      check_versions(cookbook, local_version, remote_versions)
+    end
+
+
+    def get_local_cookbook_version(cookbook_path, cookbook)
+      current_version = get_version(cookbook_path, cookbook).split(".").map{|i| i.to_i}
+      metadata_file = File.join(cookbook_path, cookbook, "metadata.rb")
+      local_version = current_version.join('.')
+      return local_version
+    end
+
+    def get_remote_cookbook_versions(cookbook)
+      env           = config[:environment]
+      api_endpoint  = env ? "environments/#{env}/cookbooks/#{cookbook}" : "cookbooks/#{cookbook}"
+      cookbooks = rest.get_rest(api_endpoint)
+      versions = cookbooks[cookbook]["versions"]
+      return versions
+    end
+
+    def check_versions(cookbook, local_version, remote_versions)
+
+      conflict = false
+      frozen = false
+      ui.msg "Checking versions for cookbook #{cookbook}..."
+      ui.msg ""
+      ui.msg "Current local version: #{local_version}"
+      ui.msg ""
+      ui.msg "Remote versions:"
+      remote_versions.each do |v|
+
+        version_frozen = check_frozen(cookbook,v["version"])
+
+        if version_frozen then
+          pretty_frozen = "frozen"
+        else
+          pretty_frozen = "unfrozen"
+        end
+
+        if v["version"] == local_version then
+          ui.msg "*" + v["version"] + ", " + pretty_frozen
+          conflict = true
+          if version_frozen then
+            frozen = true
+          end
+        else
+          ui.msg v["version"] + ", " + pretty_frozen
+        end
+
+      end
+      ui.msg ""
+
+      if conflict && frozen
+        ui.msg "DANGER: Your local cookbook has same version number as the starred version above!\n\nPlease bump your local version or you won't be able to upload."
+      elsif conflict && !frozen
+          ui.msg "DANGER: Your local cookbook version number clashes with an unfrozen remote version.\n\nIf you upload now, you'll overwrite it."
+      else
+        ui.msg "Everything looks fine, no version clashes. You can upload!"
+      end
+    end
+
+    def get_version(cookbook_path, cookbook)
+      loader = ::Chef::CookbookLoader.new(cookbook_path)
+      return loader[cookbook].version
+    end
+
+    def check_frozen(cookbook,version)
+      env           = config[:environment]
+      api_endpoint  = env ? "environments/#{env}/cookbooks/#{cookbook}" : "cookbooks/#{cookbook}/#{version}"
+      cookbooks = rest.get_rest(api_endpoint)
+      cookbook_hash = cookbooks.to_hash
+      return cookbook_hash["frozen?"]
+    end
+  end
+end

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

@@ -0,0 +1,228 @@
+#
+# Author:: Jon Cowie (<jonlives@gmail.com>)
+# Copyright:: Copyright (c) 2011 Jon Cowie
+# License:: Apache License, Version 2.0
+#
+#
+# Uses code from the knife cookbook upload plugin by:
+#
+# 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.
+#
+
+require 'chef/knife'
+require 'json'
+
+module KnifeSpork
+  class SporkPromote < Chef::Knife
+
+      @@gitavail = true
+      deps do
+        require 'chef/exceptions'
+        require 'chef/cookbook_loader'
+        require 'chef/knife/core/object_loader'
+        begin
+          require "git"
+        rescue LoadError
+            @@gitavail = false
+        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
+
+      def run
+        config[:cookbook_path] ||= Chef::Config[:cookbook_path]
+
+        if @name_args.empty?
+          show_usage
+          ui.error("You must specify a cookbook name and an environment")
+          exit 1
+        elsif @name_args.size != 2
+          show_usage
+          ui.error("You must specify a cookbook name and an environment")
+          exit 1
+        end
+
+        if !@@gitavail
+            ui.msg "Git gem not available, skipping git pull.\n\n"
+        else
+            git_pull_if_repo
+        end
+
+        @cookbook = @name_args[1]
+        @environment = loader.load_from("environments", @name_args[0] + ".json")
+
+        if @cookbook == "all"
+          ui.msg "Promoting ALL cookbooks to environment #{@environment}\n\n"
+          cookbook_names = get_all_cookbooks
+          cookbook_names.each do |c|
+            @environment = promote(@environment, c)
+          end
+        else
+          @environment = promote(@environment, @cookbook)
+        end
+
+        ui.msg "\nSaving changes into #{@name_args[0]}.json"
+        new_environment_json = pretty_print(@environment)
+        save_environment_changes(@name_args[0],new_environment_json)
+
+        if config[:remote]
+          ui.msg "\nUploading #{@name_args[0]} to server"
+          save_environment_changes_remote(@name_args[0] + ".json")
+          ui.info "\nPromotion complete, and environment uploaded."
+        else
+          ui.info "\nPromotion complete! Please remember to upload your changed Environment file to the Chef Server."
+        end
+
+      end
+
+      def update_version_constraints(environment,cookbook,version_constraint)
+        environment.cookbook_versions[cookbook] = "= #{version_constraint}"
+        return environment
+      end
+
+      def get_version(cookbook_path, cookbook)
+        loader = ::Chef::CookbookLoader.new(cookbook_path)
+        return loader[cookbook].version
+      end
+
+      def load_environment(env)
+         e = Chef::Environment.load(env)
+         ejson = JSON.parse(e.to_json)
+         puts JSON.pretty_generate(ejson)
+         return e
+         rescue Net::HTTPServerException => e
+           if e.response.code.to_s == "404"
+             ui.error "The environment #{env} does not exist on the server, aborting."
+             Chef::Log.debug(e)
+             exit 1
+           else
+             raise
+           end
+      end
+
+       def valid_version(version)
+          v = version.split(".")
+          if v.size < 3 or v.size > 3
+            return false
+          end
+          v.each do |v_comp|
+             if !v_comp.is_i?
+               return false
+             end
+          end
+          return true
+      end
+
+      def loader
+        @loader ||= Chef::Knife::Core::ObjectLoader.new(Chef::Environment, ui)
+      end
+
+      def save_environment_changes_remote(environment)
+          @loader ||= Knife::Core::ObjectLoader.new(Chef::Environment, ui)
+          updated = loader.load_from("environments", environment)
+          updated.save
+      end
+
+      def save_environment_changes(environment,envjson)
+        cookbook_path = config[:cookbook_path]
+
+        if cookbook_path.size > 1
+          ui.warn "It looks like you have multiple cookbook paths defined so I'm not sure where to save your changed environment file.\n\n"
+          ui.msg "Here's the JSON for you to paste into #{environment}.json in the environments directory you wish to use.\n\n"
+          ui.msg "#{envjson}\n\n"
+        else
+          path = cookbook_path[0].gsub("cookbooks","environments") + "/#{environment}.json"
+
+          File.open(path, 'w') do |f2|
+            # use "\n" for two lines of text
+            f2.puts envjson
+          end
+        end
+      end
+
+      def promote(environment,cookbook)
+
+        if config[:version]
+            if !valid_version(config[:version])
+              ui.error("#{config[:version]} isn't a valid version number.")
+              return 1
+            else
+              @version = config[:version]
+            end
+        else
+           @version = get_version(config[:cookbook_path], cookbook)
+        end
+
+        ui.msg "Adding version constraint #{cookbook} = #{@version}"
+        return update_version_constraints(environment,cookbook,@version)
+      end
+
+      def get_all_cookbooks
+          results = []
+          cookbooks = ::Chef::CookbookLoader.new(config[:cookbook_path])
+          cookbooks.each do |c|
+            results << c
+          end
+          return results
+     end
+
+     def pretty_print(environment)
+       return JSON.pretty_generate(JSON.parse(environment.to_json))
+     end
+
+     def git_pull_if_repo
+        strio = StringIO.new
+        l = Logger.new strio
+        cookbook_path = config[:cookbook_path]
+        if cookbook_path.size > 1
+          ui.warn "It looks like you have multiple cookbook paths defined so I can't tell if you're running inside a git repo.\n\n"
+        else
+          begin
+            path = cookbook_path[0].gsub("cookbooks","")
+            ui.msg "Opening git repo #{path}\n\n"
+            g = Git.open(path, :log => Logger.new(strio))
+            ui.msg "Pulling latest changes from git\n\n"
+            g.pull
+          rescue ArgumentError => e
+            puts "Git Error: The root of your chef repo doesn't look like it's a git repo. Skipping git pull...\n\n"
+          rescue
+            puts "Git Error: Something went wrong, Dumping log info..."
+            puts "#{strio.string}"
+          end
+        end
+     end
+    end
+  end
+
+  class String
+      def is_i?
+         !!(self =~ /^[-+]?[0-9]+$/)
+      end
+  end

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

@@ -0,0 +1,227 @@
+#
+# Modifying Author:: Jon Cowie (<jonlives@gmail.com>)
+# Copyright:: Copyright (c) 2011 Jon Cowie
+# License:: Apache License, Version 2.0
+#
+# Modified cookbook upload to always freeze, and disable --force option
+# Based on the knife cookbook upload plugin by:
+#
+# 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.
+#
+
+require 'chef/knife'
+
+module KnifeSpork
+  class SporkUpload < Chef::Knife
+
+      CHECKSUM = "checksum"
+      MATCH_CHECKSUM = /[0-9a-f]{32,}/
+
+      deps do
+        require 'chef/exceptions'
+        require 'chef/cookbook_loader'
+        require 'chef/cookbook_uploader'
+      end
+
+      banner "knife spork upload [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 :freeze,
+        :long => '--freeze',
+        :description => 'Freeze this version of the cookbook so that it cannot be overwritten',
+        :boolean => true
+
+      option :environment,
+        :short => '-E',
+        :long  => '--environment ENVIRONMENT',
+        :description => "Set ENVIRONMENT's version dependency match the version you're uploading.",
+        :default => nil
+
+      option :depends,
+        :short => "-d",
+        :long => "--include-dependencies",
+        :description => "Also upload cookbook dependencies"
+
+      def run
+        config[:cookbook_path] ||= Chef::Config[:cookbook_path]
+
+        assert_environment_valid!
+        warn_about_cookbook_shadowing
+        version_constraints_to_update = {}
+        # Get a list of cookbooks and their versions from the server
+        # for checking existence of dependending cookbooks.
+        @server_side_cookbooks = Chef::CookbookVersion.list
+
+        if @name_args.empty?
+          show_usage
+          ui.error("You must specify the --all flag or at least one cookbook name")
+          exit 1
+        end
+        justify_width = @name_args.map {|name| name.size }.max.to_i + 2
+        @name_args.each do |cookbook_name|
+          begin
+            cookbook = cookbook_repo[cookbook_name]
+            if config[:depends]
+              cookbook.metadata.dependencies.each do |dep, versions|
+                @name_args.push dep
+              end
+            end
+            ui.info("Uploading and freezing #{cookbook.name.to_s.ljust(justify_width + 10)} [#{cookbook.version}]")
+            upload(cookbook, justify_width)
+            cookbook.freeze_version
+            upload(cookbook, justify_width)
+            version_constraints_to_update[cookbook_name] = cookbook.version
+          rescue Chef::Exceptions::CookbookNotFoundInRepo => e
+            ui.error("Could not find cookbook #{cookbook_name} in your cookbook path, skipping it")
+            Chef::Log.debug(e)
+          end
+        end
+
+        ui.info "upload complete"
+        update_version_constraints(version_constraints_to_update) if config[:environment]
+      end
+
+      def cookbook_repo
+        @cookbook_loader ||= begin
+          Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest, config[:cookbook_path]) }
+          Chef::CookbookLoader.new(config[:cookbook_path])
+        end
+      end
+
+      def update_version_constraints(new_version_constraints)
+        new_version_constraints.each do |cookbook_name, version|
+          environment.cookbook_versions[cookbook_name] = "= #{version}"
+        end
+        environment.save
+      end
+
+
+      def environment
+        @environment ||= config[:environment] ? Chef::Environment.load(config[:environment]) : nil
+      end
+
+      def warn_about_cookbook_shadowing
+        unless cookbook_repo.merged_cookbooks.empty?
+          ui.warn "* " * 40
+          ui.warn(<<-WARNING)
+The cookbooks: #{cookbook_repo.merged_cookbooks.join(', ')} exist in multiple places in your cookbook_path.
+A composite version of these cookbooks has been compiled for uploading.
+
+#{ui.color('IMPORTANT:', :red, :bold)} In a future version of Chef, this behavior will be removed and you will no longer
+be able to have the same version of a cookbook in multiple places in your cookbook_path.
+WARNING
+          ui.warn "The affected cookbooks are located:"
+          ui.output ui.format_for_display(cookbook_repo.merged_cookbook_paths)
+          ui.warn "* " * 40
+        end
+      end
+
+      private
+
+      def assert_environment_valid!
+        environment
+      rescue Net::HTTPServerException => e
+        if e.response.code.to_s == "404"
+          ui.error "The environment #{config[:environment]} does not exist on the server, aborting."
+          Chef::Log.debug(e)
+          exit 1
+        else
+          raise
+        end
+      end
+
+      def upload(cookbook, justify_width)
+
+        check_for_broken_links(cookbook)
+        check_dependencies(cookbook)
+        Chef::CookbookUploader.new(cookbook, config[:cookbook_path]).upload_cookbook
+      rescue Net::HTTPServerException => e
+        case e.response.code
+        when "409"
+          ui.error "Version #{cookbook.version} of cookbook #{cookbook.name} is frozen. Please bump your version number."
+          Chef::Log.debug(e)
+        else
+          raise
+        end
+      end
+
+      # if only you people wouldn't put broken symlinks in your cookbooks in
+      # the first place. ;)
+      def check_for_broken_links(cookbook)
+        # MUST!! dup the cookbook version object--it memoizes its
+        # manifest object, but the manifest becomes invalid when you
+        # regenerate the metadata
+        broken_files = cookbook.dup.manifest_records_by_path.select do |path, info|
+          info[CHECKSUM].nil? || info[CHECKSUM] !~ MATCH_CHECKSUM
+        end
+        unless broken_files.empty?
+          broken_filenames = Array(broken_files).map {|path, info| path}
+          ui.error "The cookbook #{cookbook.name} has one or more broken files"
+          ui.info "This is probably caused by broken symlinks in the cookbook directory"
+          ui.info "The broken file(s) are: #{broken_filenames.join(' ')}"
+          exit 1
+        end
+      end
+
+      def check_dependencies(cookbook)
+        # for each dependency, check if the version is on the server, or
+        # the version is in the cookbooks being uploaded. If not, exit and warn the user.
+        cookbook.metadata.dependencies.each do |cookbook_name, version|
+          unless check_server_side_cookbooks(cookbook_name, version) || check_uploading_cookbooks(cookbook_name, version)
+            # warn the user and exit
+            ui.error "Cookbook #{cookbook.name} depends on cookbook #{cookbook_name} version #{version},"
+            ui.error "which is not currently being uploaded and cannot be found on the server."
+            exit 1
+          end
+        end
+      end
+
+      def check_server_side_cookbooks(cookbook_name, version)
+        if @server_side_cookbooks[cookbook_name].nil?
+          false
+        else
+          @server_side_cookbooks[cookbook_name]["versions"].each do |versions_hash|
+            return true if Chef::VersionConstraint.new(version).include?(versions_hash["version"])
+          end
+          false
+        end
+      end
+
+      def check_uploading_cookbooks(cookbook_name, version)
+        if config[:all]
+          # check from all local cookbooks in the path
+          unless cookbook_repo[cookbook_name].nil?
+            return Chef::VersionConstraint.new(version).include?(cookbook_repo[cookbook_name].version)
+          end
+        else
+          # check from only those in the command argument
+          if @name_args.include?(cookbook_name)
+            return Chef::VersionConstraint.new(version).include?(cookbook_repo[cookbook_name].version)
+          end
+        end
+        false
+      end
+
+    end
+  end

data/lib/knife-spork.rb

@@ -0,0 +1,3 @@
+module KnifeSpork
+  VERSION = "0.1.0"
+end

metadata

@@ -0,0 +1,76 @@
+--- !ruby/object:Gem::Specification
+name: knife-spork
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
+platform: ruby
+authors:
+- Jon Cowie
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2012-01-28 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: &70176180960680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *70176180960680
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: &70176180960200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *70176180960200
+description: A workflow plugin to help many devs work with the same chef repo/server
+email: jonlives@gmail.com
+executables: []
+extensions: []
+extra_rdoc_files:
+- README.md
+files:
+- README.md
+- Rakefile
+- knife-spork.gemspec
+- lib/chef/knife/spork-bump.rb
+- lib/chef/knife/spork-check.rb
+- lib/chef/knife/spork-promote.rb
+- lib/chef/knife/spork-upload.rb
+- lib/knife-spork.rb
+homepage: https://github.com/jonlives/knife-spork
+licenses: []
+post_install_message: 
+rdoc_options:
+- --charset=UTF-8
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: knife-spork
+rubygems_version: 1.8.15
+signing_key: 
+specification_version: 2
+summary: A workflow plugin to help many devs work with the same chef repo/server
+test_files: []