cap_gun 0.0.5 → 0.0.9

data/CHANGELOG

@@ -1,3 +1,11 @@
+v0.0.9  Ruby 1.8.7 support via a small change to the Net::SMTP SSL hack
+
+v0.0.8. Fix failing spec on runcoderun that depended on timezone; add redgreen to specs
+
+v0.0.7. Pick up changelog and gemspec
+
+v0.0.6. Fix subject line if there *is* a rails_env defined - this was a bug introduced with the 0.0.5 'fix'.  Awesome.
+
 v0.0.5. Fix subject line iv there is no rails_env defined
 
 v0.0.4. Add dev dependency on echoe; update manifest

data/README.rdoc

@@ -34,6 +34,15 @@ In your Capistrano config file (usually deploy.rb):
     
     # Test everything out by running "cap cap_gun:email"
 
+== USAGE
+
+Good news: it just works.  
+
+Want to make the notifications even better and explain _why_ you're deploying?
+Just include a comment in the cap command like so, and CapGun will add the comment to the email notification.
+
+    cap -s comment="fix for bug #303" deploy
+
 == REQUIREMENTS
 
 * Capistrano 2+
@@ -81,4 +90,7 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+ 
+ 
+ 

data/Rakefile

@@ -1,12 +1,5 @@
-begin
-  gem 'technicalpickles-echoe'
-rescue LoadError => e
-  puts "couldn't find the correct version of echoe - please install from forked version on github: http://github.com/technicalpickles/echoe/"
-  puts "gem sources -a http://gems.github.com"
-  puts "sudo gem install technicalpickles-echoe"
-end
-  
 require 'rubygems'
+gem 'echoe', '~> 3.0.1'
 require 'echoe'
 require './lib/cap_gun.rb'
 
@@ -23,6 +16,4 @@ echoe = Echoe.new('cap_gun') do |p|
   p.rdoc_template = rdoc_template
   p.test_pattern = 'spec/**/*_spec.rb'
   p.manifest_name = 'manifest.txt'
-end
-
-echoe.spec.add_development_dependency "echoe"
+end

data/cap_gun.gemspec

@@ -1,36 +1,87 @@
-Gem::Specification.new do |s|
-  s.name = %q{cap_gun}
-  s.version = "0.0.5"
 
