batali 0.3.10 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc79c37709d9a82123b18ff7f3708d3ab3090747
-  data.tar.gz: d71675d5533528818ffdafe8a2b7727ae7d20566
+  metadata.gz: 011f26a3e8a17db988eb207d7fc79cbdc51e1306
+  data.tar.gz: e0bd881f9cf5be081f73c315e6be9ee50a206ff7
 SHA512:
-  metadata.gz: e745bf572287f0c86144b03a55493f0de0f8954762664d5165e2cce579bffb80742af7f22c4ac9881fe06519a459b619f922cb7f8c7390cb3d59f62ca7dfc042
-  data.tar.gz: 6dcb427899adfbc5c7d9e7c9b5b2cb1900a52e98e27511c357f4287b53c94a2698c26ffad5d44efab9cf7df2d66d2f74286ebaac93c0e1d74bc75128de531b96
+  metadata.gz: dc6e7955b3163d94389ee1b71b61ce63651ea760f39e4061682f8fbb91505642129159252e95d851e3ae6cae6b6600d1bebf9f580adad9613e358ed1ef082abb
+  data.tar.gz: fa4b45f0b1c202a9ada821e6d64456c78316b21b52e969281f7ef6fbc07a9395aec2209dea78b724035430445f9b9498ea0c39ec657a0805d389be7af31811d3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.3.12
+* [feature] Support multiple sources for single cookbook in infra-mode
+* [fix] Make cache directory usage consistent in all commands
+
 # v0.3.10
 * [feature] Chef server manifest sync knife plugin
 

data/README.md

@@ -240,6 +240,24 @@ $ batali resolve --infrastructure
 
 _NOTE: Depending on constraints defined within the Batali file, this can be a very large manifest_
 
+#### Single cookbook, multiple sources
+
+When running in infrastructure mode, Batali supports single cookbooks being loaded from
+multiple sources. For example, if all the `users` cookbooks greater than version `1.0` should
+be available _and_ an unreleased development version that lives in a git repository, Batali
+will properly include all versions:
+
+```ruby
+Batali.define do
+  source 'https://supermarket.chef.io'
+  cookbook 'users', '> 1.0'
+  cookbook 'users', git: 'git://example.com/org/users.git', ref: 'development'
+end
+```
+
+The resulting Batali manifest file will include all available versions greater than `1.0`
+from the supermarket source _and_ the version defined at the specified git end point.
+
 #### Uploading infrastructure cookbooks
 
 When the infrastructure cookbooks are installed locally, the cookbook directories will have

data/batali.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'bogo-ui', '~> 0.1.6'
   s.add_runtime_dependency 'http', '>= 0.8.2', '< 1.0.0'
   s.add_runtime_dependency 'git'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rubocop'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'chef'

data/lib/batali.rb

@@ -2,6 +2,7 @@ require 'bogo-cli'
 require 'grimoire'
 require 'batali/monkey'
 
+# Batali namespace
 module Batali
 
   autoload :BFile, 'batali/b_file'

data/lib/batali/b_file.rb

@@ -1,8 +1,10 @@
 require 'batali'
 require 'pathname'
 
+# Batali namespace
 module Batali
 
+  # Custom struct class for file processing
   class Struct < AttributeStruct
 
     def cookbook(*args)
@@ -85,8 +87,22 @@ module Batali
     struct
   end
 
+  # Custom file loading class
   class BFile < Bogo::Config
 
+    # @return [String] path to cache
+    attr_reader :cache
+
+    # Create a new BFile instance
+    #
+    # @param b_file [String] path to file
+    # @param cache_path [String] path to cache directory
+    # @return [self]
+    def initialize(b_file, cache_path)
+      @cache = cache_path
+      super(b_file)
+    end
+
     # @return [Proc] cookbook convert
     def self.cookbook_coerce
       proc do |v|
@@ -107,19 +123,23 @@ module Batali
       end
     end
 
+    # Cookbook entry
     class Cookbook < Utility
       attribute :name, String, :required => true
       attribute :constraint, String, :multiple => true
       attribute :git, String
       attribute :ref, String
       attribute :path, String
+      attribute :restrict, [TrueClass, FalseClass], :default => false
     end
 
+    # Restriction entry
     class Restriction < Utility
       attribute :cookbook, String, :required => true
       attribute :source, String, :required => true
     end
 
+    # Group entry
     class Group < Utility
       attribute :name, String, :required => true
       attribute :cookbook, Cookbook, :multiple => true, :required => true, :coerce => BFile.cookbook_coerce
@@ -133,7 +153,7 @@ module Batali
         Restriction.new(:cookbook => v.first, :source => v.last.to_smash[:source])
       end
     }
-    attribute :source, Origin::RemoteSite, :multiple => true, :default => [], :coerce => lambda{|v|
+    attribute :source, Origin::RemoteSite, :multiple => true, :default => [], :coerce => lambda{|v, b_file|
       if(v.is_a?(Hash))
         args = v
       else
@@ -142,9 +162,9 @@ module Batali
           args.merge!(v.last)
         end
       end
-      Origin::RemoteSite.new(args)
+      Origin::RemoteSite.new(args.merge(:cache_path => b_file.cache))
     }
-    attribute :chef_server, Origin::ChefServer, :multiple => true, :default => [], :coerce => lambda{|v|
+    attribute :chef_server, Origin::ChefServer, :multiple => true, :default => [], :coerce => lambda{|v, b_file|
       if(v.is_a?(Hash))
         args = v
       else
@@ -153,7 +173,7 @@ module Batali
           args.merge!(v.last)
         end
       end
-      Origin::ChefServer.new(args)
+      Origin::ChefServer.new(args.merge(:cache_path => b_file.cache))
     }
     attribute :group, Group, :multiple => true, :coerce => lambda{|v| Group.new(v)}
     attribute :cookbook, Cookbook, :multiple => true, :coerce => BFile.cookbook_coerce, :default => []
@@ -162,7 +182,7 @@ module Batali
         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
+        m_unit = Origin::Path.new(:name => 'metadata', :path => dir, :cache_path => b_file.cache).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))
@@ -186,7 +206,7 @@ module Batali
             result[:name] => result[:cookbooks]
           )
         end
-      end.compact.inject(Smash.new){|m,n| m.merge(n)}
+      end.compact.inject(Smash.new){|m, n| m.merge(n)}
       environment_items.each do |e_name, items|
         next if environment && e_name != environment
         debug "Discovery processing of environment: #{e_name}"
@@ -315,7 +335,7 @@ module Batali
           env.fetch(
             :cookbook_versions,
             Smash.new
-          ).map{|k,v| [k, v.to_s.split(',')]}
+          ).map{|k, v| [k, v.to_s.split(',')]}
         ]
       )
     end

data/lib/batali/chefspec.rb

@@ -3,7 +3,9 @@ require 'stringio'
 require 'fileutils'
 require 'tmpdir'
 
+# ChefSpec namespace
 module ChefSpec
+  # Batali integration class
   class Batali
 
     class << self
@@ -13,10 +15,12 @@ module ChefSpec
 
     include Singleton
 
+    # Create new instance
     def initialize
       @vendor_path = Dir.mktmpdir
     end
 
+    # Setup the environment (load cookbooks)
     def setup!
       output = ''
       begin
@@ -44,6 +48,7 @@ module ChefSpec
       end
     end
 
+    # Clean up after complete
     def teardown!
       if(File.directory?(@vendor_path))
         FileUtils.rm_rf(@vendor_path)

data/lib/batali/command.rb

@@ -28,7 +28,7 @@ module Batali
         # TODO: Add directory traverse searching
         path = config.fetch(:file, File.join(Dir.pwd, 'Batali'))
         ui.verbose "Loading Batali file from: #{path}"
-        bfile = BFile.new(path)
+        bfile = BFile.new(path, cache_directory)
         if(bfile.discover)
           bfile.auto_discover!(config[:environment])
         end

data/lib/batali/command/install.rb

@@ -17,12 +17,12 @@ module Batali
             nil
           end
           if(manifest.cookbook.nil? || manifest.cookbook.empty?)
-            ui.error "No cookbooks defined within manifest! Try resolving first. (`batali resolve`)"
+            ui.error 'No cookbooks defined within manifest! Try resolving first. (`batali resolve`)'
           else
             run_action('Installing cookbooks') do
               manifest.cookbook.each do |unit|
-                if(unit.source.respond_to?(:cache))
-                  unit.source.cache = cache_directory(
+                if(unit.source.respond_to?(:cache_path))
+                  unit.source.cache_path = cache_directory(
                     Bogo::Utility.snake(unit.source.class.name.split('::').last)
                   )
                 end

data/lib/batali/command/resolve.rb

@@ -14,7 +14,8 @@ module Batali
           UnitLoader.new(
             :file => batali_file,
             :system => system,
-            :cache => cache_directory(:git)
+            :cache => cache_directory(:git),
+            :auto_path_restrict => !infrastructure?
           ).populate!
           nil
         end
@@ -101,7 +102,7 @@ module Batali
                   unless(u_diff.empty?)
                     diff_output = "[#{u_diff.values.map{|v| v.join(' -> ')}.join(' | ')}]"
                   end
-                  ui.puts ui.color("#{unit_name} <#{version_output}> #{diff_output}" , :yellow)
+                  ui.puts ui.color("#{unit_name} <#{version_output}> #{diff_output}", :yellow)
                 end
               else
                 ui.puts ui.color("#{unit_name} <#{manifest_units[unit_name].version}>", :red)
@@ -169,15 +170,15 @@ module Batali
                 uv.last ? ui.color(uv.first.to_s, uv.last) : uv.first.to_s
               end
               unless(added.empty? && removed.empty?)
-                ui.puts "#{ui.color(unit_name, :yellow)} #{ui.color('<', :yellow)}#{unit_versions.join(ui.color(', ', :yellow))}#{ui.color('>', :yellow)}"
+                ui.puts "#{ui.color(unit_name, :yellow)} #{ui.color('<', :yellow)}#{unit_versions.join(ui.color(', ', :yellow))}#{ui.color('>', :yellow)}" # rubocop:disable Metrics/LineLength
               else
                 ui.puts "#{unit_name} <#{unit_versions.join(', ')}>"
               end
             else
-              ui.puts ui.color("#{unit_name} <#{manifest_units[unit_name].map(&:version).sort.map(&:to_s).join(', ')}>", :red)
+              ui.puts ui.color("#{unit_name} <#{manifest_units[unit_name].map(&:version).sort.map(&:to_s).join(', ')}>", :red) # rubocop:disable Metrics/LineLength
             end
           else
-            ui.puts ui.color("#{unit_name} <#{solution_units[unit_name].map(&:version).sort.map(&:to_s).join(', ')}>", :green)
+            ui.puts ui.color("#{unit_name} <#{solution_units[unit_name].map(&:version).sort.map(&:to_s).join(', ')}>", :green) # rubocop:disable Metrics/LineLength
           end
         end
       end

data/lib/batali/git.rb

@@ -1,12 +1,14 @@
 require 'git'
 require 'batali'
 
+# Batali namespace
 module Batali
+  # Helper module for git interactions
   module Git
 
     # @return [String] path to repository clone
     def base_path
-      File.join(cache, Base64.urlsafe_encode64(url))
+      File.join(cache_path, Base64.urlsafe_encode64(url))
     end
 
     # Clone the repository to the local machine
@@ -33,13 +35,13 @@ module Batali
       git.checkout(ref)
       git.pull('origin', ref)
       self.ref = git.log.first.sha
-      self.path = File.join(cache, ref)
+      self.path = File.join(cache_path, 'git', ref)
       unless(File.directory?(path))
         FileUtils.mkdir_p(path)
         FileUtils.cp_r(File.join(base_path, '.'), path)
         FileUtils.rm_rf(File.join(path, '.git'))
       end
-      self.path
+      path
     end
 
     # Load attributes into class
@@ -47,7 +49,6 @@ module Batali
       klass.class_eval do
         attribute :url, String, :required => true, :equivalent => true
         attribute :ref, String, :required => true, :equivalent => true
-        attribute :cache, String, :default => File.join(Dir.home, '.batali', 'cache', 'git')
       end
     end
 

data/lib/batali/manifest.rb

@@ -16,10 +16,10 @@ module Batali
     # @param path [String] path to manifest
     # @return [Manifest]
     def self.build(path)
-      if(File.exists?(path))
-        self.new(Bogo::Config.new(path).data.merge(:path => path))
+      if(File.exist?(path))
+        new(Bogo::Config.new(path).data.merge(:path => path))
       else
-        self.new(:path => path)
+        new(:path => path)
       end
     end
 

data/lib/batali/monkey.rb

@@ -1,11 +1,15 @@
 require 'batali'
 require 'bogo/http_proxy'
 
+# Batali namespace
 module Batali
-  # Simple stubs mostly for naming
+  # Custom named unit version
   class UnitVersion < Grimoire::VERSION_CLASS; end
+  # Custom named unit requirement
   class UnitRequirement < Grimoire::REQUIREMENT_CLASS; end
+  # Custom named unit dependency
   class UnitDependency < Grimoire::DEPENDENCY_CLASS
+    # Override to properly convert to JSON
     def to_json(*args)
       result = [
         name,

data/lib/batali/origin.rb

@@ -10,6 +10,7 @@ module  Batali
     autoload :Path, 'batali/origin/path'
 
     attribute :name, String, :required => true
+    attribute :cache_path, String, :required => true
     attribute :identifier, String
 
     # @return [Array<Unit>] all units

data/lib/batali/origin/chef_server.rb

@@ -20,7 +20,7 @@ module Batali
         init_chef!
         self.identifier = Digest::SHA256.hexdigest(endpoint)
         unless(name?)
-          self.name = self.identifier
+          self.name = identifier
         end
       end
 
@@ -48,7 +48,8 @@ module Batali
                 :dependencies => c_deps,
                 :endpoint => endpoint,
                 :client_key => client_key,
-                :client_name => client_name
+                :client_name => client_name,
+                :cache_path => cache_path
               )
             )
           end.flatten

data/lib/batali/origin/git.rb

@@ -18,7 +18,7 @@ module Batali
           :subdirectory => subdirectory
         ).checksum
         unless(name?)
-          self.name = self.identifier
+          self.name = identifier
         end
       end
 
@@ -29,7 +29,8 @@ module Batali
           items.first.source = Source::Git.new(
             :url => url,
             :ref => ref,
-            :subdirectory => subdirectory
+            :subdirectory => subdirectory,
+            :cache_path => cache_path
           )
           items
         end

data/lib/batali/origin/path.rb

@@ -5,6 +5,7 @@ module Batali
     # Fetch unit from local path
     class Path < Origin
 
+      # Helper class for loading metadata ruby files
       class Metadata < AttributeStruct
 
         # Perform constant lookup if required
@@ -33,7 +34,7 @@ module Batali
         super
         self.identifier = Smash.new(:path => path).checksum
         unless(name?)
-          self.name = self.identifier
+          self.name = identifier
         end
       end
 
@@ -63,7 +64,8 @@ module Batali
                 :type => :path,
                 :version => info[:version],
                 :path => path,
-                :dependencies => info.fetch(:depends, [])
+                :dependencies => info.fetch(:depends, []),
+                :cache_path => cache_path
               )
             )
           ]
@@ -73,9 +75,9 @@ module Batali
       # @return [Smash] metadata information
       def load_metadata
         memoize(:metadata) do
-          if(File.exists?(json = File.join(path, 'metadata.json')))
+          if(File.exist?(json = File.join(path, 'metadata.json')))
             MultiJson.load(json).to_smash
-          elsif(File.exists?(rb = File.join(path, 'metadata.rb')))
+          elsif(File.exist?(rb = File.join(path, 'metadata.rb')))
             struct = Metadata.new
             struct.set_state!(:value_collapse => true)
             struct.instance_eval(File.read(rb), rb, 1)

data/lib/batali/origin/remote_site.rb

@@ -19,21 +19,20 @@ module Batali
       attribute :endpoint, String, :required => true
       attribute :force_update, [TrueClass, FalseClass], :required => true, :default => false
       attribute :update_interval, Integer, :required => true, :default => 60
-      attribute :cache, String, :default => File.join(Dir.home, '.batali', 'cache', 'remote_site'), :required => true
 
       def initialize(*_)
         super
         endpoint = URI.join(self.endpoint, COOKBOOK_API_SUFFIX).to_s
         self.identifier = Digest::SHA256.hexdigest(endpoint)
         unless(name?)
-          self.name = self.identifier
+          self.name = identifier
         end
       end
 
       # @return [String] cache directory path
       def cache_directory
         memoize(:cache_directory) do
-          c_path = File.join(cache, identifier)
+          c_path = File.join(cache_path, 'remote_site', identifier)
           FileUtils.mkdir_p(c_path)
           c_path
         end
@@ -52,7 +51,8 @@ module Batali
                   :type => :site,
                   :url => info[:download_url],
                   :version => version,
-                  :dependencies => info[:dependencies]
+                  :dependencies => info[:dependencies],
+                  :cache_path => cache_path
                 )
               )
             end
@@ -75,7 +75,7 @@ module Batali
       def fetch
         do_fetch = true
         cache_directory # init directory creation
-        if(File.exists?(universe_path))
+        if(File.exist?(universe_path))
           age = Time.now - File.mtime(universe_path)
           if(age < update_interval)
             do_fetch = false

data/lib/batali/requirement_list.rb

@@ -1,8 +1,15 @@
 require 'batali'
 
+# Batali namespace
 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)}
+    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/score_keeper.rb

@@ -4,6 +4,14 @@ module Batali
   # Provide scores for units
   class ScoreKeeper < Grimoire::UnitScoreKeeper
 
+    # Score multiplier values
+    MULTIPLIERS = {
+      :preferred => 10_000_000,
+      :patch => 1_000_000,
+      :minor => 1_000,
+      :major => 100
+    }
+
     attribute :manifest, Manifest, :required => true
 
     # Always prefer higher scoring units
@@ -28,25 +36,28 @@ module Batali
         # If the unit version matches the manifest version, this
         # should be _the_ preferred version
         if(manifest_unit.version == unit.version)
-          multiplier = 10000000
+          multiplier = MULTIPLIERS[:preferred]
         elsif(opts[:solver] && opts[:solver].new_world)
           new_world_unit = opts[:solver].new_world.units.detect do |n_unit|
             n_unit.name == unit.name &&
               n_unit.version == unit.version
           end
-          multiplier = 10000000 if new_world_unit
+          multiplier = MULTIPLIERS[:preferred] if new_world_unit
         else
           # If the unit version satisfies within the patch segment of
           # the manifest version score those versions highest for upgrade
           if(UnitRequirement.new("~> #{manifest_unit.version}").satisfied_by?(unit.version))
-            multiplier = 1000000
+            multiplier = MULTIPLIERS[:patch]
           else
             # If the unit version satisfies within the minor or major
             # version segments of the manifest version, bump score
             # value up (with satisfaction within minor segment being
             # worth more than satisfaction within major segment)
-            pos = UnitRequirement.new("~> #{manifest_unit.version.segments.slice(0,2).join('.')}").satisfied_by?(unit.version) ? 1 : 0
-            multi_val = pos == 1 ? 1000 : 100
+            satisfied = UnitRequirement.new(
+              "~> #{manifest_unit.version.segments.slice(0, 2).join('.')}"
+            ).satisfied_by?(unit.version)
+            pos = satisfied ? 1 : 0
+            multi_val = pos == 1 ? MULTIPLIERS[:minor] : MULTIPLIERS[:major]
             distance = (manifest_unit.version.segments[pos] - unit.version.segments[pos])
             if(distance > 0)
               distance = 1.0 / distance
@@ -62,17 +73,17 @@ module Batali
             n_unit.name == unit.name &&
               n_unit.version == unit.version
           end
-          multiplier = 10000000 if new_world_unit
+          multiplier = MULTIPLIERS[:preferred] if new_world_unit
         end
       end
       score = []
       # Generate a "value" for each segment of the version with
       # growing importance (major > minor > patch)
-      unit.version.segments.reverse.each_with_index.map do |val, pos|
+      unit.version.segments.reverse.each_with_index.map do |val, v_pos|
         if(val == 0)
           score.push 0
         else
-          score.push (2 - (1.0 / val)) * ((pos + 1)**10)
+          score << (2 - (1.0 / val)) * ((v_pos + 1)**10)
         end
       end
       # Sum the score for each segment to provide the score for the

data/lib/batali/source.rb

@@ -9,7 +9,15 @@ module Batali
     autoload :Git, 'batali/source/git'
     autoload :ChefServer, 'batali/source/chef_server'
 
-    attribute :type, String, :required => true, :default => lambda{ self.name }
+    # @return [String] path to local cache
+    attr_accessor :cache_path
+
+    attribute :type, String, :required => true, :default => lambda{ self.name } # rubocop:disable Style/RedundantSelf
+
+    def initialize(args={})
+      @cache_path = args.delete(:cache_path)
+      super
+    end
 
     # @return [String]
     def unit_version
@@ -28,15 +36,11 @@ module Batali
 
     # @return [TrueClass, FalseClass]
     def clean_asset(asset_path)
-      if(self.respond_to?(:cache))
-        false
+      if(cache_path && asset_path.include?(cache_path) && File.exist?(asset_path))
+        FileUtils.rm_rf(asset_path)
+        true
       else
-        if(File.exists?(asset_path))
-          FileUtils.rm_rf(asset_path)
-          true
-        else
-          false
-        end
+        false
       end
     end
 
@@ -55,7 +59,7 @@ module Batali
     # @return [Smash]
     def diff(s)
       Smash.new.tap do |_diff|
-        self.class.attributes.each do |k,v|
+        self.class.attributes.each do |k, v|
           if(v[:equivalent])
             s_attrs = s.respond_to?(:attributes) ? s.attributes : {}
             unless(attributes[k] == s_attrs[k])
@@ -77,7 +81,7 @@ module Batali
         raise ArgumentError.new 'Missing required option `:type`!'
       end
       unless(type.to_s.include?('::'))
-        type = [self.name, Bogo::Utility.camel(type)].join('::')
+        type = [name, Bogo::Utility.camel(type)].join('::')
       end
       klass = Bogo::Utility.constantize(type)
       unless(klass)

data/lib/batali/source/chef_server.rb

@@ -48,9 +48,7 @@ module Batali
       # @return [String] path to cache
       def cache_directory
         memoize(:cache_directory) do
-          unless(@cache)
-            @cache = File.join(Dir.home, '.batali', 'cache', 'chef_server', endpoint)
-          end
+          @cache ||= File.join(cache_path, 'chef_server', endpoint)
           cache
         end
       end
@@ -63,7 +61,7 @@ module Batali
           cookbook = rest.get_rest("cookbooks/#{name}/#{version}")
           manifest = cookbook.manifest
           Chef::CookbookVersion::COOKBOOK_SEGMENTS.each do |segement|
