batali 0.2.30 → 0.2.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 034b14624fd03d050d9ae0e8d1142332b56882b1
-  data.tar.gz: 083f314e9a0537ffc3c471f365693d1df8502f60
+  metadata.gz: bb8be253084c752f62ea9022af64502013512df6
+  data.tar.gz: 14c8943c92771c752d94825140352a39a544aec3
 SHA512:
-  metadata.gz: d37d1bc1ec728b270524dee1af9eaa96963410e18f24258d83451479fba7cc2939908de50d7de364b417b87e14f82fef35985961ae728687c41cafa8c55ff475
-  data.tar.gz: f0917117a5202699863a408ad1191ca2a5c4914576aa1808ba62e86df7d751c793ec9ce45d054d7ba7125512359ce01899216e939d31e1bfe990ab3c8d8c9803
+  metadata.gz: 8098dbc72989379d75e26ec694fad5be9c041dc659638c19cf4d85aa3bf68ebed4435c21d780cbaa0e0f207ca2525784f91da1e210fe86d2cd8ddf8896f30d53
+  data.tar.gz: 3f6de6fe1e4cb254bbc8322673f398297f5b37e433e60d04ca355a07375b1a902a3bc261785caac0d162890fcb8dc858202d7ada8e62eed440c4766e765fab12

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.2.32
+* [fix] Skip constraint merging when entry is non-site sourced
+* [enhancement] Support dry run in infrastructure resolve
+* [enhancement] Provide colorized diff on infrastructure manifest updates via resolve
+
 # v0.2.30
 * [fix] Run world pruner prior to manifest output
 * [enhancement] Provider UI context when pruning world

data/batali.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.license = 'Apache 2.0'
   s.add_runtime_dependency 'attribute_struct', '~> 0.2.14'
-  s.add_runtime_dependency 'grimoire', '~> 0.2.6'
+  s.add_runtime_dependency 'grimoire', '~> 0.2.8'
   s.add_runtime_dependency 'bogo', '~> 0.1.20'
   s.add_runtime_dependency 'bogo-cli', '~> 0.1.23'
   s.add_runtime_dependency 'bogo-config', '~> 0.1.10'

data/lib/batali/b_file.rb

@@ -54,6 +54,24 @@ module Batali
       super
     end
 
+    ::Object.constants.each do |const_name|
+      next if const_name == :Config
+      const_set(const_name, ::Object.const_get(const_name))
+    end
+
+    def require(*args)
+      result = ::Kernel.require(*args)
+      instance_exec do
+        class << self
+          ::Object.constants.each do |const_name|
+            next if const_name == :Config
+            const_set(const_name, ::Object.const_get(const_name))
+          end
+        end
+      end
+      result
+    end
+
   end
 
   # Create a new file
@@ -157,6 +175,10 @@ module Batali
             c.name == ckbk_name
           end
           if(ckbk)
+            unless(ckbk.constraint)
+              debug "Skipping constraint merging due to lack of original constraints: #{ckbk.inspect}"
+              next
+            end
             new_constraints = ckbk.constraint.dup
             new_constraints += constraints
             requirement = UnitRequirement.new(*new_constraints)

data/lib/batali/command/resolve.rb

@@ -126,19 +126,59 @@ module Batali
           solv.prune_world!
           nil
         end
-        run_action 'Writing infrastructure manifest file' do
-          File.open(manifest.path, 'w') do |file|
-            manifest = Manifest.new(
-              :cookbook => solv.world.units.values.flatten,
-              :infrastructure => true
-            )
-            file.write MultiJson.dump(manifest, :pretty => true)
-            nil
+        dry_run('manifest file write') do
+          run_action 'Writing infrastructure manifest file' do
+            File.open(manifest.path, 'w') do |file|
+              manifest = Manifest.new(
+                :cookbook => solv.world.units.values.flatten,
+                :infrastructure => true
+              )
+              file.write MultiJson.dump(manifest, :pretty => true)
+              nil
+            end
           end
         end
         ui.info 'Infrastructure manifest solution:'
-        solv.world.units.sort_by(&:first).each do |name, units|
-          ui.puts "#{name} <#{units.map(&:version).sort.map(&:to_s).join(', ')}>"
+
+        solution_units = solv.world.units
+        manifest_units = Smash.new.tap do |mu|
+          manifest.cookbook.each do |unit|
+            mu[unit.name] ||= []
+            mu[unit.name] << unit
+          end
+        end
+        (solution_units.keys + manifest_units.keys).compact.uniq.sort.each do |unit_name|
+          if(manifest_units[unit_name])
+            if(solution_units[unit_name])
+              removed = manifest_units[unit_name].find_all do |m_unit|
+                solution_units[unit_name].none? do |s_unit|
+                  m_unit.same?(s_unit)
+                end
+              end.map{|u| [u.version, :red] }
+              added = solution_units[unit_name].find_all do |s_unit|
+                manifest_units[unit_name].none? do |m_unit|
+                  s_unit.same?(m_unit)
+                end
+              end.map{|u| [u.version, :green]}
+              persisted = solution_units[unit_name].find_all do |s_unit|
+                manifest_units[unit_name].any? do |m_unit|
+                  s_unit.same?(m_unit)
+                end
+              end.map{|u| [u.version, nil]}
+              unit_versions = (removed + added + persisted).sort_by(&:first).map do |uv|
+                uv.last ? ui.color(uv.first.to_s, uv.last) : uv.first.to_s
+              end
+              unless(added.empty? && removed.empty?)
+                ui.puts "#{ui.color(unit_name, :yellow)} #{ui.color('<', :yellow)}#{unit_versions.join(ui.color(', ', :yellow))}#{ui.color('>', :yellow)}"
+              else
+                ui.puts "#{unit_name} <#{unit_versions.join(', ')}>"
+              end
+            else
+              ui.puts ui.color("#{unit_name} <#{manifest_units[unit_name].map(&:version).sort.map(&:to_s).join(', ')}>", :red)
+            end
+          else
+            ui.puts ui.color("#{unit_name} <#{solution_units[unit_name].map(&:version).sort.map(&:to_s).join(', ')}>", :green)
+          end
         end
       end
 

data/lib/batali/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.2.30
+  version: 0.2.32
 platform: ruby
 authors:
 - Chris Roberts
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.8
 - !ruby/object:Gem::Dependency
   name: bogo
   requirement: !ruby/object:Gem::Requirement