-  s.required_rubygems_version = Gem::Requirement.new("= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Rob Sanheim, Relevance"]
-  s.date = %q{2008-07-04}
-  s.description = %q{Super simple capistrano deployments.}
-  s.email = %q{opensource@thinkrelevance.com}
-  s.extra_rdoc_files = ["CHANGELOG", "lib/cap_gun.rb", "MIT-LICENSE", "README.rdoc"]
-  s.files = ["cap_gun.gemspec", "CHANGELOG", "init.rb", "install.rb", "lib/cap_gun.rb", "manifest.txt", "MIT-LICENSE", "Rakefile", "README.rdoc", "spec/cap_gun_spec.rb", "tasks/cap_bot_tasks.rake", "vendor/action_mailer_tls/init.rb", "vendor/action_mailer_tls/lib/smtp_tls.rb", "vendor/action_mailer_tls/README", "vendor/action_mailer_tls/sample/mailer.yml.sample", "vendor/action_mailer_tls/sample/smtp_gmail.rb"]
-  s.has_rdoc = true
-  s.homepage = %q{http://opensource.thinkrelevance.com/wiki/cap_gun}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cap_gun", "--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{thinkrelevance}
-  s.rubygems_version = %q{1.2.0}
-  s.summary = %q{Bang! You're deployed!}
-  s.test_files = ["spec/cap_gun_spec.rb"]
+# Gem::Specification for Cap_gun-0.0.9
+# Originally generated by Echoe
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+--- !ruby/object:Gem::Specification 
+name: cap_gun
+version: !ruby/object:Gem::Version 
+  version: 0.0.9
+platform: ruby
+authors: 
+- Rob Sanheim, Relevance
+autorequire: 
+bindir: bin
 
-    if current_version >= 3 then
-      s.add_development_dependency(%q<echoe>, [">= 0"])
-      s.add_development_dependency(%q<echoe>, [">= 0"])
-    else
-      s.add_dependency(%q<echoe>, [">= 0"])
-      s.add_dependency(%q<echoe>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<echoe>, [">= 0"])
-    s.add_dependency(%q<echoe>, [">= 0"])
-  end
-end
+date: 2008-10-30 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: Super simple capistrano deployments.
+email: opensource@thinkrelevance.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- CHANGELOG
+- lib/cap_gun.rb
+- MIT-LICENSE
+- README.rdoc
+files: 
+- cap_gun.gemspec
+- CHANGELOG
+- init.rb
+- install.rb
+- lib/cap_gun.rb
+- manifest.txt
+- MIT-LICENSE
+- Rakefile
+- README.rdoc
+- spec/cap_gun_spec.rb
+- tasks/cap_bot_tasks.rake
+- vendor/action_mailer_tls/init.rb
+- vendor/action_mailer_tls/lib/smtp_tls.rb
+- vendor/action_mailer_tls/README
+- vendor/action_mailer_tls/sample/mailer.yml.sample
+- vendor/action_mailer_tls/sample/smtp_gmail.rb
+has_rdoc: true
+homepage: http://opensource.thinkrelevance.com/wiki/cap_gun
+post_install_message: 
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Cap_gun
+- --main
+- README.rdoc
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "1.2"
+  version: 
+requirements: []
+
+rubyforge_project: thinkrelevance
+rubygems_version: 1.3.0
+specification_version: 2
+summary: Bang! You're deployed!
+test_files: 
+- spec/cap_gun_spec.rb

data/lib/cap_gun.rb

@@ -1,4 +1,3 @@
-require 'active_support'
 require 'action_mailer'
 require File.join(File.dirname(__FILE__), *%w[.. vendor action_mailer_tls lib smtp_tls])
 
@@ -27,7 +26,7 @@ require File.join(File.dirname(__FILE__), *%w[.. vendor action_mailer_tls lib sm
 #
 # See README for full install/config instructions.
 module CapGun
-  VERSION = '0.0.5'
+  VERSION = '0.0.9'
 
   module Helper
     
@@ -116,7 +115,7 @@ module CapGun
       end
       
       def deployed_to(capistrano)
-        returning(s = "deployed") { s += " to #{capistrano[:rails_env]}" if capistrano[:rails_env] }
+        returning(deploy_msg = "deployed") { |msg| msg << " to #{capistrano[:rails_env]}" if capistrano[:rails_env] }
       end
       
       # Create the body of the message using a bunch of values from Capistrano

data/spec/cap_gun_spec.rb

@@ -4,6 +4,7 @@ require 'test/unit'
 require 'test/spec'
 require 'mocha'
 require 'net/smtp'
+require 'redgreen' unless Object.const_defined?("TextMate")
 require File.join(File.dirname(__FILE__), *%w[.. lib cap_gun])
 
 describe "CapGun" do
@@ -86,7 +87,21 @@ describe "CapGun" do
       capistrano = { :current_release => "/data/foo", :previous_release => "/data/foo", :cap_gun_email_envelope => {:recipients => ["joe@example.com"]} }
       CapGun::Mailer.any_instance.expects(:create_body).with(capistrano).returns("foo")
       CapGun::Mailer.create_deployment_notification capistrano
+    end
+    
+    it "calls Net::SMTP to send the mail correctly (we test this because SMTP internals changed between 1.8.6 and newer versions of Ruby)" do
+      ActionMailer::Base.smtp_settings = {
+        :address => "smtp.gmail.com",
+        :port => 587,
+        :domain => "foo.com",
+        :authentication => :plain,
+        :user_name => "username",
+        :password => "password"
+      }
       
+      capistrano = { :current_release => "/data/foo", :previous_release => "/data/foo", :cap_gun_email_envelope => {:recipients => ["joe@example.com"]} }
+      Net::SMTP.expects(:start)
+      CapGun::Mailer.deliver_deployment_notification capistrano
     end
   end
   
@@ -113,16 +128,22 @@ describe "CapGun" do
   end
   
   describe "creating body" do
+    before do # make DateTime act as if local timezone is EDT
+      CapGun::Mailer.any_instance.stubs(:local_timezone).returns("EDT")
+      CapGun::Mailer.any_instance.stubs(:local_datetime_zone_offset).returns(Rational(-1,6))
+    end
+    
     it "has a friendly summary line" do
       CapGun::Mailer.any_instance.stubs(:current_user).returns("jdoe")
-      capistrano = { :application => "my app", :rails_env => "staging", :current_release => "/data/foo/releases/20080227120000", :cap_gun_email_envelope => { :from => "booyakka!@example.com", :recipients => ["foo@here.com", "bar@here.com"] } }
+      capistrano = { :application => "my app", :rails_env => "staging", :current_release => "/data/foo/releases/20080227120000",  :cap_gun_email_envelope => {} }
       mail = CapGun::Mailer.create_deployment_notification capistrano
+      mail.subject.should == "[DEPLOY] my app deployed to staging" 
       mail.body.split("\n").first.should == "my app was deployed to staging by jdoe at February 27th, 2008 8:00 AM EDT."
     end
 
-    it "does not include rails env in summary if not defined" do
+    it "does not include rails env if not defined" do
       CapGun::Mailer.any_instance.stubs(:current_user).returns("jdoe")
-      capistrano = { :application => "my app", :current_release => "/data/foo/releases/20080227120000", :cap_gun_email_envelope => { :from => "booyakka!@example.com", :recipients => ["foo@here.com", "bar@here.com"] } }
+      capistrano = { :application => "my app", :current_release => "/data/foo/releases/20080227120000", :cap_gun_email_envelope => {}}
       mail = CapGun::Mailer.create_deployment_notification capistrano
       mail.subject.should == "[DEPLOY] my app deployed" 
       mail.body.split("\n").first.should == "my app was deployed by jdoe at February 27th, 2008 8:00 AM EDT."

data/vendor/action_mailer_tls/lib/smtp_tls.rb

@@ -5,7 +5,13 @@ Net::SMTP.class_eval do
   private
   def do_start(helodomain, user, secret, authtype)
     raise IOError, 'SMTP session already started' if @started
-    check_auth_args user, secret, authtype if user or secret
+    if user or secret
+      if RUBY_VERSION == "1.8.7"
+        check_auth_args user, secret
+      else
+        check_auth_args user, secret, authtype
+      end
+    end
 
     sock = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
     @socket = Net::InternetMessageIO.new(sock)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cap_gun
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.9
 platform: ruby
 authors: 
 - Rob Sanheim, Relevance
@@ -9,19 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-04 00:00:00 -04:00
+date: 2008-10-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
   type: :development
@@ -80,14 +70,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - "="
+  - - ">="
     - !ruby/object:Gem::Version 
       version: "1.2"
   version: 
 requirements: []
 
 rubyforge_project: thinkrelevance
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Bang! You're deployed!