capistrano-helpers 0.5.7 → 0.6.0

data/CHANGELOG.markdown

@@ -1,5 +1,11 @@
 # Capistrano-Helpers Changelog
 
+Fixed:
+
+* Campfire notifications were broken. Updated for new API, use git names for announcements.
+* Force a chown of vendor/bundler, since building gems sometimes doesn't preserve group permissions.
+  Hopefully there will be a fix for this someday so we can avoid this workaround.
+
 ## 0.5.7
 
 Changed:

data/README.rdoc

@@ -46,15 +46,14 @@ After the application has been deployed, this helper will post a message to
 the given campfire room stating the username, the application, the branch/tag,
 and the environment. E.g.:
 
-  woods just deployed myapp v0.5.4 to staging
+  Scott Woods just deployed myapp v0.5.4 to staging
 
-This helper expects to find a configuration file config/campfire.yml with the
-following format:
+This helper expects to find a configuration file config/campfire.yml or ~/.campfire.yml 
+with the following format:
 
   # Configuration for posting to campfire.
-  account: mycompany
-  email: smithers@mycompany.com
-  password: 's3kret!'
+  subdomain: mycompany
+  token: abcd1234567890
   room: Chatter
 
 You can override the location of the configuration file by setting the
@@ -62,13 +61,6 @@ You can override the location of the configuration file by setting the
 
   set :campfire_config, 'somewhere/else.yml'
   
-This helper requires that the "tinder" gem is installed on the machine that
-you run the "cap" command from. It doesn't need to be installed on any of the
-servers. You can install the tinder gem using the following command on linux 
-or mac:
-
-  sudo gem install tinder
-
 === features
 
 Before the app is deployed, this helper checks out the branch/tag that is

data/Rakefile

@@ -10,7 +10,9 @@ begin
     gem.email = "scott@westarete.com"
     gem.homepage = "http://github.com/westarete/capistrano-helpers"
     gem.authors = ["Scott Woods"]
-    gem.add_dependency('capistrano', '>= 2.0.0')
+    gem.add_dependency('capistrano', '2.5.19')
+    gem.add_dependency('git', '1.2.5')
+    gem.add_dependency('tinder', '1.4.3')
   end
 
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.5.7
+0.6.0

data/capistrano-helpers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capistrano-helpers}
-  s.version = "0.5.7"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Woods"]
-  s.date = %q{2010-10-20}
+  s.date = %q{2010-12-11}
   s.description = %q{A set of optional extensions to capistrano to make common tasks easier.}
   s.email = %q{scott@westarete.com}
   s.extra_rdoc_files = [
@@ -57,12 +57,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<capistrano>, [">= 2.0.0"])
+      s.add_runtime_dependency(%q<capistrano>, ["= 2.5.19"])
+      s.add_runtime_dependency(%q<git>, ["= 1.2.5"])
+      s.add_runtime_dependency(%q<tinder>, ["= 1.4.3"])
     else
-      s.add_dependency(%q<capistrano>, [">= 2.0.0"])
+      s.add_dependency(%q<capistrano>, ["= 2.5.19"])
+      s.add_dependency(%q<git>, ["= 1.2.5"])
+      s.add_dependency(%q<tinder>, ["= 1.4.3"])
     end
   else
-    s.add_dependency(%q<capistrano>, [">= 2.0.0"])
+    s.add_dependency(%q<capistrano>, ["= 2.5.19"])
+    s.add_dependency(%q<git>, ["= 1.2.5"])
+    s.add_dependency(%q<tinder>, ["= 1.4.3"])
   end
 end
 

data/lib/capistrano-helpers/bundler.rb

@@ -5,6 +5,7 @@ CapistranoHelpers.with_configuration do
   namespace :deploy do
     desc "Install gems on the remote server using Bundler."
     task :bundler do
+      run "sudo chown -Rh `whoami` #{shared_path}/vendor/bundler"
       run "cd #{release_path} && bundle install --deployment --local --path #{shared_path}/vendor/bundler --without development test"
     end
   end

data/lib/capistrano-helpers/campfire.rb

@@ -1,35 +1,31 @@
 require File.dirname(__FILE__) + '/../capistrano-helpers' if ! defined?(CapistranoHelpers)
 
-begin
-  # Campfire API gem for deploy notifications.
-  gem 'tinder', '>= 1.4.0'
-  require 'tinder'
-rescue LoadError
-  abort "The campfire helper requires the tinder gem. Install it with: sudo gem install tinder"
-end
+require 'tinder'
+require 'git'
 
 CapistranoHelpers.with_configuration do
   
   namespace :deploy do
     desc 'Make a post to campfire to tell everyone about this deployment.'
     task :post_to_campfire do
-      if !exists?(:application)
-        puts "You should set :application to the name of this app."
-      end
-      username = `whoami`.chomp
-      config_file = fetch(:campfire_config, 'config/campfire.yml')
-      begin
+      config_file = [fetch(:campfire_config, 'config/campfire.yml'), "#{ENV['HOME']}/.campfire.yml"].detect { |f| File.readable?(f) }
+      if config_file.nil?
+         puts "Could not find a campfire configuration. Skipping campfire notification."
+      else
+        if ! exists?(:application)
+          puts "You should set :application to the name of this app."
+        end
+        git_config = Git.open('.').config rescue {}
+        someone = ENV['GIT_AUTHOR_NAME'] || git_config['user.name'] || `whoami`.strip
         config = YAML::load_file(config_file)
-        campfire = Tinder::Campfire.new(config['account'], :username => config['email'], :password => config['password'])
+        campfire = Tinder::Campfire.new(config['subdomain'], :token => config['token'])
         room = campfire.find_room_by_name(config['room'])
-        room.speak("#{username} just deployed #{application} #{branch} to #{stage}")
+        stage ||= 'production'
+        room.speak("#{someone} just deployed #{application} #{branch} to #{stage}")
         room.leave
-      rescue Errno::ENOENT
-        puts "Could not open config/campfire.yml. Skipping campfire notification."
       end
     end
   end
-
   after "deploy:restart", "deploy:post_to_campfire"
 
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 7
-  version: 0.5.7
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Scott Woods
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 -04:00
+date: 2010-12-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,15 +22,43 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
-        - 0
-        - 0
-        version: 2.0.0
+        - 5
+        - 19
+        version: 2.5.19
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: git
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 5
+        version: 1.2.5
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: tinder
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 3
+        version: 1.4.3
+  type: :runtime
+  version_requirements: *id003
 description: A set of optional extensions to capistrano to make common tasks easier.
 email: scott@westarete.com
 executables: []