bourdain 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b004a03b3490c700e0e0347b3516a4bbc2059c5d
-  data.tar.gz: a635f4b84631e3bee09582de76c818f6a1c5eda5
+  metadata.gz: 270fbf9547b48a86f75570212bb2dbb2a11a511e
+  data.tar.gz: 86e522eb39acb28252859376f21389cfe1a8c90c
 SHA512:
-  metadata.gz: c7ee9939a1072a1dfbde59fcae34fa87a674653c233d4ae590bcac8852cffa6f09daaaf83439191616e033bd64f39d59c632751b34f4fde16890d3bda150b553
-  data.tar.gz: 51613421ecb5af2dcda569a3361d12acdc8bf1830b681452294d8c2bcc3d52091f1e20853882f62a79c0f8c7c2c525c001ce9517c742dfd7b185024ba7d85e81
+  metadata.gz: 69dc72f2ddac33c5b5c03ff74ed8336af507351a9c73219bb54a413911b8e8cba50b01497bd6eb6f78a26faf23213bfd77136fc327916c360df33c8699eb2f8a
+  data.tar.gz: 847d50b46fa0625684c711403fb099463723475884bae78ad0d18c015fc08cb7cab629c77101be59a9724b61ff52668596b83d58b72ae676ad911d16fda6d9f5

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.5.0

data/lib/bourdain/resources/checks.rb

@@ -67,5 +67,4 @@ end
 
 require_relative 'checks/chef'
 require_relative 'checks/bourdain'
-require_relative 'checks/cookbooks'
-require_relative 'checks/ssh_config'
+require_relative 'checks/cookbooks'

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

@@ -11,6 +11,7 @@ module Bourdain
       def initialize cookbook_config
         super []
         return unless require_chef!
+        log.info 'Checking cookbooks, this may take a while...'
         check_gitlab_cookbooks! cookbook_config
         check_local_cookbooks! cookbook_config
       end
@@ -18,64 +19,51 @@ module Bourdain
 
 
     private
-      def check_cookbook_freshness cookbook
+      def check_cookbook cookbook
         notifications = []
         path = cookbook[:path]
         stale = []
 
-        if Dir.exists? path
-          if youre_dirty? path
-            notifications.push [ path, :warn, "Your cookbook %{path} is dirty." % cookbook ]
-          elsif youre_ahead? path
-            notifications.push [ path, :warn, "Your cookbook %{path} is ahead of %{repo}." % cookbook ]
-          elsif youre_behind? path
-            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
+        unless Dir.exists? path
+          ensure_cookbook_exists cookbook
+          return
         end
 
-        log_notifications [ notifications ]
-        stale
-      end
-
-      def check_cookbook_exists cookbook
-        unless Dir.exists? cookbook[:path]
-          log.warn "Populating cookbook %{path} with %{repo}" % cookbook
-          %x| git clone git@#{GITLAB_HOST}:#{cookbook[:repo]} #{cookbook[:path]} |
-          log.info "Your cookbook %{path} is now up-to-date." % cookbook
+        log.info "Fetching latest work on %{path} from %{repo}..." % cookbook
+        Dir.chdir(path) { %x| git fetch | }
+
+        if youre_dirty? path
+          log.warn "Your cookbook %{path} is dirty." % cookbook
+        elsif youre_ahead? path
+          log.warn "Your cookbook %{path} is ahead of %{repo}." % cookbook
+        elsif youre_behind? path
+          ensure_cookbook_up_to_date cookbook
+        else
+          log.info "Your cookbook %{path} looks up-to-date." % cookbook
         end
       end
 
-      def log_notifications notifications
-        ns = notifications.map { |n| n.first rescue nil }.compact.select { |n| !n.empty? }
-        ns.sort_by(&:first).each do |n|
-          next if n.empty?
-          _, severity, message = n
-          log.send severity, message
-        end
-      end
 
-      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
+      def ensure_cookbook_exists cookbook
+        return if Dir.exists? cookbook[:path]
+        log.warn "Populating cookbook %{path} with %{repo}..." % cookbook
+        %x| git clone git@#{GITLAB_HOST}:#{cookbook[:repo]} #{cookbook[:path]} |
+        log.info "Your cookbook %{path} is now up-to-date." % cookbook
       end
 
 
+      def ensure_cookbook_up_to_date cookbook
+        return unless Dir.exists? cookbook[:path]
+        log.warn "Pulling in changes to %{path} from %{repo}..." % cookbook
+        Dir.chdir(cookbook[:path]) { %x| git pull | }
+        log.info "Your cookbook %{path} is now up-to-date." % cookbook
+      end
 
-      def check_gitlab_cookbooks! cookbook_configs
-        stale_cookbooks = cookbook_configs.pmap do |cookbook|
-          check_cookbook_freshness cookbook
-        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
+      def check_gitlab_cookbooks! cookbook_configs
+        cookbook_configs.sort_by! { |cc| cc[:path] }
+        cookbook_configs.each do |cookbook|
+          check_cookbook cookbook
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bourdain
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pmap
@@ -114,7 +114,6 @@ files:
 - lib/bourdain/resources/checks/bourdain.rb
 - lib/bourdain/resources/checks/chef.rb
 - lib/bourdain/resources/checks/cookbooks.rb
-- lib/bourdain/resources/checks/ssh_config.rb
 - lib/bourdain/resources/commands.rb
 - lib/bourdain/resources/commands/bump.rb
 - lib/bourdain/resources/commands/check.rb

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

@@ -1,61 +0,0 @@
-require 'json'
-
-module Bourdain
-  module Checks
-
-    class SSHConfigCheck < Check
-      usage :check, <<-END
-        Ensure all nodes are enterened into the local SSH config
-        ssh_config
-      END
-
-
-      def initialize cookbook_config
-        super []
-        return unless require_chef!
-        check_ssh_config!
-      end
-
-
-
-    private
-      def check_ssh_config! ssh_config=File.join(ENV['HOME'], '.ssh', 'config')
-        unless File::exist?(ssh_config)
-          log.warn 'Skipping SSH config check. File does not exist: %s' % ssh_config.inspect
-          return
-        end
-
-        nodes = Dir[File.join('nodes', '*.json')]
-        nodes = nodes.map do |path|
-          JSON::parse File.read(path)
-        end
-
-        config = File.read(ssh_config)
-
-        hosts = []
-        config.lines.select do |l|
-          l =~ /Host (\S+)/
-          hosts << $1 if $1
-        end
-
-        unconfigured_nodes = nodes.select do |n|
-          !hosts.include? n['name']
-        end
-
-        File.open(ssh_config, 'a') do |f|
-          f.puts unless unconfigured_nodes.empty?
-          unconfigured_nodes.each do |n|
-            log.info 'Adding %s to %s' % [ n['name'].inspect, ssh_config ]
-            f.puts "Host %s" % n['name']
-            f.puts "\tHostName\t%s" % n['name']
-            f.puts "\tPort\t22"
-            f.puts "\tUser\tvagrant"
-            f.puts "\tStrictHostKeyChecking\tno"
-            f.puts "\tIdentityFile\t~/.vagrant.d/insecure_private_key"
-            f.puts
-          end
-        end
-      end
-    end
-  end
-end