batali-tk 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc8c7a562ad705cdeb8271748e5809e4a988f41c
-  data.tar.gz: 17ef1799d68a9e2cb7d50e1fb91ab5f39926d899
+  metadata.gz: 0b6f318f0e0529d04126964e9bef9be6da18018d
+  data.tar.gz: f38cc77847cfecfe57598d7a44614bc69ec9eae9
 SHA512:
-  metadata.gz: 680edcc872fe4e33fc7a3a1553bb9d154bcbc503983fdcecf0e679e64026e88764cba144a9e254e14137b25f0315621e2afd78a8ad180df05a2fd0b1f0fa837a
-  data.tar.gz: cd1c0a282e7c91afec6e8fb22c29da2ac48d5f0a4ffaa315f38fefb20cbb0ba54a2ef9177cbca09dbd7923ef00383d8844d2f41e5302e56152dc1d7a5b740327
+  metadata.gz: 51518ec2b64948257da81e2462e07e799f7d3164f89538b09f60229675ceda2097b22abc3f025e3be1673cdb58de7d0eeb5c51ab940c7d31aa51a6906774aea7
+  data.tar.gz: e8f908d11159ba87c55d3514a499f79d481ea1e94bbd4787d4dae56f2af413b564644c0c2b59d6e9d8895620530c760d1d3d22c6466c5a6de7e6a5a059565ae3

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.2.0
+* [enhancement] Add support for infrastructure repository style testing
+
 # v0.1.4
 * [fix] Fix cookbook installation issue
 * Always send batali action output to debug

data/README.md

@@ -17,7 +17,30 @@ use the wrapper command:
 $ batali-tk --help
 ```
 
-This will hopefully not be needed for future versions of test kitchen.
+### Infrastructure Repository
+
+The Batali test-kitchen wrapper can be used to test cookbooks within an
+infrastructure repository context. A `Batali` file is required at the root
+of the infrastructure repository and is optional within the cookbook itself
+(only required in the cookbook if extra testing dependencies are required).
+This can be done using the `--batali-cookbook-path` flag. As most cookbooks
+will live in a separate repository, you can provide the path to a working
+copy on your system:
+
+```
+$ batali-tk test BOX --batali-cookbook-path ../users
+```
+
+#### Environment constraints
+
+If you want to test the cookbook using a specific set of environment constraints,
+that can be done too. It required the auto discovery feature of Batali to be
+in use within the infrastructure repository Batali file. To enable environment
+constraints:
+
+```
+$ batali-tk test BOX --batali-cookbook-path ../users --batali-environment production
+```
 
 # Info
 

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.16', '< 1'
+  s.add_runtime_dependency 'batali', '>= 0.2.33', '< 1'
   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

@@ -1,6 +1,64 @@
 #!/usr/bin/env ruby
 
 Signal.trap("INT") { exit 1 }
+require 'bogo'
+require 'batali'
+
+if(idx = ARGV.index('--batali-cookbook-path'))
+  _, cookbook_path = ARGV.slice!(idx, 2)
+  cookbook_info = Batali::Origin::Path.new(:name => 'metadata', :path => File.expand_path(cookbook_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.cookbook.delete_if{|item| item.name == cookbook_name}
+  if(File.exists?(ckbk_batali))
+    ckbk_b = Batali::BFile.new(ckbk_batali)
+    new_batali_data = MultiJson.dump(
+      MultiJson.load(
+        MultiJson.dump(ckbk_b.data)
+      ).to_smash.deep_merge(
+        MultiJson.load(
+          MultiJson.dump(origin_batali.data)
+        )
+      )
+    )
+  else
+    origin_batali.cookbook.push(Batali::BFile::Cookbook.new(:name => cookbook_name, :path => cookbook_path))
+    new_batali_data = MultiJson.dump(origin_batali.data)
+  end
+
+  n_data = MultiJson.load(new_batali_data)
+
+  expander = lambda do |item|
+    if(item.is_a?(Hash))
+      item.keys.each do |k|
+        if(k == 'path')
+          item[k] = File.expand_path(item[k])
+        elsif(item[k].is_a?(Hash) || item[k].is_a?(Array))
+          expander.call(item[k])
+        end
+      end
+    elsif(item.is_a?(Array))
+      item.each{|i| expander.call(i)}
+    end
+  end
+  expander.call(n_data)
+
+  temp_b = Bogo::EphemeralFile.new('batali-tk')
+  temp_b.write MultiJson.dump(n_data)
+  temp_b.flush
+
+  ENV['KITCHEN_BATALI_FILE'] = temp_b.path
+  ENV['KITCHEN_YAML'] = File.expand_path(
+    File.join('.', cookbook_path, '.kitchen.yml')
+  )
+  puts "!! Batali test-kitchen infra-repo override for `#{cookbook_name}` @ `#{cookbook_path}`"
+end
+if(idx = ARGV.index('--batali-environment'))
+  _, environment_name = ARGV.slice!(idx, 2)
+  ENV['KITCHEN_BATALI_ENVIRONMENT'] = environment_name
+  puts "!! Batali test-kitchen infra-repo override for resolution against `#{environment_name}` environment defined constraints"
+end
 
 # Force `kitchen` name so we don't end up with batali-tk branding
 require 'thor'
@@ -16,5 +74,10 @@ require 'kitchen'
 require 'kitchen/cli'
 require 'kitchen/errors'
 
-
-Kitchen.with_friendly_errors { Kitchen::CLI.start }
+cwd = Dir.pwd
+begin
+  Dir.chdir(cookbook_path)
+  Kitchen.with_friendly_errors { Kitchen::CLI.start }
+ensure
+  Dir.chdir(cwd)
+end

data/lib/batali-tk/monkey.rb

@@ -3,7 +3,7 @@ module BataliTk
   module Box
 
     def batali_file
-      File.join(config[:kitchen_root], "Batali")
+      ENV.fetch('KITCHEN_BATALI_FILE', File.join(config[:kitchen_root], "Batali"))
     end
 
     def batali_prepare_cookbooks
@@ -37,7 +37,7 @@ module BataliTk
   module Base
 
     def batali_file
-      File.join(config[:kitchen_root], "Batali")
+      ENV.fetch('KITCHEN_BATALI_FILE', File.join(config[:kitchen_root], "Batali"))
     end
 
     def batali_load_needed_dependencies!

data/lib/batali-tk/provisioner.rb

@@ -48,20 +48,30 @@ module Kitchen
           debug "Using Batali file located at: #{batali_file}"
           output = ''
           begin
-            ::Batali::Command::Update.new(
-              Smash.new(
-                :file => batali_file,
+            FileUtils.cp(
+              batali_file,
+              File.join(
+                File.dirname(vendor_path),
+                'Batali'
+              )
+            )
+            Dir.chdir(File.dirname(vendor_path)) do
+              ::Batali::Command::Update.new(
+                Smash.new(
                 :path => vendor_path,
                 :update => {
-                  :install => true
+                  :install => true,
+                  :environment => ENV['KITCHEN_BATALI_ENVIRONMENT'],
+                  :infrastructure => false
                 },
                 :ui => Bogo::Ui.new(
                   :app_name => 'Batali',
                   :output_to => StringIO.new(output)
                 ),
               ),
-              []
-            ).execute!
+                []
+              ).execute!
+            end
           rescue => e
             error "Batali failed to install cookbooks! #{e.class}: #{e}"
           end

data/lib/batali-tk/version.rb

@@ -1,6 +1,6 @@
 module BataliTk
   # Library version
-  VERSION = Gem::Version.new('0.1.4')
+  VERSION = Gem::Version.new('0.2.0')
   # 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.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: batali
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.16
+        version: 0.2.33
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.16
+        version: 0.2.33
     - - "<"
       - !ruby/object:Gem::Version
         version: '1'
@@ -81,9 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Batali for test-kitchen
 test_files: []
-has_rdoc: