samson_hipchat 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45bb274aa095f6b2a5b740c8d619bcb867a0465f
-  data.tar.gz: 2329e861b24b294ebc01b5c044aa815aa13fcae3
+  metadata.gz: 5dde8617b79688e447d24772d04c4636257074a7
+  data.tar.gz: 54c8e367ee9a185ee3a195af3aff827558a8a097
 SHA512:
-  metadata.gz: 273cab850c46492f71dedaa06c118da187ddc5b79facccf97bea99bb655e448cddab5fd2ebcde118a80af024dba5f3dc28ca7fe1f391b29ef0ff12fc095fbf3a
-  data.tar.gz: 5c2a5b8b30bbdba6cd87aa1c77ad2adb2285b0c8c077f9f132051298e76e004c03cc4ac2ad07c11731e75ec19f586d3075d87793a042c2c6b08d4a8a743e9eaf
+  metadata.gz: 7d4b4f361f3a33e2273a116fd5be3b458d03208a1ce1ce250801295bc69f07cb27523ec433da1ab019dda773e4ebcf53093818f6659b20d80ce8f0d04b0820cb
+  data.tar.gz: 487fa2af69ba5a66e2bb79913a4a16f58164bb4aa4fcfb396a9823c7d64161254267039538e779a09ea8c8575bfa8841494df7db6c82fe5d46dd17570c103170

data/app/decorators/stage_decorator.rb

@@ -22,12 +22,14 @@ Stage.class_eval do
   def update_room_id
     if room_for(room_name)
       self.hipchat_rooms.first.room_id = room_for(room_name)['id']
+    else
+      self.hipchat_rooms.first.room_id = nil
     end
   end
 
   def room_exists?
     if room_name
-      errors.add(:hipchat_rooms_name, "was not found. Create the room first.") unless room_for(room_name)
+      errors.add(:hipchat_rooms_name, "was not found. Create the room first. If this is a notification token, you can ignore this message") unless room_for(room_name)
     end
   end
 
@@ -42,7 +44,7 @@ Stage.class_eval do
     Rails.cache.fetch(hipchat_rooms_cache_key, expires_in: 5.minutes) do
       begin
         hipchat[name].get_room
-      rescue HipChat::UnknownRoom
+      rescue HipChat::UnknownRoom, HipChat::UnknownResponseCode
         nil
       end
     end

data/app/views/samson_hipchat/notification.text.erb

@@ -1,12 +1,11 @@
 <%= subject %>
+<p>&nbsp;&nbsp;<%= deploy.message %> </p>
 <% if changeset.commits.count == 0 %>
 There are no new commits since last time.
 <% else %>
 <%= pluralize changeset.commits.count, "commit" %> by <%= changeset.author_names.to_sentence %>.
 <br>
 
-<%= deploy.message %>
-
 <% if false %>
 <strong>Files changed:</strong>
 <ul>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: samson_hipchat
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Vinh Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hipchat
@@ -39,11 +39,6 @@ files:
 - config/initializers/hipchat.rb
 - db/migrate/20150519105221_create_hipchat_rooms.rb
 - lib/samson_hipchat/samson_plugin.rb
-- samson_hipchat.gemspec
-- test/models/hipchat_notification_renderer_test.rb
-- test/models/hipchat_notification_test.rb
-- test/models/hooks_test.rb
-- test/test_helper.rb
 homepage: 
 licenses: []
 metadata: {}
@@ -63,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Samson hipchat integration

data/samson_hipchat.gemspec

@@ -1,7 +0,0 @@
-Gem::Specification.new "samson_hipchat", "0.0.4" do |s|
-  s.summary = "Samson hipchat integration"
-  s.authors = ["Vinh Nguyen"]
-  s.email = "vinh@listia.com"
-  s.add_runtime_dependency "hipchat", "~> 1.5"
-  s.files = `git ls-files`.split("\n")
-end

data/test/models/hipchat_notification_renderer_test.rb

@@ -1,42 +0,0 @@
-require_relative '../test_helper'
-
-describe HipchatNotificationRenderer do
-  describe "starting" do
-    it "renders a nicely formatted notification" do
-      changeset = stub("changeset")
-      deploy = stub("deploy", short_reference: "xyz", changeset: changeset)
-
-      author1 = "author1"
-      author2 = "author2"
-      changeset.stubs(:author_names).returns([author1, author2])
-
-      commit1 = stub("commit1", url: "#", author_name: "author1", summary: "Introduce bug")
-      commit2 = stub("commit2", url: "#", author_name: "author2", summary: "Fix bug")
-      changeset.stubs(:commits).returns([commit1, commit2])
-
-      file1 = stub("file1", status: "added", filename: "foo.rb")
-      file2 = stub("file2", status: "modified", filename: "bar.rb")
-      changeset.stubs(:files).returns([file1, file2])
-
-      subject = "Deploy starting"
-
-      result = HipchatNotificationRenderer.render(deploy, subject)
-
-      result.must_equal <<-RESULT.strip_heredoc.chomp
-  Deploy starting
-  2 commits by author1 and author2.
-  <br>
-  <strong>Files changed:</strong>
-  <ul>
-    <li>A foo.rb</li>
-    <li>M bar.rb</li>
-  </ul>
-  <strong>Commits:</strong>
-  <ol>
-    <li><a href='#'>(author1)</a>: Introduce bug</li>
-    <li><a href='#'>(author2)</a>: Fix bug</li>
-  <ol>
-      RESULT
-    end
-  end
-end

data/test/models/hipchat_notification_test.rb

@@ -1,47 +0,0 @@
-require_relative '../test_helper'
-
-describe HipchatNotification do
-  let(:project) { stub(name: "Glitter") }
-  let(:user) { stub(name: "John Wu", email: "wu@rocks.com") }
-  let(:stage) { stub(name: "staging", hipchat_rooms: [stub(name: "x123yx", token: "token123")], project: project) }
-  let(:hipchat_message) { stub(content: "hello world!", style: {color: :red}, subject: "subject") }
-  let(:previous_deploy) { stub(summary: "hello world!", user: user, stage: stage) }
-  let(:deploy) { stub(summary: "hello world!", user: user, stage: stage, changeset: "changeset") }
-  let(:notification) { HipchatNotification.new(deploy) }
-  let(:endpoint) { "https://api.hipchat.com/v2/room/x123yx/notification?auth_token=token123" }
-
-  before do
-    HipchatNotificationRenderer.stubs(:render).returns("foo")
-    HipchatNotification::Message.any_instance.stubs(:content).returns("message to send")
-    HipchatNotification::Message.any_instance.stubs(:from).returns("Deployer")
-    HipchatNotification::Message.any_instance.stubs(:style).returns({color: :red})
-  end
-
-  it "notifies hipchat channels configured for the stage" do
-    delivery = stub_request(:post, endpoint)
-    notification.deliver
-
-    assert_requested delivery
-  end
-
-  it "renders a nicely formatted notification" do
-    stub_request(:post, endpoint)
-    HipchatNotificationRenderer.stubs(:render).returns("bar")
-    notification.deliver
-
-    content, format, from, color = nil
-    assert_requested :post, endpoint do |request|
-      body = JSON.parse(request.body)
-      puts body["message"]
-      content = body.fetch("message")
-      format  = body.fetch("message_format")
-      from  = body.fetch("from")
-      color  = body.fetch("color")
-      content.must_equal "message to send"
-      format.must_equal "html"
-      from.must_equal "Deployer"
-      color.must_equal "red"
-    end
-  end
-
-end

data/test/models/hooks_test.rb

@@ -1,32 +0,0 @@
-require_relative '../test_helper'
-
-describe "hipchat hooks" do
-  let(:deploy) { deploys(:succeeded_test) }
-  let(:stage) { deploy.stage }
-
-  describe :before_deploy do
-    it "sends notification on before hook" do
-      stage.stubs(:send_hipchat_notifications?).returns(true)
-      HipchatNotification.any_instance.expects(:deliver)
-      Samson::Hooks.fire(:before_deploy, deploy, nil)
-    end
-
-    it "does not send notifications when disabled" do
-      HipchatNotification.any_instance.expects(:deliver).never
-      Samson::Hooks.fire(:before_deploy, deploy, nil)
-    end
-  end
-
-  describe :after_deploy do
-    it "sends notification on after hook" do
-      stage.stubs(:send_hipchat_notifications?).returns(true)
-      HipchatNotification.any_instance.expects(:deliver)
-      Samson::Hooks.fire(:after_deploy, deploy, nil)
-    end
-
-    it "does not send notifications when disabled" do
-      HipchatNotification.any_instance.expects(:deliver).never
-      Samson::Hooks.fire(:after_deploy, deploy, nil)
-    end
-  end
-end

data/test/test_helper.rb

@@ -1 +0,0 @@
-require_relative '../../../test/test_helper'