batali-tk 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54db81e5be411cd1c943f95b2bf1eac5334ea685
-  data.tar.gz: 04c5afb6cba6959d7c2d496baea8b5cb566a8c70
+  metadata.gz: 86d46ac8fcec3698fa480ebcd8994a6e955608dc
+  data.tar.gz: c322dcd58a4ad29bcc2aca6942c0efe993f9661a
 SHA512:
-  metadata.gz: f90ff6db2f2a6001cd1fa33d7f1a79d77a3b199a610f21f773ee604f6d72601db99053944683a2e29b643f84d8fba4580184c096dac96fd11009cab250a0f1a3
-  data.tar.gz: 86c4c2b233293cb02419dcc9748d56600aa9652b6cd7f36e23021837c1bb63095e55c2549fcca50e835062f422002e4963a5da268ee1e7d4834f896934006496
+  metadata.gz: 440ece530e06205ac4495388866017980a4a3533104a7951ade18280d19c5dff7039264bb50b47b2f478325bfb4ff7e8ed1f650e191c61a0e5f9486b03750972
+  data.tar.gz: 9097f9fbc9bd7bd3d50e62565cdd2d5ad16b5dfec5f2ceed97d017836ea5d06ab94a76386906689e78b003f84e36cde544cb0ecd468965f62d3c5e27ddcaf097

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.4
+* [fix] Relative paths for single cookbook resolution
+* [fix] Use custom cache directory on ephemeral batali files in infra mode
+
 # v0.2.2
 * [fix] Only change working directory if providing cookbook path (#2)
 

data/batali-tk.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = 'Batali support injector for test kitchen'
   s.require_path = 'lib'
   s.license = 'Apache 2.0'
-  s.add_runtime_dependency 'batali', '>= 0.2.33', '< 1'
+  s.add_runtime_dependency 'batali', '>= 0.2.33', '< 0.5'
   s.add_runtime_dependency 'test-kitchen', BataliTk::TK_CONSTRAINT
   s.executables << 'batali-tk'
   s.files = Dir['{lib,bin}/**/**/*'] + %w(batali-tk.gemspec README.md CHANGELOG.md CONTRIBUTING.md LICENSE)

data/bin/batali-tk

@@ -3,16 +3,22 @@
 Signal.trap("INT") { exit 1 }
 require 'bogo'
 require 'batali'
+require 'tmpdir'
 
 if(idx = ARGV.index('--batali-cookbook-path'))
+  cache_path = Dir.mktmpdir('batali-tk-cache')
   _, cookbook_path = ARGV.slice!(idx, 2)
-  cookbook_info = Batali::Origin::Path.new(:name => 'metadata', :path => File.expand_path(cookbook_path))
+  cookbook_info = Batali::Origin::Path.new(
+    :name => 'metadata',
+    :path => File.expand_path(cookbook_path),
+    :cache_path => cache_path
+  )
   cookbook_name = cookbook_info.units.first.name
   ckbk_batali = File.join(File.expand_path(cookbook_path), 'Batali')
-  origin_batali = Batali::BFile.new(File.expand_path('./Batali'))
+  origin_batali = Batali::BFile.new(File.expand_path('./Batali'), cache_path)
   origin_batali.cookbook.delete_if{|item| item.name == cookbook_name}
   if(File.exists?(ckbk_batali))
-    ckbk_b = Batali::BFile.new(ckbk_batali)
+    ckbk_b = Batali::BFile.new(ckbk_batali, cache_path)
     new_batali_data = MultiJson.dump(
       MultiJson.load(
         MultiJson.dump(ckbk_b.data)
@@ -52,6 +58,7 @@ if(idx = ARGV.index('--batali-cookbook-path'))
   ENV['KITCHEN_YAML'] = File.expand_path(
     File.join('.', cookbook_path, '.kitchen.yml')
   )
+  FileUtils.rm_rf(cache_path)
   puts "!! Batali test-kitchen infra-repo override for `#{cookbook_name}` @ `#{cookbook_path}`"
 end
 if(idx = ARGV.index('--batali-environment'))

data/lib/batali-tk/provisioner.rb

@@ -48,32 +48,53 @@ module Kitchen
           debug "Using Batali file located at: #{batali_file}"
           output = ''
           begin
-            FileUtils.cp(
-              batali_file,
-              File.join(
-                File.dirname(vendor_path),
-                'Batali'
+            if(ENV['KITCHEN_BATALI_FILE'])
+              debug 'Running Batali resolution in full vendor directory isolation'
+              FileUtils.cp(
+                batali_file,
+                File.join(
+                  File.dirname(vendor_path),
+                  'Batali'
+                )
               )
-            )
-            Dir.chdir(File.dirname(vendor_path)) do
+              Dir.chdir(File.dirname(vendor_path)) do
+                ::Batali::Command::Update.new(
+                  Smash.new(
+                    :path => vendor_path,
+                    :update => {
+                      :install => true,
+                      :environment => ENV['KITCHEN_BATALI_ENVIRONMENT'],
+                      :infrastructure => false
+                    },
+                    :ui => Bogo::Ui.new(
+                      :app_name => 'Batali',
+                      :output_to => StringIO.new(output)
+                    ),
+                  ),
+                  []
+                ).execute!
+              end
+            else
               ::Batali::Command::Update.new(
                 Smash.new(
-                :path => vendor_path,
-                :update => {
-                  :install => true,
-                  :environment => ENV['KITCHEN_BATALI_ENVIRONMENT'],
-                  :infrastructure => false
-                },
-                :ui => Bogo::Ui.new(
-                  :app_name => 'Batali',
-                  :output_to => StringIO.new(output)
+                  :file => batali_file,
+                  :path => vendor_path,
+                  :update => {
+                    :install => true,
+                    :environment => ENV['KITCHEN_BATALI_ENVIRONMENT'],
+                    :infrastructure => false
+                  },
+                  :ui => Bogo::Ui.new(
+                    :app_name => 'Batali',
+                    :output_to => StringIO.new(output)
+                  ),
                 ),
-              ),
                 []
               ).execute!
             end
           rescue => e
             error "Batali failed to install cookbooks! #{e.class}: #{e}"
+            raise e
           end
           debug "Batali output:\n#{output}"
         end

data/lib/batali-tk/version.rb

@@ -1,6 +1,6 @@
 module BataliTk
   # Library version
-  VERSION = Gem::Version.new('0.2.2')
+  VERSION = Gem::Version.new('0.2.4')
   # Constraint for test-kitchen dependency
   TK_CONSTRAINT = '~> 1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali-tk
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: batali
@@ -19,7 +19,7 @@ dependencies:
         version: 0.2.33
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 0.2.33
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement