batali 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 583f2ea83e2fb2813e041d122c3578f4816b84cc
-  data.tar.gz: 2aebd3e383e3b91e58c22f11452779603c0fd923
+  metadata.gz: cc7940adb3a1a14d55eb855b5f4e1e23d05777bb
+  data.tar.gz: 50bface2e8d95e696b7d5d403885b9b1b08dc085
 SHA512:
-  metadata.gz: e5e0d6735a93edba1c9d58db7d2078e0b5a79afe5c4947124ca6b04626e48618276055bf5cafed3f946721c4dc571b4d5e1765d97371118fc15484cc9644b978
-  data.tar.gz: ac5e8c16532a66e3b7e706e3db2cf6a2e07bea66c69feeaae0269635a72878fa3138cd6259303839ce17461b564af2cf1deeeba4579d5a6209977ad9209990c7
+  metadata.gz: 763cedeab275662414f90a01938fc7d42879cf57b0507a917fcf0723c5ad2a9b291bba6938a88b877f1b8823d38fe8417d7e92ddf3b1c6aaaba6cde14039e8a1
+  data.tar.gz: 795b924481089ad62bb8bb6b5dc83dd2a7f7bab66b108a2ebfc9787fcdae83a1c04bf6a8b7f100e618e8f0cb8819eb175f1a29b36b38990dcb969652c62626ac

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.1.12
+* Bug fix for multiple constraint arguments
+* Provide consistent type for values that can be multiples within Batali file
+* Get started on spec coverage
+
 # v0.1.10
 * Bug fix for Batali file parsing to provide expected format on processing
 

data/lib/batali/b_file.rb

@@ -8,7 +8,25 @@ module Batali
       unless(self[:cookbook])
         set!(:cookbook, ::AttributeStruct::CollapseArray.new.push(args))
       else
-        set!(:cookbook, args)
+        self[:cookbook].push(args)
+      end
+      self
+    end
+
+    def source(*args)
+      unless(self[:source])
+        set!(:source, ::AttributeStruct::CollapseArray.new.push(args))
+      else
+        self[:source].push(args)
+      end
+      self
+    end
+
+    def restrict(*args)
+      unless(self[:restrict])
+        set!(:restrict, ::AttributeStruct::CollapseArray.new.push(args))
+      else
+        self[:restrict].push(args)
       end
       self
     end
@@ -31,8 +49,16 @@ module Batali
     # @return [Proc] cookbook convert
     def self.cookbook_coerce
       proc do |v|
-        name, args = v
-        Cookbook.new(Smash.new(:name => name).merge(args || {}))
+        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
+        else
+          args = Smash.new(:constraint => args.map(&:to_s))
+        end
+        Cookbook.new(Smash.new(:name => name).merge(args))
       end
     end
 
@@ -54,8 +80,16 @@ module Batali
       attribute :cookbook, Cookbook, :multiple => true, :required => true, :coerce => BFile.cookbook_coerce
     end
 
-    attribute :restrict, Restriction, :multiple => true, :coerce => lambda{|v| Restriction.new(:cookbook => v.first, :source => v.last)}
-    attribute :source, Origin::RemoteSite, :multiple => true, :coerce => lambda{|v| Origin::RemoteSite.new(:endpoint => v)}
+    attribute :restrict, Restriction, :multiple => true, :coerce => lambda{|v|
+      Restriction.new(:cookbook => v.first, :source => v.last.to_smash[:to])
+    }
+    attribute :source, Origin::RemoteSite, :multiple => true, :coerce => lambda{|v|
+      args = Smash.new(:endpoint => v.first)
+      if(v.last.is_a?(Hash))
+        args.merge!(v.last)
+      end
+      Origin::RemoteSite.new(args)
+    }
     attribute :group, Group, :multiple => true, :coerce => lambda{|v| Group.new()}
     attribute :cookbook, Cookbook, :multiple => true, :coerce => BFile.cookbook_coerce
 

data/lib/batali/command/resolve.rb

@@ -21,7 +21,7 @@ module Batali
         requirements = Grimoire::RequirementList.new(
           :name => :batali_resolv,
           :requirements => batali_file.cookbook.map{ |ckbk|
-            [ckbk.name, *(ckbk.constraint.nil? || ckbk.constraint.empty? ? ['> 0'] : ckbk.constraint)]
+            [ckbk.name, (ckbk.constraint.nil? || ckbk.constraint.empty? ? ['> 0'] : ckbk.constraint)]
           }
         )
         solv = Grimoire::Solver.new(
@@ -63,7 +63,7 @@ module Batali
                 nil
               end
             end
-            ui.info "Number of solutions collected for defined requirements: #{results.size + 1}"
+            # ui.info "Number of solutions collected for defined requirements: #{results.size + 1}"
             ui.info 'Ideal solution:'
             ideal_solution.units.sort_by(&:name).map do |unit|
               output_args = ["#{unit.name} <#{unit.version}>"]

data/lib/batali/version.rb

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

data/lib/batali.rb

@@ -4,6 +4,7 @@ require 'batali/monkey'
 
 module Batali
 
+  autoload :BFile, 'batali/b_file'
   autoload :Command, 'batali/command'
   autoload :Config, 'batali/config'
   autoload :Git, 'batali/git'
@@ -12,6 +13,7 @@ module Batali
   autoload :RequirementList, 'batali/requirement_list'
   autoload :ScoreKeeper, 'batali/score_keeper'
   autoload :Source, 'batali/source'
+  autoload :Struct, 'batali/b_file'
   autoload :Unit, 'batali/unit'
   autoload :UnitLoader, 'batali/unit_loader'
   autoload :Utility, 'batali/utility'

metadata

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