kitchen_hooks 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b231a360740fd42847f0b9d6ccf89f9fbee0b3ee
-  data.tar.gz: 643ee7d3385463afaf8b98f3139d5c36ec5e734f
+  metadata.gz: 566b6a40d025278b7ef874afb45a68a1e4f83bff
+  data.tar.gz: b756ae4e319396fe04f099488fc841d65bd8cdb2
 SHA512:
-  metadata.gz: 7fea85d09df6258f7711bd62f91925e6b1bd0ca0846e9a151b402950defa4e96141cc2f3c9b8b79ee1df4979aea5b5bd3faee5d5bfbdff4df5b1a8b441210856
-  data.tar.gz: 5d204a1a8d7468f98c872713f05a40a038d10779f8e45c09cd179de548e45e3e51d3a9cbd774f9cbdfeac1dd284dd730bb491afea3dbdb9795b778a0066645e3
+  metadata.gz: 5fe30aba57bb4d2c7266a6e7b0f88afb4f13981a86488b0889aa426da2370fd3cd4d83bd612055a32db43708b5e855f7ab468e90c275210cc5cba0d17541f58a
+  data.tar.gz: 7cbadfa56c95a712400e02c47789bd184cd45912c63b6a912ace24a3bde303ce7fb7ed6c6715e6199075cd2615e89abd46963039b3cbe80dece5c96900be0130

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    kitchen_hooks (1.3.1)
+    kitchen_hooks (1.3.2)
       berkshelf (~> 3)
       chef (~> 11.16.4)
       daybreak (~> 0.3)
       git (~> 1.2)
-      mime-types (~> 1)
+      hipchat (~> 1)
       retryable (~> 1)
       ridley (~> 4.1)
       sinatra (~> 1.4)
@@ -105,7 +105,12 @@ GEM
     git (1.2.8)
     hashie (2.1.2)
     highline (1.6.21)
+    hipchat (1.4.0)
+      httparty
     hitimes (1.2.2)
+    httparty (0.13.3)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
     ipaddress (0.8.0)
     json (1.8.1)
     libyajl2 (1.2.0)
@@ -119,6 +124,7 @@ GEM
     mixlib-config (2.1.0)
     mixlib-log (1.6.0)
     mixlib-shellout (1.6.1)
+    multi_xml (0.5.5)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-ssh (2.9.1)

data/Readme.md

@@ -32,11 +32,20 @@ Use the `server` command to start the WebHook receiver:
 
 ## TODO
 
+* Add indication of success or failure
+* Add custom timeline icons to distinguish event types
 * Use Ridley for data bag, role, and environment uploads to remove Chef dependency
 
 
 ## Changelog
 
+### 1.4
+
+* Simplified configuration format (breaking!)
+* Added support for HipChat notifications when configured
+* Linked to tag name with `.../commits/TAG` where appropriate
+* Replaced "modified" with more appropriate verb where appropriate
+
 ### 1.3
 
 * Added local database to store history (Daybreak), visualized on homepage

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.4.0

data/etc/config.json

@@ -1,14 +1,10 @@
 {
-  "email": {
-    "user": "chef-upload@bluejeansnet.com",
-    "port": 25,
-    "server": "10.4.5.7",
-    "recipient": "sclemmer@bluejeans.com"
+  "hipchat": {
+    "nick": "Kitchen (bot)",
+    "room": "test",
+    "token": "YOUR_V1_HIPCHAT_TOKEN"
   },
-  "servers": [
-    {
-      "name": "Prod",
-      "knife": "~/.chef/knife.rb"
-    }
-  ]
+  "knives": {
+    "prod": "~/.chef/knife.rb"
+  }
 }

data/kitchen_hooks.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
   s.homepage    = KitchenHooks::HOMEPAGE
   s.license     = KitchenHooks::LICENSE
 
+  s.add_runtime_dependency 'hipchat', '~> 1'
   s.add_runtime_dependency 'daybreak', '~> 0.3'
   s.add_runtime_dependency 'retryable', '~> 1'
   s.add_runtime_dependency 'berkshelf', '~> 3'
-  s.add_runtime_dependency 'mime-types', '~> 1'
   s.add_runtime_dependency 'chef', '~> 11.16.4'
   s.add_runtime_dependency 'thor', '~> 0'
   s.add_runtime_dependency 'git', '~> 1.2'

data/lib/kitchen_hooks/app.rb

@@ -2,6 +2,7 @@ require 'pathname'
 require 'thread'
 require 'json'
 
+require 'hipchat'
 require 'daybreak'
 require 'sinatra/base'
 
@@ -22,8 +23,14 @@ module KitchenHooks
     end
 
     def self.config! config
-      @@knives = config['servers'].map do |s|
-        Pathname.new(s['knife']).expand_path.realpath.to_s
+      @@hipchat = nil
+      if config['hipchat']
+        @@hipchat = HipChat::Client.new config['hipchat']['token']
+        @@hipchat_nick = config['hipchat']['nick'] || raise('No HipChat "nick" provided')
+        @@hipchat_room = config['hipchat']['room'] || raise('No HipChat "room" provided')
+      end
+      @@knives = config['knives'].map do |_, knife|
+        Pathname.new(knife).expand_path.realpath.to_s
       end
     end
 
@@ -62,6 +69,16 @@ module KitchenHooks
 
     def db ; @@db end
 
+    def hipchat message, color='green', notify=false
+      return if @@hipchat.nil?
+      @@hipchat[@@hipchat_room].send @@hipchat_nick, message, \
+        color: color, notify: notify, message_format: 'html'
+    end
+
+    def notify event, type
+      hipchat notification(event, type)
+    end
+
     def mark event, type
       db.synchronize do
         db[Time.now.to_f] = {
@@ -69,6 +86,7 @@ module KitchenHooks
           event: event
         }
       end
+      notify event, type
     end
 
     def process event
@@ -80,7 +98,7 @@ module KitchenHooks
       if tagged_commit_to_cookbook?(event) &&
          tag_name(event) =~ /^v\d+/ # Tagged with version we're releasing
         perform_cookbook_upload(event, knives)
-        mark event, 'cookbok upload'
+        mark event, 'cookbook upload'
       end
 
       if tagged_commit_to_realm?(event) &&

data/lib/kitchen_hooks/helpers.rb

@@ -132,6 +132,17 @@ module KitchenHooks
       chef_environment.save
     end
 
+    def notification event, type
+      case type
+      when 'kitchen upload'
+        %Q| <i>#{author(event)}</i> updated <a href="#{gitlab_url(event)}">the Kitchen</a></p> |
+      when 'cookbook upload'
+        %Q| <i>#{author(event)}</i> released <a href="#{gitlab_tag_url(event)}">#{tag_name(event)}</a> of <a href="#{gitlab_url(event)}">#{repo_name(event)}</a> |
+      when 'constraint application'
+        %Q| <i>#{author(event)}</i> constrained <a href="#{gitlab_tag_url(event)}">#{tag_name(event)}</a> with <a href="#{gitlab_url(event)}">#{repo_name(event)}</a> |
+      end.strip
+    end
+
     def author event
       event['user_name']
     end
@@ -157,6 +168,11 @@ module KitchenHooks
       "#{url}/commit/#{event['after']}"
     end
 
+    def gitlab_tag_url event
+      url = git_daemon_style_url(event).sub(/^git/, 'http').sub(/\.git$/, '')
+      "#{url}/commits/#{tag_name(event)}"
+    end
+
     def latest_commit event
       event['commits'].last['id']
     end

data/web/app/kitchen_hooks.js

@@ -1,25 +1,5 @@
 ;(function(){
-  // Add relative timestamps
-  jQuery('.time-ago').timeago();
-
-  // Ripped from http://codyhouse.co/gem/vertical-timeline
   jQuery(document).ready(function($){
-    var $timeline_block = $('.cd-timeline-block');
-
-    // Hide timeline blocks which are outside the viewport
-    $timeline_block.each(function(){
-      if($(this).offset().top > $(window).scrollTop()+$(window).height()*0.75) {
-        $(this).find('.cd-timeline-img, .cd-timeline-content').addClass('is-hidden');
-      }
-    });
-
-    // On scolling, show/animate timeline blocks when enter the viewport
-    $(window).on('scroll', function(){
-      $timeline_block.each(function(){
-        if( $(this).offset().top <= $(window).scrollTop()+$(window).height()*0.75 && $(this).find('.cd-timeline-img').hasClass('is-hidden') ) {
-          $(this).find('.cd-timeline-img, .cd-timeline-content').removeClass('is-hidden').addClass('bounce-in');
-        }
-      });
-    });
+    $('.time-ago').timeago();
   });
 })();

data/web/views/app.erb

@@ -9,13 +9,8 @@
         <img src="/vendor/img/cd-icon.svg" alt="Picture">
       </div>
       <div class="cd-timeline-content">
-        <% if type == 'kitchen upload' %>
-          <h2><%= type %></h2>
-          <p><%= author(event) %> modified <a href="<%= gitlab_url(event) %>">the Kitchen</a></p>
-        <% else %>
-          <h2><%= type %></h2>
-          <p><%= author(event) %> modified <a href="<%= gitlab_url(event) %>"><%= repo_name(event) %></a></p>
-        <% end %>
+        <h2><%= type %></h2>
+        <p><%= notification(event, type) %></p>
         <span class="cd-date"><time datetime="<%= datetime %>" pubdate="pubdate" class="time-ago" title="<%= datetime %>"><%= datetime %></time></span>
       </div>
     </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Kelly Wong
@@ -11,61 +11,61 @@ cert_chain: []
 date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: daybreak
+  name: hipchat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: retryable
+  name: daybreak
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: berkshelf
+  name: retryable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: berkshelf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement