jumpup-hipchat 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c38cab98e288d6f45809c90a6dfa628c18e7ed78
-  data.tar.gz: eff8dac1f00a69a1fadb2b8bf33a1cf9ebb0f875
+  metadata.gz: e983c1913d6010c2721df952d3a7b1b4f1240d3e
+  data.tar.gz: 7915bdb75400d9d87266f5cad8edc9e8c9bcf721
 SHA512:
-  metadata.gz: 36578d0652ead5f0fef86c3856b0b0fba02c862edeebe7cc21318230c3167512b6d21761d4178c8c430c6dea6afdc296234599b9dc3cccc9dd7d58f25f057bb2
-  data.tar.gz: c3cbd33e3414f49a6c55036cf696d5498622497cb19cd8c66db28de8a64054deb5602a7ff90a13153e585062cfd11e638ac4ae2f57cc4890b1c237869fa73613
+  metadata.gz: 4610c74b8ee61459176859c357c35ba10796015e45f430401408e0c200cf572cf6a4c0d1aba1ab675c99f14e4ef76a5025b20cd26dc959a0c310e19b83db4339
+  data.tar.gz: bd003f04d8604e1dc1582bd0eb8230c57462026f1fc35161aad90924650294f5ebb8972ad1bfe7058c620c0b046fc9d77fa8462249e438fec590e0e7d5a8b13a

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0
+ruby-2.1.1

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-## 0.1.1 (Feb 25, 2014)
+## 0.2.0 (May 16, 2014)
+
+### features
+
+- Show branch that is being integrated when posting messages to HipChat [[GH-14]]
+
+## 0.1.1 (Apr 25, 2014)
 
 ### bug fixes
 
@@ -23,6 +29,7 @@
 The changelog began with version 0.1.0, so any changes prior to that
 can be seen by reading old git commit messages.
 
+[GH-14]: https://github.com/Helabs/jumpup-hipchat/pull/14
 [GH-12]: https://github.com/Helabs/jumpup-hipchat/issues/12
 [GH-3]: https://github.com/Helabs/jumpup-hipchat/issues/3
 [GH-2]: https://github.com/Helabs/jumpup-hipchat/issues/2

data/README.md

@@ -30,9 +30,7 @@ HIPCHAT_APP_NAME="Your project name" # used on announcement messages
 
 ```ruby
 INTEGRATION_TASKS = %w(
-  jumpup:heroku:add_remote
-  jumpup:heroku:check
-  jumpup:heroku:lock
+  jumpup:heroku:start
   jumpup:hipchat:announce
   jumpup:start
   jumpup:bundle_install
@@ -40,8 +38,7 @@ INTEGRATION_TASKS = %w(
   spec
   jumpup:coverage_verify
   jumpup:finish
-  jumpup:heroku:deploy
-  jumpup:heroku:unlock
+  jumpup:heroku:finish
   jumpup:hipchat:finish
 )
 ```

data/lib/jumpup-hipchat/integrate.rb

@@ -0,0 +1,45 @@
+require 'hipchat'
+
+module Jumpup
+  module Hipchat
+    class Integrate
+      def self.announce
+        instance.announce
+      end
+
+      def self.finish
+        instance.finish
+      end
+
+      def self.instance
+        @integrate ||= Integrate.new(ENV['HIPCHAT_APP_NAME'], ENV['HIPCHAT_TOKEN'], ENV['HIPCHAT_ROOM'])
+      end
+
+      def initialize(app_name, token, room)
+        @app_name   = app_name
+        @room       = room
+        @client     = ::HipChat::Client.new(token)
+        @git_user   = `git config --get user.name`.strip
+        @git_branch = `git rev-parse --abbrev-ref HEAD`.strip
+      end
+
+      def announce
+        send_message "[#{@git_branch}] User #{@git_user} started to integrate project #{@app_name}"
+      end
+
+      def finish
+        send_message "[#{@git_branch}] User #{@git_user} finished to integrate project #{@app_name}. Well done pro!"
+      end
+
+      private
+
+        def send_message(msg)
+          begin
+            @client[@room].send(@git_user, msg, notify: true)
+          rescue => ex
+            puts "----> Unable to send message to HipChat room!\n  ERROR: #{ex}"
+          end
+        end
+    end
+  end
+end

data/lib/jumpup-hipchat/version.rb

@@ -1,5 +1,5 @@
 module Jumpup
   module Hipchat
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/lib/tasks/integrate.rake

@@ -1,31 +1,15 @@
-require 'hipchat'
-
 namespace :jumpup do
-  # REFACTOR: Extract a separate class with duplicated logic
   namespace :hipchat do
     desc "Announce the begining of the integration process to a hipchat room"
     task :announce do
-      user = `git config --get user.name`.strip
-      msg  = "User #{user} started to integrate project #{ENV['HIPCHAT_APP_NAME']}"
-
-      client = HipChat::Client.new(ENV['HIPCHAT_TOKEN'])
-      begin
-        client[ENV['HIPCHAT_ROOM']].send(user, msg, notify: true)
-      rescue => ex
-        puts "----> Unable to send message to HipChat room!\n  ERROR: #{ex}"
-      end
+      require 'jumpup-hipchat/integrate'
+      Jumpup::Hipchat::Integrate.announce
     end
 
+    desc "Announce the end of the integration process to a hipchat room"
     task :finish do
-      user = `git config --get user.name`.strip
-      msg  = "User #{user} finished to integrate project #{ENV['HIPCHAT_APP_NAME']}. Well done pro!"
-
-      client = HipChat::Client.new(ENV['HIPCHAT_TOKEN'])
-      begin
-        client[ENV['HIPCHAT_ROOM']].send(user, msg, notify: true)
-      rescue => ex
-        puts "----> Unable to send message to HipChat room!\n  ERROR: #{ex}"
-      end
+      require 'jumpup-hipchat/integrate'
+      Jumpup::Hipchat::Integrate.finish
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jumpup-hipchat
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - HE:labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -55,6 +55,7 @@ files:
 - Rakefile
 - jumpup-hipchat.gemspec
 - lib/jumpup-hipchat.rb
+- lib/jumpup-hipchat/integrate.rb
 - lib/jumpup-hipchat/version.rb
 - lib/tasks/integrate.rake
 homepage: https://github.com/Helabs/jumpup-hipchat