batali 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27264f54883b15e90cf86e0c44a18c861ee33e05
-  data.tar.gz: 3db117858379470704b67ad9e0acef863a471d3a
+  metadata.gz: c69ca3a698a94a1797c499c491e9a50f69bc8d3b
+  data.tar.gz: 781d13d797963bdb886c0a22f219bee3e161bd2b
 SHA512:
-  metadata.gz: 4fad68431b1362dafb49f2c2821ce8907a06c1af70c8591512e1ad4094148f681d85a335cf281e903887eb1ca76fbccb1e74c2590a99de79c942c9e8b60a92d7
-  data.tar.gz: 136eaed0d5bf501e5fe0f66b03f697beb532230f33600031794d29e06a92c2b3cc76e021adb7c66fd48b01095c7040f80fbdb953c1cf6cf583aff1773f5bbb23
+  metadata.gz: 2c56fcd91bb80bcafdc94f5a5b13ff3db00f32066e754ec92a249f7d488b4da23a97bb0d2662fee2feab71408493d88289e7f06209545d68baac704c43f3ad69
+  data.tar.gz: 1c171c5155f4ce221809273e899a6daa8a551aabc7fdfb25a14ae48617bc5e114fa5dabedc5e6f87431c00dab6a5e8093d2e27cac25fc0a9e57bd84076c928b1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.1.16
+* Include cookbook removals on resolve output
+* Add initial infrastructure resolve output to show cookbooks + versions
+* Update restrictions to use `:source` instead of `:to` for source reference
+
 # v0.1.14
 * Start adding debug and verbose output (#9)
 * Update exception messages to provide more clarity

data/lib/batali/b_file.rb

@@ -81,7 +81,7 @@ module Batali
     end
 
     attribute :restrict, Restriction, :multiple => true, :coerce => lambda{|v|
-      Restriction.new(:cookbook => v.first, :source => v.last.to_smash[:to])
+      Restriction.new(:cookbook => v.first, :source => v.last.to_smash[:source])
     }
     attribute :source, Origin::RemoteSite, :multiple => true, :coerce => lambda{|v|
       args = Smash.new(:endpoint => v.first)

data/lib/batali/command/resolve.rb

@@ -30,56 +30,9 @@ module Batali
           :score_keeper => score_keeper
         )
         if(opts[:infrastructure])
-          ui.info 'Performing infrastructure path resolution.'
-          run_action 'Writing infrastructure manifest file' do
-            File.open('batali.manifest', 'w') do |file|
-              manifest = Manifest.new(:cookbook => solv.world.units.values.flatten)
-              file.write MultiJson.dump(manifest, :pretty => true)
-              nil
-            end
-          end
+          infrastructure_resolution(solv)
         else
-          original_units = Smash[
-            [manifest.cookbook].flatten.compact.map do |unit|
-              [unit.name, unit.version]
-            end
-          ]
-          ui.info 'Performing single path resolution.'
-          results = []
-          run_action 'Resolving dependency constraints' do
-            results = solv.generate!
-            nil
-          end
-          if(results.empty?)
-            ui.error 'No solutions found defined requirements!'
-          else
-            ideal_solution = results.pop
-            dry_run('manifest file write') do
-              run_action 'Writing manifest' do
-                manifest = Manifest.new(:cookbook => ideal_solution.units)
-                File.open('batali.manifest', 'w') do |file|
-                  file.write MultiJson.dump(manifest, :pretty => true)
-                end
-                nil
-              end
-            end
-            # ui.info "Number of solutions collected for defined requirements: #{results.size + 1}"
-            ui.info 'Ideal solution:'
-            ideal_solution.units.sort_by(&:name).map do |unit|
-              output_args = ["#{unit.name} <#{unit.version}>"]
-              unless(original_units.empty?)
-                if(original_units[unit.name])
-                  unless(original_units[unit.name] == unit.version)
-                    output_args.first.replace "#{unit.name} <#{original_units[unit.name]} -> #{unit.version}>"
-                    output_args.push(:yellow)
-                  end
-                else
-                  output_args.push(:green)
-                end
-              end
-              ui.puts ui.color(*output_args)
-            end
-          end
+          single_path_resolution(solv)
         end
       end
 
@@ -97,6 +50,75 @@ module Batali
         end
       end
 
+      # Generate manifest comprised of units for single path resolution
+      #
+      # @param solv [Grimoire::Solver]
+      # @return [TrueClass]
+      def single_path_resolution(solv)
+        original_units = Smash[
+          [manifest.cookbook].flatten.compact.map do |unit|
+            [unit.name, unit.version]
+          end
+        ]
+        ui.info 'Performing single path resolution.'
+        results = []
+        run_action 'Resolving dependency constraints' do
+          results = solv.generate!
+          nil
+        end
+        if(results.empty?)
+          ui.error 'No solutions found defined requirements!'
+        else
+          ideal_solution = results.pop
+          dry_run('manifest file write') do
+            run_action 'Writing manifest' do
+              manifest = Manifest.new(:cookbook => ideal_solution.units)
+              File.open('batali.manifest', 'w') do |file|
+                file.write MultiJson.dump(manifest, :pretty => true)
+              end
+              nil
+            end
+          end
+          # ui.info "Number of solutions collected for defined requirements: #{results.size + 1}"
+          ui.info 'Ideal solution:'
+          solution = Smash[ideal_solution.units.map{|unit| [unit.name, unit.version]}]
+          (original_units.keys + solution.keys).compact.uniq.sort.each do |unit_name|
+            if(original_units[unit_name])
+              if(solution[unit_name])
+                if(solution[unit_name] == original_units[unit_name])
+                  ui.puts "#{unit_name} <#{solution[unit_name]}>"
+                else
+                  ui.puts ui.color("#{unit_name} <#{original_units[unit_name]} -> #{solution[unit_name]}>", :yellow)
+                end
+              else
+                ui.puts ui.color("#{unit_name} <#{original_units[unit_name]}>", :red)
+              end
+            else
+              ui.puts ui.color("#{unit_name} <#{solution[unit_name]}>", :green)
+            end
+          end
+        end
+      end
+
+      # Generate manifest comprised of units for entire infrastructure
+      #
+      # @param solv [Grimoire::Solver]
+      # @return [TrueClass]
+      def infrastructure_resolution(solv)
+        ui.info 'Performing infrastructure path resolution.'
+        run_action 'Writing infrastructure manifest file' do
+          File.open(manifest.path, 'w') do |file|
+            manifest = Manifest.new(:cookbook => solv.world.units.values.flatten)
+            file.write MultiJson.dump(manifest, :pretty => true)
+            nil
+          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(', ')}>"
+        end
+      end
+
     end
 
   end

data/lib/batali/manifest.rb

@@ -6,6 +6,7 @@ module Batali
 
     include Bogo::Memoization
 
+    attribute :path, String
     attribute :cookbook, Batali::Unit, :multiple => true, :coerce => lambda{|v| Batali::Unit.new(v)}, :default => []
 
     # Build manifest from given path. If no file exists, empty
@@ -15,9 +16,9 @@ module Batali
     # @return [Manifest]
     def self.build(path)
       if(File.exists?(path))
-        self.new(Bogo::Config.new(path).data)
+        self.new(Bogo::Config.new(path).data.merge(:path => path))
       else
-        self.new
+        self.new(:path => path)
       end
     end
 

data/lib/batali/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct