hipchat 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6073dc06bef01e6ad218249ec887d775fa89e8e2
-  data.tar.gz: 4b10a0deedf65b55dd331613d6dbc25a41809122
+  metadata.gz: 87814d532992250965bb8fd683295acd9ed7e8c1
+  data.tar.gz: d0e551de4271ce51a6d60fdac6821b0b7c30f929
 SHA512:
-  metadata.gz: 66edf59e5fc4fc96fdbc43846648a76c48c48d32c3f13cbc0fdf9ce22bc15f72a8ebad3818dc716f80330498800cdbaa4e6296867e1a7b076ce057262ef20b47
-  data.tar.gz: 226c2ea4a5447c1726bb20b5727c60112f9e1f214b29786bd8db31ec2874f7efd951fcd75ff67fa737657f4041a15c6d892c9f00aebef9764882b8cc357fdd41
+  metadata.gz: 8cb2ae5a7ddcc189db17a21b09a63739ebf4dbc523ab62be6908ab14120b442f5d7d5dce6fed6ce5f8c77bb0509a401fe49e5b0b2754638089588e136e36fcef
+  data.tar.gz: 6aed60e1f7cb4df9b021cc461e47b9f814ba06c51ae3d2c5fc8a10b528ea0690e2aa468bf569500dc5e9e83973df901113f46543c997248e9b0190c28ebb8c39

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/README.textile

@@ -11,6 +11,16 @@ h2. Requirements
 * Ruby 1.9.3 or higher
 * HipChat Account, sign up "here!":https://hipchat.com/
 
+h2. Installation
+
+h3. Gemfile
+
+bc. gem 'hipchat'
+
+h3. Install
+
+bc. gem install hipchat
+
 h1. Usage
 
 h2. "API v1":https://www.hipchat.com/docs/api
@@ -159,6 +169,7 @@ bc.. set :hipchat_commit_log, true
 # Optional
 set :hipchat_commit_log_format, ":time :user\n:message\n"
 set :hipchat_commit_log_time_format, "%Y/%m/%d %H:%M:%S"
+set :hipchat_commit_log_message_format, "^PROJECT-\d+" # extracts ticket number from message
 
 h2. Rails 3 Rake Task
 

data/hipchat.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9.3'
 
   spec.add_dependency "httparty"
-  
-  spec.add_development_dependency "rspec"
+
+  spec.add_development_dependency "rspec", "~> 2.0"
   spec.add_development_dependency "rr"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/hipchat/capistrano2.rb

@@ -155,8 +155,17 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     format = fetch(:hipchat_commit_log_format, ":time :user\n:message\n")
     time_format = fetch(:hipchat_commit_log_time_format, "%Y/%m/%d %H:%M:%S")
+    message_format = fetch(:hipchat_commit_log_message_format, nil)
 
     log_hashes.map do |log_hash|
+      if message_format
+        matches = log_hash[:message].match(/#{message_format}/)
+        log_hash[:message] = if matches
+                               matches[0]
+                             else
+                               ''
+                             end
+      end
       log_hash[:time] &&= log_hash[:time].localtime.strftime(time_format)
       log_hash.inject(format) do |l, (k, v)|
         l.gsub(/:#{k}/, v.to_s)

data/lib/hipchat/client.rb

@@ -28,7 +28,7 @@ module HipChat
 
     def create_room(name, options={})
       if @api.version == 'v1' && options[:owner_user_id].nil?
-        raise RoomMissingOwnerUserId, "V1 API Requres owner_user_id"
+        raise RoomMissingOwnerUserId, "V1 API Requires owner_user_id"
       end
 
       if name.length > 50
@@ -67,7 +67,18 @@ module HipChat
     end
 
     private
+
+    def no_proxy?
+      host = URI.parse(@options[:server_url]).host
+      ENV.fetch('no_proxy','').split(',').any? do |pattern|
+        # convert patterns like `*.example.com` into `.*\.example\.com`
+        host =~ Regexp.new(pattern.gsub(/\./,'\\.').gsub(/\*/,'.*'))
+      end
+    end
+
     def setup_proxy(proxy_url)
+      return if no_proxy?
+
       proxy_url = URI.parse(proxy_url)
 
       self.class.http_proxy(proxy_url.host, proxy_url.port,
@@ -86,7 +97,7 @@ module HipChat
       case response.code
       when 200
         response[@api.rooms_config[:data_key]].map do |r|
-          Room.new(@token, r.merge(:api_version => @api_version, :room_id => r['id']))
+          Room.new(@token, r.merge(:api_version => @api_version, :room_id => r['id'], :server_url => @options[:server_url]))
         end
       else
         raise UnknownResponseCode, "Unexpected #{response.code} for room"

data/lib/hipchat/version.rb

@@ -1,3 +1,3 @@
 module HipChat
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/spec/hipchat_api_v1_spec.rb

@@ -19,6 +19,14 @@ describe "HipChat (API V1)" do
       room.history(:timezone => 'America/Los_Angeles', :date => '2010-11-19').should be_true
     end
 
+    it "is successful from fetched room" do
+      mock_successful_rooms
+      mock_successful_history
+
+      subject.rooms.should be_true
+      subject.rooms.first.history.should be_true
+    end
+
     it "fails when the room doen't exist" do
       mock(HipChat::Room).get(anything, anything) {
         OpenStruct.new(:code => 404)

data/spec/hipchat_api_v2_spec.rb

@@ -20,6 +20,14 @@ describe "HipChat (API V2)" do
       room.history(:timezone => 'America/Los_Angeles', :date => '2010-11-19').should be_true
     end
 
+    it "is successful from fetched room" do
+      mock_successful_rooms
+      mock_successful_history
+
+      subject.rooms.should be_true
+      subject.rooms.first.history.should be_true
+    end
+
     it "fails when the room doen't exist" do
       mock(HipChat::Room).get(anything, anything) {
         OpenStruct.new(:code => 404)
@@ -214,4 +222,4 @@ describe "HipChat (API V2)" do
       lambda { user.send "" }.should raise_error(HipChat::Unauthorized)
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -7,10 +7,10 @@ require 'json'
 require 'webmock/rspec'
 require 'coveralls'
 
-Dir["./spec/support/**/*.rb"].each {|f| require f}
-
 Coveralls.wear!
 
+Dir["./spec/support/**/*.rb"].each {|f| require f}
+
 RSpec.configure do |config|
   config.mock_with :rr
 end

data/spec/support/shared_contexts_for_hipchat.rb

@@ -29,6 +29,17 @@ shared_context "HipChatV1" do
                                           'Content-Type' => 'application/x-www-form-urlencoded'}).to_return(:status => 200, :body => "", :headers => {})
   end
 
+  def mock_successful_rooms
+    stub_request(:get, "https://api.hipchat.com/v1/rooms/list").with(
+                             :query => {:auth_token => "blah"},
+                             :body => "",
+                             :headers => {'Accept' => 'application/json',
+                                          'Content-Type' => 'application/x-www-form-urlencoded'}).to_return(
+                                            :status => 200,
+                                            :body => '{"rooms":[{"id": "Hipchat", "links": {"self": "https://api.hipchat.com/v2/room/12345"}}]}',
+                                            :headers => {})
+  end
+
   def mock_successful_history(options={})
     options = { :date => 'recent', :timezone => 'UTC', :format => 'JSON' }.merge(options)
     canned_response = File.new(HISTORY_JSON_PATH)
@@ -80,6 +91,17 @@ shared_context "HipChatV2" do
                                                     'Content-Type' => 'application/json'}).to_return(:status => 200, :body => "", :headers => {})
   end
 
+  def mock_successful_rooms
+    stub_request(:get, "https://api.hipchat.com/v2/room").with(
+                             :query => {:auth_token => "blah"},
+                             :body => "",
+                             :headers => {'Accept' => 'application/json',
+                                          'Content-Type' => 'application/json'}).to_return(
+                                            :status => 200,
+                                            :body => '{"items":[{"id": "Hipchat", "links": {"self": "https://api.hipchat.com/v2/room/12345"}}]}',
+                                            :headers => {})
+  end
+
   def mock_successful_history(options={})
     options = { :date => 'recent', :timezone => 'UTC', :format => 'JSON' }.merge(options)
     canned_response = File.new(HISTORY_JSON_PATH)
@@ -130,4 +152,4 @@ shared_context "HipChatV2" do
                                    :headers => {'Accept' => 'application/json',
                                                 'Content-Type' => 'application/json'}).to_return(:status => 200, :body => "", :headers => {})
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hipchat
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - HipChat/Atlassian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -28,16 +28,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".document"
 - ".gitignore"
 - ".ruby-gemset"