hipchat 0.7.0 → 0.8.0

data/Gemfile

@@ -6,4 +6,8 @@ group :test do
   gem "rake"
   gem "rspec"
   gem "rr"
+end
+
+group :development do
+  gem "jeweler"
 end

data/Gemfile.lock

@@ -2,12 +2,21 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
+    git (1.2.5)
     httparty (0.9.0)
       multi_json (~> 1.0)
       multi_xml
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.7)
     multi_json (1.3.6)
     multi_xml (0.5.1)
     rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
     rr (1.0.4)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
@@ -23,6 +32,7 @@ PLATFORMS
 
 DEPENDENCIES
   httparty
+  jeweler
   rake
   rr
   rspec

data/README.textile

@@ -35,7 +35,8 @@ bc.. require 'hipchat/capistrano'
 set :hipchat_token, "<your token>"
 set :hipchat_room_name, "Your room" # If you pass an array such as ["room_a", "room_b"] you can send announcements to multiple rooms.
 set :hipchat_announce, false # notify users
-set :hipchat_color, 'green' #finished deployment message color
+set :hipchat_color, 'yellow' #normal message color
+set :hipchat_success_color, 'green' #finished deployment message color
 set :hipchat_failed_color, 'red' #cancelled deployment message color
 set :hipchat_message_format, 'text' # Sets the deployment message format, see https://www.hipchat.com/docs/api/method/rooms/message
 

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/hipchat.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{hipchat}
-  s.version = "0.7.0"
+  s.name = "hipchat"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["HipChat/Atlassian"]
-  s.date = %q{2012-11-10}
-  s.description = %q{Ruby library to interact with HipChat}
-  s.email = %q{support@hipchat.com}
+  s.date = "2013-03-15"
+  s.description = "Ruby library to interact with HipChat"
+  s.email = "support@hipchat.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.textile"
@@ -35,28 +35,30 @@ Gem::Specification.new do |s|
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{https://github.com/hipchat/hipchat-rb}
+  s.homepage = "https://github.com/hipchat/hipchat-rb"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Ruby library to interact with HipChat}
+  s.rubygems_version = "1.8.24"
+  s.summary = "Ruby library to interact with HipChat"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.0"])
       s.add_development_dependency(%q<rr>, ["~> 1.0"])
     else
       s.add_dependency(%q<httparty>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.0"])
       s.add_dependency(%q<rr>, ["~> 1.0"])
     end
   else
     s.add_dependency(%q<httparty>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.0"])
     s.add_dependency(%q<rr>, ["~> 1.0"])

data/lib/hipchat/capistrano.rb

@@ -15,17 +15,30 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     task :notify_deploy_started do
       if hipchat_send_notification
+
+        environment_string = env
+        if self.respond_to?(:stage)
+          environment_string = "#{stage} (#{env})"
+        end
+
         on_rollback do
           send_options.merge!(:color => failed_message_color)
-          send("#{human} cancelled deployment of #{deployment_name} to #{env}.", send_options)
+          send("#{human} cancelled deployment of #{deployment_name} to #{environment_string}.", send_options)
         end
 
-        send("#{human} is deploying #{deployment_name} to #{env}#{fetch(:hipchat_with_migrations, '')}.", send_options)
+        send("#{human} is deploying #{deployment_name} to #{environment_string}#{fetch(:hipchat_with_migrations, '')}.", send_options)
       end
     end
 
     task :notify_deploy_finished do
-      send("#{human} finished deploying #{deployment_name} to #{env}#{fetch(:hipchat_with_migrations, '')}.", send_options)
+      send_options.merge!(:color => success_message_color)
+
+      environment_string = env
+      if self.respond_to?(:stage)
+        environment_string = "#{stage} (#{env})"
+      end
+
+      send("#{human} finished deploying #{deployment_name} to #{environment_string}#{fetch(:hipchat_with_migrations, '')}.", send_options)
     end
 
     def send_options
@@ -53,8 +66,10 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     def deployment_name
-      if branch
-        "#{application}/#{branch}"
+      if fetch(:branch, nil)
+        name = "#{application}/#{branch}"
+        name += " (revision #{real_revision[0..7]})" if real_revision
+        name
       else
         application
       end
@@ -64,6 +79,10 @@ Capistrano::Configuration.instance(:must_exist).load do
       fetch(:hipchat_color, nil)
     end
 
+    def success_message_color
+      fetch(:hipchat_success_color, "green")
+    end
+
     def failed_message_color
       fetch(:hipchat_failed_color, "red")
     end

metadata

@@ -1,82 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hipchat
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  - 0
-  version: 0.7.0
+version: !ruby/object:Gem::Version
+  version: 0.8.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - HipChat/Atlassian
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-10 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+date: 2013-03-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httparty
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: httparty
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   name: rr
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  requirement: *id004
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Ruby library to interact with HipChat
 email: support@hipchat.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.textile
-files: 
+files:
 - .document
 - .travis.yml
 - Gemfile
@@ -94,35 +116,31 @@ files:
 - spec/hipchat_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/hipchat/hipchat-rb
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2556426077503697686
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby library to interact with HipChat
 test_files: []
-