murmurs 0.0.7 → 0.0.8

data/README.md

@@ -34,14 +34,15 @@ You can also setup environment variables for the configurations needed as follow
     export MINGLE_ACCESS_KEY_ID=mingle_access_key_id
     export MINGLE_ACCESS_SECRET_KEY=mingle_access_secret_key
 
-So that you don't need to specify them when murmur something:
+So that you don't need to specify them when you murmur something:
 
     murmurs "text"
 
 Type "murmurs -h" for full help.
 
-Integrate Mingle Murmurs with Git
+Integrating Mingle Murmurs with Git
 ----------------
+Murmurs gem can be used to integrate with Git. Use the following instructions to setup your git server so that it murmurs everytime something has been pushed to the server.
 
 On your Git server:
 

data/bin/murmurs

@@ -24,6 +24,16 @@ For further information about Mingle user access key id and secure key, please r
 http://www.thoughtworks.com/products/docs/mingle/current/help/configuring_hmac_authentication.html
 }
 
+GIT_INTALLATION_NOTES = %Q{
+Please setup the following git config:
+git config hooks.minglemurmursurl "https://<your_site>.mingle.thoughtworks.com/api/v2/pro
+git config hooks.mingleaccesskeyid "MINGLE ACCESS KEY ID"
+git config hooks.mingleaccesssecretkey "MINGLE ACCESS SECRET KEY"
+
+For further information about MINGLE ACCESS KEY ID and MINGLE ACCESS SECRET KEY, please read:
+http://www.thoughtworks.com/products/docs/mingle/current/help/configuring_hmac_authentication.html
+}
+
 opts = OptionParser.new do |opts|
   opts.banner = "Usage: murmurs [options] MESSAGE"
 
@@ -69,20 +79,15 @@ end.parse!
 
 include Murmurs
 
-if git_repo_path = options[:install_git_hook]
-  hook = install_git_hook(git_repo_path, __FILE__)
-  puts "Installed #{hook}"
-  puts "Please setup the following git config:"
-  puts %Q{
-git config hooks.minglemurmursurl "https://<your_site>.mingle.thoughtworks.com/api/v2/pro
-git config hooks.mingleaccesskeyid "MINGLE ACCESS KEY ID"
-git config hooks.mingleaccesssecretkey "MINGLE ACCESS SECRET KEY"
-
-For further information about MINGLE ACCESS KEY ID and MINGLE ACCESS SECRET KEY, please read:
-http://www.thoughtworks.com/products/docs/mingle/current/help/configuring_hmac_authentication.html
-}
-
-else
-  msg = ARGV[0] || (STDIN.tty? ? nil : STDIN.read)
-  murmur(options.delete(:murmurs_url), msg, options)
+begin
+  if git_repo_path = options[:install_git_hook]
+    hook = install_git_hook(git_repo_path, __FILE__)
+    puts "Installed #{hook}"
+    puts GIT_INTALLATION_NOTES
+  else
+    msg = ARGV[0] || (STDIN.tty? ? nil : STDIN.read)
+    murmur(options.delete(:murmurs_url), msg, options)
+  end
+rescue Error => e
+  puts e.message
 end

data/lib/murmurs/git.rb

@@ -31,7 +31,7 @@ mingle_murmurs_url=$(git config hooks.minglemurmursurl)
 mingle_access_key_id=$(git config hooks.mingleaccesskeyid)
 mingle_access_secret_key=$(git config hooks.mingleaccesssecretkey)
 
-echo "$(cat)" | #{script} -g -b master -m "$mingle_murmurs_url" -k "$mingle_access_key_id" -s "$mingle_access_secret_key"
+echo "$(cat)" | #{script.inspect} -g -b master -m "$mingle_murmurs_url" -k "$mingle_access_key_id" -s "$mingle_access_secret_key"
 BASH
       end
       FileUtils.chmod('+x', hook)

data/lib/murmurs.rb

@@ -6,9 +6,10 @@ require 'json'
 require 'murmurs/git'
 
 module Murmurs
-  class InvalidMurmursURLError < StandardError; end
-  class UnexpectedResponseError < StandardError; end
-  class HookExistsError < StandardError; end
+  class Error < StandardError; end
+  class InvalidMurmursURLError < Error; end
+  class UnexpectedResponseError < Error; end
+  class HookExistsError < Error; end
 
   include Git
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: murmurs
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -74,7 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4595464421835208926
+      hash: 4152477486673083389
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4595464421835208926
+      hash: 4152477486673083389
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23