batali 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d366f8505f42d3de37db98957d97c9375aed1e92
-  data.tar.gz: 4fc9d0f05e4cbe6b96f0e39814c75d34820ec5ee
+  metadata.gz: e518ea6ec9a6d6bb6374bb42532cdece1b016cab
+  data.tar.gz: 3b8640ca8b7450a2d177eba35225ca23c1fa083e
 SHA512:
-  metadata.gz: ec2b50fe38838317715d79ed0de57b467c853397f54ceb0da9c49b9d7f51d2c3b6e4cbd04e89a926d82425c8dc0000ed41ac8e7fbc42a0d20290c6fbd71527f6
-  data.tar.gz: dda1337c5320c000f5689f25c27b2b4389b50f1c1b0e908c0206f668e8368674b6a8b204f2b336d1dd11579b471ee7179113de849ac16ef1a041f127909cf0a7
+  metadata.gz: eb6553c1ec9cf13319939da5f558559ba2d16c63a84895199c5982d652a958c537e320c7724e0fb67995ebb2a0c323662e1d494d347ab2afae58a8253128ee6d
+  data.tar.gz: 21c1665c35095d1f802fe95ee4c2e59bcd5a25ff8f18b7303c16b99f820e67318c2e68465131118f638161066557435ac9068e8c3eb58309bd28d3de329fe155

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.1.8
+* Provide helpful exception message when source is not found
+* Allow using default classes when building items
+* Removing constant swapping in grimoire
+
 # v0.1.6
 * Bug fix for proper Batali file loading when single cookbook defined
 * Bug fix for cookbook install when using path source (git as well)

data/lib/batali/manifest.rb

@@ -6,7 +6,7 @@ module Batali
 
     include Bogo::Memoization
 
-    attribute :cookbook, Unit, :multiple => true, :coerce => lambda{|v| Unit.new(v)}, :default => []
+    attribute :cookbook, Batali::Unit, :multiple => true, :coerce => lambda{|v| Batali::Unit.new(v)}, :default => []
 
     # Build manifest from given path. If no file exists, empty
     # manifest will be provided.

data/lib/batali/monkey.rb

@@ -16,11 +16,3 @@ module Batali
     end
   end
 end
-
-Grimoire.send(:remove_const, :VERSION_CLASS)
-Grimoire.send(:remove_const, :DEPENDENCY_CLASS)
-Grimoire.send(:remove_const, :REQUIREMENT_CLASS)
-
-Grimoire.const_set(:VERSION_CLASS, Batali::UnitVersion)
-Grimoire.const_set(:DEPENDENCY_CLASS, Batali::UnitDependency)
-Grimoire.const_set(:REQUIREMENT_CLASS, Batali::UnitRequirement)

data/lib/batali/requirement_list.rb

@@ -0,0 +1,8 @@
+require 'batali'
+
+module Batali
+  # Customized Unit
+  class RequirementList < Grimoire::RequirementList
+    attribute :requirements, [Batali::UnitDependency, Grimoire::DEPENDENCY_CLASS], :multiple => true, :default => [], :coerce => lambda{|v| Batali::UnitDependency.new(val.first, *val.last)}
+  end
+end

data/lib/batali/source.rb

@@ -52,7 +52,12 @@ module Batali
       unless(type.to_s.include?('::'))
         type = [self.name, Bogo::Utility.camel(type)].join('::')
       end
-      Bogo::Utility.constantize(type).new(args.merge(:type => type))
+      klass = Bogo::Utility.constantize(type)
+      unless(klass)
+        raise TypeError.new "Unknown source type provided `#{type}`!"
+      else
+        klass.new(args.merge(:type => type))
+      end
     end
 
   end

data/lib/batali/unit.rb

@@ -4,5 +4,7 @@ module Batali
   # Customized Unit
   class Unit < Grimoire::Unit
     attribute :source, Source, :required => true, :coerce => lambda{|v| Batali::Source.build(v)}
+    attribute :dependencies, [Batali::UnitDependency, Grimoire::DEPENDENCY_CLASS], :multiple => true, :default => [], :coerce => lambda{|val| Batali::UnitDependency.new(val.first, *val.last)}
+    attribute :version, [Batali::UnitVersion, Grimoire::VERSION_CLASS], :required => true, :coerce => lambda{|val| Batali::UnitVersion.new(val)}
   end
 end

data/lib/batali/version.rb

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

data/lib/batali.rb

@@ -1,5 +1,6 @@
 require 'bogo-cli'
 require 'grimoire'
+require 'batali/monkey'
 
 module Batali
 
@@ -8,6 +9,7 @@ module Batali
   autoload :Git, 'batali/git'
   autoload :Manifest, 'batali/manifest'
   autoload :Origin, 'batali/origin'
+  autoload :RequirementList, 'batali/requirement_list'
   autoload :ScoreKeeper, 'batali/score_keeper'
   autoload :Source, 'batali/source'
   autoload :Unit, 'batali/unit'
@@ -17,5 +19,4 @@ module Batali
 end
 
 require 'batali/b_file'
-require 'batali/monkey'
 require 'batali/version'

metadata

@@ -1,141 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Chris Roberts
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.14
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.14
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: grimoire
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.4
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bogo
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.12
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  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
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  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
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.10
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: git
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: http
   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'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: minitest
   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'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: pry
   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'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  type: :development
 description: Magic
 email: code@chrisroberts.org
 executables:
@@ -143,59 +143,59 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- CONTRIBUTING.md
-- LICENSE
-- README.md
-- batali.gemspec
-- bin/batali
 - lib/batali.rb
-- lib/batali/b_file.rb
-- lib/batali/command.rb
-- lib/batali/command/configure.rb
-- lib/batali/command/install.rb
-- lib/batali/command/resolve.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
-- lib/batali/origin/remote_site.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/unit.rb
-- lib/batali/unit_loader.rb
-- lib/batali/utility.rb
-- lib/batali/version.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/origin/git.rb
+- lib/batali/origin/path.rb
+- bin/batali
+- batali.gemspec
+- README.md
+- CHANGELOG.md
+- CONTRIBUTING.md
+- LICENSE
 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.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Magic
 test_files: []
-has_rdoc: