capistrano-campout 1.0.0 → 1.1.0

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 1.1.0 (Apr 10, 2012)
+
+Switched to [broach](https://github.com/Manfred/broach) instead of [tinder](https://github.com/collectiveidea/tinder) due to Tinder's reliance on ActiveSupport and the side-effect issues of ActiveSupport with capistrano (See [Issue #169](https://github.com/capistrano/capistrano/issues/169), [Issue #170](https://github.com/capistrano/capistrano/issues/170), and [Pull Request #175](https://github.com/capistrano/capistrano/pull/175) )

data/README.md

@@ -16,11 +16,11 @@ from two projects: [capistrano-mountaintop](https://github.com/technicalpickles/
 
 I created my own instead of forking either for the following reasons
 
-* I wanted to use Tinder (Capfire uses broach)
-* I wanted the necessary functionality built in instead of using additional gems (mountaintop depends on capistrano-campfire and capistrano-log_with_awesome)
+* I initially wanted to use Tinder (Capfire uses broach). I later went with Broach due to ActiveSupport (which Tinder requires) conflicts with Capistrano.
+* I wanted more customization with regard to messages than capfire provided.
+* I liked EngineYard's logger implementation much better than capistrano-log_with_awesome (which capistrano-mountaintop depends on) - and liked it better integrated into campout's gem itself.
 * I wanted configuration-file based settings that I can separate into shared (checked into git) and local (git ignored) files
 * I wanted room to expand for my team's needs for utilities for git and github inspection
-* Because I could.
 
 ## Installation
 
@@ -69,23 +69,7 @@ Otherwise, use the source, Luke.
 
 ## Known Limitations
 
-### Deploy:Cleanup task
-
-Capistrano::Campout requires [Tinder](https://github.com/collectiveidea/tinder) - which requires [ActiveSupport](https://github.com/rails/rails/tree/master/activesupport)
-
-Apparently, Capistrano's "deploy:cleanup" task breaks in some situations due to conflicts between Capistrano and ActiveSupport
-
-See:
-
-* [Issue #169](https://github.com/capistrano/capistrano/issues/169)
-* [Issue #170](https://github.com/capistrano/capistrano/issues/170)
-* [Pull Request #175](https://github.com/capistrano/capistrano/pull/175)
-
-Until that's fixed, you'll have to comment out any "deploy:cleanup" invocations 
-
-### Error checking
-
-There isn't much. And there's no tests. The latter might be a feature.
+There isn't much error checking on the campfire connection. And there's no tests. The latter might be a feature.
 
 ## Contributing
 

data/capistrano-campout.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Capistrano::Campout::VERSION
   gem.add_dependency('capistrano', '>= 2.11')
-  gem.add_dependency('tinder', '>= 1.8')
+  gem.add_dependency('broach', '>= 0.2')
   gem.add_dependency('grit', '>= 2.4')
 end

data/lib/capistrano-campout/core.rb

@@ -6,7 +6,7 @@ module Capistrano
   module Campout    
     class TemplateError < NameError
     end
-
+    
     class Core
       attr_accessor :settings, :campfire, :room
     
@@ -43,7 +43,7 @@ module Capistrano
       end
       
       def play(sound)
-        room.play(sound)
+        room.sound(sound)
       end
       
       def paste(text)
@@ -54,18 +54,27 @@ module Capistrano
         @campfire ||= connect_to_campfire
       end
       
-      def connect_to_campfire
-        options = {token: settings.campfire.token}
-        if(!settings.campfire.ssl.nil?)
-          options[:ssl] = settings.campfire.ssl
-        end
+      def find_campfire_room(room_id)
+        broach_settings = {
+          'account' => settings.campfire.domain,
+          'token' => settings.campfire.token
+        }
         
-        if(!settings.campfire.ssl_verify.nil?)
-          options[:ssl_verify] = settings.campfire.ssl_verify
+        if(!settings.campfire.ssl.nil?)
+          broach_settings['use_ssl'] = settings.campfire.ssl
+        else
+          broach_settings['use_ssl'] = true
         end
-        Tinder::Campfire.new(settings.campfire.domain,options)
+          
+        Broach.settings = broach_settings
+        Broach::Room.find(room_id)
       end
       
+      def room
+        @room ||= find_campfire_room(settings.campfire.room)
+      end
+      
+      
       def pre_announce(options = {})
         self.speak(erberize(settings.pre_deploy.message,'pre_deploy message',options[:binding]))
         if(!settings.suppress_sounds and settings.pre_deploy.play)
@@ -130,9 +139,7 @@ module Capistrano
       end
       
   
-      def room
-        @room ||= campfire.find_room_by_id(settings.campfire.room)
-      end
+
             
       def will_do(options = {})
         puts "Before Deployment:"
@@ -192,11 +199,8 @@ module Capistrano
       
       # Takes a period of time in seconds and returns it in human-readable form (down to minutes)
       # code from http://www.postal-code.com/binarycode/2007/04/04/english-friendly-timespan/
-      def time_period_to_s(time_period,abbreviated=false,defaultstring = '')
+      def time_period_to_s(time_period,abbreviated=false,defaultstring='')
        out_str = ''
-       if(time_period.blank?)
-         return defaultstring
-       end
        interval_array = [ [:weeks, 604800], [:days, 86400], [:hours, 3600], [:minutes, 60], [:seconds, 1] ]
        interval_array.each do |sub|
         if time_period >= sub[1] then
@@ -211,7 +215,7 @@ module Capistrano
           out_str += time_val.to_s + " #{name}"
         end
        end
-       if(out_str.blank?)
+       if(out_str.nil? or out_str.empty?)
          return defaultstring
        else
          return out_str

data/lib/capistrano-campout/git_utils.rb

@@ -2,6 +2,10 @@
 # Copyright (c) 2012 Jason Adam Young
 # === LICENSE:
 # see LICENSE file
+
+# TODO: clean this implementation up, not the biggest fan of what
+# I have here.
+
 module Capistrano
   module Campout
     class GitUtils

data/lib/capistrano-campout/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Campout
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/capistrano-campout.rb

@@ -3,7 +3,7 @@
 # === LICENSE:
 # see LICENSE file
 require 'capistrano'
-require 'tinder'
+require 'broach'
 require 'grit'
 
 require 'capistrano-campout/logger'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-campout
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-08 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70347365888740 !ruby/object:Gem::Requirement
+  requirement: &70255309559320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '2.11'
   type: :runtime
   prerelease: false
-  version_requirements: *70347365888740
+  version_requirements: *70255309559320
 - !ruby/object:Gem::Dependency
-  name: tinder
-  requirement: &70347365887720 !ruby/object:Gem::Requirement
+  name: broach
+  requirement: &70255309558780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70347365887720
+  version_requirements: *70255309558780
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70347365885720 !ruby/object:Gem::Requirement
+  requirement: &70255309558300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70347365885720
+  version_requirements: *70255309558300
 description: ! "    Capistrano::Campout is a gem extension to capistrano to post/speak
   messages and paste logs from a capistrano deployment \n    to a campfire room. Settings
   are configurable using ERB in a \"config/campout.yml\" or \"config/campout.local.yml\"
@@ -57,6 +57,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md