batali 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c692d1edb330642392a6ef61b210a5f5037e793c
-  data.tar.gz: b1aa54310c247f36d94a0e432e7e32ff7c351eb0
+  metadata.gz: d366f8505f42d3de37db98957d97c9375aed1e92
+  data.tar.gz: 4fc9d0f05e4cbe6b96f0e39814c75d34820ec5ee
 SHA512:
-  metadata.gz: b0b3ac70767d86424b2ef49b603352d06dc8bfba7b1ef24d876fb3b207424d90a8b9bd06b2ebfd84608255fd9db28c7798a288d97200a69d44ea0fba53ffdaaf
-  data.tar.gz: 2f96dcad44fb26db63b243c48d4e1ce395390ff773d5c5b9fd69520bae5533bae1740d71b7050491caa99e5faef22ba0b71bc87e44f6376169a5455d50a5596d
+  metadata.gz: ec2b50fe38838317715d79ed0de57b467c853397f54ceb0da9c49b9d7f51d2c3b6e4cbd04e89a926d82425c8dc0000ed41ac8e7fbc42a0d20290c6fbd71527f6
+  data.tar.gz: dda1337c5320c000f5689f25c27b2b4389b50f1c1b0e908c0206f668e8368674b6a8b204f2b336d1dd11579b471ee7179113de849ac16ef1a041f127909cf0a7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.1.6
+* Bug fix for proper Batali file loading when single cookbook defined
+* Bug fix for cookbook install when using path source (git as well)
+* Add color coding to solution output on single path resolutions
+
 # v0.1.4
 * Bug fix for dependency parsing when using path type source
 

data/lib/batali/b_file.rb

@@ -47,6 +47,13 @@ module Batali
           end
         when String
           Cookbook.new(:name => v)
+        when Hash
+          c_name = v.first
+          Cookbook.new(
+            v.last.merge(
+              :name => c_name
+            )
+          )
         else
           raise ArgumentError.new "Unable to coerce given type `#{v.class}` to `Batali::BFile::Cookbook`!"
         end

data/lib/batali/command/resolve.rb

@@ -39,6 +39,11 @@ module Batali
             end
           end
         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
@@ -60,7 +65,20 @@ module Batali
             end
             ui.info "Number of solutions collected for defined requirements: #{results.size + 1}"
             ui.info 'Ideal solution:'
-            ui.puts ideal_solution.units.sort_by(&:name).map{|u| "#{u.name}<#{u.version}>"}
+            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
         end
       end

data/lib/batali/git.rb

@@ -31,6 +31,7 @@ module Batali
     def ref_dup
       git = ::Git.open(base_path)
       git.checkout(ref)
+      git.pull('origin', ref)
       self.ref = git.log.first.sha
       self.path = File.join(cache, ref)
       unless(File.directory?(path))

data/lib/batali/source/path.rb

@@ -16,7 +16,7 @@ module Batali
       def asset
         memoize(:asset) do
           dir = Dir.mktmpdir
-          FileUtils.cp_r(path, dir)
+          FileUtils.cp_r(File.join(path, '.'), dir)
           dir
         end
       end

data/lib/batali/version.rb

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

metadata

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