kitchen_hooks 1.7.13 → 1.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7547b532dfd1f1769211d8d0dfbaff80c9cc9ec4
-  data.tar.gz: 11b5bd99de0c8b841daf1b4b41c3af944ebbe362
+  metadata.gz: d79c5b35992c0b702d82ca724450adf64d278543
+  data.tar.gz: ffd258c665a0e05c247c226131b3f86a55f7a16d
 SHA512:
-  metadata.gz: 5bc83fafd03deb3f8ed2c583d8106544fde41061325d8f396d78cd214031d49cfd122275b68d10bc8d8b112a88410ae805a44aad0b8b6265c39cb58d171b9ce3
-  data.tar.gz: 7f3773e3589c928837199b2b1e609eb65809e6a44705607e7e8be55e69032641bb0366a8683a7e4cafb5bae656c80efbc7b0638902ead4336774caaf30de7374
+  metadata.gz: 189e45821445f040498ccce4f56a1d604fa1f3cc8e738ba7c2a025974c27f5a5181901148b0cf9fc117ab24350e6db37b950b6bfb9fcc69ae6fe2c14352f580c
+  data.tar.gz: b5d4cf3c1e4a9651f566f14e21529873ae641d097ccac9621fcfe3f482b6572fc0a882b466913b329356d302b882fdbb63d3a0c662dfc72a316e6de8c9f37ae3

data/VERSION

@@ -1 +1 @@
-1.7.13
+1.7.14

data/etc/commit-release.json

@@ -1,21 +1,21 @@
 {
-  "before": "52398401e005ec9003e932571147366cdaa3ce4b",
-  "after": "52398401e005ec9003e932571147366cdaa3ce4b",
-  "ref": "refs/tags/v0.2.5",
+  "before": "fd4777414aeb61315d292936687d5a87e7d62ded",
+  "after": "fd4777414aeb61315d292936687d5a87e7d62ded",
+  "ref": "refs/tags/v0.2.6",
   "user_id": 645,
   "user_name": "Sean Clemmer",
   "repository": {
-    "name": "app_cassandra_dse",
-    "url": "git@git.bluejeansnet.com:chef/app_cassandra_dse.git",
+    "name": "app_graphite",
+    "url": "git@git.bluejeansnet.com:chef/app_graphite.git",
     "description": "",
-    "homepage": "http://git.bluejeansnet.com/chef/app_cassandra_dse"
+    "homepage": "http://git.bluejeansnet.com/chef/app_graphite"
   },
   "commits": [
     {
-      "id": "52398401e005ec9003e932571147366cdaa3ce4b",
+      "id": "fd4777414aeb61315d292936687d5a87e7d62ded",
       "message": "XYZ",
       "timestamp": "2014-11-25T18:30:57-08:00",
-      "url": "http://git.bluejeansnet.com/chef/app_cassandra_dse/commit/bbdfcc13233ca0173c75896155c8013e08fa81e6",
+      "url": "http://git.bluejeansnet.com/chef/app_graphite/commit/fd4777414aeb61315d292936687d5a87e7d62ded",
       "author": {
         "name": "Sean Clemmer",
         "email": "sclemmer@bluejeans.com"

data/etc/config.json

@@ -1,5 +1,5 @@
 {
-  "sync_interval": 30,
+  "sync_interval": null,
   "hipchat": null,
   "knives": {
     "sj1": "~/.chef/sj1.rb",

data/lib/kitchen_hooks/app.rb

@@ -46,6 +46,7 @@ module KitchenHooks
     end
 
     def self.sync!
+      return if @@sync_interval.nil?
       @@sync_worker = Thread.new do
         loop do
           process_sync
@@ -66,7 +67,7 @@ module KitchenHooks
       @@knives = config['knives'].map do |_, knife|
         Pathname.new(knife).expand_path.realpath.to_s
       end
-      @@sync_interval = config.fetch 'sync_interval', 3600 # Hourly
+      @@sync_interval = config['sync_interval']
     end
 
     get '/backlog' do

data/lib/kitchen_hooks/helpers.rb

@@ -107,8 +107,14 @@ module KitchenHooks
         end
 
         berksfile = File::join clone, 'Berksfile'
+        berksfile_lock = "#{berksfile}.lock"
+
+        # If no lockfile provided, use latest dependencies
+        do_update = !File::exist?(berksfile_lock)
+
         $stdout.puts 'Uploading dependencies'
         berks_install berksfile
+        berks_update berksfile if do_update
         knives.peach do |knife|
           berks_upload berksfile, knife
         end
@@ -164,6 +170,30 @@ module KitchenHooks
     end
 
 
+    def self.berks_update berksfile
+      $stdout.puts 'started berks_update berksfile=%s' % berksfile.inspect
+      env_git_dir = ENV.delete 'GIT_DIR'
+      env_git_work_tree = ENV.delete 'GIT_WORK_TREE'
+
+      cmd = "berks update --debug --berksfile %s" % [
+        Shellwords::escape(berksfile)
+      ]
+      begin
+        $stdout.puts "berks_update: %s" % cmd
+        system cmd
+        raise unless $?.exitstatus.zero?
+      rescue
+        raise 'Could not perform berks_update with config %s' % [
+          berksfile.inspect
+        ]
+      end
+
+      ENV['GIT_DIR'] = env_git_dir
+      ENV['GIT_WORK_TREE'] = env_git_work_tree
+      $stdout.puts 'finished berks_update: %s' % berksfile
+    end
+
+
     def self.berks_install berksfile
       $stdout.puts 'started berks_install berksfile=%s' % berksfile.inspect
       env_git_dir = ENV.delete 'GIT_DIR'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 1.7.13
+  version: 1.7.14
 platform: ruby
 authors:
 - Sean Clemmer