knife-spork 0.1.10 → 0.1.11

data/CHANGELOG.md

@@ -0,0 +1,99 @@
+## 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
+    - Spork Promote will optionally revert local changes to environment files if multiple changes were detected.
+    - 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:
+
+    - Spork Bump now defaults to "patch" if bump level not specified
+    - Spork Promote will prompt for confirmation if you're about to promote --remote changes to any cookbooks *other* than the one you specified on the command line. This should help avoid accidentally over-writing someone elses changes.
+    - Irccat messages now support multiple channels
+    - During promote, if git pull fails, ie a merge conflict has arisen, the error will be shown and promote will exit.
+    - 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
+    - Spork will no longer work with Ruby 1.8. If you're on that version, the plugin will bail immediately.
+    - Spork now support updating a graphite metric when promote --remote is run
+    - Spork now supports alerting using irccat when a cookbook upload or promote --remote happens
+    - 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)
+
+Yanked
+
+## 0.1.0 (January 28, 2012)
+
+Initial version.

data/README.md

@@ -32,6 +32,13 @@ Below is a sample config file with all supported options enabled below, followed
 ````
 git:
   enabled: true
+hipchat:
+  enabled: true
+  apikey: MYAPIKEYHERE
+  nickname: "Knife-Spork"
+  room: "Chef"
+  notify: true
+  color: "red"
 irccat:
   enabled: true
   server: irccat.mycompany.com
@@ -60,6 +67,15 @@ This section enables a couple of git commands which will run as part of your spo
 * 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

data/knife-spork.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## 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.10'
-  s.date              = '2012-04-12'
+  s.version           = '0.1.11'
+  s.date              = '2012-06-05'
   s.rubyforge_project = 'knife-spork'
 
   ## Make sure your summary is short. The description may be as long
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
   s.add_dependency('chef', [">= 0.10.4"])
   s.add_dependency('git', [">= 1.2.5"])
   s.add_dependency('app_conf', [">= 0.4.0"])
+  s.add_dependency('hipchat', [">= 0.4.0"])
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
@@ -50,6 +51,7 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     README.md
+    CHANGELOG.md
     Rakefile
     knife-spork.gemspec
     lib/chef/knife/spork-bump.rb

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

@@ -130,7 +130,7 @@ module KnifeSpork
       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)
+      update_version(new_version, metadata_file)
       ui.msg("Bumping #{type} level of the #{cookbook} cookbook from #{old_version} to #{new_version}\n\n")
     end
 
@@ -150,15 +150,15 @@ module KnifeSpork
       end
 
       metadata_file = File.join(cookbook_path, cookbook, "metadata.rb")
-      update_metadata(current_version, version, metadata_file)
+      update_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)
+    def update_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)
+      body_of_file.gsub!(/version\s+"[0-9\.]+"/, "version    \"#{new_version}\"")
       File.open(metadata_file, "w") { |file| file << body_of_file }
     end
 

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

@@ -29,6 +29,7 @@ require 'app_conf'
 require 'chef/knife'
 require 'json'
 require 'socket'
+require 'hipchat'
 
 module KnifeSpork
   class SporkPromote < Chef::Knife
@@ -260,6 +261,16 @@ module KnifeSpork
               puts "Something went wrong with sending to irccat: (#{msg})"  
             end
           end
+
+          if !@conf.hipchat.nil? && @conf.hipchat.enabled
+              begin
+                message = "#{ENV['USER']} uploaded environment #{environment.gsub(".json","")} #{@gist}"
+                client = HipChat::Client.new(@conf.hipchat.apikey)
+                client["#{@conf.hipchat.room}"].send( @conf.hipchat.nickname, message, :notify => @conf.hipchat.notify, :color => @conf.hipchat.color )
+              rescue Exception => msg
+                puts "Something went wrong with sending to HipChat: (#{msg})"
+              end
+          end
             
           if !@conf.eventinator.nil? && @conf.eventinator.enabled
             metadata = {}

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

@@ -30,6 +30,7 @@
 require 'app_conf'
 require 'chef/knife'
 require 'socket'
+require 'hipchat'
 
 module KnifeSpork
   class SporkUpload < Chef::Knife
@@ -148,6 +149,16 @@ module KnifeSpork
                end
             end
 
+            if !@conf.hipchat.nil? && @conf.hipchat.enabled
+                begin
+                  message = "#{ENV['USER']} uploaded and froze cookbook #{cookbook_name} version #{cookbook.version}"
+                  client = HipChat::Client.new(@conf.hipchat.apikey)
+                  client["#{@conf.hipchat.room}"].send( @conf.hipchat.nickname, message, :notify => @conf.hipchat.notify, :color => @conf.hipchat.color )
+                rescue Exception => msg  
+                  puts "Something went wrong with sending to HipChat: (#{msg})"  
+                end
+            end
+
             if !@conf.eventinator.nil? && @conf.eventinator.enabled
               metadata = {}
               metadata[:cookbook_name]    = cookbook.name

data/lib/knife-spork.rb

@@ -1,3 +1,3 @@
 module KnifeSpork
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,77 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: knife-spork
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 10
-  version: 0.1.10
+version: !ruby/object:Gem::Version
+  version: 0.1.11
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jon Cowie
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-12 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: chef
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70361791232900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 10
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.10.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: git
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70361791232900
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: &70361791232420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.5
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70361791232420
+- !ruby/object:Gem::Dependency
   name: app_conf
+  requirement: &70361791231940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70361791231940
+- !ruby/object:Gem::Dependency
+  name: hipchat
+  requirement: &70361790131840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70361790131840
 description: A workflow plugin to help many devs work with the same chef repo/server
 email: jonlives@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - README.md
+- CHANGELOG.md
 - Rakefile
 - knife-spork.gemspec
 - lib/chef/knife/spork-bump.rb
@@ -79,37 +71,30 @@ files:
 - lib/chef/knife/spork-promote.rb
 - lib/chef/knife/spork-upload.rb
 - lib/knife-spork.rb
-has_rdoc: true
 homepage: https://github.com/jonlives/knife-spork
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: knife-spork
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 2
 summary: A workflow plugin to help many devs work with the same chef repo/server
 test_files: []
-
+has_rdoc: