hipchat 0.5.0 → 0.6.0

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+
+script: bundle exec rspec spec

data/Gemfile

@@ -0,0 +1,9 @@
+source :rubygems
+
+gem "httparty"
+
+group :test do
+  gem "rake"
+  gem "rspec"
+  gem "rr"
+end

data/Gemfile.lock

@@ -0,0 +1,28 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    httparty (0.9.0)
+      multi_json (~> 1.0)
+      multi_xml
+    multi_json (1.3.6)
+    multi_xml (0.5.1)
+    rake (0.9.2.2)
+    rr (1.0.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  httparty
+  rake
+  rr
+  rspec

data/README.textile

@@ -2,6 +2,10 @@ h1. HipChat Wrapper
 
 A very basic wrapper for the HipChat HTTP API.
 
+h2. Build Status
+
+"!https://travis-ci.org/hipchat/hipchat-rb.png!":https://travis-ci.org/hipchat/hipchat-rb
+
 h2. Usage
 
 bc.. client = HipChat::Client.new(api_token)
@@ -21,7 +25,7 @@ h2. Capistrano
 bc.. require 'hipchat/capistrano'
 
 set :hipchat_token, "<your token>"
-set :hipchat_room_name, "Your room"
+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_failed_color, 'red' #cancelled deployment message color

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/hipchat.gemspec

@@ -4,20 +4,23 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "hipchat"
-  s.version = "0.5.0"
+  s.name = %q{hipchat}
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["HipChat/Atlassian"]
-  s.date = "2012-10-12"
-  s.description = "Ruby library to interact with HipChat"
-  s.email = "support@hipchat.com"
+  s.date = %q{2012-11-02}
+  s.description = %q{Ruby library to interact with HipChat}
+  s.email = %q{support@hipchat.com}
   s.extra_rdoc_files = [
     "LICENSE",
     "README.textile"
   ]
   s.files = [
     ".document",
+    ".travis.yml",
+    "Gemfile",
+    "Gemfile.lock",
     "LICENSE",
     "README.textile",
     "Rakefile",
@@ -32,24 +35,28 @@ Gem::Specification.new do |s|
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
-  s.homepage = "https://github.com/hipchat/hipchat-rb"
+  s.homepage = %q{https://github.com/hipchat/hipchat-rb}
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Ruby library to interact with HipChat"
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{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::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<httparty>, [">= 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<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<httparty>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.0"])
     s.add_dependency(%q<rr>, ["~> 1.0"])

data/lib/hipchat/capistrano.rb

@@ -2,40 +2,30 @@ require 'hipchat'
 
 Capistrano::Configuration.instance(:must_exist).load do
   set :hipchat_send_notification, false
-  set :hipchat_with_migrations, false
+  set :hipchat_with_migrations, ''
 
   namespace :hipchat do
-    task :set_client do
-      set :hipchat_client, HipChat::Client.new(hipchat_token)
-    end
-
     task :trigger_notification do
       set :hipchat_send_notification, true
     end
 
     task :configure_for_migrations do
-      set :hipchat_with_migrations, true
+      set :hipchat_with_migrations, ' (with migrations)'
     end
 
     task :notify_deploy_started do
       if hipchat_send_notification
         on_rollback do
           send_options.merge!(:color => failed_message_color)
-          hipchat_client[hipchat_room_name].
-            send(deploy_user, "#{human} cancelled deployment of #{deployment_name} to #{env}.", send_options)
+          send("#{human} cancelled deployment of #{deployment_name} to #{env}.", send_options)
         end
 
-        message = "#{human} is deploying #{deployment_name} to #{env}"
-        message << " (with migrations)" if hipchat_with_migrations
-        message << "."
-
-        hipchat_client[hipchat_room_name].send(deploy_user, message, send_options)
+        send("#{human} is deploying #{deployment_name} to #{env}#{fetch(:hipchat_with_migrations, '')}.", send_options)
       end
     end
 
     task :notify_deploy_finished do
-      hipchat_client[hipchat_room_name].
-        send(deploy_user, "#{human} finished deploying #{deployment_name} to #{env}.", send_options)
+      send("#{human} finished deploying #{deployment_name} to #{env}#{fetch(:hipchat_with_migrations, '')}.", send_options)
     end
 
     def send_options
@@ -46,6 +36,22 @@ Capistrano::Configuration.instance(:must_exist).load do
       @send_options
     end
 
+    def send(message, options)
+      set :hipchat_client, HipChat::Client.new(hipchat_token) if fetch(:hipchat_client, nil).nil?
+
+      if hipchat_room_name.is_a?(String)
+        rooms = [hipchat_room_name]
+      elsif hipchat_room_name.is_a?(Symbol)
+        rooms = [hipchat_room_name.to_s]
+      else
+        rooms = hipchat_room_name
+      end
+
+      rooms.each { |room|
+        hipchat_client[room].send(deploy_user, message, options)
+      }
+    end
+
     def deployment_name
       if branch
         "#{application}/#{branch}"
@@ -91,7 +97,6 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   end
 
-  before "hipchat:notify_deploy_started", "hipchat:set_client"
   before "deploy", "hipchat:trigger_notification"
   before "deploy:migrations", "hipchat:trigger_notification", "hipchat:configure_for_migrations"
   before "deploy:update_code", "hipchat:notify_deploy_started"

data/spec/hipchat_spec.rb

@@ -7,12 +7,13 @@ describe HipChat do
 
   # Helper for mocking room message post requests
   def mock_successful_send(from, message, options={})
-    options = {:color => 'yellow', :notify => 0}.merge(options)
+    options = {:color => 'yellow', :notify => 0, :message_format => 'html'}.merge(options)
     mock(HipChat::Room).post("/message",
                              :query => {:auth_token => "blah"},
                              :body  => {:room_id => "Hipchat",
                                         :from    => "Dude",
                                         :message => "Hello world",
+                                        :message_format => options[:message_format],
                                         :color   => options[:color],
                                         :notify  => options[:notify]}) {
       OpenStruct.new(:code => 200)
@@ -38,6 +39,12 @@ describe HipChat do
       room.send("Dude", "Hello world", :color => 'red').should be_true
     end
 
+    it "successfully with text message_format" do
+      mock_successful_send 'Dude', 'Hello world', :message_format => 'text'
+
+      room.send("Dude", "Hello world", :message_format => 'text').should be_true
+    end
+
     it "but fails when the room doesn't exist" do
       mock(HipChat::Room).post(anything, anything) {
         OpenStruct.new(:code => 404)

metadata

@@ -1,73 +1,86 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: hipchat
-version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
-authors:
+authors: 
 - HipChat/Atlassian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-11-02 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   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
+  type: :development
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  name: rr
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  requirement: *id004
 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
+- Gemfile.lock
 - LICENSE
 - README.textile
 - Rakefile
@@ -81,28 +94,35 @@ 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
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+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: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby library to interact with HipChat
 test_files: []
+