kitchen_hooks 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdb2a72a6956b35d41937cde0cee3be69ad832f2
-  data.tar.gz: 8f033c77c713dee2abe2ef435b7ef2d01645bdc6
+  metadata.gz: cf6b444d973aa69f4eaf3bf79ccacca65e717149
+  data.tar.gz: fcdb939b53fc35a04eb18eaad4cb52ce81166304
 SHA512:
-  metadata.gz: 9ab833ecddff610020cec29609480d136514a069425a16ab9daaa941c9de9453e5fc5b380a5a5b9bbe72b9a62b5ccc85ce44431f7c48ee9aaa3b42d3ea810dd6
-  data.tar.gz: cbea2a4672b06e4e096e335e7e2efd2220944bc59e1504f6ddd774a81d622cef6993029e76cade61722f43d5999c9725f4fd1ac44d148dc7ff42e60ba57425ce
+  metadata.gz: 935caae8b512c4e1607840cf428778fdf94914c70107e73b5f7df50e23d00d44c5430656e0013ed081c32dbaf320881d4625b413b3c1a9e5c9844885fb37179c
+  data.tar.gz: 7ebdc2ebc6cf361a74305547cb455313da6a1c67bfe202af2524a90e65820387800ff5212a3cb86500ad4b98146447e2de3ce537064a9eeecb112aa1095de274

data/.gitignore

@@ -13,4 +13,5 @@
 .yardoc
 doc
 pkg
-tmp
+tmp
+Gemfile.lock

data/Readme.md

@@ -38,6 +38,7 @@ Use the `server` command to start the WebHook receiver:
 
 ### 1.5
 
+* Add release notifications
 * Add indication of success or failure
 * Only upload on commits to Kitchen `master` branch
 * Add custom timeline icons to distinguish event types

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

data/lib/kitchen_hooks/app.rb

@@ -36,9 +36,10 @@ module KitchenHooks
 
 
     get '/' do
+      process_release
       db_entries = {}
       db.each do |k, v|
