knife-spork 0.1.11 → 1.0.0

data/.gitignore

@@ -0,0 +1,18 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+.project
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.3@knife-spork --create

data/CHANGELOG.md

@@ -1,23 +1,37 @@
+## 1.0.0 (27th August, 2012)
+Features:
+
+    - Major refactor (initial refactor: Seth Vargo)
+    - Plugin API (Seth Vargo)
+    - Added "spork info" command to show config hash and plugins status
+    - Missing local / remote cookbook now handled nicely in spork check
+    - Add "--fail" option to spork check to "exit 1" if check fails
+    - Git plugin now uses git gem instead of shelling out
+    - Confirmation check on promote if version jumps more than version_change_threshold
+    - Thanks also to jperry, bethanybenzur and nickmarden for contributions submitted pre-refactor which have been included in one form or another.
+
+    
+
 ## 0.1.11 (5th June, 2012)
 Features:
 
     - Hipchat Support (courtesy of Chris Ferry: @cdferry)
-    
+
 Bugfixes:
-    
+
     - Tweaks to spork bump to play nicely with x.x versions as well as x.x.x (courtesy of Russ Garrett: @russss)
-    
+
 ## 0.1.10 (12th April, 2012)
 Features:
 
     - All spork plugins now support multiple cookbook paths
-    
+
 Bugfixes:
-    
+
     - Fixes to work with app_conf 0.4.0
-    
+
 ## 0.1.9 (3rd April, 2012)
-    
+
 Features:
 
     - Spork Promote will now git add updated environment files if git is enabled
@@ -25,24 +39,24 @@ Features:
     - Spork Bump will now perform a git pull and pull from submodules if git is enabled
     - Optional Foodcritic integration added for Spork Upload
     - ickymettle's Eventinator service now optionally supported
-    
+
 Bugfixes:
 
     - Correct irccat alerts to not fire if cookbook upload fails
     - Code cleanup to remove unused Opscode code from Spork Upload
 
 ## 0.1.8 (21st February, 2012)
-    
+
 Features:
 
     - Make promote --remote check if the correct version of the cookbook has been uploaded before updating the remote environment
-    
+
 ## 0.1.7 (21st February, 2012)
-    
+
 Bugfixes:
 
     - Make promote --remote work nicely when not run from chef repo root
-    
+
 ## 0.1.6 (21st February, 2012)
 Features:
 
@@ -53,17 +67,17 @@ Features:
     - Spork Promote will now also update git submodules before promoting. Specifically, it will run "git submodule foreach git pull"
     - Failures during "git add" on spork bumps have a more helpful error message
     - Irccat messages are now more nicely formatted and have pretty colours.
-    
+
 Bugfixes:
-    
+
     - Spork Promote will now work from anywhere in your chef repo, not just the repo root
-    
+
 ## 0.1.5 (21st February, 2012)
-    
+
 Yanked
 
 ## 0.1.4 (3rd February, 2012)
-    
+
 Features:
 
     - Spork Check only show the last 5 remote versions, include the --all option if you want to see them all
@@ -73,21 +87,21 @@ Features:
     - It will also optionally post a gist of version constraint changes in the above message when a promote --remote happens
     - Added support for default environments to promote to
     - knife-spork gemification thanks to Daniel Schauenberg
-    
+
 Bugfixes:
 
     - Various bugfixes and tweaks to formatting and log messages
-    
+
 ## 0.1.4 (3rd February, 2012)
-    
+
 Yanked
 
 ## 0.1.3 (3rd February, 2012)
-    
+
 Yanked
 
 ## 0.1.2 (3rd February, 2012)
-    
+
 Yanked
 
 ## 0.1.1 (3rd February, 2012)
@@ -96,4 +110,4 @@ Yanked
 
 ## 0.1.0 (January 28, 2012)
 
-Initial version.
+Initial version.

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/LICENSE

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

data/README.md

@@ -1,258 +1,241 @@
-# knife-spork
+KnifeSpork
+===========
+KnifeSpork is a workflow plugin for `Chef::Knife` which helps multiple developers work on the same Chef Server and repository without treading on eachother'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:
 
-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:
+Installation
+------------
+### Gem Install (recommended)
+`knife-spork` is available on rubygems. Add the following to your `Gemfile`:
 
-# Installation
+```ruby
+gem 'knife-spork'
+```
 
-## SCRIPT INSTALL
+or install the gem manually:
 
-Copy spork-* script from lib/chef/knife/spork-*.rb to your ~/.chef/plugins/knife directory.
-
-## GEM INSTALL
-knife-spork is available on rubygems.org - if you have that source in your gemrc, you can simply use:
-
-````
+```bash
 gem install knife-spork
-````
-
-# Spork Configuration
-
-Out of the box, knife spork will work with no configuration. However, you can optionally enable several features to enhance it's functionality.
-
-Knife Spork will look for it's config file in the following locations, in ascending order of precedence.
-
-* <chef-repo>/config/spork-config.yml
-* /etc/spork-config.yml
-* ~/.chef/spork-config.yml
-
-Anything set in the config file in your home directory for example, will override options set in your chef repo or /etc.
-
-Below is a sample config file with all supported options enabled below, followed by an explanation of each section.
-
-````
-git:
-  enabled: true
-hipchat:
-  enabled: true
-  apikey: MYAPIKEYHERE
-  nickname: "Knife-Spork"
-  room: "Chef"
-  notify: true
-  color: "red"
-irccat:
-  enabled: true
-  server: irccat.mycompany.com
-  port: 12345
-  channel: "#chef"
-graphite:
-  enabled: true
-  server: graphite.mycompany.com
-  port: 2003
-gist:
-  enabled: true
-  in_chef: true
-  chef_path: cookbooks/gist/files/default/gist
-  path: /usr/bin/gist
-foodcritic:
-  enabled: true
-  fail_tags: [any]
-  tags: [foo]
-  include_rules: [/home/me/myrules]
-default_environments: [ production, development ]
-````
-## Git
-
-This section enables a couple of git commands which will run as part of your spork workflow, namely:
-
-* When you bump a cookbook's version, the relevant metadata.rb file will be git added
-* When you promote an environment, git pull will be run before your changes are made.
-
-## HipChat
-
-Notifications will be sent to the HipChat room of your choice. Currently notifies on
-
-* When a cookbook is uploaded using spork upload
-* When  an environment is promoted to the server using promote --remote
+```
 
-color: "yellow", "red", "green", "purple", or "random"
-
-## Irccat
-
-If you're using the irccat (https://github.com/RJ/irccat) irc bot, this lets you post notifications to the channel of your choice. It currently notifies on
-
-* When a cookbook is uploaded using spork upload
-* When  an environment is promoted to the server using promote --remote
-
-## Graphite
-
-This lets you send to a graphite metric when promote --remote is performed. It send to the metric deploys.chef.<environment>
-	
-## Gist
-
-This allows you to generate an optional gist of environment changes which will be added to irccat notifications on promote --remote. It supports the https://rubygems.org/gems/gist, and contains two parameters to use a version in your chef repo, or a version installed somewhere else locally.
-
-## Foodcritic
-
-This allows you to run a foodcritic lint check against your cookbook before spork uploading. The check only runs against the cookbook you've passed to spork-upload on the command line.
-
-PLEASE NOTE: Due to it's many dependancies (gem dependancy Nokogiri requires libxml-devel, libxslt-devel), foodcritic is not specified as a dependency of the knife-spork gem as it won't install without other manual package installs, so if you want to use it you'll need to make sure it's installed yourself for now. This may change in a future version.
+### Plugin Install
+Copy spork-* script from lib/chef/knife/spork-*.rb to your ~/.chef/plugins/knife directory.
 
-The optional attributes for this section work as follows:
+Spork Configuration
+-------------------
+Out of the box, knife spork will work with no configuration. However, you can optionally enable several features to enhance its functionality.
+
+KnifeSpork will look for a configuration file in the following locations, in ascending order of precedence:
+
+- `config/spork-config.yml`
+- `/etc/spork-config.yml`
+- `~/.chef/spork-config.yml`
+
+Anything set in the configuration file in your home directory for example, will override options set in your Chef repository or `/etc`.
+
+Below is a sample config file with all supported options and all shipped plugins enabled below, followed by an explanation of each section.
+
+```yaml
+default_environments:
+  - development
+  - production
+version_change_threshold: 
+plugins:
+  campfire:
+    account: myaccount
+    token: a1b2c3d4...
+  hipchat:
+    api_token: ABC123
+    rooms:
+      - General
+      - Web Operations
+    notify: true
+    color: yellow
+  git:
+    enabled: true
+  irccat:
+    server: irccat.mydomain.com
+    port: 12345
+    gist: "/usr/bin/gist"
+    channel: ["chef-annoucements"]
+  graphite:
+    server: graphite.mydomain.com
+    port: 2003
+  eventinator:
+    url: http://eventinator.mydomain.com/events/oneshot
+```
+
+#### Default Environments
+The `default_environments` directive allows you to specify a default list of environments you want to promote changes to. If this option is configured and you *ommit* the environment parameter when promoting KnifeSpork will promote to all environments in this list.
+
+#### 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.
+
+#### Plugins
+Knife spork supports plugins to allow users to hook it into existing systems such as source control, monitoring and chat systems. Plugins are enabled / disabled by adding / removing their config block from the plugin section of the config file. Any of the default plugins shown above can be disabled by removing their section.
+
+For more information on how to develop plugins for spork, please read the plugins/README.md file.
+
+Spork Info
+-----------
+This function is designed to help you see which plugins you currently have loaded, and the current config Hash which knife spork is using.
+
+#### Usage
+```bash
+knife spork info
+```
+
+#### Example
+
+```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}, "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
+KnifeSpork::Plugins::Eventinator: enabled
+KnifeSpork::Plugins::Foodcritic: disabled
+KnifeSpork::Plugins::Git: enabled
+KnifeSpork::Plugins::Graphite: enabled
+KnifeSpork::Plugins::HipChat: disabled
+KnifeSpork::Plugins::Irccat: enabled
+```
+
+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.
 
-fail_tags: Fail the build if any of the specified tags are matched.
-tags: Only check against rules with the specified tags.
-include_rules: Additional rule file path(s) to load.
+#### Usage
+```bash
+knife spork check COOKBOOK [--all]
+```
 
-## Default Environments
+By default, spork check only shows the 5 most recent remote cookbook versions. Add the --all option if you want to see everything.
 
-This allows you to specify a default list of environments you want to promote changes to. If this option is configured and you *ommit* the environment parameter when promoting, ie knife spork promote <cookbook>, then it will promote to all environments in this list.
+#### Example (Checking an Unfrozen Cookbook with version clash)
 
-# Spork Check
+```text
+$ knife spork check apache2
+Checking versions for cookbook apache2...
 
-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.
+Local Version:
+  1.1.49
 
-## Usage 
+Remote Versions: (* indicates frozen)
+ *2.0.2
+ *2.0.1
+  1.1.49
+ *1.1.14
+ *1.1.13
 
-````
-knife spork check COOKBOOK ( --all)
-````
+ERROR: The version 1.1.49 exists on the server and is not frozen. Uploading will overwrite!
+```
 
-By default, spork check only shows the 5 most recent remote cookbook versions. Add the --all option if you want to see everything.
+#### Example (Checking a Frozen Cookbook with version clash)
 
-## Example (Checking an Unfrozen Cookbook with version clash)
+```text
+$ knife spork check apache2
+Checking versions for cookbook apache2...
 
-````
-$ knife spork check apache
-Checking versions for cookbook apache...
- 
-Current local version: 0.1.0
- 
-Remote versions (Max. 5 most recent only):
-*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.
-````
+Local Version:
+  2.0.2
 
-## Example (Checking a Frozen Cookbook with version clash)
+Remote Versions: (* indicates frozen)
+ *2.0.2
+ *2.0.1
+  1.1.49
+ *1.1.14
+ *1.1.13
 
-````
-$ knife spork check apache2
-Checking versions for cookbook apache2...
- 
-Current local version: 1.0.6
- 
-Remote versions (Max. 5 most recent only):
-*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.
+WARNING: Your local version (2.0.2) is frozen on the remote server. You'll need to bump before you can upload.
 ````
 
-## Example (No version clashes)
+#### Example (No version clashes)
 
-````
+```text
 $ knife spork check apache2
 Checking versions for cookbook apache2...
- 
-Current local version: 1.0.7
- 
-Remote versions (Max. 5 most recent only):
-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
+Local Version:
+  2.0.3
 
-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.
+Remote Versions: (* indicates frozen)
+ *2.0.2
+ *2.0.1
+  1.1.49
+ *1.1.14
+ *1.1.13
 
-## Usage
+Everything looks good!
+```
 
-````
-knife bump COOKBOOK <MAJOR | MINOR | PATCH | MANUAL x.x.x>
+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. If no bump level is specified, a patch level bump will be performed.
 
+#### Usage
+```bash
+knife spork bump COOKBOOK [MAJOR | MINOR | PATCH | MANUAL x.x.x]
 ````
 
-## Example (Bumping patch level)
+#### Example (No patch level specified - defaulting to patch)
+```text
+$ knife spork bump apache2
+Successfully bumped apache2 to v2.0.4!
 
-````
+#### Example (Bumping patch level)
+```text
 $ knife spork bump apache2 patch
-Bumping patch level of the apache2 cookbook from 1.0.6 to 1.0.7
+Successfully bumped apache2 to v2.0.4!
 ````
 
-## Example (Manually setting version)
-
-````
+#### Example (Manually setting version)
+```text
 $ knife spork bump apache2 manual 1.0.13
-Manually bumped version of the apache2 cookbook from 1.0.7 to 1.0.13
-````
+Successfully bumped apache2 to v1.0.13!
+```
 
-#Spork Upload
+Spork Upload
+------------
+This function works mostly the same as normal `knife cookbook upload COOKBOOK` except that this automatically freezes cookbooks when you upload them.
 
-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
-
-````
+#### Usage
+```bash
 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.
-````
-
+```
+#### Example
+```text
+$ knife spork upload apache2
+Freezing apache2 at 1.0.13...
+Successfully uploaded apache2@1.0.13!
+```
+
+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.
+
+If you don't specify an environment, the default_environments config directive will be used if set.
+
+#### Usage
+
+```bash
+knife spork promote [ENVIRONMENT] COOKBOOK [--version, --remote]
+```
+
+#### Example (Using local cookbook version number)
+
+```text
+$ knife spork promote my_environment apache2 --remote
+Adding version constraint apache2 = 1.0.13
+Saving changes to my_environment.json
+Uploading my_environment to Chef Server
+Promotion complete!
+```
+
+#### Example (Using manual version)
+```text
+$ knife spork promote my_environment apache2 -v 2.0.2
+Adding version constraint apache2 = 2.0.2
+Saving changes to my_environment.json
+Promotion complete. Don't forget to upload your changed my_environment to Chef Server
+```