batali 0.2.32 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb8be253084c752f62ea9022af64502013512df6
-  data.tar.gz: 14c8943c92771c752d94825140352a39a544aec3
+  metadata.gz: 46854b296a6edbf19b102be8b154d07a7b12281a
+  data.tar.gz: 7ffcd5cb954a80a8f3fa3c03081b71eaef3ff614
 SHA512:
-  metadata.gz: 8098dbc72989379d75e26ec694fad5be9c041dc659638c19cf4d85aa3bf68ebed4435c21d780cbaa0e0f207ca2525784f91da1e210fe86d2cd8ddf8896f30d53
-  data.tar.gz: 3f6de6fe1e4cb254bbc8322673f398297f5b37e433e60d04ca355a07375b1a902a3bc261785caac0d162890fcb8dc858202d7ada8e62eed440c4766e765fab12
+  metadata.gz: 54d327a5d8968e97c5b015e69137a702b38cef1e46251d3e2ccd05ba59c7300ca5e6f0c0b1ea06f3b8f97bb290674c09525f151bd2b51a690bfdd240b2da1076
+  data.tar.gz: 545583f6bf2c2bebf1f12a5b0208b1b353b3bc3631aae38e1cb8e9823858acb44df9fc60049ea4158af3ea254a9a22ba44afe25f1620454e40159d0348736900

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.3.0
+* [enhancement] Properly restore BFile from serialized data
+* [enhancement] Provide access to environment specific constraint usage
+
 # v0.2.32
 * [fix] Skip constraint merging when entry is non-site sourced
 * [enhancement] Support dry run in infrastructure resolve

data/bin/batali

@@ -44,6 +44,7 @@ Bogo::Cli::Setup.define do
     on :i, 'install', 'Install cookbooks after update', :default => true
     on :p, 'path=', 'Cookbook install path'
     on :I, 'infrastructure', 'Resolve infrastructure cookbooks'
+    on :e, 'environment=', 'Restrict auto-discovery to named environment'
 
     run do |opts, args|
       Batali::Command::Update.new({:update => opts.to_hash}, args).execute!
@@ -56,6 +57,7 @@ Bogo::Cli::Setup.define do
     on :d, 'dry-run', 'Print changes'
     on :l, 'least-impact', 'Update cookbooks with minimal version impact', :default => true
     on :I, 'infrastructure', 'Resolve infrastructure cookbooks'
+    on :e, 'environment=', 'Restrict auto-discovery to named environment'
 
     run do |opts, args|
       Batali::Command::Resolve.new({:resolve => opts.to_hash}, args).execute!

data/lib/batali/b_file.rb

@@ -91,15 +91,19 @@ module Batali
     def self.cookbook_coerce
       proc do |v|
         v = [v].flatten.compact
-        name, args = v.first, v.slice(1, v.size)
-        if(args.empty?)
-          args = Smash.new
-        elsif(args.size == 1 && args.first.is_a?(Hash))
-          args = args.first
+        if(v.size == 1 && v.first.is_a?(Hash))
+          Cookbook.new(v.first)
         else
-          args = Smash.new(:constraint => args.map(&:to_s))
+          name, args = v.first, v.slice(1, v.size)
+          if(args.empty?)
+            args = Smash.new
+          elsif(args.size == 1 && args.first.is_a?(Hash))
+            args = args.first
+          else
+            args = Smash.new(:constraint => args.map(&:to_s))
+          end
+          Cookbook.new(Smash.new(:name => name).merge(args))
         end
-        Cookbook.new(Smash.new(:name => name).merge(args))
       end
     end
 
@@ -123,28 +127,44 @@ module Batali
 
     attribute :discover, [TrueClass, FalseClass], :required => true, :default => false
     attribute :restrict, Restriction, :multiple => true, :coerce => lambda{|v|
-      Restriction.new(:cookbook => v.first, :source => v.last.to_smash[:source])
+      if(v.is_a?(Hash))
+        Restriction.new(v)
+      else
+        Restriction.new(:cookbook => v.first, :source => v.last.to_smash[:source])
+      end
     }
     attribute :source, Origin::RemoteSite, :multiple => true, :default => [], :coerce => lambda{|v|
-      args = Smash.new(:endpoint => v.first)
-      if(v.last.is_a?(Hash))
-        args.merge!(v.last)
+      if(v.is_a?(Hash))
+        args = v
+      else
+        args = Smash.new(:endpoint => v.first)
+        if(v.last.is_a?(Hash))
+          args.merge!(v.last)
+        end
       end
       Origin::RemoteSite.new(args)
     }
     attribute :chef_server, Origin::ChefServer, :multiple => true, :default => [], :coerce => lambda{|v|
-      args = Smash.new(:endpoint => v.first)
-      if(v.last.is_a?(Hash))
-        args.merge!(v.last)
+      if(v.is_a?(Hash))
+        args = v
+      else
+        args = Smash.new(:endpoint => v.first)
+        if(v.last.is_a?(Hash))
+          args.merge!(v.last)
+        end
       end
       Origin::ChefServer.new(args)
     }
-    attribute :group, Group, :multiple => true, :coerce => lambda{|v| Group.new()}
+    attribute :group, Group, :multiple => true, :coerce => lambda{|v| Group.new(v)}
     attribute :cookbook, Cookbook, :multiple => true, :coerce => BFile.cookbook_coerce, :default => []
     attribute :metadata, Cookbook, :coerce => lambda{ |v, b_file|
-      dir = Pathname.new(File.dirname(b_file.path)).relative_path_from(Pathname.new(Dir.pwd)).to_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)
+      if(v.is_a?(Hash))
+        ckbk = Cookbook.new(v)
+      else
+        dir = Pathname.new(File.dirname(b_file.path)).relative_path_from(Pathname.new(Dir.pwd)).to_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)
+      end
       unless(b_file.cookbook.map(&:name).include?(ckbk.name))
         b_file.cookbook.push ckbk
       end

data/lib/batali/command.rb

@@ -30,7 +30,7 @@ module Batali
         ui.verbose "Loading Batali file from: #{path}"
         bfile = BFile.new(path)
         if(bfile.discover)
-          bfile.auto_discover!
+          bfile.auto_discover!(config[:environment])
         end
         bfile.data.keys.each do |key|
           unless(bfile.respond_to?(key))

data/lib/batali/version.rb

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

metadata

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