relevance-cap_gun 0.0.4 → 0.0.5

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.0.5. Fix subject line iv there is no rails_env defined
+
 v0.0.4. Add dev dependency on echoe; update manifest
 
 v0.0.3. Don't try to convert the RAILS_ENV if its not set to better support default capistrano deployments

data/Rakefile

@@ -1,3 +1,11 @@
+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'
 require 'echoe'
 require './lib/cap_gun.rb'

data/cap_gun.gemspec

@@ -1,97 +1,36 @@
+Gem::Specification.new do |s|
+  s.name = %q{cap_gun}
+  s.version = "0.0.5"
 
-# Gem::Specification for Cap_gun-0.0.4
-# Originally generated by Echoe
+  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"]
 
---- !ruby/object:Gem::Specification 
-name: cap_gun
-version: !ruby/object:Gem::Version 
-  version: 0.0.4
-platform: ruby
-authors: 
-- Rob Sanheim, Relevance
-autorequire: 
-bindir: bin
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
 
-date: 2008-06-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
-  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.2.0
-specification_version: 2
-summary: Bang! You're deployed!
-test_files: 
-- spec/cap_gun_spec.rb
+    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

data/lib/cap_gun.rb

@@ -27,7 +27,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.4'
+  VERSION = '0.0.5'
 
   module Helper
     
@@ -84,7 +84,7 @@ module CapGun
   class Mailer < ActionMailer::Base
       include CapGun::Helper
       DEFAULT_SENDER = %("CapGun" <cap_gun@example.com>)
-      DEFAULT_EMAIL_PREFIX = "[DEPLOY] "
+      DEFAULT_EMAIL_PREFIX = "[DEPLOY]"
       
       adv_attr_accessor :email_prefix
       attr_accessor :summary
@@ -107,7 +107,7 @@ module CapGun
         self.summary = create_summary(capistrano)
         
         content_type "text/plain"
-        subject "#{email_prefix} #{capistrano[:application]} deployed to #{capistrano[:rails_env]}"
+        subject "#{email_prefix} #{capistrano[:application]} #{deployed_to(capistrano)}"
         body    create_body(capistrano)
       end
       
@@ -115,6 +115,10 @@ module CapGun
         %[#{capistrano[:application]} was deployed#{" to " << capistrano[:rails_env] if capistrano[:rails_env]} by #{current_user} at #{humanize_release_time(capistrano[:current_release])}.]
       end
       
+      def deployed_to(capistrano)
+        returning(s = "deployed") { s += " to #{capistrano[:rails_env]}" if capistrano[:rails_env] }
+      end
+      
       # Create the body of the message using a bunch of values from Capistrano
       def create_body(capistrano)
 <<-EOL

data/spec/cap_gun_spec.rb

@@ -114,15 +114,18 @@ describe "CapGun" do
   
   describe "creating body" do
     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"] } }
       mail = CapGun::Mailer.create_deployment_notification capistrano
-      mail.body.split("\n").first.should == "my app was deployed to staging by rsanheim at February 27th, 2008 8:00 AM EDT."
+      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
+      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"] } }
       mail = CapGun::Mailer.create_deployment_notification capistrano
-      mail.body.split("\n").first.should == "my app was deployed by rsanheim at February 27th, 2008 8:00 AM EDT."
+      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."
     end
     
   end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification 
 name: relevance-cap_gun
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Rob Sanheim, Relevance
 autorequire: 
 bindir: bin
-cert_chain: 
-date: 2008-06-29 21:00:00 -07:00
+cert_chain: []
+
+date: 2008-07-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: echoe
-  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,7 +23,6 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
-  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: