murmurs 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f318e8f7a6753605c905258d8693312f7241a5ad
-  data.tar.gz: 2c1d6a0ca1dc3f11b705f0131f220ee78487762b
+  metadata.gz: 5ceb67cfc3d4fb198e351f552d210920b5a4782c
+  data.tar.gz: 13873e634d77ec001d70ce537e8420da3ac25618
 SHA512:
-  metadata.gz: 3da1f95bdc0c56c0ce2a8884bece1bcc4e3b9bf79bf0f624d6e23090f6e9d8ec28be865991f6cc856a68d870ce225be0563ca1cebf73264023510117b5e7163d
-  data.tar.gz: 103e6c1a8715c6a2e67ab90953bd769c0b802bbc9cb3069863e025e82c4b35071d9422b06675277d1af739c45fd1fc87cb4b977fa16e678303699407538353ec
+  metadata.gz: ea6cabec5e53fc13b741d9a2c7b8864e98196d8c39f46d78b7e560d03cb718f2178d30e5ae269f64ee11fb5b69dfa5dc8ff934ed8fa32eb4b5507e735acb2be4
+  data.tar.gz: ddf79b99bc3ee18f5e9987c771bf5fe05e8bf6f5da8c585c59686860559dd0898a7cc1857c739a8081646a9aaff436fb70356a906bee8199fe5e1a99707831ca

data/bin/murmurs

@@ -10,7 +10,8 @@ options = {
   :access_secret_key => ENV['MINGLE_ACCESS_SECRET_KEY'],
   :skip_ssl_verify => false,
   :git => false,
-  :git_branch => 'master'
+  :git_branch => 'master',
+  :log_level => :info
 }
 
 NOTES = %Q{
@@ -40,7 +41,6 @@ opts = OptionParser.new do |opts|
 
   opts.on_tail('-g', '--git', 'Process standard input of Git hook post-receive, and murmur each commits; default is false') do
     options[:git] = true
-    options[:log_level] = :info
   end
 
   opts.on("-b", "--git_branch GIT_BRANCH", "Murmur Git commits in branch, default is master") do |v|
@@ -51,6 +51,11 @@ opts = OptionParser.new do |opts|
     options[:skip_ssl_verify] = true
   end
 
+  opts.on_tail('-v', '--version') do
+    puts Gem.loaded_specs['murmurs'].version
+    exit(0)
+  end
+
   opts.on_tail('-h', '--help') do
     puts opts
     puts NOTES
@@ -60,4 +65,6 @@ opts = OptionParser.new do |opts|
 end.parse!
 
 include Murmurs
-murmur(options.delete(:murmurs_url), ARGV[0] || ARGF.read, options)
+
+msg = ARGV[0] || (STDIN.tty? ? nil : STDIN.read)
+murmur(options.delete(:murmurs_url), msg, options)

data/lib/murmurs.rb

@@ -17,26 +17,33 @@ module Murmurs
       if msg.nil? || msg.empty?
         log(options[:log_level], "Nothing to murmur.")
       else
-        log(options[:log_level], msg)
+        log(options[:log_level], "murmur #{truncate(msg)} => #{extract_project_info(url)}")
         http_post(url, {:murmur => {:body => msg}}, options)
       end
     end
   end
 
+  def extract_project_info(url)
+    if url =~ /\/projects\/([^\/]+)\//
+      "#{$1}@#{URI(url).host}"
+    else
+      url
+    end
+  end
+
   def validate_murmurs_url!(url)
     if url.to_s !~ /\Ahttps?\:\/\/.+\/murmurs/
       raise InvalidMurmursURLError, "Invalid murmurs URL: #{url.inspect}"
     end
   end
 
+  def truncate(m, t=15)
+    m.size > t ? "#{m[0..t]}..." : m
+  end
+
   def log(level, m)
     if level == :info
-      t = 20
-      if m.size > t
-        puts "murmur #{m[0..t]}..."
-      else
-        puts "murmur #{m}"
-      end
+      puts m
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: murmurs
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - ThoughtWorks Mingle Team