knife-spork 1.0.8 → 1.0.9

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+## 1.0.9 (28th October, 2012)
+Features:
+
+    -  Jabber Plugin (thanks to Graham McMillan - https://github.com/gmcmillan)
+
+Bugfixes:
+
+    - Fix exception when spork promote called with no arguments (thanks to Julian Dunn - https://github.com/juliandunn)
+    
+## 1.0.8 (25th September, 2012)
+Bugfixes:
+
+    - Fix whitespace warnings which occur in the git plugin under Ruby 1.8
+    
+## 1.0.7 (25th September, 2012)
+Bugfixes:
+
+    - Fix invalid syntax in Hipchat plugin
+    
+## 1.0.6 (25th September, 2012)
+Bugfixes:
+
+    - Fix for disabling plugins when override config files are present
+    
+## 1.0.5 (24th September, 2012)
+Bugfixes:
+
+    - Fixes for hipchat plugin
+    
 ## 1.0.4 (14th September, 2012)
 Features:
 

data/README.md

@@ -1,6 +1,6 @@
 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:
+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:
 
 Installation
 ------------
@@ -77,7 +77,7 @@ The `environment_path` allows you to specify the path to where you store your ch
 #### 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.
+For more information on how to develop plugins for spork, please read the [plugins/README.md](plugins/README.md) file.
 
 Spork Info
 -----------

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.0.8'
+  gem.version       = '1.0.9'
   gem.authors       = ["Jon Cowie"]
   gem.email         = 'jonlives@gmail.com'
   gem.homepage      = 'https://github.com/jonlives/knife-spork'

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

@@ -21,6 +21,13 @@ module KnifeSpork
 
     def run
       self.config = Chef::Config.merge!(config)
+
+      if @name_args.empty?
+        show_usage
+        ui.error("You must specify the cookbook and environment to promote to")
+        exit 1
+      end
+
       @environments, @cookbook = load_environments_and_cookbook
 
       run_plugins(:before_promote)

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

@@ -0,0 +1,49 @@
+require 'knife-spork/plugins/plugin'
+
+module KnifeSpork
+  module Plugins
+    class Jabber < Plugin
+      name :jabber
+
+      def perform; end
+
+      def after_upload
+        jabber "#{current_user} uploaded the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")}"
+      end
+
+      def after_promote_remote
+        jabber "#{current_user} promoted the following cookbooks:\n#{cookbooks.collect{ |c| "  #{c.name}@#{c.version}" }.join("\n")} to #{environments.collect{ |e| "#{e.name}" }.join(", ")}"
+      end
+
+      private
+
+      def jabber(message)
+        safe_require 'xmpp4r'
+        safe_require 'xmpp4r/muc/helper/simplemucclient'
+
+        client = ::Jabber::Client.new(config.username)
+        client.connect(host = config.server_name, port = config.server_port ||= '5222')
+        client.auth(config.password)
+
+        rooms.each do |room_name|
+          begin
+            conference = ::Jabber::MUC::SimpleMUCClient.new(client)
+            conference.join("#{room_name}/#{nickname}")
+            conference.say(message)
+          rescue Exception => e
+            ui.error 'Something went wrong sending to Jabber.'
+            ui.error e.to_s
+          end
+        end
+      end
+
+      def rooms
+        [ config.room || config.rooms ].flatten
+      end
+
+      def nickname
+        config.nickname || 'KnifeSpork'
+      end
+    end
+  end
+end

data/plugins/Jabber.md

@@ -0,0 +1,61 @@
+Jabber
+=======
+Jabber posts messages to a designated Jabber group chat room.
+
+Gem Requirements
+----------------
+This plugin requires the following gems:
+
+```ruby
+gem 'xmpp4r'
+```
+
+Hooks
+-----
+- `after_upload`
+- `after_promote`
+
+Configuration
+-------------
+```yaml
+plugins:
+  jabber:
+    username: YOURUSER
+    password: YOURPASSWORD
+    nickname: Chef Bot
+    server_name: your.jabberserver.com
+    server_port: 5222
+    rooms:
+      - engineering@your.conference.com/spork
+      - systems@your.conference.com/spork
+```
+
+#### username
+Your Jabber username.
+
+- Type: `String`
+
+#### password
+Your Jabber password.
+
+- Type: `String`
+
+#### nickname
+A nickname to use in the conference room when making announcements.
+
+- Type: `String`
+
+#### server_name
+Your Jabber server name.
+
+- Type: `String`
+
+#### server_port
+Your Jabber server port number. Default: 5222
+
+- Type: `String`
+
+#### rooms
+The list of rooms to post to.
+
+- Type: `Array`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-spork
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70234682141100 !ruby/object:Gem::Requirement
+  requirement: &70361786030120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *70234682141100
+  version_requirements: *70361786030120
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70234682140540 !ruby/object:Gem::Requirement
+  requirement: &70361786029160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70234682140540
+  version_requirements: *70361786029160
 - !ruby/object:Gem::Dependency
   name: app_conf
-  requirement: &70234682140080 !ruby/object:Gem::Requirement
+  requirement: &70361786028040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70234682140080
+  version_requirements: *70361786028040
 description: A workflow plugin to help many devs work with the same chef repo/server
 email: jonlives@gmail.com
 executables: []
@@ -72,6 +72,7 @@ files:
 - lib/knife-spork/plugins/graphite.rb
 - lib/knife-spork/plugins/hipchat.rb
 - lib/knife-spork/plugins/irccat.rb
+- lib/knife-spork/plugins/jabber.rb
 - lib/knife-spork/plugins/plugin.rb
 - lib/knife-spork/runner.rb
 - plugins/Campfire.md
@@ -81,6 +82,7 @@ files:
 - plugins/Graphite.md
 - plugins/HipChat.md
 - plugins/Irccat.md
+- plugins/Jabber.md
 - plugins/README.md
 - plugins/Template.md
 homepage: https://github.com/jonlives/knife-spork