gitlab-flowdock-git-hook 0.4.2.2 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8f04a6f62e807a2ec59b2aa456c82ac8472d83d2
+  data.tar.gz: dc39e47ec6214c8d03dc751012e6d359e38d7698
+SHA512:
+  metadata.gz: 2b94ba9e7f920fca84f81a93b957f21d8c792196e04f7a457ea6bdda84890d61cc2fc4ac31c90dfc7e43772db75bce4ff345ad8d5e6eb7ca3b747dc367db71bc
+  data.tar.gz: ca33e30435bbac89362d8f33addc395d0fde988c198ab6a6fbb98dcfdfa329d27d0b2765d353e93e92c8a3cf589bf8993122468e135b2946bcf0fbc6564d7c1f

data/.travis.yml

@@ -1,3 +1,4 @@
 rvm:
-  - 1.8.7
-  - 1.9.3
+  - 2.0
+  - 2.1
+  - 2.2

data/Gemfile

@@ -2,8 +2,9 @@ source "http://rubygems.org"
 
 gem "gitlab-grit", ">= 2.4.1"
 gem "multi_json"
-
+gem "flowdock", "~> 0.7"
 group :development do
+  gem "byebug"
   gem "rdoc", ">= 2.4.2"
   gem "rspec", "~> 2.8"
   gem "bundler", "~> 1.0"

data/README.md

@@ -2,9 +2,13 @@
 
 Git Post-Receive hook for [Flowdock](http://flowdock.com).
 
+## Note
+
+Version 1.0. supports only source flow tokens. 0.x versions use a deprecated API which will be removed soon.
+
 ## Installation
 
-First, you need to install this gem. You need to have Ruby 1.8.6 and Rubygems installed in your system.
+First, you need to install this gem. You need to have Ruby and Rubygems installed in your system.
 
     $ gem install flowdock-git-hook
 
@@ -13,9 +17,9 @@ Then, download the post-receive hook file to the hooks directory and make it exe
     $ 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
+Set the source flow token given to you by the Flowdock git configuration service
 
-    $ git config flowdock.token <Flow API token>
+    $ git config flowdock.token <source flow token>
 
 After this, you should get updates from your git repo every time you push to it.
 
@@ -23,6 +27,22 @@ After this, you should get updates from your git repo every time you push to it.
 
 Service specific instructions for [Gitlab](https://github.com/flowdock/flowdock-git-hook/wiki/Gitlab) and [Redmine](https://github.com/flowdock/flowdock-git-hook/wiki/Redmine) can be found in [Wiki](https://github.com/flowdock/flowdock-git-hook/wiki).
 
+### Permanent references
+
+By default each push to the `master` branch will generate a new thread containing just the commits that were pushed. Pushes to other branches or tags will be grouped to a single thread containing all the pushed commits. You can configure this behaviour by setting the `permanent-reference` git variable. The value of that configuration parameter should be a comma separated list of regular expressions.
+
+For example to create new threads for each push to the `master` branch and any branch starting with `with-regex-` do this
+
+    $ git config flowdock.permanent-references "refs/heads/master, refs/heads/with-regex-.*"
+
+
+### Repository name
+
+The repository name displayed in the inbox message can be set with `repository-name`
+
+    $ git config flowdock.repository-name "my repo"
+
+
 ### Repository URL
 
 Each Team Inbox item sent from the post-receive hook can link back to the repository. To configure the URL for the repository, configure a `repository-url`:
@@ -41,7 +61,7 @@ The `%s` will be replaced with the commit SHA.
 
 Commit messages in Team Inbox can have a action for viewing the commit diff. To enable the Diff action for comparing commits, configure a `diff-url-pattern`:
 
-     $ gitconfig flowdock.diff-url-pattern "http://example.com/mygitviewer/compare/%s...%s"
+     $ git config flowdock.diff-url-pattern "http://example.com/mygitviewer/compare/%s...%s"
 
 ## Advanced usage
 

data/VERSION

@@ -1 +1 @@
-0.4.2
+1.0.0

data/gitlab-flowdock-git-hook.gemspec

@@ -5,11 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "gitlab-flowdock-git-hook"
-  s.version = "0.4.2.2"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Ville Lautanala", "Boyan Tabakov"]
-  s.date = "2013-10-03"
+  s.date = "2015-08-11"
   s.email = "blade@alslayer.net"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -29,14 +30,12 @@ Gem::Specification.new do |s|
     "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 = "http://github.com/bladealslayer/flowdock-git-hook"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.5"
+  s.rubygems_version = "2.4.1"
   s.summary = "Git Post-Receive hook for Flowdock. Gem requirements patched for use with Gitlab."
 
   if s.respond_to? :specification_version then
@@ -45,6 +44,8 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<gitlab-grit>, [">= 2.4.1"])
       s.add_runtime_dependency(%q<multi_json>, [">= 0"])
+      s.add_runtime_dependency(%q<flowdock>, ["~> 0.7"])
+      s.add_development_dependency(%q<byebug>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 2.4.2"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
@@ -54,6 +55,8 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<gitlab-grit>, [">= 2.4.1"])
       s.add_dependency(%q<multi_json>, [">= 0"])
+      s.add_dependency(%q<flowdock>, ["~> 0.7"])
+      s.add_dependency(%q<byebug>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 2.4.2"])
       s.add_dependency(%q<rspec>, ["~> 2.8"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -64,6 +67,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<gitlab-grit>, [">= 2.4.1"])
     s.add_dependency(%q<multi_json>, [">= 0"])
+    s.add_dependency(%q<flowdock>, ["~> 0.7"])
+    s.add_dependency(%q<byebug>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 2.4.2"])
     s.add_dependency(%q<rspec>, ["~> 2.8"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])

data/lib/flowdock/git.rb

@@ -1,69 +1,52 @@
 require "multi_json"
-require "net/https"
 require "cgi"
-
+require "flowdock"
 require "flowdock/git/builder"
 
 module Flowdock
   class Git
     class TokenError < StandardError; end
-    API_ENDPOINT = "https://api.flowdock.com/v1/git"
 
     class << self
       def post(ref, from, to, options = {})
-        git = Git.new(options)
-        git.post(Git::Builder.new(git.repo, ref, from, to))
+        Git.new(ref, from, to, options).post
       end
 
       def background_post(ref, from, to, options = {})
-        git = Git.new(options)
-        git.background_post(Git::Builder.new(git.repo, ref, from, to))
+        Git.new(ref, from, to, options).background_post
       end
     end
 
-    def initialize(options = {})
+    def initialize(ref, from, to, options = {})
+      @ref = ref
+      @from = from
+      @to = to
       @options = options
       @token = options[:token] || config["flowdock.token"] || raise(TokenError.new("Flowdock API token not found"))
       @commit_url = options[:commit_url] || config["flowdock.commit-url-pattern"] || nil
       @diff_url = options[:diff_url] || config["flowdock.diff-url-pattern"] || nil
       @repo_url = options[:repo_url] || config["flowdock.repository-url"] || nil
+      @repo_name = options[:repo_name] || config["flowdock.repository-name"] || nil
+      @permanent_refs = options[:permanent_refs] ||
+                        (config["flowdock.permanent-references"] || "refs/heads/master")
+                          .split(",")
+                          .map(&:strip)
+                          .map {|exp| Regexp.new(exp) }
     end
 
     # Send git push notification to Flowdock
-    def post(data)
-      uri = URI.parse("#{API_ENDPOINT}/#{([@token] + tags).join('+')}")
-      req = Net::HTTP::Post.new(uri.path)
-
-      payload_hash = data.to_hash
-      if @repo_url
-        payload_hash[:repository][:url] = @repo_url
-      end
-      if @commit_url
-        payload_hash[:commits].each do |commit|
-          commit[:url] = @commit_url % commit[:id]
-        end
-      end
-      if @diff_url
-        payload_hash[:compare] = @diff_url % [payload_hash[:before], payload_hash[:after]]
+    def post
+      messages.each do |message|
+        Flowdock::Client.new(flow_token: @token).post_to_thread(message)
       end
-
-      req.set_form_data(:payload => MultiJson.encode(payload_hash))
-      http = Net::HTTP.new(uri.host, uri.port)
-
-      if uri.scheme == 'https'
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        http.use_ssl = true
-      end
-
-      http.start { |http| http.request(req) }
     end
 
     # Create and post notification in background process. Avoid blocking the push notification.
-    def background_post(data)
+    def background_post
       pid = Process.fork
       if pid.nil?
         Grit::Git.with_timeout(600) do
-          post(data) # Child
+          post
         end
       else
         Process.detach(pid) # Parent
@@ -76,12 +59,27 @@ module Flowdock
 
     private
 
+    def messages
+      Git::Builder.new(repo: @repo,
+                       ref: @ref,
+                       before: @from,
+                       after: @to,
+                       commit_url: @commit_url,
+                       branch_url: @branch_url,
+                       diff_url: @diff_url,
+                       repo_url: @repo_url,
+                       repo_name: @repo_name,
+                       permanent_refs: @permanent_refs,
+                       tags: tags
+                      ).to_hashes
+    end
+
     # Flowdock tags attached to the push notification
     def tags
       if @options[:tags]
         @options[:tags]
       else
-        config["flowdock.tags"].to_s.split(",")
+        config["flowdock.tags"].to_s.split(",").map(&:strip)
       end.map do |t|
         CGI.escape(t)
       end

data/lib/flowdock/git/builder.rb

@@ -1,60 +1,38 @@
 require "grit"
+require 'cgi'
+require "securerandom"
 
 module Flowdock
   class Git
-    # Class used to build Git payload
-    class Builder
-      def initialize(repo, ref, before, after)
-        @repo = repo
-        @ref = ref
-        @before = before
-        @after = after
-      end
-
-      def commits
-        @repo.commits_between(@before, @after).map do |commit|
-          {
-            :id => commit.sha,
-            :message => commit.message,
-            :timestamp => commit.authored_date.iso8601,
-            :author => {
-              :name => commit.author.name,
-              :email => commit.author.email
-            },
-            :removed => filter(commit.diffs) { |d| d.deleted_file },
-            :added => filter(commit.diffs) { |d| d.new_file },
-            :modified => filter(commit.diffs) { |d| !d.deleted_file && !d.new_file }
-          }
-        end
-      end
-
-      def ref_name
-        @ref.to_s.sub(/\Arefs\/(heads|tags)\//, '')
+    class Commit
+      def initialize(external_thread_id, thread, tags, commit)
+        @commit = commit
+        @external_thread_id = external_thread_id
+        @thread = thread
+        @tags = tags
       end
 
       def to_hash
-        encode({
-          :before   => @before,
-          :after    => @after,
-          :ref      => @ref,
-          :commits  => commits,
-          :ref_name => @ref.to_s.sub(/\Arefs\/(heads|tags)\//, ''),
-          :repository => {
-            :name => File.basename(@repo.path).sub(/\.git$/,'')
-          }
-        }).merge(if @before == "0000000000000000000000000000000000000000"
-          {:created => true}
-        elsif @after == "0000000000000000000000000000000000000000"
-          {:deleted => true}
-        else
-          {}
-        end)
+        hash = {
+          external_thread_id: @external_thread_id,
+          event: "activity",
+          author: {
+            name: @commit[:author][:name],
+            email: @commit[:author][:email]
+          },
+          title: title,
+          thread: @thread,
+          body: body
+        }
+        hash[:tags] = @tags if @tags
+        encode(hash)
       end
 
       private
 
-      def filter(diffs)
-        diffs.select { |e| yield e }.map { |diff| diff.b_path }
+      def encode(hash)
+        return hash unless "".respond_to? :encode
+        encode_as_utf8(hash)
       end
 
       # This only works on Ruby 1.9
@@ -72,12 +50,100 @@ module Flowdock
             obj.force_encoding("ISO-8859-1").encode!(Encoding::UTF_8, :invalid => :replace, :undef => :replace)
           end
         end
-        obj
       end
 
-      def encode(hash)
-        return hash unless "".respond_to? :encode
-        encode_as_utf8(hash)
+      def body
+        content = @commit[:message][first_line.size..-1]
+        content.strip! if content
+        "<pre>#{content}</pre>" unless content.empty?
+      end
+
+      def first_line
+        @first_line ||= (@commit[:message].split("\n")[0] || @commit[:message])
+      end
+
+      def title
+        commit_id = @commit[:id][0, 7]
+        if @commit[:url]
+          "<a href=\"#{@commit[:url]}\">#{commit_id}</a> #{message_title}"
+        else
+          "#{commit_id} #{message_title}"
+        end
+      end
+
+      def message_title
+        CGI.escape_html(first_line.strip)
+      end
+    end
+
+    # Class used to build Git payload
+    class Builder
+      def initialize(opts)
+        @repo = opts[:repo]
+        @ref = opts[:ref]
+        @before = opts[:before]
+        @after = opts[:after]
+        @opts = opts
+      end
+
+      def commits
+        @repo.commits_between(@before, @after).map do |commit|
+          {
+            url: if @opts[:commit_url] then @opts[:commit_url] % [commit.sha] end,
+            id: commit.sha,
+            message: commit.message,
+            author: {
+              name: commit.author.name,
+              email: commit.author.email
+            }
+          }
+        end
+      end
+
+      def ref_name
+        @ref.to_s.sub(/\Arefs\/(heads|tags)\//, '')
+      end
+
+      def to_hashes
+        commits.map do |commit|
+          Commit.new(external_thread_id, thread, @opts[:tags], commit).to_hash
+        end
+      end
+
+      private
+
+      def thread
+        @thread ||= {
+          title: thread_title,
+          external_url: @opts[:repo_url]
+        }
+      end
+
+      def permanent?
+        @permanent ||= @opts[:permanent_refs].select do |regex|
+          regex.match(@ref)
+        end.size > 0
+      end
+
+      def thread_title
+        action = if permanent?
+                   "updated"
+                 end
+        type = if @ref.match(%r(^refs/heads/))
+                 "branch"
+               else
+                 "tag"
+               end
+        [@opts[:repo_name], type, ref_name, action].compact.join(" ")
+      end
+
+      def external_thread_id
+        @external_thread_id ||=
+          if permanent?
+            SecureRandom.hex
+          else
+            @ref
+          end
       end
     end
   end

data/spec/flowdock_git_spec.rb

@@ -1,36 +1,69 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Flowdock Git Hook" do
+  let(:before) { "611ef32e3eee84b61a7efd496bd71ae1af165823" }
+  let(:after) { "3a29fcd42ca69f40c8ed357052843d8e1e549013" }
+  let(:commits_in_range) { 8 }
+  let(:flowdock_token) { SecureRandom.hex }
+  let(:expected_message) {
+    {
+      event: "activity",
+      title: "3f3a5fd Bumped version",
+      thread: {
+        title: "branch master updated",
+        external_url: nil,
+      },
+      author: {
+        name: "Antti Pitkanen",
+        email: "antti@flowdock.com"
+      },
+      body: nil,
+      flow_token: flowdock_token
+    }
+  }
+
+  let!(:request) do
+    stub_request(:post, "https://api.flowdock.com/v1/messages")
+  end
+
   it "raises error if git token is not defined" do
     lambda {
-      Flowdock::Git.new
+      Flowdock::Git.new "ref", "from", "to"
     }.should raise_error(Flowdock::Git::TokenError)
   end
 
   it "can read token from git config" do
     Grit::Config.stub!(:new).and_return({
-      "flowdock.token" => "flowdock-token"
+      "flowdock.token" => flowdock_token
     })
 
     lambda {
-      Flowdock::Git.new
+      Flowdock::Git.new "ref", "from", "to"
     }.should_not raise_error
   end
 
-  it "encodes content as UTF-8" do
-    @repo = Grit::Repo.new(".")
-    @before = "7e32af569ba794b0b1c5e4c38fef1d4e2e56be51"
-    @after = "a66d3ce668ae6f2a42d54d811962724200d5b32b"
-    @repo.stub!(:path).and_return("/foo/bar/flowdock-git-hook/.git")
-    @hash = Flowdock::Git::Builder.new(@repo, "refs/heads/master", @before, @after).to_hash
+  it "builds payload" do
+    Flowdock::Git.post("refs/heads/master", before, after, token: flowdock_token)
+    expect(request.with(body: hash_including(expected_message))).to have_been_made
   end
 
-  it "builds payload" do
-    stub_request(:post, "https://api.flowdock.com/v1/git/flowdock-token")
-    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
+  it "adds repo name to title if given" do
+    Grit::Config.stub!(:new).and_return(
+      "flowdock.repository-name" => "some repo"
+    )
+    Flowdock::Git.post("refs/heads/master", before, after, token: flowdock_token)
+    expect(request.with(body: hash_including(
+                          thread: expected_message[:thread].merge(title: "some repo branch master updated")))
+          ).to have_been_made.times(commits_in_range - 1)  # da fuq. if you figure out why 139fdb4 does not generate a hit please do tell me
+  end
+
+  it "posts all transient branch updates to same thread" do
+    Grit::Config.stub!(:new).and_return(
+      "flowdock.permanent-references" => ""
+    )
+    Flowdock::Git.post("refs/heads/master", before, after, token: flowdock_token)
+    expect(request.with(body: hash_including(external_thread_id: "refs/heads/master"))
+          ).to have_been_made.times(commits_in_range)
   end
 
   it "builds payload with repo url, diff url and commit urls" do
@@ -40,47 +73,24 @@ describe "Flowdock Git Hook" do
       "flowdock.diff-url-pattern" => "http://www.example.com/compare/%s...%s",
       "flowdock.commit-url-pattern" => "http://www.example.com/commit/%s"
     })
-    stub_request(:post, "https://api.flowdock.com/v1/git/flowdock-token")
-    Flowdock::Git.post("refs/heads/master", "7e32af569ba794b0b1c5e4c38fef1d4e2e56be51", "a1a94ba4bfa5f855676066861604b8edae1a20f5", :token => "flowdock-token")
-    a_request(:post, "https://api.flowdock.com/v1/git/flowdock-token").with { |req|
-      body = CGI.unescape(req.body)
-      body.match("http://www.example.com/") &&
-      body.match("http://www.example.com/compare/7e32af569ba794b0b1c5e4c38fef1d4e2e56be51...a1a94ba4bfa5f855676066861604b8edae1a20f5")
-    }.should have_been_made
-  end
-
-  describe "Tagging" do
-    it "reads tags from initializer parameter" do
-      tags = Flowdock::Git.new(:token => "flowdock-token", :tags => ["foo", "bar"]).send(:tags)
-      tags.should include("foo", "bar")
-    end
-
-    it "reads tags from gitconfig as fallback" do
-      Grit::Config.stub!(:new).and_return({
-        "flowdock.tags" => "foo,bar"
-      })
-      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(: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
-    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"])
+    Flowdock::Git.post("refs/heads/master", before, after, token: flowdock_token)
+    expect(request.with(body: hash_including(expected_message.merge(
+                                              thread: expected_message[:thread].merge(external_url: "http://www.example.com"),
+                                              title: "<a href=\"http://www.example.com/commit/3f3a5fd37f53970f71adec08c5376ae003ba22a3\">3f3a5fd</a> Bumped version"
+                                            )))
+          ).to have_been_made
   end
 
-  it "posts to api.flowdock.com" do
-    a_request(:post, "https://api.flowdock.com/v1/git/flowdock-token+foo+bar").should have_been_made
+  it "attaches tags from configuration" do
+    Grit::Config.stub!(:new).and_return({"flowdock.tags" => "git, push, foo%bar"})
+    Flowdock::Git.post("refs/heads/master", before, after, token: flowdock_token)
+    expect(request.with(body: hash_including(tags: ["git", "push", "foo%25bar"]))
+          ).to have_been_made.times(7)
   end
 
-  it "sends payload encoded as JSON" do
-    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
+  it "attaches tags from opts" do
+    Flowdock::Git.post("refs/heads/master", before, after, token: flowdock_token, tags: ["git", "push", "foo%bar"])
+    expect(request.with(body: hash_including(tags: ["git", "push", "foo%25bar"]))
+          ).to have_been_made.times(7)
   end
 end

metadata

@@ -1,140 +1,164 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gitlab-flowdock-git-hook
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 2
-  - 2
-  version: 0.4.2.2
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Ville Lautanala
 - Boyan Tabakov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-10-03 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-08-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: gitlab-grit
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 2.4.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+- !ruby/object:Gem::Dependency
   name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: flowdock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 2
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 2.4.2
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 8
-        version: "2.8"
+      - !ruby/object:Gem::Version
+        version: '2.8'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: jeweler
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 8
-        - 7
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.8.7
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 4
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.7
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: jruby-openssl
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+- !ruby/object:Gem::Dependency
+  name: jruby-openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: blade@alslayer.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - .rspec
 - .travis.yml
@@ -148,38 +172,31 @@ files:
 - lib/flowdock/git.rb
 - lib/flowdock/git/builder.rb
 - post-receive
-- spec/builder_spec.rb
 - spec/flowdock_git_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/bladealslayer/flowdock-git-hook
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Git Post-Receive hook for Flowdock. Gem requirements patched for use with Gitlab.
+summary: Git Post-Receive hook for Flowdock. Gem requirements patched for use with
+  Gitlab.
 test_files: []
-

data/spec/builder_spec.rb

@@ -1,135 +0,0 @@
-# encoding: utf-8
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Git Payload Builder" do
-  before :each do
-    @repo = Grit::Repo.new(".")
-    @before = "7e32af569ba794b0b1c5e4c38fef1d4e2e56be51"
-    @after = "a66d3ce668ae6f2a42d54d811962724200d5b32b"
-  end
-
-  it "parses ref name from head" do
-    Flowdock::Git::Builder.new(@repo, "refs/heads/master", @before, @after).ref_name.should == "master"
-  end
-
-  it "parses ref name from tag" do
-    Flowdock::Git::Builder.new(@repo, "refs/tags/release-1.0", @before, @after).ref_name.should == "release-1.0"
-  end
-
-  it "detects new branch and sets created=true in data" do
-    hash = Flowdock::Git::Builder.new(@repo, "refs/heads/master", "0000000000000000000000000000000000000000", @after).to_hash
-    hash[:created].should eq(true)
-    hash[:deleted].should_not eq(true)
-  end
-
-  it "detects deleted branch and sets deleted=true in data" do
-    hash = Flowdock::Git::Builder.new(@repo, "refs/heads/master", @before, "0000000000000000000000000000000000000000").to_hash
-    hash[:deleted].should eq(true)
-    hash[:created].should_not eq(true)
-  end
-
-  it "doesn't include commits in branch delete" do
-    hash = Flowdock::Git::Builder.new(@repo, "refs/heads/master", @before, "0000000000000000000000000000000000000000").to_hash
-    hash[:commits].should be_empty
-  end
-
-  describe "data hash" do
-    before :each do
-      @repo.stub!(:path).and_return("/foo/bar/flowdock-git-hook/.git")
-      @hash = Flowdock::Git::Builder.new(@repo, "refs/heads/master", @before, @after).to_hash
-    end
-
-    if RUBY_VERSION > '1.9'
-      it "properly sets encoding for UTF-8 content" do
-        builder = Flowdock::Git::Builder.new(@repo, "refs/heads/master", @before, "0000000000000000000000000000000000000000")
-        builder.stub(:commits).and_return([
-          {
-            :id => "0000000000000000000000000000000000000001",
-            :message => "This message contains UTF-8: ö".force_encoding("ASCII-8BIT"),
-            :timestamp => Time.now.iso8601,
-            :author => {
-              :name => "Föö Bär".force_encoding("ASCII-8BIT"),
-              :email => "foo@example.com"
-            },
-            :removed => [],
-            :added => [],
-            :modified => []
-          }
-        ])
-        builder.to_hash[:commits][0][:message].encoding.should eq(Encoding::UTF_8)
-        builder.to_hash[:commits][0][:message].should == "This message contains UTF-8: ö"
-      end
-
-      it "encodes ISO-8859-1 to UTF-8" do
-        builder = Flowdock::Git::Builder.new(@repo, "refs/heads/master", @before, "0000000000000000000000000000000000000000")
-        builder.stub(:commits).and_return([
-          {
-            :id => "0000000000000000000000000000000000000001",
-            :message => "This message contains UTF-8: ö".encode("ISO-8859-1").force_encoding("ASCII-8BIT"),
-            :timestamp => Time.now.iso8601,
-            :author => {
-              :name => "Föö Bär".encode("ISO-8859-1").force_encoding("ASCII-8BIT"),
-              :email => "foo@example.com"
-            },
-            :removed => [],
-            :added => [],
-            :modified => []
-          }
-        ])
-        builder.to_hash[:commits][0][:author][:name].encoding.should eq(Encoding::UTF_8)
-        builder.to_hash[:commits][0][:author][:name].should == "Föö Bär"
-      end
-    end
-
-    it "contains before" do
-      @hash[:before].should == @before
-    end
-
-    it "contains after" do
-      @hash[:after].should == @after
-    end
-
-    it "contains ref" do
-      @hash[:ref].should == "refs/heads/master"
-    end
-
-    it "contains ref name" do
-      @hash[:ref_name].should == "master"
-    end
-
-    describe "commits" do
-      it "contains all changed commits" do
-        @hash[:commits].should have(2).items
-      end
-
-      it "has commit author information" do
-        @hash[:commits].first[:author][:name].should eq("Ville Lautanala")
-        @hash[:commits].first[:author][:email].should eq("lautis@gmail.com")
-      end
-
-      it "has commit id" do
-        @hash[:commits].first[:id].should == "cf4a78c59cf9e06ebd7336900b2a66b85a88b76c"
-      end
-
-      it "puts deleted files in an array" do
-        @hash[:commits].first[:removed].should include("spec/flowdock-git-hook_spec.rb")
-      end
-
-      it "puts added files to an array" do
-        @hash[:commits].first[:added].should include("lib/flowdock/git.rb")
-      end
-
-      it "detects modified files" do
-        @hash[:commits].first[:modified].should_not include("spec/flowdock-git-hook_spec.rb")
-        @hash[:commits].first[:modified].should_not include("lib/flowdock/git.rb")
-        @hash[:commits].first[:modified].should include("lib/flowdock-git-hook.rb")
-      end
-    end
-
-    describe "repository information" do
-      it "contains repository name based on file path" do
-        @hash[:repository][:name] = "flowdock-git-hook"
-      end
-    end
-  end
-end