batali 0.1.20 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eadd48fc1341e54688813b18a73d6eb13284451c
-  data.tar.gz: 84b62f74c35cd576c3c32aaea40beed4bb082eb4
+  metadata.gz: dbea03b20a8f3a778cf33c5419052e6287d03fa6
+  data.tar.gz: 31cb700a57303625a7b153d7cd337d697ddbcaff
 SHA512:
-  metadata.gz: d9452d064ef4c452098319d76e0f1708b7a962977b5ef8b41d3c513aa7895c5c484413c41b1342eb602242adda92a80140a0c1a792b6a0e98c20a70d6ee562b9
-  data.tar.gz: f330d2af6d5e897fe4604ac7e2ea855a5f6c8e7d1b922fb989030de6ba5bad3c6ed1c26b577f99681ea93d762c9375b3ffa94afa5806e692b16edf86b674f835
+  metadata.gz: 8cb20016cc7b46f91cc629020b50e5661c16ad0c81ebdb56beeb64d9bbef012973937e9bb8844197278a819b75a52072cc38db4f96f831bea0a12b79bbbc1ded
+  data.tar.gz: 78b4188b71cbeaaccf38a244ecc2c31ec134485aca8974bbf527d15f747c15a96da8a02a31adaba58fd07a427f53207edc0eb1b15432ed4beffaf6f1c9230ecf

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.1.22
+* Add support for `metadata` keyword in Batali file
+* Extract install path from merged config instead of only namespaced opts
+
 # v0.1.20
 * Reuse ui on `update` command when calling `resolve` and `install`
 

data/README.md

@@ -194,6 +194,12 @@ $ batali resolve --infrastructure
 
 _NOTE: Depending on constraints defined within the Batali file, this can be a very large manifest_
 
+## Test Kitchen
+
+Batali can be used with [Test Kitchen](https://github.com/test-kitchen/test-kitchen):
+
+* https://github.com/hw-labs/batali-tk
+
 # Info
 
 * Repository: https://github.com/hw-labs/batali

data/lib/batali/b_file.rb

@@ -31,6 +31,10 @@ module Batali
       self
     end
 
+    def metadata(*args)
+      set!(:metadata, *(args.empty? ? [true] : args))
+    end
+
   end
 
   # Create a new file
@@ -92,6 +96,13 @@ module Batali
     }
     attribute :group, Group, :multiple => true, :coerce => lambda{|v| Group.new()}
     attribute :cookbook, Cookbook, :multiple => true, :coerce => BFile.cookbook_coerce, :default => []
+    attribute :metadata, Cookbook, :coerce => lambda{ |v, b_file|
+      dir = File.dirname(b_file.path)
+      m_unit = Origin::Path.new(:name => 'metadata', :path => dir).units.first
+      ckbk = Cookbook.new(:name => m_unit.name, :version => m_unit.version, :path => dir)
+      b_file.cookbook.push ckbk
+      ckbk
+    }
 
   end
 

data/lib/batali/command/install.rb

@@ -10,7 +10,7 @@ module Batali
       # Install cookbooks
       def execute!
         dry_run('Cookbook installation') do
-          install_path = opts.fetch(:path, 'cookbooks')
+          install_path = config.fetch(:path, 'cookbooks')
           run_action('Readying installation destination') do
             FileUtils.rm_rf(install_path)
             FileUtils.mkdir_p(install_path)
@@ -27,13 +27,14 @@ module Batali
                   )
                 end
                 asset_path = unit.source.asset
+                final_path = File.join(install_path, unit.name)
+                if(config[:infrastructure])
+                  final_path << "-#{unit.version}"
+                end
                 begin
                   FileUtils.cp_r(
                     File.join(asset_path, '.'),
-                    File.join(
-                      install_path,
-                      "#{unit.name}-#{unit.version}"
-                    )
+                    final_path
                   )
                 ensure
                   unit.source.clean_asset(asset_path)

data/lib/batali/version.rb

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

metadata

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