capfire 0.2.0 → 0.2.1

data/Rakefile

@@ -9,13 +9,13 @@ begin
     gem.description = %Q{Inspired by http://github.com/blog/609-tracking-deploys-with-compare-view}
     gem.email = "junkiesxl@gmail.com"
     gem.homepage = "http://github.com/pjaspers/Capfire"
-    gem.authors = ["pjaspers"]
+    gem.authors = ["pjaspers", "atog"]
     gem.files = FileList['[A-Z]*',
       'generators/**/*.*',
       'lib/**/*.rb',
       'lib/templates/*.erb']
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    gem.add_dependency('broach', '>= 0.1.4')
+    gem.add_dependency('broach', '>= 0.2.1')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/generators/capfire_generator.rb

@@ -24,9 +24,11 @@ class CapfireGenerator < Rails::Generator::Base
 campfire:
   account: #{options[:campfire_account]}
   token: #{options[:campfire_token]}
+  ssl: false
   room: #{options[:chat_room]}
-  message: "I (#deployer#) deployed #application#
-with `cap #args#` (#compare_url#)"
+  message: "I (#deployer#) deployed #application# with `cap #args#` (#compare_url#)"
+  cowsay: true
+  cow: random
 CONF
       unless campfire_file_exists?
         File.open(File.join(ENV['HOME'],'.campfire'), 'w') do |out|

data/lib/capfire/capistrano.rb

@@ -12,28 +12,39 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deploy do
     desc "Posting a message to Campfire"
     task :notify_campfire do
-      source_repo_url = repository
-      deployer = Etc.getlogin
-      deploying = `git rev-parse HEAD`[0,7]
       begin
-        deployed = previous_revision[0,7]
-      rescue
-        deployed = "000000"
-      end
-      puts "Posting to Campfire"
-      # Getting the github url
-      github_url = repository.gsub(/git@/, 'http://').gsub(/\.com:/,'.com/').gsub(/\.git/, '')
-      compare_url = "#{github_url}/compare/#{deployed}...#{deploying}"
+        source_repo_url = repository
+        deployer = Etc.getlogin
+        deploying = `git rev-parse HEAD`[0,7]
+        begin
+          deployed = previous_revision[0,7]
+        rescue
+          deployed = "000000"
+        end
+        puts "Posting to Campfire"
+        # Getting the github url
+        github_url = repository.gsub(/git@/, 'http://').gsub(/\.com:/,'.com/').gsub(/\.git/, '')
+        compare_url = "#{github_url}/compare/#{deployed}...#{deploying}"
+
+        # Reading the config file and drill in on the campfire section of course.
+        config = YAML::load(File.open(File.join(ENV['HOME'],'.campfire')))["campfire"]
 
-      # Reading the config file.
-      config = YAML::load(File.open(File.join(ENV['HOME'],'.campfire')))
+        # Ugly but it does the job.
+        message = config["message"].gsub(/#deployer#/, deployer).gsub(/#application#/, application).gsub(/#args#/, ARGV.join(' ')).gsub(/#compare_url#/,compare_url)
 
-      # Ugly but it does the job.
-      message = config["campfire"]["message"].gsub(/#deployer#/, deployer).gsub(/#application#/, application).gsub(/#args#/, ARGV.join(' ')).gsub(/#compare_url#/,compare_url)
+        message = `cowsay "#{message}"` if config["cowsay"]
 
-      # Posting the message.
-      Broach.settings = { 'account' => config["campfire"]["account"], 'token' => config["campfire"]["token"] }
-      Broach.speak(config["campfire"]["room"], message)
+        # Posting the message.
+        Broach.settings = {
+          'account' => config["account"],
+          'token' => config["token"],
+          'use_ssl' => true
+        }
+        room = Broach::Room.find_by_name(config["room"])
+        room.speak(message)
+      rescue => e
+        puts e.message
+      end
     end
   end
 end

metadata

@@ -1,29 +1,33 @@
 --- !ruby/object:Gem::Specification 
 name: capfire
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - pjaspers
+- atog
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 +02:00
+date: 2010-10-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,14 +37,16 @@ dependencies:
   name: broach
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 0
+        - 2
         - 1
-        - 4
-        version: 0.1.4
+        version: 0.2.1
   type: :runtime
   version_requirements: *id002
 description: Inspired by http://github.com/blog/609-tracking-deploys-with-compare-view
@@ -60,8 +66,10 @@ files:
 - generators/capfire_generator.rb
 - generators/lib/insert_commands.rb
 - generators/templates/capistrano_hook.rb
-- lib/capfire.rb
+- lib/Capfire.rb
 - lib/capfire/capistrano.rb
+- test/helper.rb
+- test/test_Capfire.rb
 has_rdoc: true
 homepage: http://github.com/pjaspers/Capfire
 licenses: []
@@ -72,23 +80,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Send a notification to Campfire after a cap deploy