bourdain 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb30fcd0eea1e47d8f18544aebccf74e01ac985c
-  data.tar.gz: 1d493aeb57b8aee5ce9c2157a42cfab6b0ff1410
+  metadata.gz: b004a03b3490c700e0e0347b3516a4bbc2059c5d
+  data.tar.gz: a635f4b84631e3bee09582de76c818f6a1c5eda5
 SHA512:
-  metadata.gz: e0abe2865e740887e4cc5ab594e9ee2b0a9f4dd7ba49b119ded47067af6edaf514dde093efc11bb0c36e6828e594e85d30119fd869e92f8b23ce489dedada182
-  data.tar.gz: a10c79a9434603dcea5ae23ee6160bbdae91b77fef3c14a66d2123f647bf993be011a3dcac277352f1359b0f150aaaf58d9017e0827720969b80946f858cfb2a
+  metadata.gz: c7ee9939a1072a1dfbde59fcae34fa87a674653c233d4ae590bcac8852cffa6f09daaaf83439191616e033bd64f39d59c632751b34f4fde16890d3bda150b553
+  data.tar.gz: 51613421ecb5af2dcda569a3361d12acdc8bf1830b681452294d8c2bcc3d52091f1e20853882f62a79c0f8c7c2c525c001ce9517c742dfd7b185024ba7d85e81

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/lib/bourdain/resources/checks/cookbooks.rb

@@ -21,6 +21,7 @@ module Bourdain
       def check_cookbook_freshness cookbook
         notifications = []
         path = cookbook[:path]
+        stale = []
 
         if Dir.exists? path
           if youre_dirty? path
@@ -28,14 +29,15 @@ module Bourdain
           elsif youre_ahead? path
             notifications.push [ path, :warn, "Your cookbook %{path} is ahead of %{repo}." % cookbook ]
           elsif youre_behind? path
-            notifications.push [ path, :error, "Hey, looks like your cookbook %{path} is behind %{repo}. Try pulling." % cookbook ]
-            error!
+            notifications.push [ path, :warn, "Looks like your cookbook %{path} is behind %{repo}. Will try pulling for you in a moment..." % cookbook ]
+            stale.push path
           else
             notifications.push [ path, :info, "Your cookbook %{path} looks up-to-date." % cookbook ]
           end
         end
 
-        notifications
+        log_notifications [ notifications ]
+        stale
       end
 
       def check_cookbook_exists cookbook
@@ -55,29 +57,26 @@ module Bourdain
         end
       end
 
-      def ensure_pre_commit_installed cookbook
-        pre_commit_hook = File.join(cookbook[:path], '.git', 'hooks', 'pre-commit')
-        apply_template pre_commit_hook, template: %w[ cookbook pre-commit ]
-        FileUtils.chmod 0755, pre_commit_hook
+      def ensure_cookbook_up_to_date cookbook_path
+        log.warn "Pulling in remote changes to existing cookbook %s" % cookbook_path
+        %x| git -C #{cookbook_path} pull |
+        log.info "Your cookbook %s is now up-to-date." % cookbook_path
       end
 
 
 
       def check_gitlab_cookbooks! cookbook_configs
-        notifications = cookbook_configs.pmap do |cookbook|
+        stale_cookbooks = cookbook_configs.pmap do |cookbook|
           check_cookbook_freshness cookbook
-        end
-        unless notifications.first.empty?
-          log_notifications notifications
+        end.flatten.compact
+
+        stale_cookbooks.sort.each do |cookbook_path|
+          ensure_cookbook_up_to_date cookbook_path
         end
 
         cookbook_configs.sort_by { |cc| cc[:path] }.each do |cookbook|
           check_cookbook_exists cookbook
         end
-
-        cookbook_configs.each do |cookbook|
-          ensure_pre_commit_installed cookbook
-        end
       end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bourdain
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pmap