batali 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e518ea6ec9a6d6bb6374bb42532cdece1b016cab
-  data.tar.gz: 3b8640ca8b7450a2d177eba35225ca23c1fa083e
+  metadata.gz: 583f2ea83e2fb2813e041d122c3578f4816b84cc
+  data.tar.gz: 2aebd3e383e3b91e58c22f11452779603c0fd923
 SHA512:
-  metadata.gz: eb6553c1ec9cf13319939da5f558559ba2d16c63a84895199c5982d652a958c537e320c7724e0fb67995ebb2a0c323662e1d494d347ab2afae58a8253128ee6d
-  data.tar.gz: 21c1665c35095d1f802fe95ee4c2e59bcd5a25ff8f18b7303c16b99f820e67318c2e68465131118f638161066557435ac9068e8c3eb58309bd28d3de329fe155
+  metadata.gz: e5e0d6735a93edba1c9d58db7d2078e0b5a79afe5c4947124ca6b04626e48618276055bf5cafed3f946721c4dc571b4d5e1765d97371118fc15484cc9644b978
+  data.tar.gz: ac5e8c16532a66e3b7e706e3db2cf6a2e07bea66c69feeaae0269635a72878fa3138cd6259303839ce17461b564af2cf1deeeba4579d5a6209977ad9209990c7

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.1.10
+* Bug fix for Batali file parsing to provide expected format on processing
+
 # v0.1.8
 * Provide helpful exception message when source is not found
 * Allow using default classes when building items

data/lib/batali/b_file.rb

@@ -4,8 +4,12 @@ module Batali
 
   class Struct < AttributeStruct
 
-    def cookbook(*args, &block)
-      set!(:cookbook, args, &block)
+    def cookbook(*args)
+      unless(self[:cookbook])
+        set!(:cookbook, ::AttributeStruct::CollapseArray.new.push(args))
+      else
+        set!(:cookbook, args)
+      end
       self
     end
 
@@ -27,36 +31,8 @@ module Batali
     # @return [Proc] cookbook convert
     def self.cookbook_coerce
       proc do |v|
-        case v
-        when Array
-          case v.last
-          when String
-            Cookbook.new(
-              :name => v.first,
-              :constraint => v.slice(1, v.size)
-            )
-          when Hash
-            c_name = v.first
-            Cookbook.new(
-              v.last.merge(
-                :name => c_name
-              )
-            )
-          else
-            raise ArgumentError.new "Unable to coerce given type `#{v.class}` to `Batali::BFile::Cookbook`!"
-          end
-        when String
-          Cookbook.new(:name => v)
-        when Hash
-          c_name = v.first
-          Cookbook.new(
-            v.last.merge(
-              :name => c_name
-            )
-          )
-        else
-          raise ArgumentError.new "Unable to coerce given type `#{v.class}` to `Batali::BFile::Cookbook`!"
-        end
+        name, args = v
+        Cookbook.new(Smash.new(:name => name).merge(args || {}))
       end
     end
 

data/lib/batali/version.rb

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

metadata

@@ -1,141 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Chris Roberts
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.14
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.14
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: grimoire
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.14
+- !ruby/object:Gem::Dependency
+  name: grimoire
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.4
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bogo
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.12
+        version: 0.1.4
+- !ruby/object:Gem::Dependency
+  name: bogo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.12
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bogo-cli
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.12
+- !ruby/object:Gem::Dependency
+  name: bogo-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.8
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bogo-config
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.1.8
+- !ruby/object:Gem::Dependency
+  name: bogo-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.10
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: git
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.10
+- !ruby/object:Gem::Dependency
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: http
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: minitest
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: pry
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Magic
 email: code@chrisroberts.org
 executables:
@@ -143,59 +143,60 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- CONTRIBUTING.md
+- LICENSE
+- README.md
+- batali.gemspec
+- bin/batali
 - lib/batali.rb
-- lib/batali/origin.rb
-- lib/batali/manifest.rb
-- lib/batali/score_keeper.rb
-- lib/batali/utility.rb
-- lib/batali/source.rb
-- lib/batali/command.rb
-- lib/batali/version.rb
-- lib/batali/monkey.rb
-- lib/batali/requirement_list.rb
-- lib/batali/unit.rb
-- lib/batali/config.rb
-- lib/batali/git.rb
 - lib/batali/b_file.rb
-- lib/batali/unit_loader.rb
-- lib/batali/source/git.rb
-- lib/batali/source/path.rb
-- lib/batali/source/site.rb
+- lib/batali/command.rb
 - lib/batali/command/configure.rb
 - lib/batali/command/install.rb
-- lib/batali/command/update.rb
 - lib/batali/command/resolve.rb
-- lib/batali/origin/remote_site.rb
+- lib/batali/command/update.rb
+- lib/batali/config.rb
+- lib/batali/git.rb
+- lib/batali/manifest.rb
+- lib/batali/monkey.rb
+- lib/batali/origin.rb
 - lib/batali/origin/git.rb
 - lib/batali/origin/path.rb
-- bin/batali
-- batali.gemspec
-- README.md
-- CHANGELOG.md
-- CONTRIBUTING.md
-- LICENSE
+- lib/batali/origin/remote_site.rb
+- lib/batali/requirement_list.rb
+- lib/batali/score_keeper.rb
+- lib/batali/source.rb
+- lib/batali/source/git.rb
+- lib/batali/source/path.rb
+- lib/batali/source/site.rb
+- lib/batali/unit.rb
+- lib/batali/unit_loader.rb
+- lib/batali/utility.rb
+- lib/batali/version.rb
 homepage: https://github.com/hw-labs/batali
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
 summary: Magic
 test_files: []
+has_rdoc: