capistrano-flowdock 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cac34e546340767b69509127f8075a8de849527
-  data.tar.gz: ab7e1e5d550d99064053be02d97d36a0776875c5
+  metadata.gz: f3671e13d25179f5eae4e319b55c2aed74ca239e
+  data.tar.gz: 0dbb414ba178ac0eefc6fbeb211318e1c26b8308
 SHA512:
-  metadata.gz: 7250374f37415e2402cc69dc2176c52e04b9073952a5e3e5de558e7e124aae7c7aeee3e9f68ed6607132a21fd27ae4ac623eca4594fa29aa478a67790b2d600c
-  data.tar.gz: 5bb6992a382e64d680f3b47c5186318c312b3ae4e0235568875302f8e4e804fdd6ac1869a79e190a63b8b007ef56ffd1e886f3ea43557bed596590ae3278d577
+  metadata.gz: cc98cffa9eaae2a57ef624e463107380fd3458e51b71a552162d630b157e2b6c20096b7e8bcefdd6ec4d9cfaf0f45b48241ceefdc247ce996555359c4e7879f4
+  data.tar.gz: 63323508afaa1bbe30f0a6cd11cd60ba4ee4aac388a13d79d79c99bb1c0bef61f81d411eb3c1f792fa9543ac14cd47e81b64d27f917cf31630ab532cc8b17f8e

data/capistrano-flowdock.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "flowdock", "~> 0.3.1"
+  spec.add_runtime_dependency "flowdock", "~> 0.5.0"
   spec.add_runtime_dependency "capistrano", "~> 3.0"
-  spec.add_runtime_dependency "grit", "~> 2.4"
+  spec.add_runtime_dependency "rugged", "~> 0.19.0"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

data/lib/capistrano/flowdock.rb

@@ -1,5 +1,24 @@
 require 'flowdock'
 require 'digest/md5'
 require 'cgi'
+require 'rugged'
+
+module Capistrano
+  module Flowdock
+    class << self
+      def commits_between(repository, before, after)
+        walker = Rugged::Walker.new(repository)
+        walker.push(after)
+        walker.hide(before)
+        walker.sorting Rugged::SORT_TOPO
+        walker.walk.to_a
+      end
+
+      def id_abbrev(id)
+        id[0...7]
+      end
+    end
+  end
+end
 
 load File.expand_path('../tasks/flowdock.cap', __FILE__)

data/lib/capistrano/flowdock/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Flowdock
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/lib/capistrano/tasks/flowdock.cap

@@ -14,7 +14,7 @@ namespace :flowdock do
   task :save_deployed_branch do
     on roles(:all) do
       begin
-        execute("echo '#{fetch(:repo).head.name.chomp}' > #{current_path}/BRANCH")
+        execute("echo '#{fetch(:flowdock_deploy_head_name)}' > #{current_path}/BRANCH")
       rescue => e
         puts "Flowdock: error in saving deployed branch information: #{e.to_s}"
       end
@@ -24,10 +24,8 @@ namespace :flowdock do
   task :set_flowdock_api do
     set :flowdock_deploy_env, fetch(:stage, fetch(:rails_env, ENV["RAILS_ENV"] || "production"))
     begin
-      require 'grit'
-      repo = Grit::Repo.new(".")
-      set :repo, repo
-      config = Grit::Config.new(repo)
+      set :repo, Rugged::Repository.new(".")
+      set :flowdock_deploy_head_name, fetch(:repo).head.name.split("/", 3).last.chomp
     rescue LoadError => e
       puts "Flowdock: you need to have Grit gem installed: #{e.to_s}"
     rescue => e
@@ -38,7 +36,7 @@ namespace :flowdock do
       flows = Array(fetch(:flowdock_api_token)).map do |api_token|
         Flowdock::Flow.new(:api_token => api_token,
         :source => "Capistrano deployment", :project => fetch(:flowdock_project_name),
-        :from => {:name => config["user.name"], :address => config["user.email"]})
+        :from => {:name => fetch(:repo).config["user.name"], :address => fetch(:repo).config["user.email"]})
       end
       set :flowdock_api, flows
     rescue => e
@@ -53,7 +51,7 @@ namespace :flowdock do
         flow.push_to_team_inbox(:format => "html",
           :subject => "#{fetch(:flowdock_project_name)} deployed with branch #{fetch(:branch)} on ##{fetch(:flowdock_deploy_env)}",
           :content => notification_message,
-          :tags => ["deploy", "#{fetch(:flowdock_deploy_env)}"] | fetch(:flowdock_deploy_tags))
+          :tags => fetch(:flowdock_deploy_tags, ["deploy", "#{fetch(:flowdock_deploy_env)}"]))
       end unless fetch('dry_run')
     rescue => e
       puts "Flowdock: error in sending notification to your flow: #{e.to_s}"
@@ -63,24 +61,26 @@ namespace :flowdock do
   def notification_message
     if fetch(:branch) == fetch(:current_branch)
       message = "<p>The following changes were just deployed to #{fetch(:flowdock_deploy_env)}:</p>"
-      commits = fetch(:repo).commits_between(
-        fetch(:previous_revision), fetch(:current_revision)
-      ).reverse
+      commits = if fetch(:previous_revision)
+        Capistrano::Flowdock.commits_between(fetch(:repo),  fetch(:previous_revision), fetch(:current_revision))
+      else
+        []
+      end
 
       unless commits.empty?
         commits.each do |c|
           short, long = c.message.split(/\n+/, 2)
-          message << "\n<div style=\"margin-bottom: 10px\"><div style=\"height:30px;width:30px;float:left;margin-right:5px;\"><img src=\"https://secure.gravatar.com/avatar/#{Digest::MD5::hexdigest(c.author.email.downcase)}?s=30\" /></div>"
+          message << "\n<div style=\"margin-bottom: 10px\"><div style=\"height:30px;width:30px;float:left;margin-right:5px;\"><img src=\"https://secure.gravatar.com/avatar/#{Digest::MD5::hexdigest(c.author[:email].to_s.downcase)}?s=30\" /></div>"
           message << "<div style=\"padding-left: 35px;\">#{CGI.escapeHTML(short)}<br/>"
           if long
             long.gsub!(/\n/, '<br />')
             message << '<p style="margin:5px 0px; padding: 0 5px; border-left: 3px solid #ccc">' + long + '</p>'
           end
-          message << "<span style=\"font-size: 90%; color: #333\"><code>#{c.id_abbrev}</code> <a href=\"mailto:#{CGI.escapeHTML(c.author.email)}\">#{CGI.escapeHTML(c.author.name)}</a> on #{c.authored_date.strftime("%b %d, %H:%M")}</span></div></div>"
+          message << "<span style=\"font-size: 90%; color: #333\"><code>#{Capistrano::Flowdock.id_abbrev(c.oid)}</code> <a href=\"mailto:#{CGI.escapeHTML(c.author[:email].to_s)}\">#{CGI.escapeHTML(c.author[:name].to_s)}</a> on #{c.time.strftime("%b %d, %H:%M")}</span></div></div>"
         end
       end
     else
-      message = "Branch #{fetch(:repo).head.name} was deployed to #{fetch(:flowdock_deploy_env)}. Previously deployed branch was #{fetch(:current_branch)}."
+      message = "Branch #{fetch(:flowdock_deploy_head_name)} was deployed to #{fetch(:flowdock_deploy_env)}. Previously deployed branch was #{fetch(:current_branch)}."
     end
     message
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-flowdock
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Ville Lautanala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flowdock
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Flowdock notifier for Capistrano