-            if(manifest.has_key?(segment))
+            if(manifest.key?(segment))
               manifest[segement].each do |s_file|
                 new_path = File.join(path, s_file['path'].gsub('/', File::SEPARATOR))
                 FileUtils.mkdir_p(File.dirname(new_path))

data/lib/batali/source/path.rb

@@ -23,7 +23,7 @@ module Batali
           dir = Dir.mktmpdir
           chefignore = IGNORE_FILE.map do |c_name|
             c_path = File.join(path, c_name)
-            c_path if File.exists?(c_path)
+            c_path if File.exist?(c_path)
           end.compact.first
           chefignore = chefignore ? File.readlines(chefignore) : []
           chefignore += DEFAULT_IGNORE

data/lib/batali/source/site.rb

@@ -43,9 +43,7 @@ module Batali
       # @return [String] path to cache
       def cache_directory
         memoize(:cache_directory) do
-          unless(@cache)
-            @cache = File.join(Dir.home, '.batali', 'cache', 'remote_site')
-          end
+          @cache ||= File.join(cache_path, 'remote_site')
           cache
         end
       end

data/lib/batali/tag_lines.rb

@@ -1,13 +1,15 @@
 require 'batali'
 
+# Batali namespace
 module Batali
 
+  # Version output taglines
   TAG_LINES = [
-    "I got 99 problems but a policyfile ain't one",
-    "Solve the way you want, not the way you're told",
-    "Build environments, not applications",
-    "DRY should be the rule, not the exception",
-    "Solve for the forest, not just a tree"
+    'I got 99 problems but a policyfile ain\'t one',
+    'Solve the way you want, not the way you\'re told',
+    'Build environments, not applications',
+    'DRY should be the rule, not the exception',
+    'Solve for the forest, not just a tree'
   ]
 
 end

data/lib/batali/unit.rb

@@ -1,11 +1,23 @@
 require 'batali'
 
+# Batali namespace
 module Batali
   # Customized Unit
   class Unit < Grimoire::Unit
     attribute :source, Source, :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)}
+    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)
+      }
+    )
 
     # @return [TrueClass, FalseClass]
     def diff?(u)
@@ -21,8 +33,8 @@ module Batali
     def diff(u)
       Smash.new.tap do |_diff|
         [:name, :version].each do |k|
-          unless(self.send(k) == u.send(k))
-            _diff[k] = [self.send(k), u.send(k)]
+          unless(send(k) == u.send(k))
+            _diff[k] = [send(k), u.send(k)]
           end
         end
         if(source)

data/lib/batali/unit_loader.rb

@@ -1,7 +1,9 @@
 require 'batali'
 
+# Batali namespace
 module Batali
 
+  # Load cookbook units
   class UnitLoader < Utility
 
     include Bogo::Memoization
@@ -9,6 +11,7 @@ module Batali
     attribute :file, BFile, :required => true
     attribute :system, Grimoire::System, :required => true
     attribute :cache, String, :required => true
+    attribute :auto_path_restrict, [TrueClass, FalseClass], :default => true
 
     # Populate the system with units
     #
@@ -33,12 +36,13 @@ module Batali
               :url => ckbk.git,
               :subdirectory => ckbk.path,
               :ref => ckbk.ref || 'master',
-              :cache => cache
+              :cache_path => cache
             )
           elsif(ckbk.path)
             source = Origin::Path.new(
               :name => ckbk.name,
-              :path => ckbk.path
+              :path => ckbk.path,
+              :cache_path => cache
             )
           end
           if(source)
@@ -53,13 +57,15 @@ module Batali
       memoize(:restrictions) do
         rest = (file.restrict || Smash.new).to_smash
         file.cookbook.each do |ckbk|
-          if(ckbk.path)
-            rest[ckbk.name] = Smash.new(:path => ckbk.path).checksum
-          elsif(ckbk.git)
-            rest[ckbk.name] = Smash.new(
-              :url => ckbk.git,
-              :ref => ckbk.ref
-            ).checksum
+          if(auto_path_restrict || ckbk.restrict)
+            if(ckbk.path)
+              rest[ckbk.name] = Smash.new(:path => ckbk.path).checksum
+            elsif(ckbk.git)
+              rest[ckbk.name] = Smash.new(
+                :url => ckbk.git,
+                :ref => ckbk.ref
+              ).checksum
+            end
           end
         end
         rest

data/lib/batali/utility.rb

@@ -32,12 +32,14 @@ module Batali
           :c_name => :node_name,
           :c_key => :client_key
         ).each do |local_attr, config_key|
-          unless(self.send(local_attr))
+          unless(self.send(local_attr)) # rubocop:disable Style/RedundantSelf
             memoize(:knife_configure, :global) do
               require 'chef/knife'
               ::Chef::Knife.new.configure_chef
             end
+            # rubocop:disable Style/RedundantSelf
             debug "Settting #{config_key} from knife configuration file for #{self.class} <#{endpoint}>"
+            # rubocop:disable Style/RedundantSelf
             self.send("#{local_attr}=", ::Chef::Config[config_key])
           end
         end

data/lib/batali/version.rb

@@ -1,4 +1,5 @@
+# Batali namespace
 module Batali
   # Current version
-  VERSION = Gem::Version.new('0.3.10')
+  VERSION = Gem::Version.new('0.3.12')
 end

data/lib/chef/knife/batali_sync.rb

@@ -2,6 +2,7 @@ require 'batali'
 
 class Chef
   class Knife
+    # Batali manifest to chef server sync
     class BataliSync < Knife
 
       banner 'knife batali sync'
@@ -63,7 +64,7 @@ class Chef
           )
         end
         if(to_add.empty? && to_remove.empty?)
-          ui.info "#{ui.color('[Batali]', :green, :bold)}: Chef Server Batali Manifest Sync - #{ui.color('No Changes Detected!', :green, :bold)}"
+          ui.info "#{ui.color('[Batali]', :green, :bold)}: Chef Server Batali Manifest Sync - #{ui.color('No Changes Detected!', :green, :bold)}" # rubocop:disable Metrics/LineLength
         else
           display_sync_info(
             :additions => to_add,
@@ -74,7 +75,7 @@ class Chef
             ui.confirm 'Sync remote cookbooks with Batali manifest'
             remove_cookbooks(to_remove) unless to_remove.empty?
             add_cookbooks(to_add) unless to_add.empty?
-            ui.info "#{ui.color('[Batali]', :green, :bold)}: Chef Server Batali Manifest Sync - #{ui.color('Sync Complete!', :green, :bold)}"
+            ui.info "#{ui.color('[Batali]', :green, :bold)}: Chef Server Batali Manifest Sync - #{ui.color('Sync Complete!', :green, :bold)}" # rubocop:disable Metrics/LineLength
           else
             ui.warn 'Dry run requested. No action taken.'
           end
@@ -143,7 +144,7 @@ class Chef
             end
           end
           if(Chef::Config[:knife][:batali_show_remaining])
-            ui.info "#{ui.color('[Batali]', :green, :bold)}: Final list of cookbooks to be available on the chef server:"
+            ui.info "#{ui.color('[Batali]', :green, :bold)}: Final list of cookbooks to be available on the chef server:" # rubocop:disable Metrics/LineLength
             opts[:manifest].sort.each do |name, versions|
               vers = versions.map do |v|
                 Gem::Version.new(v)
@@ -178,7 +179,7 @@ class Chef
 
       def generate_manifest_cookbooks
         path = File.join(Dir.pwd, 'batali.manifest')
-        unless(File.exists?(path))
+        unless(File.exist?(path))
           raise "Failed to locate batali manifest at: #{path}"
         end
         manifest = Batali::Manifest.build(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.12
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -128,6 +128,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement