batali 0.3.8 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47869001066b08c8d611cdbbcf448769136ea753
-  data.tar.gz: 12b8059a2dab468f8863e160a4f1eb3855f4702c
+  metadata.gz: bc79c37709d9a82123b18ff7f3708d3ab3090747
+  data.tar.gz: d71675d5533528818ffdafe8a2b7727ae7d20566
 SHA512:
-  metadata.gz: 58c28c8fe207f98343428725755423ed99232222f7e62fd6085897e483d9dcd652bccdae73ff94c6f90de2f80aa439c8d005a8d0f6e18dd23d54704a1ef851bd
-  data.tar.gz: 8f5ef4ea067923d84b1dcbe139e7e9712d03481f8779d8ca7b954b4ec29201ea4a2aabff4bdc0719e9e33801313d59664febb94cfd67cc11d48a2b7a89308c2b
+  metadata.gz: e745bf572287f0c86144b03a55493f0de0f8954762664d5165e2cce579bffb80742af7f22c4ac9881fe06519a459b619f922cb7f8c7390cb3d59f62ca7dfc042
+  data.tar.gz: 6dcb427899adfbc5c7d9e7c9b5b2cb1900a52e98e27511c357f4287b53c94a2698c26ffad5d44efab9cf7df2d66d2f74286ebaac93c0e1d74bc75128de531b96

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.3.10
+* [feature] Chef server manifest sync knife plugin
+
 # v0.3.8
 * [fix] Generate JSON properly under old implementations
 

data/README.md

@@ -393,6 +393,20 @@ line to your `spec_helper.rb` file:
 require 'batali/chefspec'
 ```
 
+## Chef Server Sync
+
+Batali includes a knife plugin to sync cookbooks defined within the local
+`batali.manifest` file with the cookbooks available from on the Chef server.
+
+```
+$ knife batali sync
+```
+
+This command will remove any cookbooks on the Chef server that are not found
+within the `batali.manifest` file. If cookbooks are defined within the
+`batali.manifest` file that have not been uploaded to the Chef server, those
+cookbooks will be uploaded.
+
 # Info
 
 * Repository: https://github.com/hw-labs/batali

data/lib/batali/version.rb

@@ -1,4 +1,4 @@
 module Batali
   # Current version
-  VERSION = Gem::Version.new('0.3.8')
+  VERSION = Gem::Version.new('0.3.10')
 end

data/lib/chef/knife/batali_sync.rb

@@ -0,0 +1,221 @@
+require 'batali'
+
+class Chef
+  class Knife
+    class BataliSync < Knife
+
+      banner 'knife batali sync'
+
+      option(:blacklist,
+        :short => '-B COOKBOOK_NAME[,COOKBOOK_NAME]',
+        :long => '--blacklist COOKBOOK_NAME[,COOKBOOK_NAME]',
+        :description => 'Cookbooks to ignore from sync',
+        :proc => lambda{|val|
+          Chef::Config[:knife][:batali_blacklist] ||= []
+          Chef::Config[:knife][:batali_blacklist] += val.split(',')
+        }
+      )
+
+      option(:details,
+        :long => '--[no-]details',
+        :boolean => true,
+        :default => true,
+        :description => 'Show details of cookbooks to be removed / added'
+      )
+
+      option(:show_remaining,
+        :long => '--[no-]show-remaining',
+        :description => 'Display cookbook details of expected final server state',
+        :boolean => true,
+        :default => false,
+        :proc => lambda{|val|
+          Chef::Config[:knife][:batali_show_remaining] = val
+        }
+      )
+
+      option(:dry_run,
+        :long => '--[no-]dry-run',
+        :description => 'Display information but perform no action',
+        :boolean => true,
+        :default => false
+      )
+
+      def run
+        Chef::Config[:knife][:batali_blacklist] ||= []
+        config[:verbose] = config[:verbosity].to_i > 0
+        ui.info "#{ui.color('[Batali]', :green, :bold)}: Chef Server Batali Manifest Sync"
+        valid_cookbooks = run_task('Generating valid cookbook versions from manifest') do
+          generate_manifest_cookbooks
+        end
+        remote_cookbooks = run_task('Generating remote cookbook versions from chef server') do
+          generate_remote_cookbooks
+        end
+        to_remove = run_task('Building cookbook removal list') do
+          locate_removals(
+            :manifest => valid_cookbooks,
+            :server => remote_cookbooks
+          )
+        end
+        to_add = run_task('Building cookbook upload list') do
+          locate_additions(
+            :manifest => valid_cookbooks,
+            :server => remote_cookbooks
+          )
+        end
+        if(to_add.empty? && to_remove.empty?)
+          ui.info "#{ui.color('[Batali]', :green, :bold)}: Chef Server Batali Manifest Sync - #{ui.color('No Changes Detected!', :green, :bold)}"
+        else
+          display_sync_info(
+            :additions => to_add,
+            :removals => to_remove,
+            :manifest => valid_cookbooks
+          )
+          unless(config[:dry_run])
+            ui.confirm 'Sync remote cookbooks with Batali manifest'
+            remove_cookbooks(to_remove) unless to_remove.empty?
+            add_cookbooks(to_add) unless to_add.empty?
+            ui.info "#{ui.color('[Batali]', :green, :bold)}: Chef Server Batali Manifest Sync - #{ui.color('Sync Complete!', :green, :bold)}"
+          else
+            ui.warn 'Dry run requested. No action taken.'
+          end
+        end
+      end
+
+      def remove_cookbooks(ckbks)
+        run_task('Removing cookbooks') do
+          ckbks.each do |c_name, vers|
+            vers.each do |version|
+              if(config[:verbose])
+                ui.warn "Deleting cookbook #{c_name} @ #{version}"
+              end
+              rest.delete("/cookbooks/#{c_name}/#{version}")
+            end
+          end
+        end
+      end
+
+      def add_cookbooks(ckbks)
+        Batali::Command::Install.new({}, []).execute!
+        ui.info "#{ui.color('[Batali]', :green, :bold)}: Adding cookbooks to Chef server."
+        Knife::Upload.load_deps
+        ckbks.each do |c_name, vers|
+          vers.each do |version|
+            c_path = [
+              File.join('cookbooks', c_name),
+              File.join('cookbooks', "#{c_name}-#{version}")
+            ].detect do |_path|
+              File.directory?(_path)
+            end
+            uploader = Knife::Upload.new
+            uploader.configure_chef
+            uploader.config = config
+            uploader.name_args = [c_path]
+            if(config[:verbose])
+              ui.warn "Unloading cookbook #{c_name} @ #{version} - `#{c_path}`"
+            end
+            uploader.run
+          end
+        end
+        ui.info "#{ui.color('[Batali]', :green, :bold)}: Chef server cookbook additions complete."
+      end
+
+      def display_sync_info(opts)
+        num_remove = ui.color(opts[:removals].size.to_s, :red, :bold)
+        num_add = ui.color(opts[:additions].size.to_s, :green, :bold)
+        ui.info "#{ui.color('[Batali]', :green, :bold)}: Removals - #{num_remove} Additions: #{num_add}"
+        if(config[:details])
+          unless(opts[:removals].empty?)
+            ui.info "#{ui.color('[Batali]', :green, :bold)}: Cookbooks to be #{ui.color('removed', :red, :bold)}:"
+            opts[:removals].sort.each do |name, versions|
+              vers = versions.map do |v|
+                Gem::Version.new(v)
+              end.sort.map(&:to_s).join(', ')
+              ui.info "  #{ui.color(name, :red, :bold)}: #{ui.color(vers, :red)}"
+            end
+          end
+          unless(opts[:additions].empty?)
+            ui.info "#{ui.color('[Batali]', :green, :bold)}: Cookbooks to be #{ui.color('added', :green, :bold)}:"
+            opts[:additions].sort.each do |name, versions|
+              vers = versions.map do |v|
+                Gem::Version.new(v)
+              end.sort.map(&:to_s).join(', ')
+              ui.info "  #{ui.color(name, :green, :bold)}: #{ui.color(vers, :green)}"
+            end
+          end
+          if(Chef::Config[:knife][:batali_show_remaining])
+            ui.info "#{ui.color('[Batali]', :green, :bold)}: Final list of cookbooks to be available on the chef server:"
+            opts[:manifest].sort.each do |name, versions|
+              vers = versions.map do |v|
+                Gem::Version.new(v)
+              end.sort.map(&:to_s).join(', ')
+              ui.info "  #{ui.color(name, :bold)}: #{vers}"
+            end
+          end
+        end
+      end
+
+      def locate_removals(opts)
+        Smash.new.tap do |rm|
+          opts[:server].each do |c_name, c_versions|
+            kills = c_versions - opts[:manifest].fetch(c_name, [])
+            unless(kills.empty?)
+              rm[c_name] = kills
+            end
+          end
+        end
+      end
+
+      def locate_additions(opts)
+        Smash.new.tap do |add|
+          opts[:manifest].each do |c_name, c_versions|
+            adds = c_versions - opts[:server].fetch(c_name, [])
+            unless(adds.empty?)
+              add[c_name] = adds
+            end
+          end
+        end
+      end
+
+      def generate_manifest_cookbooks
+        path = File.join(Dir.pwd, 'batali.manifest')
+        unless(File.exists?(path))
+          raise "Failed to locate batali manifest at: #{path}"
+        end
+        manifest = Batali::Manifest.build(path)
+        Smash.new.tap do |ckbks|
+          manifest.cookbook.each do |c|
+            next if Chef::Config[:knife][:batali_blacklist].include?(c.name)
+            ckbks[c.name] ||= []
+            ckbks[c.name] << c.version.to_s
+          end
+        end
+      end
+
+      def generate_remote_cookbooks
+        Smash.new.tap do |ckbks|
+          rest.get('cookbooks?num_versions=all').map do |c_name, meta|
+            next if Chef::Config[:knife][:batali_blacklist].include?(c_name)
+            ckbks[c_name] = []
+            meta['versions'].each do |info|
+              ckbks[c_name] << info['version']
+            end
+          end
+        end
+      end
+
+      def run_task(task)
+        ui.stdout.print "#{ui.color('[Batali]', :green, :bold)}: #{task}... "
+        begin
+          value = yield if block_given?
+          ui.info ui.color('complete', :green)
+          value
+        rescue => e
+          ui.info ui.color('failed', :red, :bold)
+          puts e.backtrace.join("\n")
+          raise e
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.10
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -214,6 +214,7 @@ files:
 - lib/batali/unit_loader.rb
 - lib/batali/utility.rb
 - lib/batali/version.rb
+- lib/chef/knife/batali_sync.rb
 homepage: https://github.com/hw-labs/batali
 licenses:
 - Apache 2.0