batali 0.4.8 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97f59524874d12a82fbf6a83243667f8fe75862e
-  data.tar.gz: 07a695381bf89644a5e54878b2d69063163263fb
+  metadata.gz: f4553dc89e46b84385924f5bb91aa2be8ef25f1a
+  data.tar.gz: 2002e75fc05c7b841f3152131ca66076969a1f26
 SHA512:
-  metadata.gz: 8f4604d2387be774d94fe30a7259162dc059e1a962b7720986436e29a81bd5f110842c8394b88eac3e83217e7667b6a610012cc9fdaba49603ee24fc4edb9d22
-  data.tar.gz: b3cf034a89fbcf276b9a8610067e20bce542f4a21dbe96286008b0b63d887000dfd696d3a3680ea6e462962fd43dff1741a2122d0fca4f7c57599ec57779b865
+  metadata.gz: 6c03e18e0c2ac2854ae223245b63134c5dc742ac2b3d1e439d248bb1e1ac5dad704b422ff4d0d1c168a66532da8981ba99606f28ec38396fcefbfe86c9986d15
+  data.tar.gz: 1ad3695558546faefb03819e2192ce5541dfc22e232c98b628fd99f58b2098a5f26286f05437d961e48da4ff780bdd314f3570d0dc75e31a60b044074dcc4c1b

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.4.10
+* [fix] Cookbook installation errors on windows (#82)
+
 # v0.4.8
 * [task] Pin rubocop to make less annoying
 * [fix] Explicitly load tempfile

data/lib/batali/b_file.rb

@@ -57,7 +57,7 @@ module Batali
     end
 
     ::Object.constants.each do |const_name|
-      next if const_name == :Config
+      next if const_name == :Config || const_name == :TimeoutError
       const_set(const_name, ::Object.const_get(const_name))
     end
 
@@ -66,7 +66,7 @@ module Batali
       instance_exec do
         class << self
           ::Object.constants.each do |const_name|
-            next if const_name == :Config
+            next if const_name == :Config || const_name == :TimeoutError
             const_set(const_name, ::Object.const_get(const_name))
           end
         end

data/lib/batali/command/install.rb

@@ -23,6 +23,7 @@ module Batali
               manifest.cookbook.each_slice(100) do |units_slice|
                 units_slice.map do |unit|
                   Thread.new do
+                    ui.debug "Starting unit install for: #{unit.name}<#{unit.version}>"
                     if(unit.source.respond_to?(:cache_path))
                       unit.source.cache_path = cache_directory(
                         Bogo::Utility.snake(unit.source.class.name.split('::').last)
@@ -38,6 +39,10 @@ module Batali
                         File.join(asset_path, '.'),
                         final_path
                       )
+                      ui.debug "Completed unit install for: #{unit.name}<#{unit.version}>"
+                    rescue => e
+                      ui.debug "Failed unit install for: #{unit.name}<#{unit.version}> - #{e.class}: #{e}"
+                      raise
                     ensure
                       unit.source.clean_asset(asset_path)
                     end

data/lib/batali/command/resolve.rb

@@ -74,6 +74,10 @@ module Batali
           ui.error 'No solutions found defined requirements!'
         else
           ideal_solution = results.pop
+          ui.debug 'Full solution raw contents:'
+          ideal_solution.units.each do |unit|
+            ui.debug [unit.name, unit.version].join(' -> ')
+          end
           dry_run('manifest file write') do
             run_action 'Writing manifest' do
               manifest = Manifest.new(

data/lib/batali/source/path.rb

@@ -31,7 +31,7 @@ module Batali
           files_to_copy = Dir.glob(File.join(path, '{.[^.]*,**}', '**', '{*,*.*,.*}'))
           files_to_copy = files_to_copy.map do |file_path|
             next unless File.file?(file_path)
-            relative_path = file_path.sub("#{path}/", '')
+            relative_path = file_path.sub("#{path}#{File::SEPARATOR}", '')
             relative_path unless chefignore.detect{|ig| File.fnmatch(ig, relative_path)}
           end.compact
           files_to_copy.each do |relative_path|

data/lib/batali/source/site.rb

@@ -51,7 +51,13 @@ module Batali
       # @return [String] directory
       def asset
         path = File.join(cache_directory, Base64.urlsafe_encode64(url))
-        unless(File.directory?(path))
+        if(File.directory?(path))
+          discovered_path = Dir.glob(File.join(path, '*')).reject do |i|
+            i.end_with?("#{File::SEPARATOR}asset")
+          end.first
+          FileUtils.rm_rf(path)
+        end
+        unless(discovered_path)
           retried = false
           begin
             FileUtils.mkdir_p(path)
@@ -92,13 +98,23 @@ module Batali
             end
             raise
           end
+          discovered_path = Dir.glob(File.join(path, '*')).reject do |i|
+            i.end_with?("#{File::SEPARATOR}asset")
+          end.first
+        end
+        unless(discovered_path)
+          raise Errno::ENOENT.new "Failed to locate asset within `#{path}`"
         end
-        Dir.glob(File.join(path, '*')).reject{|i| i.end_with?('/asset') }.first
+        discovered_path
       end
 
       # @return [TrueClass, FalseClass]
       def clean_asset(asset_path)
-        super File.dirname(asset_path)
+        if(asset_path)
+          super File.dirname(asset_path)
+        else
+          false
+        end
       end
 
     end

data/lib/batali/version.rb

@@ -1,5 +1,5 @@
 # Batali namespace
 module Batali
   # Current version
-  VERSION = Gem::Version.new('0.4.8')
+  VERSION = Gem::Version.new('0.4.10')
 end

metadata

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