-        db_entries[k] = v
+        db_entries[k] = v unless k == 'meta'
       end
       erb :app, locals: {
         database: db_entries.sort_by { |stamp, _| stamp }
@@ -64,21 +65,30 @@ module KitchenHooks
     end
 
 
+
   private
+
     def knives ; @@knives ||= [] end
 
     def db ; @@db end
 
-    def hipchat message, color='green', notify=false
+    def hipchat message, color
       return if @@hipchat.nil?
       @@hipchat[@@hipchat_room].send @@hipchat_nick, message, \
-        color: color, notify: notify, message_format: 'html'
+        color: color, notify: false, message_format: 'html'
     end
 
+
     def notify entry
-      hipchat notification(entry)
+      color = case entry[:type]
+      when 'failure' ; 'red'
+      when 'release' ; 'purple'
+      else ; 'green'
+      end
+      hipchat notification(entry), color
     end
 
+
     # error == nil   => success
     # error == false => nop
     # otherwise      => failure
@@ -93,6 +103,17 @@ module KitchenHooks
       notify entry
     end
 
+
+    def process_release version=KitchenHooks::VERSION
+      db['meta'] ||= {}
+      return if db['meta']['version'] == version
+      mark version, 'release'
+      db.synchronize do
+        db['meta']['version'] = version
+      end
+      db.flush
+    end
+
     def process event
       if event.nil? # JSON parse failed
         mark event, 'failure', 'Could not parse WebHook payload'        

data/lib/kitchen_hooks/helpers.rb

@@ -170,9 +170,11 @@ module KitchenHooks
       when 'kitchen upload'
         %Q| <i>#{author(event)}</i> updated <a href="#{gitlab_url(event)}">the Kitchen</a> |
       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> |
+        %Q| <i>#{author(event)}</i> released <a href="#{gitlab_tag_url(event)}">#{tag_name(event)}</a> of <a href="#{gitlab_url(event)}">#{cookbook_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> |
+        %Q| <i>#{author(event)}</i> constrained <a href="#{gitlab_tag_url(event)}">#{tag_name(event)}</a> with <a href="#{gitlab_url(event)}">#{cookbook_name(event)}</a> |
+      when 'release'
+        %Q| Kitchen Hooks <b>v#{event}</b> released! |
       end.strip
     end
 

data/web/app/style/kitchen_hooks.css

@@ -10,6 +10,10 @@ body {
   background: #d9534f;
 }
 
+.release .cd-timeline-img {
+  background: #5bc0de;
+}
+
 .cd-timeline-content {
   color: #4e5d6c;
 }

data/web/public/vendor/img/cube.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<svg width="512" height="512" xmlns="http://www.w3.org/2000/svg">
+
+ <g>
+  <title>background</title>
+  <rect fill="none" id="canvas_background" height="402" width="582" y="-1" x="-1"/>
+ </g>
+ <g>
+  <title>Layer 1</title>
+  <path fill="#ffffff" d="m253.897766,53.210709l188.147552,103.745026l0,202.358688l-188.045319,100.327362l-188.045334,-100.327362l0,-203.59285l187.9431,-102.510864zm0.102234,-47.664927l-229.834,125.363551l0,253.460754l229.834,122.629913l229.833984,-122.629913l0,-252.092728l-229.833984,-126.731578zm0,100.226336l-146.257904,77.372459l0,147.848618l146.257904,75.006378l146.256653,-75.006378l0,-147.042908l-146.256653,-78.178169zm75.943542,87.972359l-75.740311,38.941818l-74.964951,-40.084686l74.659485,-39.50293l76.045776,40.645798zm-180.413986,30.351364l83.576111,44.695145l0,79.545013l-83.576111,-42.879211l0,-81.360947zm125.363541,124.241348l0,-79.321045l83.577332,-42.960724l0,79.402618l-83.577332,42.87915z" id="cube-9-icon"/>
+ </g>
+</svg>

data/web/views/app.erb

@@ -14,6 +14,8 @@
           <img src="/vendor/img/shield.svg" alt="Shield">
         <% when 'failure' %>
           <img src="/vendor/img/error.svg" alt="Error">
+        <% when 'release' %>
+          <img src="/vendor/img/cube.svg" alt="Cube">
         <% end %>
       </div>
       <div class="cd-timeline-content">
@@ -22,6 +24,8 @@
           <p><%= notification entry %>. Triggered when <%= generic_details(entry[:event]) %></p>
         <% elsif entry[:error] # Failed before event generated %>
           <p><%= notification entry %></p>
+        <% elsif type == 'release' %>
+          <p><%= notification entry %></p>
         <% else %>
           <p><%= notification entry %> by pushing <%= push_details(entry[:event]) %></p>
         <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Kelly Wong
@@ -145,7 +145,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - Rakefile
 - Readme.md
@@ -165,7 +164,7 @@ files:
 - web/public/vendor/css/superhero-v3.3.0.css
 - web/public/vendor/css/vertical-timeline-v1.0.0.css
 - web/public/vendor/img/book.svg
-- web/public/vendor/img/cd-icon.svg
+- web/public/vendor/img/cube.svg
 - web/public/vendor/img/cutlery.svg
 - web/public/vendor/img/error.svg
 - web/public/vendor/img/shield.svg

data/Gemfile.lock

@@ -1,220 +0,0 @@
-PATH
-  remote: .
-  specs:
-    kitchen_hooks (1.5.0)
-      berkshelf (~> 3)
-      chef (~> 11.16.4)
-      daybreak (~> 0.3)
-      git (~> 1.2)
-      hipchat (~> 1)
-      retryable (~> 1)
-      ridley (~> 4.1)
-      sinatra (~> 1.4)
-      thor (~> 0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.6)
-    arr-pm (0.0.9)
-      cabin (> 0)
-    backports (3.6.4)
-    berkshelf (3.2.1)
-      addressable (~> 2.3.4)
-      berkshelf-api-client (~> 1.2)
-      buff-config (~> 1.0)
-      buff-extensions (~> 1.0)
-      buff-shell_out (~> 0.1)
-      celluloid (~> 0.16.0)
-      celluloid-io (~> 0.16.1)
-      cleanroom (~> 1.0)
-      faraday (~> 0.9.0)
-      minitar (~> 0.5.4)
-      octokit (~> 3.0)
-      retryable (~> 1.3.3)
-      ridley (~> 4.0)
-      solve (~> 1.1)
-      thor (~> 0.19)
-    berkshelf-api-client (1.2.0)
-      faraday (~> 0.9.0)
-    buff-config (1.0.1)
-      buff-extensions (~> 1.0)
-      varia_model (~> 0.4)
-    buff-extensions (1.0.0)
-    buff-ignore (1.1.1)
-    buff-ruby_engine (0.1.0)
-    buff-shell_out (0.2.0)
-      buff-ruby_engine (~> 0.1.0)
-    cabin (0.6.1)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    celluloid-io (0.16.1)
-      celluloid (>= 0.16.0)
-      nio4r (>= 1.0.0)
-    chef (11.16.4)
-      chef-zero (~> 2.1, >= 2.1.4)
-      diff-lcs (~> 1.2, >= 1.2.4)
-      erubis (~> 2.7)
-      ffi-yajl (~> 1.0)
-      highline (~> 1.6, >= 1.6.9)
-      mime-types (~> 1.16)
-      mixlib-authentication (~> 1.3)
-      mixlib-cli (~> 1.4)
-      mixlib-config (~> 2.0)
-      mixlib-log (~> 1.3)
-      mixlib-shellout (~> 1.4)
-      net-ssh (~> 2.6)
-      net-ssh-multi (~> 1.1)
-      ohai (~> 7.4)
-      plist (~> 3.1.0)
-      pry (~> 0.9)
-      rest-client (>= 1.0.4, <= 1.6.7)
-    chef-zero (2.2.1)
-      ffi-yajl (~> 1.1)
-      hashie (~> 2.0)
-      mixlib-log (~> 1.3)
-      rack
-    childprocess (0.5.5)
-      ffi (~> 1.0, >= 1.0.11)
-    clamp (0.6.3)
-    cleanroom (1.0.0)
-    coderay (1.1.0)
-    daemons (1.1.9)
-    daybreak (0.3.0)
-    dep-selector-libgecode (1.0.2)
-    dep_selector (1.0.3)
-      dep-selector-libgecode (~> 1.0)
-      ffi (~> 1.9)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    eventmachine (1.0.3)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.9.6)
-    ffi-yajl (1.3.1)
-      ffi (~> 1.5)
-      libyajl2 (~> 1.2)
-    fpm (1.3.2)
-      arr-pm (~> 0.0.9)
-      backports (>= 2.6.2)
-      cabin (>= 0.6.0)
-      childprocess
-      clamp (~> 0.6)
-      ffi
-      json (>= 1.7.7)
-    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)
-    method_source (0.8.2)
-    mime-types (1.25.1)
-    minitar (0.5.4)
-    minitest (5.4.3)
-    mixlib-authentication (1.3.0)
-      mixlib-log
-    mixlib-cli (1.5.0)
-    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)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
-    net-ssh-multi (1.2.0)
-      net-ssh (>= 2.6.5)
-      net-ssh-gateway (>= 1.2.0)
-    nio4r (1.0.1)
-    octokit (3.7.0)
-      sawyer (~> 0.6.0, >= 0.5.3)
-    ohai (7.4.0)
-      ffi (~> 1.9)
-      ffi-yajl (~> 1.0)
-      ipaddress
-      mime-types (~> 1.16)
-      mixlib-cli
-      mixlib-config (~> 2.0)
-      mixlib-log
-      mixlib-shellout (~> 1.2)
-      systemu (~> 2.6.4)
-      wmi-lite (~> 1.0)
-    plist (3.1.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.5.2)
-    rack-protection (1.5.3)
-      rack
-    rake (10.4.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    retryable (1.3.6)
-    ridley (4.1.0)
-      addressable
-      buff-config (~> 1.0)
-      buff-extensions (~> 1.0)
-      buff-ignore (~> 1.1)
-      buff-shell_out (~> 0.1)
-      celluloid (~> 0.16.0)
-      celluloid-io (~> 0.16.1)
-      erubis
-      faraday (~> 0.9.0)
-      hashie (>= 2.0.2, < 3.0.0)
-      json (>= 1.7.7)
-      mixlib-authentication (>= 1.3.0)
-      net-http-persistent (>= 2.8)
-      retryable
-      semverse (~> 1.1)
-      varia_model (~> 0.4)
-    rubygems-tasks (0.2.4)
-    sawyer (0.6.0)
-      addressable (~> 2.3.5)
-      faraday (~> 0.8, < 0.10)
-    semverse (1.2.1)
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    slop (3.6.0)
-    solve (1.2.1)
-      dep_selector (~> 1.0)
-      semverse (~> 1.1)
-    systemu (2.6.4)
-    thin (1.6.3)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
-      rack (~> 1.0)
-    thor (0.19.1)
-    tilt (1.4.1)
-    timers (4.0.1)
-      hitimes
-    varia_model (0.4.0)
-      buff-extensions (~> 1.0)
-      hashie (>= 2.0.2, < 3.0.0)
-    version (1.0.0)
-    wmi-lite (1.0.0)
-    yard (0.8.7.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fpm
-  kitchen_hooks!
-  minitest
-  pry
-  rake
-  rubygems-tasks
-  thin
-  version
-  yard

data/web/public/vendor/img/cd-icon.svg

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="24px" height="24px" viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-</style>
-<path class="st0" d="M12,1C7.6,1,4,4.6,4,9C4,16,12,23,12,23S20,16,20,9C20,4.6,16.4,1,12,1z M12,11.9c-1.6,0-3-1.3-3-3s1.3-3,3-3
-	s3,1.3,3,3S13.6,11.9,12,11.9z"/>
-</svg>