murmurs 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f318e8f7a6753605c905258d8693312f7241a5ad
+  data.tar.gz: 2c1d6a0ca1dc3f11b705f0131f220ee78487762b
+SHA512:
+  metadata.gz: 3da1f95bdc0c56c0ce2a8884bece1bcc4e3b9bf79bf0f624d6e23090f6e9d8ec28be865991f6cc856a68d870ce225be0563ca1cebf73264023510117b5e7163d
+  data.tar.gz: 103e6c1a8715c6a2e67ab90953bd769c0b802bbc9cb3069863e025e82c4b35071d9422b06675277d1af739c45fd1fc87cb4b977fa16e678303699407538353ec

data/bin/murmurs

@@ -40,6 +40,7 @@ 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|

data/lib/murmurs.rb

@@ -2,29 +2,36 @@ require 'net/http'
 require 'net/https'
 require 'time'
 require 'api-auth'
+require 'json'
 
 module Murmurs
+  class InvalidMurmursURLError < StandardError; end
+
   def murmur(url, msg, options={})
     if options[:git]
-      msg = git_commits_murmur(msg, options[:git_branch])
+      Array(git_commits(msg, options[:git_branch])).each do |msg|
+        murmur(url, msg, options.merge(:git => false))
+      end
+    else
+      validate_murmurs_url!(url)
+      if msg.nil? || msg.empty?
+        log(options[:log_level], "Nothing to murmur.")
+      else
+        log(options[:log_level], msg)
+        http_post(url, {:murmur => {:body => msg}}, options)
+      end
     end
+  end
 
-    if url.to_s !~ /\Ahttps?\:\/\/.+\/projects\/[^\/]+\/murmurs/
-      raise "Invalid murmurs URL: #{url.inspect}"
-    end
-    if msg.nil? || msg.empty?
-      puts "Nothing to murmur." unless options[:git]
-      return
-    end
-    t = 20
-    Array(msg).each do |m|
-      git_log(options[:git], m)
-      http_post(url, {'murmur[body]' => m}, options)
+  def validate_murmurs_url!(url)
+    if url.to_s !~ /\Ahttps?\:\/\/.+\/murmurs/
+      raise InvalidMurmursURLError, "Invalid murmurs URL: #{url.inspect}"
     end
   end
 
-  def git_log(log, m)
-    if log
+  def log(level, m)
+    if level == :info
+      t = 20
       if m.size > t
         puts "murmur #{m[0..t]}..."
       else
@@ -35,7 +42,7 @@ module Murmurs
 
   # input: git post receive stdin string
   # branch: git branch
-  def git_commits_murmur(input, branch)
+  def git_commits(input, branch)
     data = input.split("\n").map do |l|
       l.split
     end.find do |l|
@@ -69,9 +76,14 @@ module Murmurs
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
     end
+    body = params.to_json
 
     request = Net::HTTP::Post.new(uri.request_uri)
-    request.form_data = params if params
+    request.body = body
+
+    request['Content-Type'] = 'application/json'
+    request['Content-Length'] = body.bytesize
+
 
     if options[:access_key_id]
       ApiAuth.sign!(request, options[:access_key_id], options[:access_secret_key])

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: murmurs
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - ThoughtWorks Mingle Team
@@ -14,24 +13,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: api-auth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
-description: ! 'Use HMAC to create murmur in Mingle project.
-
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+description: |
+  Use HMAC to create murmur in Mingle project.
   Git post-receive hook to post murmurs when new commits pushed to Git server.
-
-'
 email:
 - mingle-dev@thoughtworks.com
 executables:
@@ -47,26 +56,25 @@ files:
 homepage: https://github.com/ThoughtWorksStudios/murmurs
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Post murmur to Mingle project murmurs
 test_files: []