kitchen_hooks 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f53d2fc0be5382749dc1fdea991bbbeeea94ec0
-  data.tar.gz: 3d04c7e25053c5462b0759b35603ce74f7896f21
+  metadata.gz: b231a360740fd42847f0b9d6ccf89f9fbee0b3ee
+  data.tar.gz: 643ee7d3385463afaf8b98f3139d5c36ec5e734f
 SHA512:
-  metadata.gz: 23a54b5efb5d6cee545b1a95927f8891573db8e8688cbf2703f26cc69e196010c69a4215be4c101e6b0c2540155dd71acc95337cf515cec5961bfe919bcb8bfb
-  data.tar.gz: 5f9a71504316534dcc798f794ab4a915010df9713a1c966cf8f1587ebecd120965010cf812adc698ff25c3baef49bb27aa864e9b97d713934d14cd3eaeec80c6
+  metadata.gz: 7fea85d09df6258f7711bd62f91925e6b1bd0ca0846e9a151b402950defa4e96141cc2f3c9b8b79ee1df4979aea5b5bd3faee5d5bfbdff4df5b1a8b441210856
+  data.tar.gz: 5d204a1a8d7468f98c872713f05a40a038d10779f8e45c09cd179de548e45e3e51d3a9cbd774f9cbdfeac1dd284dd730bb491afea3dbdb9795b778a0066645e3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kitchen_hooks (1.3.0)
+    kitchen_hooks (1.3.1)
       berkshelf (~> 3)
       chef (~> 11.16.4)
       daybreak (~> 0.3)

data/Readme.md

@@ -40,6 +40,9 @@ Use the `server` command to start the WebHook receiver:
 ### 1.3
 
 * Added local database to store history (Daybreak), visualized on homepage
+* Added `database` option to `server` command
+* Corrected GitLab link for tagged commits
+* Process events in the background to avoid duplicate entries [INF-6040]
 
 ### 1.2
 

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/lib/kitchen_hooks/app.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'thread'
 require 'json'
 
 require 'daybreak'
@@ -16,26 +17,8 @@ module KitchenHooks
 
     include KitchenHooks::Helpers
 
-    def self.db! db_path
-      @@db = Daybreak::DB.new db_path
-    end
-
-    def db &block
-      if block_given?
-        @@db.synchronize do
-          yield
-        end
-      else
-        return @@db
-      end
-    end
-
-    def database
-      db_entries = {}
-      db.each do |k, v|
-        db_entries[k] = v
-      end
-      return db_entries.sort_by { |stamp, _| stamp }
+    def self.db! path
+      @@db = Daybreak::DB.new path
     end
 
     def self.config! config
@@ -44,12 +27,14 @@ module KitchenHooks
       end
     end
 
-    def knives ; @@knives ||= [] end
-
 
     get '/' do
+      db_entries = {}
+      db.each do |k, v|
+        db_entries[k] = v
+      end
       erb :app, locals: {
-        database: database
+        database: db_entries.sort_by { |stamp, _| stamp }
       }
     end
 
@@ -63,50 +48,48 @@ module KitchenHooks
         :disposition => 'inline'
     end
 
-
     post '/' do
       request.body.rewind
       event = JSON::parse request.body.read
+      Thread.new do
+        process event
+      end
+    end
+
+
+  private
+    def knives ; @@knives ||= [] end
+
+    def db ; @@db end
 
+    def mark event, type
+      db.synchronize do
+        db[Time.now.to_f] = {
+          type: type,
+          event: event
+        }
+      end
+    end
+
+    def process event
       if commit_to_kitchen?(event)
         perform_kitchen_upload(event, knives)
-        save_event \
-          type: 'kitchen upload',
-          author: author(event),
-          repo: repo_name(event),
-          raw: event
+        mark event, 'kitchen upload'
       end
 
       if tagged_commit_to_cookbook?(event) &&
          tag_name(event) =~ /^v\d+/ # Tagged with version we're releasing
         perform_cookbook_upload(event, knives)
-        save_event \
-          type: 'cookbook upload',
-          author: author(event),
-          repo: repo_name(event),
-          cookbook: cookbook_name(event),
-          raw: event
+        mark event, 'cookbok upload'
       end
 
       if tagged_commit_to_realm?(event) &&
          tag_name(event) =~ /^bjn_/ # Tagged with environment we're pinning
         perform_constraint_application(event, knives)
-        save_event \
-          type: 'constraint application',
-          author: author(event),
-          repo: repo_name(event),
-          cookbook: cookbook_name(event),
-          raw: event
+        mark event, 'constraint application'
       end
 
       db.flush
     end
-
-  private
-    def save_event e
-      db do
-        db[Time.now.to_f] = e
-      end
-    end
   end
 end

data/lib/kitchen_hooks/helpers.rb

@@ -152,13 +152,9 @@ module KitchenHooks
       event['repository']['url'].sub(':', '/').sub('@', '://')
     end
 
-    def gitlab_url event, commit_method
+    def gitlab_url event
       url = git_daemon_style_url(event).sub(/^git/, 'http').sub(/\.git$/, '')
-      if commit_method == :tagged_commit
-        "#{url}/commits/#{self.send(commit_method, event)}"
-      else
-        "#{url}/commit/#{self.send(commit_method, event)}"
-      end
+      "#{url}/commit/#{event['after']}"
     end
 
     def latest_commit event

data/web/views/app.erb

@@ -1,6 +1,7 @@
 <section id="cd-timeline" class="cd-container">
-  <% database.reverse.each do |entry| %>
-    <% timestamp, data = entry %>
+  <% database.reverse.each do |(timestamp, entry)| %>
+    <% type = entry[:type] %>
+    <% event = entry[:event] %>
     <% timestamp = timestamp.to_f %>
     <% datetime = Time.at(timestamp).iso8601 %>
     <div class="cd-timeline-block">
@@ -8,14 +9,14 @@
         <img src="/vendor/img/cd-icon.svg" alt="Picture">
       </div>
       <div class="cd-timeline-content">
-        <% if data[:type] == 'kitchen upload' %>
-          <h2><%= data[:type] %></h2>
-          <p><%= data[:author] %> modified <a href="<%= gitlab_url(data[:raw], :latest_commit) %>"><%= data[:repo] %></a></p>
+        <% if type == 'kitchen upload' %>
+          <h2><%= type %></h2>
+          <p><%= author(event) %> modified <a href="<%= gitlab_url(event) %>">the Kitchen</a></p>
         <% else %>
-          <h2><%= data[:type] %></h2>
-          <p><%= data[:author] %> modified <a href="<%= gitlab_url(data[:raw], :tagged_commit) %>"><%= data[:repo] %></a></p>
+          <h2><%= type %></h2>
+          <p><%= author(event) %> modified <a href="<%= gitlab_url(event) %>"><%= repo_name(event) %></a></p>
         <% end %>
-        <span class="cd-date">Triggered <time datetime="<%= datetime %>" pubdate="pubdate" class="time-ago" title="<%= datetime %>"><%= datetime %></time></span>
+        <span class="cd-date"><time datetime="<%= datetime %>" pubdate="pubdate" class="time-ago" title="<%= datetime %>"><%= datetime %></time></span>
       </div>
     </div>
   <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Kelly Wong