flowdock 0.1.1 → 0.1.2

data/.gitignore

@@ -1,3 +1,4 @@
 *.gem
 .bundle
 pkg/*
+Gemfile.lock

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in flowdock.gemspec
 gemspec
+
+gem "rake"

data/lib/flowdock/capistrano.rb

@@ -1,11 +1,18 @@
 require 'flowdock'
 require 'grit'
+require 'digest/md5'
+require 'cgi'
 
 Capistrano::Configuration.instance(:must_exist).load do
   set :flowdock_send_notification, false
+  
+  set(:current_branch) do
+    capture("cat #{current_path}/BRANCH").chomp rescue "master"
+  end
 
   namespace :flowdock do
     task :set_flowdock_api do
+      set :rails_env, (!stage.nil?) ? stage : ENV['RAILS_ENV']
       set :repo, Grit::Repo.new(".")
       config = Grit::Config.new(repo)
       set :flowdock_api, Flowdock::Flow.new(:api_token => flowdock_api_token, 
@@ -27,14 +34,13 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     def notification_message
       if branch == current_branch || stage == :production
-        message = "<p>The following changes were just deployed to #{host}:</p>"
-        commits = repo.commits_between(capture("cat #{previous_release}/REVISION").chomp, current_revision).reverse
+        message = "<p>The following changes were just deployed to #{rails_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=\"http://gravatar.com/avatar/#{MD5::md5(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.downcase)}?s=30\" /></div>"
             message << "<div style=\"padding-left: 35px;\">#{CGI.escapeHTML(short)}<br/>"
             if long
               long.gsub!(/\n/, '<br />')
@@ -44,7 +50,7 @@ Capistrano::Configuration.instance(:must_exist).load do
           end
         end
       else
-        message = "Branch #{source.head} was deployed to #{host}. Previously deployed branch was #{current_branch}."
+        message = "Branch #{source.head} was deployed to #{rails_env}. Previously deployed branch was #{current_branch}."
       end
       message
     end

data/lib/flowdock/version.rb

@@ -1,3 +1,3 @@
 module Flowdock
-  GEM_VERSION = "0.1.1"
+  GEM_VERSION = "0.1.2"
 end

data/spec/flowdock_spec.rb

@@ -85,11 +85,13 @@ describe Flowdock do
             :from_address => "eric@example.com",
             :subject => "Hello World",
             :content => @example_content,
-            :tags => "cool,stuff"
+            :tags => "cool,stuff",
+            :link => "http://www.flowdock.com/"
           }).
           to_return(:body => "", :status => 200)
 
-        @flow.send_message(:subject => "Hello World", :content => @example_content, :tags => ["cool", "stuff"]).should be_true
+        @flow.send_message(:subject => "Hello World", :content => @example_content, 
+          :tags => ["cool", "stuff"], :link => "http://www.flowdock.com/").should be_true
       }.should_not raise_error
     end
     
@@ -104,7 +106,7 @@ describe Flowdock do
             :from_address => "invalid@nodeta.fi",
             :subject => "Hello World",
             :content => @example_content,
-            :tags => "cool,stuff"
+            :tags => "cool,stuff",
           }).
           to_return(:body => "", :status => 200)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flowdock
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - anttipitkanen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-25 00:00:00 Z
+date: 2011-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
@@ -76,7 +76,6 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README
 - Rakefile
@@ -115,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: flowdock
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby Gem for using Flowdock's API.

data/Gemfile.lock

@@ -1,33 +0,0 @@
-PATH
-  remote: .
-  specs:
-    flowdock (0.1.0)
-      httparty (~> 0.7.8)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.2.4)
-    crack (0.1.8)
-    diff-lcs (1.1.2)
-    httparty (0.7.8)
-      crack (= 0.1.8)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    webmock (1.6.2)
-      addressable (>= 2.2.2)
-      crack (>= 0.1.7)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  flowdock!
-  rspec
-  webmock (~> 1.6.0)