bourdain 1.2.14 → 1.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d25ccec53a814150f4d724f5e811ca292e1a9442
-  data.tar.gz: 73c4550bb9b4dd5ca681c461407ee0e5dd654345
+  metadata.gz: d0546af0081ec0ed6aef62a0ba68b3289f3d5f91
+  data.tar.gz: 0f14f843d1d4d5e461496ebf728efd29638d9312
 SHA512:
-  metadata.gz: 145899f67763ada16bd94a97071bfb7405e99bf1a3bfb6cef43bdfbbfc8dc6688a5d81a786615d465c1726329d10ef84c9a199b2d6707262950d88440596001d
-  data.tar.gz: 61d364fd4924cb08d9de754e1a0ca3ff1377bc09dc6cba93aa1930ecd1ac01047d79179af73340a5a7a5ed874e83590323d2e2682f27007f6d29f749a63d4102
+  metadata.gz: f68b33cb79ff3f4d79bad1700eb8f0a7c57daf699ff8a0c4144a5a729e0443fa20db9829cefa71de406743f27a50240f942cd56bb0df257e9b166f3f11f68f1b
+  data.tar.gz: 7adb1947b69a3737a44cd6bfda0c61c0511172b93dbd744eb9ca3943bd3874e4765d9df38455faaa6574ca2c73059726ae675d9f5d7208caa20f919e1ea4a606

data/VERSION

@@ -1 +1 @@
-1.2.14
+1.2.15

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

@@ -42,27 +42,19 @@ module Bourdain
           end
         end
 
-        matches = File.read('Gemfile.lock').match(/bourdain \((.*?)\)$/)
+        local_version = gemfile_version 'bourdain'
+        latest_version = rubygems_version 'bourdain'
 
-        if matches.nil?
-          log.warn "Couldn't find Kitchen hooks in your Gemfile lock. Something is amiss..."
+        if latest_version == local_version
+          log.info 'Your Kitchen is bundled with the latest Bourdain.'
+        elsif local_version < latest_version
+          log.error 'Your Kitchen is bundled with an older Bourdain. Try "bundle update bourdain".'
           error!
-
         else
-          repo_version = matches[1].strip
-          local_version = File.read(File.join(bourdain, 'VERSION')).strip
-
-          if repo_version == local_version
-            log.info "Your Chef repo is bundled with the latest Bourdain."
-          elsif ahead_of_remote
-            # Don't worry about it, we've already warned them
-          elsif local_version < repo_version
-            log.error 'Your Chef repo is bundled with an older Bourdain. Try "bundle update".'
-            error!
-          end
+          log.warn "You appear to have an unreleased Bourdain. I hope you know what you're doing..."
         end
 
-        # Remove pre-commit hook if installed
+        # Remove deprecated pre-commit hook if installed
         pre_commit_hook = File.join(*bourdain, '.git', 'hooks', 'pre-commit')
         FileUtils.rm_rf pre_commit_hook
       end

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

@@ -3,7 +3,7 @@ module Bourdain
 
     class HooksCheck < Check
       usage :check, <<-END
-        Check the local copy of Kitchen hooks
+        Check the local copy of the Kitchen Hooks
         hooks
       END
 
@@ -18,48 +18,40 @@ module Bourdain
 
     private
       def check_hooks!
-        # Ensure we have an up-to-date copy of Kitchen hooks
+        # Ensure we have an up-to-date copy of the Kitchen Hooks
         hooks = File.join('utils', 'hooks')
 
         ahead_of_remote = false
         unless Dir.exists? hooks
-          log.warn  "Hm, I don't see a copy of Kitchen hooks. I'll fix that for you..."
+          log.warn  "Hm, I don't see a copy of the Kitchen Hooks. I'll fix that for you..."
           %x| git clone git@git.bluejeansnet.com:kitchen-hooks.git #{hooks} |
-          log.info  "Your copy of Kitchen hooks is now up-to-date."
+          log.info  "Your copy of the Kitchen Hooks is now up-to-date."
 
         else
           if youre_dirty? hooks
-            log.warn  "Your copy of Kitchen hooks is dirty."
+            log.warn  "Your copy of the Kitchen Hooks is dirty."
           elsif youre_ahead? hooks
-            log.warn  "Your copy of Kitchen hooks is ahead of the remote."
+            log.warn  "Your copy of the Kitchen Hooks is ahead of the remote."
             ahead_of_remote = true
           elsif youre_behind? hooks
-            log.warn  "Hey, looks like your copy of Kitchen hooks is out-of-date. I'll fix that for you..."
+            log.warn  "Hey, looks like your copy of the Kitchen Hooks is out-of-date. I'll fix that for you..."
             Dir.chdir(bourdain) { %x| git pull | }
-            log.info  "Your copy of Kitchen hooks is now up-to-date."
+            log.info  "Your copy of the Kitchen Hooks is now up-to-date."
           else
-            log.info  "Your copy of Kitchen hooks looks up-to-date."
+            log.info  "Your copy of the Kitchen Hooks looks up-to-date."
           end
         end
 
-        matches = File.read('Gemfile.lock').match(/kitchen_hooks \((.*?)\)$/)
+        local_version = gemfile_version 'bourdain'
+        latest_version = rubygems_version 'bourdain'
 
-        if matches.nil?
-          log.warn "Couldn't find Kitchen hooks in your Gemfile lock. Something is amiss..."
+        if latest_version == local_version
+          log.info 'Your Kitchen is bundled with the latest Kitchen Hooks.'
+        elsif local_version < latest_version
+          log.error 'Your Kitchen is bundled with older Kitchen Hooks. Try "bundle update kitchen_hooks".'
           error!
-
         else
-          repo_version = matches[1].strip
-          local_version = File.read(File.join(hooks, 'VERSION')).strip
-
-          if repo_version == local_version
-            log.info "Your Chef repo is bundled with the latest Kitchen hooks."
-          elsif ahead_of_remote
-            # Don't worry about it, we've already warned them
-          elsif local_version < repo_version
-            log.error 'Your Chef repo is bundled with an older Kitchen hooks. Try "bundle update".'
-            error!
-          end
+          log.warn "You appear to have unreleased Kitchen Hooks. I hope you know what you're doing..."
         end
       end
     end

data/lib/bourdain/resources/checks.rb

@@ -1,11 +1,28 @@
-require 'erb'
 require 'fileutils'
+require 'open-uri'
+require 'json'
+require 'erb'
 
 
 module Bourdain
   module Checks
     class Check < Bourdain::Resource
     protected
+      def gemfile_version gem_name
+        gemfile_lock = File.read 'Gemfile.lock'
+        gemfile_lock =~ /#{gem_name} \((.*?)\)/
+        $1
+      end
+
+      def rubygems_version gem_name
+        versions_url = "https://rubygems.org/api/v1/versions/#{gem_name}.json"
+        open(versions_url) do |f|
+          versions = JSON::parse f.read
+          versions = versions.sort_by { |v| v['number'] }
+          versions.last['number']
+        end
+      end
+
       def work_tree repo
         "--work-tree=#{File.join(Dir.pwd, repo)}"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bourdain
 version: !ruby/object:Gem::Version
-  version: 1.2.14
+  version: 1.2.15
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pmap