knife-spork 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: be55378787dc1240c670fc01b68de5b616c0df95
-  data.tar.gz: b7d5be3123fec39a5a9d85504c9574758ed918c6
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDQ0OGMxOWQxZjQ5OWQ4OTIxM2NjZjg0ZGFiZmIxYjEwYWRlZDYyZg==
+  data.tar.gz: !binary |-
+    MDBiYmMzMjMxMjQxNzZhYmMwYzQ0MTVjNzczY2M5NTgxZWZhZTA1Nw==
 SHA512:
-  metadata.gz: 748924e200608f02f47e63e84e1ac2acf5de5c5411d8d9d6ec2ba47fa8523bdf2580ac7c5d584757f7baa9179004bc7a4c9278cd15ba4f1e78d21e43f6714daf
-  data.tar.gz: 5de3995fea10c3a725ec446abddb34312d7eaf48bf09c79088e67e5151656062aadde13eb6b73bc5cb2770ac51d88d8881c7f4b129cf018b90d6eca69426de79
+  metadata.gz: !binary |-
+    ZDkwOWZmNjEyNzQ3YTgzOWJmOTJkNGU1NTFhYjMwNGMwMWE5ZjAwNjJhY2M4
+    MGYyODgwMDdkMGY2ZTRjY2JiNDgyM2Y2NTlkNWFiYTlhMzMzNjM0YzExZjAy
+    MWJjMzY3YmNmZjk1NDNiYjZlOTA5YmNkZmY0NDcwNDRkZjU3YTA=
+  data.tar.gz: !binary |-
+    MTg4MGRlN2Q5YzgxNWJmZjFkODZjNDZkNTcxZDI5MDIyMTQzOTEyMDY3NGIy
+    MTI1NDRjMmE2OTI3NTU2OWVkY2I4NmQ3MjY0YzA1MjlmNDVkOGFkMGQyMDli
+    YmY5ZTlkYjE4YmRiMDYwM2RlNmI1NjZkNTFmYjVjMjZlM2Y4Nzc=

data/.gitignore

@@ -17,3 +17,4 @@ test/tmp
 test/version_tmp
 tmp
 .idea
+checksums

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p448
+ruby-1.9.3-p484

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 1.9.3

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 1.4.2(3rd November, 2014)
+
+Features:
+
+    - Improve error messages when uploading invalid JSON (Thanks to @jeunito https://github.com/jonlives/knife-spork/pull/151)
+    - Allow an optional comma delimited set of environments to be passed to spork promote (Thanks to @jeunito https://github.com/jonlives/knife-spork/pull/148)
+    - Add support for rubocop >= 0.23.0 in RuboCop plugin (Thanks to @dwradcliffe https://github.com/jonlives/knife-spork/pull/147)
+    - Relax foodcritic version requirement from ~> 3.0.0 to >= 3.0.0 (Thanks to @dwradcliffe https://github.com/jonlives/knife-spork/pull/146)
+    - Slack plugin now supports adding images in messages (Thanks to @ctrlok https://github.com/jonlives/knife-spork/pull/144)
+    - Git plugin can now optionally commit and push on changes (Thanks to @jeunito https://github.com/jonlives/knife-spork/pull/124)
+    
+Bugfixes:
+
+    - Fix custom plugin loading on Window (Thanks to @carpnick https://github.com/jonlives/knife-spork/pull/150)
+    - Fix config loading in CookbookUploader under Chef 12 (Thanks to @jordane https://github.com/jonlives/knife-spork/pull/149)
+    - Do not attempt to load Berksfile if not present (Thanks to @redondos https://github.com/jonlives/knife-spork/pull/142)
+    
 ## 1.4.1 (21st August, 2014)
 
 Bugfixes:

data/README.md

@@ -2,6 +2,7 @@ KnifeSpork
 ===========
 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. It contains several functions, documented below:
 
+[![Build Status](https://travis-ci.org/jonlives/knife-spork.svg)](https://travis-ci.org/jonlives/knife-spork)
 [![Gem Version](https://badge.fury.io/rb/knife-spork.png)](http://badge.fury.io/rb/knife-spork)
 
 Installation
@@ -79,6 +80,8 @@ plugins:
       - systems@your.conference.com/spork
   git:
     enabled: true
+    auto_push: true
+    branch: some_branch
   irccat:
     server: irccat.mydomain.com
     port: 12345
@@ -94,6 +97,7 @@ plugins:
     channel: "#sysops"
     teamname: myteam
     username: knife
+    icon_url: http://example.com/image.jpg
   rubocop:
     epic_fail: true
     show_name: false
@@ -153,7 +157,7 @@ knife spork info
 ```text
 $ knife spork info
 Config Hash:
-{"plugins"=>{"git"=>{"enabled"=>true}, "irccat"=>{"server"=>"irccat.mydomain.com", "port"=>12345, "gist"=>"usr/bin/gist", "channel"=>["#chef-announce"]}, "graphite"=>{"server"=>"graphite.mydomain.com", "port"=>2003}, "slack"=>{"api_token"=>"abc123", "channel"=>"random", "teamname"=>"myteam"}, "eventinator"=>{"url"=>"http://eventinator.mydomain.com/events/oneshot"}}, "default_environments"=>["development", "production"], "version_change_threshold"=>2, "pplugins"=>{"foodcritic"=>{"fail_tags"=>["style,correctness,test"], "tags"=>["~portability"], "include_rules"=>["config/rules.rb"]}}}
+{"plugins"=>{"git"=>{"enabled"=>true}, "irccat"=>{"server"=>"irccat.mydomain.com", "port"=>12345, "gist"=>"usr/bin/gist", "channel"=>["#chef-announce"]}, "graphite"=>{"server"=>"graphite.mydomain.com", "port"=>2003}, "slack"=>{"api_token"=>"abc123", "channel"=>"random", "teamname"=>"myteam", "icon_url"=>"http://example.com/image.jpg"}, "eventinator"=>{"url"=>"http://eventinator.mydomain.com/events/oneshot"}}, "default_environments"=>["development", "production"], "version_change_threshold"=>2, "pplugins"=>{"foodcritic"=>{"fail_tags"=>["style,correctness,test"], "tags"=>["~portability"], "include_rules"=>["config/rules.rb"]}}}
 
 Plugins:
 KnifeSpork::Plugins::Campfire: disabled
@@ -278,7 +282,7 @@ Successfully uploaded apache2@1.0.13!
 
 Spork Promote
 -------------
-This function lets you easily set a version constraint in an environment or group of environments 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.
+This function lets you easily set a version constraint in an environment or group of environments 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. To promote to multiple environments, simply pass a list of them delimited with a comma.  
 
 If you don't specify an environment or environment group, the default_environments config directive will be used if set.
 

data/Rakefile

@@ -1,2 +1,35 @@
 #!/usr/bin/env rake
 require 'bundler/gem_tasks'
+
+require 'rspec/core/rake_task'
+require 'chef_zero/server'
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = [].tap do |a|
+    a.push('--color')
+    a.push('--format doc')
+  end.join(' ')
+end
+
+desc 'Run all tests'
+task :test => [:spec]
+
+task :preseed_test_environment do
+  puts "Creating checksums directory"
+  `mkdir spec/unit/fixtures/checksums`
+  puts "Starting chef-zero server"
+  @server = ChefZero::Server.new(port: 4000)
+  @server.start_background
+  puts "Uploading test data"
+  `knife cookbook upload example -c spec/unit/fixtures/knife.rb`
+  `knife environment from file spec/unit/fixtures/environments/example.json -c spec/unit/fixtures/knife.rb`
+end
+
+task :cleanup_test_environment do
+  puts "Stopping chef-zero server"
+  @server.stop
+  puts "Cleaning up checksums"
+  `rm -rf spec/unit/fixtures/checksums`
+end
+
+task :default => [:preseed_test_environment, :test, :cleanup_test_environment]

data/knife-spork.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = 'knife-spork'
-  gem.version       = '1.4.1'
+  gem.version       = '1.4.2'
   gem.authors       = ["Jon Cowie"]
   gem.email         = 'jonlives@gmail.com'
   gem.homepage      = 'https://github.com/jonlives/knife-spork'
@@ -16,6 +16,9 @@ Gem::Specification.new do |gem|
   gem.name          = "knife-spork"
   gem.require_paths = ["lib"]
 
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec', '>= 3.1.0'
+  gem.add_development_dependency 'chef-zero', '>= 3.2'
   gem.add_runtime_dependency 'chef', '>= 11.0.0'
   gem.add_runtime_dependency 'git', '>= 1.2.5'
   gem.add_runtime_dependency 'app_conf', '>= 0.4.0'

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

@@ -84,7 +84,11 @@ module KnifeSpork
         begin
           check_dependencies(cookbook)
           if name_args.include?(cookbook.name.to_s)
-            uploader = Chef::CookbookUploader.new(cookbook, ::Chef::Config.cookbook_path)
+            if Gem::Version.new(Chef::VERSION).release >= Gem::Version.new('12.0.0')
+              uploader = Chef::CookbookUploader.new(cookbook)
+            else
+              uploader = Chef::CookbookUploader.new(cookbook, ::Chef::Config.cookbook_path)
+            end
             begin
               if uploader.respond_to?(:upload_cookbooks)
                 # Chef >= 10.14.0

data/lib/knife-spork/plugins.rb

@@ -7,7 +7,9 @@ module KnifeSpork
       hook = options[:hook].to_sym
 
       #Load each of the drop-in plugins specified in the custom plugin path
-      Dir[File.expand_path("#{options[:config][:custom_plugin_path]}/*.rb")].each { |f| require f }
+      if (options[:config][:custom_plugin_path] !=nil)
+        Dir[File.expand_path("#{options[:config][:custom_plugin_path]}/*.rb")].each { |f| require f }
+      end
 
       klasses.each do |klass|
         plugin = klass.new(options)

data/lib/knife-spork/plugins/foodcritic.rb

@@ -9,7 +9,7 @@ module KnifeSpork
       def perform
         safe_require 'foodcritic'
 
-        if Gem::Specification.find_all_by_name("foodcritic", "~> 3.0.0").empty?
+        if Gem::Specification.find_all_by_name("foodcritic", ">= 3.0.0").empty?
           ui.fatal "The knife-spork foodcritic plugin requires foodcritic >= 3.0.0. Please install a more recent foodcritic version."
           exit 1
         end

data/lib/knife-spork/plugins/git.rb

@@ -44,6 +44,16 @@ module KnifeSpork
         environments.each do |environment|
           git_add(environment_path,"#{environment}.json")
         end
+        if config.auto_push
+          branch =  if not config.branch.nil?
+                      config[:branch] 
+                    else 
+                      "master"
+                    end
+
+          git_commit(environment_path, "promote #{cookbooks.collect{ |c| "#{c.name}@#{c.version}" }.join(",")} to #{environments.join(",")}")
+          git_push(branch)
+        end
       end
 
       private
@@ -52,9 +62,10 @@ module KnifeSpork
         log = Logger.new(STDOUT)
         log.level = Logger::WARN
         @git ||= begin
-          ::Git.open('.', :log => log)
-        rescue
-          ui.error 'You are not currently in a git repository. Please ensure you are in a git repo, a repo subdirectory, or remove the git plugin from your KnifeSpork configuration!'
+          cwd = FileUtils.pwd()
+          ::Git.open(get_parent_dir(cwd) , :log => log)
+        rescue Exception => e  
+          ui.error "You are not currently in a git repository #{cwd}. Please ensure you are in a git repo, a repo subdirectory, or remove the git plugin from your KnifeSpork configuration!"
           exit(0)
         end
       end
@@ -105,21 +116,23 @@ module KnifeSpork
           end
         end
       end
-
-      # Commit changes, if any
-      def git_commit
+      
+      def git_commit(filepath, msg)
         begin
-          git.add('.')
-          `git ls-files --deleted`.chomp.split("\n").each{ |f| git.remove(f) }
-          git.commit_all "[KnifeSpork] Bumping cookbooks:\n#{cookbooks.collect{|c| "  #{c.name}@#{c.version}"}.join("\n")}"
-        rescue ::Git::GitExecuteError; end
+          if is_repo?(filepath)
+            ui.msg "Git: Committing changes..."
+            git.commit msg
+          end
+        rescue ::Git::GitExecuteError; 
+        end
       end
 
-      def git_push(tags = false)
+      def git_push(branch)
         begin
-          git.push remote, branch, tags
+            ui.msg "Git: Pushing to #{branch}"
+            git.push "origin", branch
         rescue ::Git::GitExecuteError => e
-          ui.error "Could not push to remote #{remote}/#{branch}. Does it exist?"
+          ui.error "Could not push to master: #{e.message}"
         end
       end
 

data/lib/knife-spork/plugins/rubocop.rb

@@ -32,7 +32,7 @@ module KnifeSpork
 
           options = [ cookbook_path ]
 
-          cli = ::Rubocop::CLI.new
+          cli = defined?(RuboCop) ? ::RuboCop::CLI.new : ::Rubocop::CLI.new
           result = cli.run(options)
 
           unless result  == 0

data/lib/knife-spork/plugins/slack.rb

@@ -100,7 +100,7 @@ module KnifeSpork
       def slack(message)
         safe_require 'slack-notifier'
         begin
-          notifier = ::Slack::Notifier.new( config.teamname, config.api_token, channel: channel, username: username)
+          notifier = ::Slack::Notifier.new( config.teamname, config.api_token, channel: channel, username: username, icon_url: config.icon_url)
           notifier.ping message 
         rescue Exception => e
           ui.error 'Something went wrong sending to Slack.'

data/lib/knife-spork/runner.rb

@@ -36,7 +36,7 @@ module KnifeSpork
 
         environments = [ @environments || @environment ].flatten.compact.collect{|environment| environment.is_a?(::Chef::Environment) ? environment : load_environment_from_file(environment)}.sort{|a,b| a.name.to_s <=> b.name.to_s}
         environment_diffs = @environment_diffs
-
+        
         KnifeSpork::Plugins.run(
           :config => spork_config,
           :hook => hook.to_sym,
@@ -54,10 +54,10 @@ module KnifeSpork
 
       def load_environments_and_cookbook
         ensure_environment_and_cookbook_provided!
-
+       
         if @name_args.size == 2
-          environments = load_specified_environment_group(@name_args[0])
-          [ environments, @name_args[1] ]
+          environments = @name_args[0].split(",").map{ |env| load_specified_environment_group(env) }
+          [ environments.flatten, @name_args[1] ]
         elsif @name_args.size == 1
           [ [default_environments].flatten, @name_args[0] ]
         end
@@ -176,6 +176,7 @@ module KnifeSpork
 
       def load_from_berkshelf(name)
         return unless defined?(::Berkshelf)
+        return unless ::File.exist?(self.config[:berksfile])
         berksfile = ::Berkshelf::Berksfile.from_file(self.config[:berksfile])
         lockfile = ::Berkshelf::Lockfile.new(berksfile)
 
@@ -228,7 +229,11 @@ module KnifeSpork
       end
 
       def load_environment_from_file(environment_name)
-        environment_loader.object_from_file("#{environment_path}/#{environment_name}.json")
+        begin
+          environment_loader.object_from_file("#{environment_path}/#{environment_name}.json")
+        rescue Yajl::ParseError => e
+          raise "#{environment_name} environment file has syntactically incorrect json.\n #{e.to_s}" 
+        end
       end
 
       def load_remote_environment(environment_name)

data/plugins/Git.md

@@ -23,6 +23,7 @@ plugins:
   git:
     remote: origin
     branch: master
+    auto_push: true
 ```
 
 **Note** Due to the nature of the git plugin, it's possible that you accept all the defaults. In that case, you should make your configuration like this:
@@ -44,3 +45,9 @@ The git branch to push/pull to/from.
 
 - Type: `String`
 - Default: `master`
+
+#### auto_push
+An optional true / false parameter indicating whether or not changes should be automatically comitted and pushed to Git
+
+- Type: `Boolean`
+- Default: `false`

data/plugins/Slack.md

@@ -44,4 +44,9 @@ The teamname of the slack account. ex. https://TEAMNAME.slack.com
 #### username
 The username to post as.
 
-- Type: `String`
+- Type: `String`
+
+#### icon_url
+The url for icon. ex. https://example.com/image.jpg, default: nil
+
+- Type: `String`

data/spec/spec_helper.rb

@@ -0,0 +1,10 @@
+require 'test_helpers'
+
+RSpec.configure do |c|
+  c.include TestHelpers
+  c.expect_with :rspec do |config|
+    config.syntax = [:should, :expect]
+  end
+  c.filter_run :focus => true
+  c.run_all_when_everything_filtered = true
+end

data/spec/test_helpers.rb

@@ -0,0 +1,46 @@
+require 'fileutils'
+require 'tmpdir'
+
+module TestHelpers
+  def tempdir
+    @tmpdir ||= Dir.mktmpdir("knife-spork")
+    File.realpath(@tmpdir)
+  end
+
+  def fixtures_path
+    File.expand_path(File.dirname(__FILE__) + "/unit/fixtures/")
+  end
+
+  def cookbook_path
+    File.expand_path('cookbooks', tempdir)
+  end
+
+  def environment_path
+    File.expand_path('environments', tempdir)
+  end
+
+  def stdout
+    stdout_io.string
+  end
+
+  def set_chef_config
+    knife.config[:chef_repo_path] = tempdir
+    knife.config[:cookbook_path] = File.join(tempdir, 'cookbooks')
+    knife.config[:environment_path] = File.join(tempdir, 'environments')
+    knife.config[:chef_server_url] = "http://localhost:4000"
+    knife.config[:client_key] = File.join(tempdir, 'test_client.pem')
+    knife.config[:client_name] = "test-client"
+    knife.config[:node_name] = "test-node"
+    knife.config[:cache_type] = 'BasicFile'
+    knife.config[:cache_options] = {:path =>  File.join(tempdir, 'checksums')}
+  end
+
+
+  def copy_test_data
+    FileUtils.cp_r "#{fixtures_path}/.", tempdir
+  end
+
+  def cleanup_test_data
+    FileUtils.rm_r Dir.glob("#{tempdir}/*")
+  end
+end

data/spec/unit/fixtures/config/spork-config.yml

@@ -0,0 +1 @@
+plugins:

data/spec/unit/fixtures/cookbooks/example/metadata.rb

@@ -0,0 +1,7 @@
+maintainer       "Jon Cowie"
+maintainer_email "jonlives@gmail.com"
+license          "All rights reserved"
+description      "Test cookbook for knife-spork"
+long_description      "Test cookbook for knife-spork"
+version "0.0.1"
+

data/spec/unit/fixtures/environments/example.json

@@ -0,0 +1,12 @@
+{
+  "name": "example",
+  "description": "This is an example environment",
+  "cookbook_versions": {
+  },
+  "json_class": "Chef::Environment",
+  "chef_type": "environment",
+  "default_attributes": {
+  },
+  "override_attributes": {
+  }
+}

data/spec/unit/fixtures/knife.rb

@@ -0,0 +1,6 @@
+chef_server_url   'http://127.0.0.1:4000'
+node_name         'test-node'
+client_key        'test_client.pem'
+chef_repo_path    'spec/unit/fixtures'
+cookbook_path     'spec/unit/fixtures/cookbooks'
+cache_options( :path => 'checksums' )

data/spec/unit/fixtures/test_client.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA6NLSaRTs1vQEuFhhBjaEuVzrPoz59U+8w8bhyL5sXXzFatVm
+t1uCtmOaaqE8QsOQG2rdaoW/YXjErg/xyzW3Z0q++RekYx6guvTbpKHoSzgqG8AJ
+wpVXn9wXKRgOHpGCvyaqMNvHpEmQdjJfFTZ5yJtDdRQbWMincs14VbuVlNniMmmF
+thw3lMgPpEs/tf7a+V23BroYBCslsAoQb4Sb4kIVVWLAuBXOdfRxOY0XH/lqKn9w
+r4/Lh6Iw3Sf6zVUI0WhBhhohP2aQhZu3CwA+B2wmEcaUrnVwuJJZcJ5NEwa7ysXk
+AGh4erlxl8vK7lbootF/vnvLqrYEdaleINGflwIDAQABAoIBAF/t9ao8Z/WNZ6B5
+Mcj4j6k8guUr+xW7fACCoqcu5sGCVmlVclQcTXhPA+Hpe0XbBDZ3yrFIWHmV5BwA
+D9V11ZKmtpc1yZLZnMpLd3CXEXpkstzqPFtDY25HpfdVpQOtWtzd1oP5GoIzmWVK
+DelUn8srRhkoZrgnPO9Nf8Z7Wv+QGaanGyiTvEbP3/ZYbKs6aXMkF1eJf1iubUWq
+jgtN9dGyvglhKNMNxo2O88MJOPWqmwrdYQGbCXJ2aPcjchRVQrdr55yaCvP9QV3P
+TIqJwsIS6fvpuhTfjpIjGKtClWubh9sVS74G9HOus908u8VQLizjkeWa3Tmcqk+t
+a8HJQZECgYEA+lk4osTUbSOQu3tSLwNoDLL1pJnJ2bZ/SM1O6yLTbpqom0dyh/xC
+ffy+iua9Ngu7dHJDc69FxqPhLlWl2KzZKvh1V7J/TVBcknVP84OKSBttc4pWN5Zv
+jkOoewI3e+0RA2Gx3+QuLea6iaV0lZ7pq5rbQv49z3qa2glCr6q4iykCgYEA7hRS
+nDPaXnvBxglv9YobXTmkB/ZxsLO4h3Tm5CHoKYTp4f8oEaJnGVd0lzp3aGw3DSac
+Z8xdStTe+6HBeFDIjaVjb693+2aE1iGoZMry93zZd5mxBS0XiG72hu7ZfFzthl3v
+72lTTj2xpRTt17p/xwl7LITPxGtl0ychUY0Y7L8CgYAz/lG35F8l54wIk/0mjHOQ
+p55CuDnmwHNBAHrSdOIqh25bCYSs32RD3DkKig9j6R3eelit7wnzzldXEyyliohz
+1zQvqX+s4/LF7B1Vusz+WsvpgiKT2ueCSWT1Xyl80GiHJkQV9sLsf43gRn+nD2EC
+ZeAB0uGtdI4ymFfEOhWnuQKBgDyZ+7U7Fbi7M8XfHRqZPwHp7DECsEnUVYJVZXho
+kRoQdSBLvL1QY4H12v2rqj1wXksAqwtY395udRwEPqULmyFDGh6Rwa7Cl8mR47VU
+W6hXpVtmScMRiU33QNVz8vRPCz8KpkqAuu3Nkmx8+VXSaTgW172rSN+snsyyxy5l
+BhUtAoGBAOr4jeJKT0jzeDJwLhrxctZkSkka0wCPe17d0+IfBbZ+XyQXFt+enuH1
+cMZ8IJr+nKHojjey7AunhYBtwQEv50Ul8TfvjUuqUY34xSVRAZD90LETZTVsq2QF
+q3wN75pqCHF55t/L5K2drAIxcfhBo/olgTvN91vGYXNieFh9PREl
+-----END RSA PRIVATE KEY-----

data/spec/unit/spork_bump_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+require 'chef/knife/spork-bump'
+require 'knife-spork/runner'
+require 'fileutils'
+
+module KnifeSpork
+  describe SporkBump do
+
+    let(:stdout_io) { StringIO.new }
+    let(:stderr_io) { StringIO.new }
+
+    subject(:knife) do
+      SporkBump.new(argv).tap do |c|
+        allow(c.ui).to receive(:stdout).and_return(stdout_io)
+      end
+    end
+
+    before(:all) do
+      copy_test_data
+    end
+
+    after(:all) do
+      cleanup_test_data
+    end
+
+    let(:argv) { ["example"] }
+
+    let(:metadata_file) { "#{cookbook_path}/example/metadata.rb" }
+
+    describe '#run' do
+      before(:each) { set_chef_config }
+      it 'calls bump method' do
+        expect(knife).to receive(:bump)
+        knife.run
+      end
+    end
+
+    describe '#bump' do
+      before(:each) { set_chef_config }
+      it 'automatically bumps patch level' do
+        knife.instance_variable_set(:@cookbook, knife.load_cookbook(argv.first))
+        knife.send(:bump)
+        File.read(metadata_file).should include "version \"0.0.2\""
+      end
+
+      it 'manually bumps patch version level' do
+        knife.instance_variable_set(:@cookbook, knife.load_cookbook(argv.first))
+        knife.instance_variable_set(:@name_args, ["example","patch"])
+        knife.send(:bump)
+        File.read(metadata_file).should include "version \"0.0.3\""
+      end
+
+      it 'manually bumps minor version level' do
+        knife.instance_variable_set(:@cookbook, knife.load_cookbook(argv.first))
+        knife.instance_variable_set(:@name_args, ["example","minor"])
+        knife.send(:bump)
+        File.read(metadata_file).should include "version \"0.1.0\""
+      end
+
+      it 'manually bumps major version level' do
+        knife.instance_variable_set(:@cookbook, knife.load_cookbook(argv.first))
+        knife.instance_variable_set(:@name_args, ["example","major"])
+        knife.send(:bump)
+        File.read(metadata_file).should include "version \"1.0.0\""
+      end
+
+      it 'manually sets version to 0.0.1' do
+        knife.instance_variable_set(:@cookbook, knife.load_cookbook(argv.first))
+        knife.instance_variable_set(:@name_args, ["example", "manual", "0.0.1"])
+        knife.send(:bump)
+        File.read(metadata_file).should include "version \"0.0.1\""
+      end
+    end
+  end
+end

data/spec/unit/spork_info_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'chef/knife/spork-info'
+require 'knife-spork/runner'
+
+module KnifeSpork
+    describe SporkInfo do
+
+      let(:stdout_io) { StringIO.new }
+      let(:stderr_io) { StringIO.new }
+
+      subject(:knife) do
+        SporkInfo.new(argv).tap do |c|
+          allow(c.ui).to receive(:stdout).and_return(stdout_io)
+        end
+      end
+
+      let(:argv) { [] }
+
+      describe '#run' do
+        it 'displays spork info' do
+          expect(knife).to receive(:info)
+          knife.run
+        end
+      end
+
+      describe '#info' do
+        before(:each) { set_chef_config }
+        let(:fake_ui) { double(:ui, msg: nil) }
+
+        before do
+          allow(knife).to receive(:ui) { fake_ui }
+        end
+
+        it 'only calls ui.msg' do
+          expect(fake_ui).to receive(:msg)
+          knife.send(:info)
+        end
+      end
+    end
+end

data/spec/unit/spork_promote_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+require 'chef/knife/spork-promote'
+require 'knife-spork/runner'
+
+module KnifeSpork
+  describe SporkPromote do
+
+    let(:stdout_io) { StringIO.new }
+    let(:stderr_io) { StringIO.new }
+
+    before(:all) do
+      copy_test_data
+    end
+
+    after(:all) do
+      cleanup_test_data
+    end
+
+    subject(:knife) do
+      SporkPromote.new(argv).tap do |c|
+        allow(c.ui).to receive(:stdout).and_return(stdout_io)
+      end
+    end
+
+    let(:environment_file) { "#{environment_path}/example.json" }
+
+    let(:argv) { ["example", "example"] }
+
+    describe '#run' do
+      before(:each) { set_chef_config }
+      it 'calls promote method' do
+        expect(knife).to receive(:promote)
+        knife.run
+      end
+
+      it 'calls save_environment_changes method by default' do
+        expect(knife).to receive(:save_environment_changes)
+        knife.run
+      end
+
+      it 'calls save_environment_changes_remote method when --remote is specified' do
+        knife.config[:remote] = true
+        expect(knife).to receive(:save_environment_changes_remote)
+        knife.run
+      end
+    end
+
+    describe '#promote' do
+      before(:each) { set_chef_config }
+      it 'updates version constraint for cookbook' do
+        knife.instance_variable_set(:@environments, ["example"])
+        knife.instance_variable_set(:@cookbook, "example")
+        expect(knife).to receive(:update_version_constraints)
+        knife.send(:promote, knife.load_environment_from_file("example"), "example")
+      end
+    end
+
+    describe '#save_environment_changes' do
+      before(:each) { set_chef_config }
+      it 'updates the constraint in the environment file' do
+        knife.instance_variable_set(:@environments, ["example"])
+        knife.instance_variable_set(:@cookbook, "example")
+        knife.send(:save_environment_changes, "example", knife.pretty_print_json(knife.load_environment_from_file("example").to_hash))
+        File.read(environment_file).should include "\"example\": \"= 0.0.1\""
+      end
+    end
+
+    describe '#save_environment_changes_remote' do
+      before(:each) { set_chef_config }
+      it 'saves the environment change to the server' do
+        knife.instance_variable_set(:@environments, ["example"])
+        knife.instance_variable_set(:@cookbook, "example")
+        knife.send(:save_environment_changes_remote, "example")
+      end
+    end
+  end
+end

data/spec/unit/spork_upload_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+require 'chef/knife/spork-upload'
+require 'chef/cookbook_uploader'
+require 'knife-spork/runner'
+
+module KnifeSpork
+  describe SporkUpload do
+
+    let(:stdout_io) { StringIO.new }
+    let(:stderr_io) { StringIO.new }
+
+    before(:all) do
+      copy_test_data
+    end
+
+    after(:all) do
+      cleanup_test_data
+    end
+
+    subject(:knife) do
+      SporkUpload.new(argv).tap do |c|
+        allow(c.ui).to receive(:stdout).and_return(stdout_io)
+      end
+    end
+
+    let(:argv) { ["example"] }
+
+    describe '#run' do
+      before(:each) { set_chef_config }
+      it 'calls upload method' do
+        expect(knife).to receive(:upload)
+        knife.run
+      end
+    end
+
+    describe '#upload' do
+      before(:each) { set_chef_config }
+      it 'uploads cookbook' do
+        knife.instance_variable_set(:@cookbooks, knife.load_cookbooks(argv))
+        knife.send(:upload)
+      end
+    end
+  end
+end

metadata

@@ -1,69 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: knife-spork
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Jon Cowie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: chef-zero
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 11.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 11.0.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: app_conf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.1
 description: KnifeSpork is a workflow plugin for Chef::Knife which helps multiple
@@ -78,6 +120,7 @@ files:
 - .gitignore
 - .ruby-gemset
 - .ruby-version
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -140,6 +183,17 @@ files:
 - plugins/Slack.md
 - plugins/StatusNet.md
 - plugins/Template.md
+- spec/spec_helper.rb
+- spec/test_helpers.rb
+- spec/unit/fixtures/config/spork-config.yml
+- spec/unit/fixtures/cookbooks/example/metadata.rb
+- spec/unit/fixtures/environments/example.json
+- spec/unit/fixtures/knife.rb
+- spec/unit/fixtures/test_client.pem
+- spec/unit/spork_bump_spec.rb
+- spec/unit/spork_info_spec.rb
+- spec/unit/spork_promote_spec.rb
+- spec/unit/spork_upload_spec.rb
 homepage: https://github.com/jonlives/knife-spork
 licenses:
 - GPL
@@ -150,18 +204,29 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A workflow plugin to help many devs work with the same chef repo/server
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/test_helpers.rb
+- spec/unit/fixtures/config/spork-config.yml
+- spec/unit/fixtures/cookbooks/example/metadata.rb
+- spec/unit/fixtures/environments/example.json
+- spec/unit/fixtures/knife.rb
+- spec/unit/fixtures/test_client.pem
+- spec/unit/spork_bump_spec.rb
+- spec/unit/spork_info_spec.rb
+- spec/unit/spork_promote_spec.rb
+- spec/unit/spork_upload_spec.rb