murmurs 0.0.6 → 0.0.7

data/README.md

@@ -11,7 +11,7 @@ Installation
 
     gem install murmurs
 
-A command 'murmurs' will be installed.
+A command 'murmurs' will be installed. (In some OS, the script name maybe changed to murmurs1.9 for ruby 1.9)
 
 Usage
 ----------------
@@ -49,17 +49,14 @@ On your Git server:
     install rubygems if there was no one installed with ruby
     gem install murmurs
 
-murmurs gem should install a new command 'murmurs-git' (In some OS, the script name maybe changed to murmurs-git1.9 for ruby 1.9)
+murmurs gem should install a new command 'murmurs'
 
 Install the git hook for post-receive:
 
-    murmurs-git <git repository path>
+    murmurs -a <git repository path>
 
 Then, in the git repository, setup the following configs:
 
     git config hooks.minglemurmursurl "https://your-site.mingle-api.thoughtworks.com/api/v2/projects/your_project/murmurs.xml"
     git config hooks.mingleaccesskeyid <Mingle user access key id>
     git config hooks.mingleaccesssecretkey <Mingle user access secret key>
-
-Note, if murmurs-git script got renamed to murmurs-git1.9 on your OS, another command "murmurs" probably will also be renamed to "murmurs1.9".
-The git post-receive hook installed in your <git repository path>/hooks (or <git repository path>/.git/hooks) directory is calling "murmurs" command to post murmur to Mingle, so you need change command "murmurs" in the post-recieve hook to be "murmurs1.9"

data/bin/murmurs

@@ -27,6 +27,9 @@ http://www.thoughtworks.com/products/docs/mingle/current/help/configuring_hmac_a
 opts = OptionParser.new do |opts|
   opts.banner = "Usage: murmurs [options] MESSAGE"
 
+  opts.on("-a", "--install_git_hook GIT_REPOSITORY_PATH", "install git hook post-receive to the given git repository") do |v|
+    options[:install_git_hook] = v
+  end
   opts.on("-m", "--murmurs_url MINGLE_MURMURS_URL", "Mingle project murmurs url") do |v|
     options[:murmurs_url] = v
   end
@@ -66,5 +69,20 @@ end.parse!
 
 include Murmurs
 
-msg = ARGV[0] || (STDIN.tty? ? nil : STDIN.read)
-murmur(options.delete(:murmurs_url), msg, options)
+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)
+end

data/lib/murmurs/git.rb

@@ -0,0 +1,70 @@
+require 'fileutils'
+
+module Murmurs
+  module Git
+    def git_hooks_dir(git_repo_dir)
+      hooks = File.join(git_repo_dir, 'hooks')
+      if File.exists?(hooks)
+        hooks
+      else
+        hooks = File.join(git_repo_dir, '.git', 'hooks')
+        if File.exists?(hooks)
+          hooks
+        else
+          raise "Could not find \"hooks\" dir or \".git/hooks\" dir in #{git_repo_dir}"
+        end
+      end
+    end
+
+    def install_git_hook(git_dir, script)
+      hooks = git_hooks_dir(git_dir)
+      hook = File.join(hooks, 'post-receive')
+      if File.exists?(hook)
+        raise HookExistsError, "There is #{hook} file existing, please backup / remove it."
+      end
+
+      File.open(hook, 'w') do |f|
+        f.write <<-BASH
+#!/usr/bin/env bash
+
+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"
+BASH
+      end
+      FileUtils.chmod('+x', hook)
+      hook
+    end
+
+    # input: git post receive stdin string
+    # branch: git branch
+    def git_commits(input, branch)
+      data = input.split("\n").map do |l|
+        l.split
+      end.find do |l|
+        l[2] =~ /\Arefs\/heads\/#{branch}\z/
+      end
+
+      return if data.nil?
+
+      null_rev = '0' * 40
+      from_rev, to_rev, _ = data
+      if to_rev == null_rev # delete branch
+        "Someone deleted branch #{branch}."
+      else
+        revs = if from_rev == null_rev  # new branch
+                 to_rev
+               else
+                 "#{from_rev}..#{to_rev}"
+               end
+        `git rev-list #{revs}`.split("\n").map do |rev|
+          `git log -n 1 #{rev}`
+        end.reverse.map do |msg|
+          "Repository: #{File.basename(Dir.getwd)}\n#{msg}"
+        end
+      end
+    end
+  end
+end

data/lib/murmurs.rb

@@ -3,10 +3,14 @@ require 'net/https'
 require 'time'
 require 'api-auth'
 require 'json'
+require 'murmurs/git'
 
 module Murmurs
   class InvalidMurmursURLError < StandardError; end
   class UnexpectedResponseError < StandardError; end
+  class HookExistsError < StandardError; end
+
+  include Git
 
   def murmur(url, msg, options={})
     if msg.nil? || msg.empty?
@@ -49,35 +53,6 @@ module Murmurs
     end
   end
 
-  # input: git post receive stdin string
-  # branch: git branch
-  def git_commits(input, branch)
-    data = input.split("\n").map do |l|
-      l.split
-    end.find do |l|
-      l[2] =~ /\Arefs\/heads\/#{branch}\z/
-    end
-
-    return if data.nil?
-
-    null_rev = '0' * 40
-    from_rev, to_rev, _ = data
-    if to_rev == null_rev # delete branch
-      "Someone deleted branch #{branch}."
-    else
-      revs = if from_rev == null_rev  # new branch
-               to_rev
-             else
-               "#{from_rev}..#{to_rev}"
-             end
-      `git rev-list #{revs}`.split("\n").map do |rev|
-        `git log -n 1 #{rev}`
-      end.reverse.map do |msg|
-        "Repository: #{File.basename(Dir.getwd)}\n#{msg}"
-      end
-    end
-  end
-
   def http_post(url, params, options={})
     uri = URI.parse(url)
     http = Net::HTTP.new(uri.host, uri.port)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: murmurs
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api-auth
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -52,13 +52,12 @@ email:
 - mingle-dev@thoughtworks.com
 executables:
 - murmurs
-- murmurs-git
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
 - bin/murmurs
-- bin/murmurs-git
+- lib/murmurs/git.rb
 - lib/murmurs.rb
 homepage: https://github.com/ThoughtWorksStudios/murmurs
 licenses:
@@ -73,12 +72,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4595464421835208926
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4595464421835208926
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/bin/murmurs-git

@@ -1,56 +0,0 @@
-#!/usr/bin/env ruby
-
-if ARGV[0] == '-h' || ARGV[0] == '--help'
-  puts "Usage murmurs-git GIT_REPOSITORY_PATH"
-  puts ""
-  puts "Install a git post-receive hook in hooks directory inside given git repository path"
-
-  exit(0)
-end
-
-def git_hooks_dir(git_repo_dir)
-  hooks = File.join(git_repo_dir, 'hooks')
-  if File.exists?(hooks)
-    hooks
-  else
-    hooks = File.join(git_repo_dir, '.git', 'hooks')
-    if File.exists?(hooks)
-      hooks
-    else
-      raise "Could not find hooks dir or .git/hooks dir in #{git_repo_dir}"
-    end
-  end
-end
-
-require 'fileutils'
-
-hooks = git_hooks_dir(ARGV[0])
-hook = File.join(hooks, 'post-receive')
-
-if File.exists?(hook)
-  puts "There is #{hook} file existing, please backup / remove it."
-  exit
-end
-
-File.open(hook, 'w') do |f|
-  f.write <<-BASH
-#!/usr/bin/env bash
-
-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)" | murmurs -g -b master -m "$mingle_murmurs_url" -k "$mingle_access_key_id" -s "$mingle_access_secret_key"
-BASH
-end
-FileUtils.chmod('+x', hook)
-puts "Installed #{hook}"
-puts "Please setup the following git config:"
-puts %Q{
-git config hooks.minglemurmursurl "https://<your_site>.mingle.thoughtworks.com/api/v2/projects/<your_project>/murmurs.xml"
-git config hooks.mingleaccesskeyid "MINGLE ACCESS KEY ID"
-git config hooks.mingleaccesssecretkey "MINGLE ACCESS SECRET KEY"
-
-For further information, please read this:
-http://www.thoughtworks.com/products/docs/mingle/current/help/configuring_hmac_authentication.html
-}