flowdock-git-hook 0.1.0 → 0.2.0

data/README.rdoc

@@ -6,16 +6,16 @@ Git Post-Receive hook for Flowdock[http://flowdock.com]
 
 First, you need to install this gem. You need to have Ruby 1.8.6 and Rubygems installed in your system.
 
-  gem install flowdock-git-hook
+  $ gem install flowdock-git-hook
 
 Then, download the post-receive hook file to the hooks directory and make it executable
 
-  curl -o hooks/post-receive http://github.com/flowdock/flowdock-git-hook/raw/master/post-receive
-  chmod +x hooks/post-receive
+  $ wget -O hooks/post-receive https://raw.github.com/flowdock/flowdock-git-hook/master/post-receive
+  $ chmod +x hooks/post-receive
 
 Configure your Flow API tokens to git configuration
 
-  git config flowdock.token <Flow API token>
+  $ git config flowdock.token <Flow API token>
 
 After this, you should get updates from your git repo every time you push to it.
 
@@ -23,16 +23,16 @@ After this, you should get updates from your git repo every time you push to it.
 
 The git hook allows Flowdock tags to be attached to push messages. If you only need static tags, e.g. git repo name as tag, this can be configured in git config:
 
-  git config flowdock.tags git,push
+  $ git config flowdock.tags git,push
 
 For programmatic control over tagging, you can change how the hook is called in post-receive hook file.
 
-  Flowdock::Git.new(ref, before, after, :tags => ["git", "push"])
+  Flowdock::Git.background_post(ref, before, after, :tags => ["git", "push"])
 
 Note that you can also define token as parameter allowing multiple Flows to be notified.
 
-  Flowdock::Git.new(ref, before, after, :token => "flow-token")
-  Flowdock::Git.new(ref, before, after, :token => "another-flow")
+  Flowdock::Git.background_post(ref, before, after, :token => "flow-token")
+  Flowdock::Git.background_post(ref, before, after, :token => "another-flow")
 
 == Example data
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/flowdock-git-hook.gemspec

@@ -0,0 +1,72 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{flowdock-git-hook}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ville Lautanala"]
+  s.date = %q{2011-08-23}
+  s.email = %q{lautis@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "flowdock-git-hook.gemspec",
+    "lib/flowdock-git-hook.rb",
+    "lib/flowdock/git.rb",
+    "lib/flowdock/git/builder.rb",
+    "post-receive",
+    "spec/builder_spec.rb",
+    "spec/flowdock_git_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/flowdock/flowdock-git-hook}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Git Post-Receive hook for Flowdock}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<grit>, [">= 2.4.1"])
+      s.add_runtime_dependency(%q<multi_json>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<webmock>, [">= 1.6.4"])
+    else
+      s.add_dependency(%q<grit>, [">= 2.4.1"])
+      s.add_dependency(%q<multi_json>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<webmock>, [">= 1.6.4"])
+    end
+  else
+    s.add_dependency(%q<grit>, [">= 2.4.1"])
+    s.add_dependency(%q<multi_json>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<webmock>, [">= 1.6.4"])
+  end
+end
+

data/lib/flowdock/git.rb

@@ -9,21 +9,28 @@ module Flowdock
     class TokenError < StandardError; end
     API_ENDPOINT = "https://api.flowdock.com/v1/git"
 
-    def initialize(ref, from, to, options = {})
-      @ref = ref
-      @from = from
-      @to = to
+    class << self
+      def post(ref, from, to, options = {})
+        git = Git.new(options)
+        git.post(Git::Builder.new(git.repo, ref, from, to))
+      end
 
-      @options = options
+      def background_post(ref, from, to, options = {})
+        git = Git.new(options)
+        git.background_post(Git::Builder.new(git.repo, ref, from, to))
+      end
+    end
 
+    def initialize(options = {})
+      @options = options
       @token = options[:token] || config["flowdock.token"] || raise(TokenError.new("Flowdock API token not found"))
     end
 
     # Send git push notification to Flowdock
-    def post
+    def post(data)
       uri = URI.parse("#{API_ENDPOINT}/#{([@token] + tags).join('+')}")
       req = Net::HTTP::Post.new(uri.path)
-      req.set_form_data(:payload => MultiJson.encode(payload))
+      req.set_form_data(:payload => MultiJson.encode(data.to_hash))
       http = Net::HTTP.new(uri.host, uri.port)
 
       if uri.scheme == 'https'
@@ -35,17 +42,21 @@ module Flowdock
     end
 
     # Create and post notification in background process. Avoid blocking the push notification.
-    def background_post
+    def background_post(data)
       pid = Process.fork
       if pid.nil?
         Grit::Git.with_timeout(600) do
-          post # Child
+          post(data) # Child
         end
       else
         Process.detach(pid) # Parent
       end
     end
 
+    def repo
+      @repo ||= Grit::Repo.new(@options[:repo] || Dir.pwd)
+    end
+
     private
 
     # Flowdock tags attached to the push notification
@@ -59,14 +70,6 @@ module Flowdock
       end
     end
 
-    def payload
-      Builder.new(repo, @ref, @from, @to).to_hash
-    end
-
-    def repo
-      @repo ||= Grit::Repo.new(@options[:repo] || Dir.pwd)
-    end
-
     def config
       @config ||= Grit::Config.new(repo)
     end

data/post-receive

@@ -1,6 +1,6 @@
-#!/usr/bin/ruby -w
+#!/usr/bin/env ruby
 require 'rubygems'
 require 'flowdock-git-hook'
 
 before, after, ref = gets.split
-Flowdock::Git.new(ref, before, after).background_post
+Flowdock::Git.background_post(ref, before, after)

data/spec/builder_spec.rb

@@ -4,7 +4,7 @@ describe "Git Payload Builder" do
   before :each do
     @repo = Grit::Repo.new(".")
     @before = "7e32af569ba794b0b1c5e4c38fef1d4e2e56be51"
-    @after = "a1a94ba4bfa5f855676066861604b8edae1a20f5"
+    @after = "a66d3ce668ae6f2a42d54d811962724200d5b32b"
   end
 
   it "parses ref name from head" do

data/spec/flowdock_git_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Flowdock Git Hook" do
   it "raises error if git token is not defined" do
     lambda {
-      Flowdock::Git.new("refs/heads/master", "random-hash", "random-hash")
+      Flowdock::Git.new
     }.should raise_error(Flowdock::Git::TokenError)
   end
 
@@ -13,13 +13,13 @@ describe "Flowdock Git Hook" do
     })
 
     lambda {
-      Flowdock::Git.new("refs/heads/master", "random-hash", "random-hash")
+      Flowdock::Git.new
     }.should_not raise_error
   end
 
   it "builds payload" do
     stub_request(:post, "https://api.flowdock.com/v1/git/flowdock-token")
-    Flowdock::Git.new("refs/heads/master", "7e32af569ba794b0b1c5e4c38fef1d4e2e56be51", "a1a94ba4bfa5f855676066861604b8edae1a20f5", :token => "flowdock-token").post
+    Flowdock::Git.post("refs/heads/master", "7e32af569ba794b0b1c5e4c38fef1d4e2e56be51", "a1a94ba4bfa5f855676066861604b8edae1a20f5", :token => "flowdock-token")
     a_request(:post, "https://api.flowdock.com/v1/git/flowdock-token").with { |req|
       req.body.match(/7e32af569ba794b0b1c5e4c38fef1d4e2e56be51/)
     }.should have_been_made
@@ -27,7 +27,7 @@ describe "Flowdock Git Hook" do
 
   describe "Tagging" do
     it "reads tags from initializer parameter" do
-      tags = Flowdock::Git.new("ref", "before", "after", :token => "flowdock-token", :tags => ["foo", "bar"]).send(:tags)
+      tags = Flowdock::Git.new(:token => "flowdock-token", :tags => ["foo", "bar"]).send(:tags)
       tags.should include("foo", "bar")
     end
 
@@ -35,30 +35,28 @@ describe "Flowdock Git Hook" do
       Grit::Config.stub!(:new).and_return({
         "flowdock.tags" => "foo,bar"
       })
-      tags = Flowdock::Git.new("ref", "before", "after", :token => "flowdock-token").send(:tags)
+      tags = Flowdock::Git.new(:token => "flowdock-token").send(:tags)
       tags.should include("foo", "bar")
     end
 
     it "encodes tags suitable for URI" do
-      Flowdock::Git.new("ref", "before", "after", :token => "flowdock-token", :tags => "foo%bar").send(:tags).should include("foo%25bar")
+      Flowdock::Git.new(:token => "flowdock-token", :tags => "foo%bar").send(:tags).should include("foo%25bar")
     end
   end
 end
 
 describe "Flowdock Git Hook", "HTTP Post" do
   before :each do
-    @notifier = Flowdock::Git.new("origin/refs/master", "random-hash", "random-hash", :token => "flowdock-token", :tags => ["foo", "bar"])
-    @notifier.stub(:payload) { {} }
     stub_request(:post, "https://api.flowdock.com/v1/git/flowdock-token+foo+bar")
+    Flowdock::Git.post("origin/refs/master", "7e32af569ba794b0b1c5e4c38fef1d4e2e56be51", "a1a94ba4bfa5f855676066861604b8edae1a20f5", :token => "flowdock-token", :tags => ["foo", "bar"])
   end
 
   it "posts to api.flowdock.com" do
-    @notifier.post
     a_request(:post, "https://api.flowdock.com/v1/git/flowdock-token+foo+bar").should have_been_made
   end
 
   it "sends payload encoded as JSON" do
-    @notifier.post
-    a_request(:post, "https://api.flowdock.com/v1/git/flowdock-token+foo+bar").with(:body => {:payload => "{}"}).should have_been_made
+    payload = MultiJson.encode(Flowdock::Git::Builder.new(Grit::Repo.new("."), "origin/refs/master", "7e32af569ba794b0b1c5e4c38fef1d4e2e56be51", "a1a94ba4bfa5f855676066861604b8edae1a20f5").to_hash)
+    a_request(:post, "https://api.flowdock.com/v1/git/flowdock-token+foo+bar").with(:body => {:payload => payload}).should have_been_made
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: flowdock-git-hook
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ville Lautanala
@@ -15,116 +14,103 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 Z
+date: 2011-08-23 00:00:00 +03:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  name: grit
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
         segments: 
         - 2
         - 4
         - 1
         version: 2.4.1
-  prerelease: false
-  version_requirements: *id001
-  name: grit
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  name: multi_json
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  version_requirements: *id002
-  name: multi_json
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  name: rspec
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 2
         - 6
         - 0
         version: 2.6.0
-  prerelease: false
-  version_requirements: *id003
-  name: rspec
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  name: bundler
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
-  version_requirements: *id004
-  name: bundler
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  name: jeweler
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 6
         - 2
         version: 1.6.2
-  prerelease: false
-  version_requirements: *id005
-  name: jeweler
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
+  name: rcov
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  version_requirements: *id006
-  name: rcov
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
+  name: webmock
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 1
         - 6
         - 4
         version: 1.6.4
-  prerelease: false
-  version_requirements: *id007
-  name: webmock
+  requirement: *id007
 description: 
 email: lautis@gmail.com
 executables: []
@@ -142,6 +128,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- flowdock-git-hook.gemspec
 - lib/flowdock-git-hook.rb
 - lib/flowdock/git.rb
 - lib/flowdock/git/builder.rb
@@ -149,6 +136,7 @@ files:
 - spec/builder_spec.rb
 - spec/flowdock_git_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/flowdock/flowdock-git-hook
 licenses: 
 - MIT
@@ -158,27 +146,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.4
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Git Post-Receive hook for Flowdock