batali 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc7940adb3a1a14d55eb855b5f4e1e23d05777bb
-  data.tar.gz: 50bface2e8d95e696b7d5d403885b9b1b08dc085
+  metadata.gz: 27264f54883b15e90cf86e0c44a18c861ee33e05
+  data.tar.gz: 3db117858379470704b67ad9e0acef863a471d3a
 SHA512:
-  metadata.gz: 763cedeab275662414f90a01938fc7d42879cf57b0507a917fcf0723c5ad2a9b291bba6938a88b877f1b8823d38fe8417d7e92ddf3b1c6aaaba6cde14039e8a1
-  data.tar.gz: 795b924481089ad62bb8bb6b5dc83dd2a7f7bab66b108a2ebfc9787fcdae83a1c04bf6a8b7f100e618e8f0cb8819eb175f1a29b36b38990dcb969652c62626ac
+  metadata.gz: 4fad68431b1362dafb49f2c2821ce8907a06c1af70c8591512e1ad4094148f681d85a335cf281e903887eb1ca76fbccb1e74c2590a99de79c942c9e8b60a92d7
+  data.tar.gz: 136eaed0d5bf501e5fe0f66b03f697beb532230f33600031794d29e06a92c2b3cc76e021adb7c66fd48b01095c7040f80fbdb953c1cf6cf583aff1773f5bbb23

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.1.14
+* Start adding debug and verbose output (#9)
+* Update exception messages to provide more clarity
+
 # v0.1.12
 * Bug fix for multiple constraint arguments
 * Provide consistent type for values that can be multiples within Batali file

data/batali.gemspec

@@ -11,10 +11,11 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.license = 'Apache 2.0'
   s.add_runtime_dependency 'attribute_struct', '>= 0.2.14'
-  s.add_runtime_dependency 'grimoire', '>= 0.1.4'
+  s.add_runtime_dependency 'grimoire', '> 0.1.4'
   s.add_runtime_dependency 'bogo', '>= 0.1.12'
-  s.add_runtime_dependency 'bogo-cli', '>= 0.1.8'
+  s.add_runtime_dependency 'bogo-cli', '> 0.1.8'
   s.add_runtime_dependency 'bogo-config', '>= 0.1.10'
+  s.add_runtime_dependency 'bogo-ui', '> 0.1.6'
   s.add_runtime_dependency 'git'
   s.add_runtime_dependency 'http'
   s.add_development_dependency 'minitest'

data/lib/batali/b_file.rb

@@ -91,7 +91,7 @@ module Batali
       Origin::RemoteSite.new(args)
     }
     attribute :group, Group, :multiple => true, :coerce => lambda{|v| Group.new()}
-    attribute :cookbook, Cookbook, :multiple => true, :coerce => BFile.cookbook_coerce
+    attribute :cookbook, Cookbook, :multiple => true, :coerce => BFile.cookbook_coerce, :default => []
 
   end
 

data/lib/batali/command.rb

@@ -12,24 +12,32 @@ module Batali
     autoload :Resolve, 'batali/command/resolve'
     autoload :Update, 'batali/command/update'
 
+    # Set UI when loading via command
+    def initialize(*_)
+      super
+      Batali.ui = ui
+    end
+
     # @return [BFile]
     def batali_file
       memoize(:batali_file) do
         # TODO: Add directory traverse searching
-        BFile.new(opts.fetch(:file, File.join(Dir.pwd, 'Batali')))
+        path = opts.fetch(:file, File.join(Dir.pwd, 'Batali'))
+        ui.verbose "Loading Batali file from: #{path}"
+        BFile.new(path)
       end
     end
 
     # @return [Manifest]
     def manifest
       memoize(:manifest) do
-        Manifest.build(
-          File.join(
-            File.dirname(
-              opts.fetch(:file, File.join(Dir.pwd, 'batali.manifest'))
-            ), 'batali.manifest'
-          )
+        path = File.join(
+          File.dirname(
+            opts.fetch(:file, File.join(Dir.pwd, 'batali.manifest'))
+          ), 'batali.manifest'
         )
+        ui.verbose "Loading manifest file from: #{path}"
+        Manifest.build(path)
       end
     end
 
@@ -37,6 +45,7 @@ module Batali
     def cache_directory(*args)
       memoize(['cache_directory', *args].join('_')) do
         directory = opts.fetch(:cache_directory, '/tmp/batali-cache')
+        ui.debug "Cache directory to persist cookbooks: #{directory}"
         unless(args.empty?)
           directory = File.join(directory, *args.map(&:to_s))
         end

data/lib/batali/origin/path.rb

@@ -76,7 +76,7 @@ module Batali
             end
             struct._dump.to_smash
           else
-            raise Errno::ENOENT.new('No metadata file available to load!')
+            raise Errno::ENOENT.new("Failed to locate metadata file in cookbook directory! (path: #{path})")
           end
         end
       end

data/lib/batali/version.rb

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

data/lib/batali.rb

@@ -18,6 +18,37 @@ module Batali
   autoload :UnitLoader, 'batali/unit_loader'
   autoload :Utility, 'batali/utility'
 
+  class << self
+    # @return [Bogo::Ui]
+    attr_reader :ui
+
+    # Set Ui instance
+    #
+    # @param ui [Bogo::Ui]
+    # @return [Bogo::Ui]
+    def ui=(ui)
+      unless(ui.respond_to?(:verbose) && ui.respond_to?(:debug))
+        raise TypeError.new "Expecting type `Bogo::Ui` but received `#{ui.class}`"
+      end
+      @ui = Grimoire.ui = ui
+    end
+
+    # Write verbose message
+    def verbose(*args)
+      if(ui)
+        ui.verbose(*args)
+      end
+    end
+
+    # Write debug message
+    def debug(*args)
+      if(ui)
+        ui.debug(*args)
+      end
+    end
+
+  end
+
 end
 
 require 'batali/b_file'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -28,14 +28,14 @@ dependencies:
   name: grimoire
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.1.4
 - !ruby/object:Gem::Dependency
@@ -56,14 +56,14 @@ dependencies:
   name: bogo-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.1.8
 - !ruby/object:Gem::Dependency
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.10
+- !ruby/object:Gem::Dependency
+  name: bogo-ui
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement