hipchat 0.8.0 → 0.9.0

data/.travis.yml

@@ -4,5 +4,6 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
 
 script: bundle exec rspec spec

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
 
 gem "httparty"
 
@@ -10,4 +10,5 @@ end
 
 group :development do
   gem "jeweler"
+  gem "builder"
 end

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
+    builder (3.2.0)
     diff-lcs (1.1.3)
     git (1.2.5)
     httparty (0.9.0)
@@ -31,6 +32,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  builder
   httparty
   jeweler
   rake

data/Rakefile

@@ -21,7 +21,7 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.9.0

data/hipchat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "hipchat"
-  s.version = "0.8.0"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["HipChat/Atlassian"]
-  s.date = "2013-03-15"
+  s.date = "2013-05-18"
   s.description = "Ruby library to interact with HipChat"
   s.email = "support@hipchat.com"
   s.extra_rdoc_files = [
@@ -46,12 +46,14 @@ Gem::Specification.new do |s|
     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_development_dependency(%q<builder>, [">= 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<builder>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.0"])
       s.add_dependency(%q<rr>, ["~> 1.0"])
@@ -59,6 +61,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<builder>, [">= 0"])
     s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.0"])
     s.add_dependency(%q<rr>, ["~> 1.0"])

data/lib/hipchat.rb

@@ -7,6 +7,7 @@ module HipChat
   class UnknownRoom         < StandardError; end
   class Unauthorized        < StandardError; end
   class UnknownResponseCode < StandardError; end
+  class UsernameTooLong < StandardError; end
 
   class Client
     include HTTParty
@@ -59,6 +60,9 @@ module HipChat
     # +notify+:: true or false
     #            (default false)
     def send(from, message, options_or_notify = {})
+      if from.length > 15
+        raise UsernameTooLong, "Username #{from} is `#{from.length} characters long. Limit is 15'"
+      end
       options = if options_or_notify == true or options_or_notify == false
         warn "DEPRECATED: Specify notify flag as an option (e.g., :notify => true)"
         { :notify => options_or_notify }

data/lib/hipchat/capistrano.rb

@@ -6,7 +6,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :hipchat do
     task :trigger_notification do
-      set :hipchat_send_notification, true
+      set :hipchat_send_notification, true if !dry_run
     end
 
     task :configure_for_migrations do
@@ -31,14 +31,16 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     task :notify_deploy_finished do
-      send_options.merge!(:color => success_message_color)
+      if hipchat_send_notification
+        send_options.merge!(:color => success_message_color)
 
-      environment_string = env
-      if self.respond_to?(:stage)
-        environment_string = "#{stage} (#{env})"
-      end
+        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)
+        send("#{human} finished deploying #{deployment_name} to #{environment_string}#{fetch(:hipchat_with_migrations, '')}.", send_options)
+      end
     end
 
     def send_options

data/lib/hipchat/chef.rb

@@ -15,17 +15,28 @@ require 'hipchat'
 module HipChat
   class NotifyRoom < Chef::Handler
 
-    def initialize(api_token, room_name, notify_users=false)
+    def initialize(api_token, room_name, notify_users=false, report_success=false)
       @api_token = api_token
       @room_name = room_name
       @notify_users = notify_users
+      @report_success = report_success
     end
 
     def report
-      msg = "Failure on #{node.name}: #{run_status.formatted_exception}"
+      msg = if run_status.failed? then "Failure on \"#{node.name}\": #{run_status.formatted_exception}"
+            elsif run_status.success? && @report_success
+              "Chef run on \"#{node.name}\" completed in #{run_status.elapsed_time.round(2)} seconds"
+            else nil
+            end
 
-      client = HipChat::Client.new(@api_token)
-      client[@room_name].send('Chef', msg, :notify => @notify_users)
+      color = if run_status.success? then 'green'
+              else 'red'
+              end
+
+      if msg
+        client = HipChat::Client.new(@api_token)
+        client[@room_name].send('Chef', msg, :notify => @notify_users, :color => color)
+      end
     end
   end
 end

data/spec/hipchat_spec.rb

@@ -111,6 +111,10 @@ describe HipChat do
       lambda { room.send "", "" }.should raise_error(HipChat::Unauthorized)
     end
 
+    it "but fails if the username is more than 15 chars" do
+      lambda { room.send "a very long username here", "a message" }.should raise_error(HipChat::UsernameTooLong)
+    end
+
     it "but fails if we get an unknown response code" do
       mock(HipChat::Room).post(anything, anything) {
         OpenStruct.new(:code => 403)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hipchat
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: builder
+  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
@@ -130,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2556426077503697686
+      hash: -3630291999816657472
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: