capistrano-flowdock 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2b7306c172d095b9da22a1ff3d9be80f7c592ba
-  data.tar.gz: dc7f2564bed2291dabf139bc477ffd230b6c9a91
+  metadata.gz: 4cac34e546340767b69509127f8075a8de849527
+  data.tar.gz: ab7e1e5d550d99064053be02d97d36a0776875c5
 SHA512:
-  metadata.gz: afb98c3c9fd0a3a098cd7f84d246b2624ac5282e3fb459982f6ba06ac46fc005119abf20d4d43e50b27ac73c64ed5f11d2d15d39556e2bf9677653ef8db0c262
-  data.tar.gz: 46c870e673de5266cedaea449b5e1e6651518efe38a18ce463e5344d492e7cf21f721f846669bb589297399501ae45f7d71791d5b1ca226caeab5551e2aa7166
+  metadata.gz: 7250374f37415e2402cc69dc2176c52e04b9073952a5e3e5de558e7e124aae7c7aeee3e9f68ed6607132a21fd27ae4ac623eca4594fa29aa478a67790b2d600c
+  data.tar.gz: 5bb6992a382e64d680f3b47c5186318c312b3ae4e0235568875302f8e4e804fdd6ac1869a79e190a63b8b007ef56ffd1e886f3ea43557bed596590ae3278d577

data/README.md

@@ -1,6 +1,7 @@
 # Capistrano::Flowdock
 
-Notify Flowdock flows about Capistrano deployments
+Notify Flowdock flows about Capistrano deployments. These instructions are for
+Capistrano 3. Check out [capistrano-2](https://github.com/flowdock/capistrano-flowdock/tree/capistrano-2) branch for Capistrano 2.x support.
 
 ## Installation
 
@@ -18,12 +19,16 @@ Or install it yourself as:
 
 ## Usage
 
-Load `capistrano-flowdock` in Capistrano `deploy.rb` file and set Flowdock API
-tokens and project configuration.
+Load this gem in Capfile:
 
 ```ruby
-require 'capistrano-flowdock'
+# Capfile
+require 'capistrano/flowdock'
+```
+
+Setup your Flowdock credentials in `deploy.rb`
 
+```ruby
 set :flowdock_api_token, "_YOUR_API_TOKEN_HERE"
 set :flowdock_project_name, "My project" # Optional, defaults to application
 set :flowdock_deploy_tags, ["deploy"] # Optional, defaults to ["deploy"]

data/capistrano-flowdock.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "flowdock", "~> 0.3.1"
-  spec.add_runtime_dependency "capistrano", "~> 2.0"
+  spec.add_runtime_dependency "capistrano", "~> 3.0"
   spec.add_runtime_dependency "grit", "~> 2.4"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/capistrano-flowdock.rb

@@ -1 +1 @@
-require 'capistrano/flowdock'
+require "capistrano/flowdock/version"

data/lib/capistrano/flowdock.rb

@@ -1,92 +1,5 @@
-require "capistrano/flowdock/version"
-
-require 'capistrano'
 require 'flowdock'
 require 'digest/md5'
 require 'cgi'
 
-Capistrano::Configuration.instance(:must_exist).load do
-
-  namespace :flowdock do
-    task :read_current_deployed_branch do
-      current_branch = capture("cat #{current_path}/BRANCH").chomp rescue "master"
-      set :current_branch, current_branch
-    end
-
-    task :save_deployed_branch do
-      begin
-        run "echo '#{source.head.to_s.chomp}' > #{current_path}/BRANCH"
-      rescue => e
-        puts "Flowdock: error in saving deployed branch information: #{e.to_s}"
-      end
-    end
-
-    task :set_flowdock_api do
-      set :flowdock_deploy_env, fetch(:stage, fetch(:rails_env, ENV["RAILS_ENV"] || "production"))
-      begin
-        require 'grit'
-        set :repo, Grit::Repo.new(".")
-        config = Grit::Config.new(repo)
-      rescue LoadError => e
-        puts "Flowdock: you need to have Grit gem installed: #{e.to_s}"
-      rescue => e
-        puts "Flowdock: error in fetching your git repository information: #{e.to_s}"
-      end
-
-      begin
-        flows = Array(flowdock_api_token).map do |api_token|
-          ::Flowdock::Flow.new(:api_token => api_token,
-          :source => "Capistrano deployment", :project => flowdock_project_name,
-          :from => {:name => config["user.name"], :address => config["user.email"]})
-        end
-        set :flowdock_api, flows
-      rescue => e
-        puts "Flowdock: error in configuring Flowdock API: #{e.to_s}"
-      end
-    end
-
-    task :notify_deploy_finished do
-      # send message to the flow
-      begin
-        flowdock_api.each do |flow|
-          flow.push_to_team_inbox(:format => "html",
-            :subject => "#{flowdock_project_name} deployed with branch #{branch} on ##{flowdock_deploy_env}",
-            :content => notification_message,
-            :tags => ["deploy", "#{flowdock_deploy_env}"] | flowdock_deploy_tags)
-        end unless dry_run
-      rescue => e
-        puts "Flowdock: error in sending notification to your flow: #{e.to_s}"
-      end
-    end
-
-    def notification_message
-      if branch == current_branch
-        message = "<p>The following changes were just deployed to #{flowdock_deploy_env}:</p>"
-        commits = repo.commits_between(previous_revision, current_revision).reverse
-
-        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 << "<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>"
-          end
-        end
-      else
-        message = "Branch #{source.head} was deployed to #{flowdock_deploy_env}. Previously deployed branch was #{current_branch}."
-      end
-      message
-    end
-  end
-
-  before "deploy:update_code", "flowdock:read_current_deployed_branch"
-  before "flowdock:notify_deploy_finished", "flowdock:set_flowdock_api"
-  ["deploy", "deploy:migrations"].each do |task|
-    after task, "flowdock:notify_deploy_finished"
-    after task, "flowdock:save_deployed_branch"
-  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 = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

data/lib/capistrano/tasks/flowdock.cap

@@ -0,0 +1,93 @@
+namespace :flowdock do
+  task :read_current_deployed_branch do
+    on roles(:all) do
+      begin
+        current_branch = capture(:cat, "#{current_path}/BRANCH").chomp
+      rescue
+        current_branch = "master"
+      end
+
+      set :current_branch, current_branch
+    end
+  end
+
+  task :save_deployed_branch do
+    on roles(:all) do
+      begin
+        execute("echo '#{fetch(:repo).head.name.chomp}' > #{current_path}/BRANCH")
+      rescue => e
+        puts "Flowdock: error in saving deployed branch information: #{e.to_s}"
+      end
+    end
+  end
+
+  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)
+    rescue LoadError => e
+      puts "Flowdock: you need to have Grit gem installed: #{e.to_s}"
+    rescue => e
+      puts "Flowdock: error in fetching your git repository information: #{e.to_s}"
+    end
+
+    begin
+      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"]})
+      end
+      set :flowdock_api, flows
+    rescue => e
+      puts "Flowdock: error in configuring Flowdock API: #{e.to_s}"
+    end
+  end
+
+  task :notify_deploy_finished do
+    # send message to the flow
+    begin
+      fetch(:flowdock_api).each do |flow|
+        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))
+      end unless fetch('dry_run')
+    rescue => e
+      puts "Flowdock: error in sending notification to your flow: #{e.to_s}"
+    end
+  end
+
+  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
+
+      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 << "<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>"
+        end
+      end
+    else
+      message = "Branch #{fetch(:repo).head.name} was deployed to #{fetch(:flowdock_deploy_env)}. Previously deployed branch was #{fetch(:current_branch)}."
+    end
+    message
+  end
+end
+
+before "deploy:updated", "flowdock:read_current_deployed_branch"
+before "flowdock:notify_deploy_finished", "flowdock:set_flowdock_api"
+
+after "deploy", "flowdock:notify_deploy_finished"
+after "deploy", "flowdock:save_deployed_branch"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-flowdock
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ville Lautanala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flowdock
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: grit
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +96,7 @@ files:
 - lib/capistrano-flowdock.rb
 - lib/capistrano/flowdock.rb
 - lib/capistrano/flowdock/version.rb
+- lib/capistrano/tasks/flowdock.cap
 homepage: https://flowdock.com/help/capistrano
 licenses:
 - MIT