batali 0.4.10 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f4553dc89e46b84385924f5bb91aa2be8ef25f1a
-  data.tar.gz: 2002e75fc05c7b841f3152131ca66076969a1f26
+SHA256:
+  metadata.gz: 36c2b3a73af2cda00310d325b11c45528b6ce1e73053733bec57aecda740691d
+  data.tar.gz: 859df3d565d6e7d0e010a75d06e6de75db33fef921d0b60472aee9c4f9675c8c
 SHA512:
-  metadata.gz: 6c03e18e0c2ac2854ae223245b63134c5dc742ac2b3d1e439d248bb1e1ac5dad704b422ff4d0d1c168a66532da8981ba99606f28ec38396fcefbfe86c9986d15
-  data.tar.gz: 1ad3695558546faefb03819e2192ce5541dfc22e232c98b628fd99f58b2098a5f26286f05437d961e48da4ff780bdd314f3570d0dc75e31a60b044074dcc4c1b
+  metadata.gz: 82f4762ba5bac43cf341c94fd3f158be89b34b2de70a47b2bae4bbf7fc1cd8ab176a7609d6abe34e9b4d4ccf0724e3a084aaa55c4f0780fda1bdb6cd5f2b884b
+  data.tar.gz: 6256dc382f21a894ef7532b71e89a8f0885b5eb5b3172441f654612c88586bd67580e464506fb90d988eb1b79d4f516eae84bd6cfd250680cc6f60c5d7e5386d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.5.0
+* [enhancement] Use UNC style paths on Windows (#95)
+* [enhancement] Use LOCALAPPDATA on Windows (#90)
+* [fix] Fix metadata loading when JSON file (#86)
+
 # v0.4.10
 * [fix] Cookbook installation errors on windows (#82)
 

data/CONTRIBUTING.md

@@ -12,7 +12,7 @@ The develop branch is the current edge of development.
 
 ## Pull requests
 
-* https://github.com/hw-labs/batali
+* https://github.com/spox/batali
 
 Please base all pull requests of the `develop` branch. Merges to
 `master` only occur through the `develop` branch. Pull requests
@@ -22,4 +22,4 @@ based on `master` will likely be cherry picked.
 
 Need to report an issue? Use the github issues:
 
-* https://github.com/hw-labs/batali
+* https://github.com/spox/batali

data/LICENSE

@@ -1,4 +1,4 @@
-   Copyright 2015 Chris Roberts
+   Copyright 2018 Chris Roberts
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/README.md

@@ -1,9 +1,10 @@
+[![Travis status](https://api.travis-ci.org/spox/batali.svg?branch=develop)](https://travis-ci.org/spox/batali) [![Appveyor status](https://ci.appveyor.com/api/projects/status/bua5vb1f2jvpuu90?svg=true)](https://ci.appveyor.com/project/chrisroberts/batali)
+
 ![Batali](img/batali-logo.png)
 
 # Batali
 
-Batali is a light weight cookbook resolver. It is now in
-a beta state, moving quickly towards a proper stable release.
+Batali is a light weight cookbook resolver.
 
 ## What is Batali?
 
@@ -400,7 +401,7 @@ end
 
 Batali can be used with [Test Kitchen](https://github.com/test-kitchen/test-kitchen):
 
-* https://github.com/hw-labs/batali-tk
+* https://github.com/spox/batali-tk
 
 ## ChefSpec
 
@@ -452,7 +453,7 @@ $ batali supermarket --remote-supermarket-url="http://supermarket.example.com"
 
 # Info
 
-* Repository: https://github.com/hw-labs/batali
+* Repository: https://github.com/spox/batali
 
 [1]: https://rubygems.org/gems/librarian "A Framework for Bundlers"
-[2]: https://rubygems.org/gems/chef "A systems integration framework"
+[2]: https://rubygems.org/gems/chef "A systems integration framework"

data/batali.gemspec

@@ -1,28 +1,29 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__)) + '/lib/'
-require 'batali/version'
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__)) + "/lib/"
+require "batali/version"
 Gem::Specification.new do |s|
-  s.name = 'batali'
+  s.name = "batali"
   s.version = Batali::VERSION.version
-  s.summary = 'Magic'
-  s.author = 'Chris Roberts'
-  s.email = 'code@chrisroberts.org'
-  s.homepage = 'https://github.com/hw-labs/batali'
-  s.description = 'Magic'
-  s.require_path = 'lib'
-  s.license = 'Apache 2.0'
-  s.add_runtime_dependency 'attribute_struct', '>= 0.2.14', '< 0.5'
-  s.add_runtime_dependency 'grimoire', '>= 0.2.14', '< 0.4'
-  s.add_runtime_dependency 'bogo', '>= 0.1.20', '< 0.4'
-  s.add_runtime_dependency 'bogo-cli', '>= 0.1.23', '< 0.4'
-  s.add_runtime_dependency 'bogo-config', '>= 0.1.10', '< 0.4'
-  s.add_runtime_dependency 'bogo-ui', '>= 0.1.6', '< 0.4'
-  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', '0.35.1'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'pry'
-  s.add_development_dependency 'chef'
-  s.executables << 'batali'
-  s.files = Dir['{lib,bin}/**/**/*'] + %w(batali.gemspec README.md CHANGELOG.md CONTRIBUTING.md LICENSE)
+  s.summary = "Magic"
+  s.author = "Chris Roberts"
+  s.email = "code@chrisroberts.org"
+  s.homepage = "https://github.com/hw-labs/batali"
+  s.description = "Magic"
+  s.require_path = "lib"
+  s.license = "Apache 2.0"
+  s.add_runtime_dependency "attribute_struct", ">= 0.2.14", "< 0.5"
+  s.add_runtime_dependency "grimoire", ">= 0.2.14", "< 0.4"
+  s.add_runtime_dependency "bogo", ">= 0.1.20", "< 0.4"
+  s.add_runtime_dependency "bogo-cli", ">= 0.2.12", "< 0.4"
+  s.add_runtime_dependency "bogo-config", ">= 0.1.10", "< 0.4"
+  s.add_runtime_dependency "bogo-ui", ">= 0.1.6", "< 0.4"
+  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 "minitest"
+  s.add_development_dependency "rufo", "~> 0.3.0"
+  s.add_development_dependency "rspec", "~> 3.5"
+  s.add_development_dependency "pry"
+  s.add_development_dependency "chef"
+  s.executables << "batali"
+  s.files = Dir["{lib,bin}/**/**/*"] + %w(batali.gemspec README.md CHANGELOG.md CONTRIBUTING.md LICENSE)
 end

data/bin/batali

@@ -15,6 +15,7 @@ Bogo::Cli::Setup.define do
     on :V, :verbose, 'Enable verbose output'
     on :D, :debug, 'Enable debug mode'
     on :f, :file=, 'Path to Batali file'
+    on :y, :yes, 'Answer yes to interactive prompts'
   end
 
   command 'display' do

data/lib/batali.rb

@@ -1,25 +1,24 @@
-require 'bogo-cli'
-require 'grimoire'
-require 'batali/monkey'
+require "bogo-cli"
+require "grimoire"
+require "batali/monkey"
 
 # Batali namespace
 module Batali
-
-  autoload :BFile, 'batali/b_file'
-  autoload :Command, 'batali/command'
-  autoload :Config, 'batali/config'
-  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 :Struct, 'batali/b_file'
-  autoload :Unit, 'batali/unit'
-  autoload :UnitLoader, 'batali/unit_loader'
-  autoload :Utility, 'batali/utility'
-
-  autoload :TAG_LINES, 'batali/tag_lines'
+  autoload :BFile, "batali/b_file"
+  autoload :Command, "batali/command"
+  autoload :Config, "batali/config"
+  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 :Struct, "batali/b_file"
+  autoload :Unit, "batali/unit"
+  autoload :UnitLoader, "batali/unit_loader"
+  autoload :Utility, "batali/utility"
+
+  autoload :TAG_LINES, "batali/tag_lines"
 
   class << self
     # @return [Bogo::Ui]
@@ -30,7 +29,7 @@ module Batali
     # @param ui [Bogo::Ui]
     # @return [Bogo::Ui]
     def ui=(ui)
-      unless(ui.respond_to?(:verbose) && ui.respond_to?(:debug))
+      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
@@ -38,21 +37,19 @@ module Batali
 
     # Write verbose message
     def verbose(*args)
-      if(ui)
+      if ui
         ui.verbose(*args)
       end
     end
 
     # Write debug message
     def debug(*args)
-      if(ui)
+      if ui
         ui.debug(*args)
       end
     end
-
   end
-
 end
 
-require 'batali/b_file'
-require 'batali/version'
+require "batali/b_file"
+require "batali/version"

data/lib/batali/b_file.rb

@@ -1,14 +1,13 @@
-require 'batali'
-require 'pathname'
+require "batali"
+require "pathname"
 
 # Batali namespace
 module Batali
 
   # Custom struct class for file processing
   class Struct < AttributeStruct
-
     def cookbook(*args)
-      unless(self[:cookbook])
+      unless self[:cookbook]
         set!(:cookbook, ::AttributeStruct::CollapseArray.new.push(args))
       else
         self[:cookbook].push(args)
@@ -17,7 +16,7 @@ module Batali
     end
 
     def source(*args)
-      unless(self[:source])
+      unless self[:source]
         set!(:source, ::AttributeStruct::CollapseArray.new.push(args))
       else
         self[:source].push(args)
@@ -26,7 +25,7 @@ module Batali
     end
 
     def chef_server(*args)
-      unless(self[:chef_server])
+      unless self[:chef_server]
         set!(:chef_server, ::AttributeStruct::CollapseArray.new.push(args))
       else
         self[:chef_server].push(args)
@@ -35,7 +34,7 @@ module Batali
     end
 
     def restrict(*args)
-      unless(self[:restrict])
+      unless self[:restrict]
         set!(:restrict, ::AttributeStruct::CollapseArray.new.push(args))
       else
         self[:restrict].push(args)
@@ -49,7 +48,7 @@ module Batali
 
     def _dump(*_)
       _keys.each do |k|
-        if(_data[k].nil? && _data[k].is_a?(::AttributeStruct))
+        if _data[k].nil? && _data[k].is_a?(::AttributeStruct)
           _data[k] = true
         end
       end
@@ -57,7 +56,17 @@ module Batali
     end
 
     ::Object.constants.each do |const_name|
-      next if const_name == :Config || const_name == :TimeoutError
+      deprecated_constants = [
+        :Config,
+        :Data,
+        :TimeoutError,
+        :Fixnum,
+        :Bignum,
+        :NIL,
+        :TRUE,
+        :FALSE,
+      ]
+      next if deprecated_constants.include?(const_name)
       const_set(const_name, ::Object.const_get(const_name))
     end
 
@@ -66,14 +75,23 @@ module Batali
       instance_exec do
         class << self
           ::Object.constants.each do |const_name|
-            next if const_name == :Config || const_name == :TimeoutError
+            deprecated_constants = [
+              :Config,
+              :Data,
+              :TimeoutError,
+              :Fixnum,
+              :Bignum,
+              :NIL,
+              :TRUE,
+              :FALSE,
+            ]
+            next if deprecated_constants.include?(const_name)
             const_set(const_name, ::Object.const_get(const_name))
           end
         end
       end
       result
     end
-
   end
 
   # Create a new file
@@ -99,6 +117,7 @@ module Batali
     # @param cache_path [String] path to cache directory
     # @return [self]
     def initialize(b_file, cache_path)
+      b_file = Utility.clean_path(b_file)
       @cache = cache_path
       super(b_file)
     end
@@ -107,13 +126,13 @@ module Batali
     def self.cookbook_coerce
       proc do |v|
         v = [v].flatten.compact
-        if(v.size == 1 && v.first.is_a?(Hash))
+        if v.size == 1 && v.first.is_a?(Hash)
           Cookbook.new(v.first)
         else
           name, args = v.first, v.slice(1, v.size)
-          if(args.empty?)
+          if args.empty?
             args = Smash.new
-          elsif(args.size == 1 && args.first.is_a?(Hash))
+          elsif args.size == 1 && args.first.is_a?(Hash)
             args = args.first
           else
             args = Smash.new(:constraint => args.map(&:to_s))
@@ -146,67 +165,67 @@ module Batali
     end
 
     attribute :discover, [TrueClass, FalseClass], :required => true, :default => false
-    attribute :restrict, Restriction, :multiple => true, :coerce => lambda{|v|
-      if(v.is_a?(Hash))
-        Restriction.new(v)
-      else
-        Restriction.new(:cookbook => v.first, :source => v.last.to_smash[:source])
-      end
-    }
-    attribute :source, Origin::RemoteSite, :multiple => true, :default => [], :coerce => lambda{|v, b_file|
-      if(v.is_a?(Hash))
-        args = v
-      else
-        args = Smash.new(:endpoint => v.first)
-        if(v.last.is_a?(Hash))
-          args.merge!(v.last)
-        end
-      end
-      Origin::RemoteSite.new(args.merge(:cache_path => b_file.cache))
-    }
-    attribute :chef_server, Origin::ChefServer, :multiple => true, :default => [], :coerce => lambda{|v, b_file|
-      if(v.is_a?(Hash))
-        args = v
-      else
-        args = Smash.new(:endpoint => v.first)
-        if(v.last.is_a?(Hash))
-          args.merge!(v.last)
-        end
-      end
-      Origin::ChefServer.new(args.merge(:cache_path => b_file.cache))
-    }
-    attribute :group, Group, :multiple => true, :coerce => lambda{|v| Group.new(v)}
+    attribute :restrict, Restriction, :multiple => true, :coerce => lambda { |v|
+                              if v.is_a?(Hash)
+                                Restriction.new(v)
+                              else
+                                Restriction.new(:cookbook => v.first, :source => v.last.to_smash[:source])
+                              end
+                            }
+    attribute :source, Origin::RemoteSite, :multiple => true, :default => [], :coerce => lambda { |v, b_file|
+                                   if v.is_a?(Hash)
+                                     args = v
+                                   else
+                                     args = Smash.new(:endpoint => v.first)
+                                     if v.last.is_a?(Hash)
+                                       args.merge!(v.last)
+                                     end
+                                   end
+                                   Origin::RemoteSite.new(args.merge(:cache_path => b_file.cache))
+                                 }
+    attribute :chef_server, Origin::ChefServer, :multiple => true, :default => [], :coerce => lambda { |v, b_file|
+                                        if v.is_a?(Hash)
+                                          args = v
+                                        else
+                                          args = Smash.new(:endpoint => v.first)
+                                          if v.last.is_a?(Hash)
+                                            args.merge!(v.last)
+                                          end
+                                        end
+                                        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 => []
-    attribute :metadata, Cookbook, :coerce => lambda{ |v, b_file|
-      if(v.is_a?(Hash))
-        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, :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))
-        b_file.cookbook.push ckbk
-      end
-      ckbk
-    }
+    attribute :metadata, Cookbook, :coerce => lambda { |v, b_file|
+                           if v.is_a?(Hash)
+                             ckbk = Cookbook.new(v)
+                           else
+                             dir = Pathname.new(File.dirname(b_file.path)).relative_path_from(Pathname.new(Utility.clean_path(Dir.pwd))).to_path
+                             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)
+                             b_file.cookbook.push ckbk
+                           end
+                           ckbk
+                         }
 
     # Search environments for cookbooks and restraints
     #
     # @return [TrueClass]
-    def auto_discover!(environment=nil)
-      debug 'Starting cookbook auto-discovery'
-      unless(discover)
-        raise 'Attempting to perform auto-discovery but auto-discovery is not enabled!'
+    def auto_discover!(environment = nil)
+      debug "Starting cookbook auto-discovery"
+      unless discover
+        raise "Attempting to perform auto-discovery but auto-discovery is not enabled!"
       end
-      environment_items = Dir.glob(File.join(File.dirname(path), 'environments', '*.{json,rb}')).map do |e_path|
+      environment_items = Dir.glob(Utility.join_path(File.dirname(path), "environments", "*.{json,rb}")).map do |e_path|
         result = parse_environment(e_path)
-        if(result[:name] && result[:cookbooks])
+        if result[:name] && result[:cookbooks]
           Smash.new(
-            result[:name] => result[:cookbooks]
+            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}"
@@ -214,8 +233,8 @@ module Batali
           ckbk = cookbook.detect do |c|
             c.name == ckbk_name
           end
-          if(ckbk)
-            unless(ckbk.constraint)
+          if ckbk
+            unless ckbk.constraint
               debug "Skipping constraint merging due to lack of original constraints: #{ckbk.inspect}"
               next
             end
@@ -230,13 +249,13 @@ module Batali
             cookbook.push(
               Cookbook.new(
                 :name => ckbk_name,
-                :constraint => constraints
+                :constraint => constraints,
               )
             )
           end
         end
       end
-      debug 'Completed cookbook auto-discovery'
+      debug "Completed cookbook auto-discovery"
       true
     end
 
@@ -247,8 +266,8 @@ module Batali
     # @param constraint [String]
     # @param [Array<String>]
     def convert_constraint(constraint)
-      comp, ver = constraint.split(' ', 2).map(&:strip)
-      if(comp == '~>')
+      comp, ver = constraint.split(" ", 2).map(&:strip)
+      if comp == "~>"
         ver = UnitVersion.new(ver)
         [">= #{ver}", "< #{ver.bump}"]
       else
@@ -268,40 +287,40 @@ module Batali
       grouped = Smash[
         grouped.map do |comp, items|
           versions = items.map(&:last)
-          if(comp.start_with?('>'))
+          if comp.start_with?(">")
             [comp, [versions.min]]
-          elsif(comp.start_with?('<'))
+          elsif comp.start_with?("<")
             [comp, [versions.max]]
           else
             [comp, versions]
           end
         end
       ]
-      if(grouped['='])
-        grouped['>='] ||= []
-        grouped['<='] ||= []
-        grouped['='].each do |ver|
-          grouped['>='] << ver
-          grouped['<='] << ver
+      if grouped["="]
+        grouped[">="] ||= []
+        grouped["<="] ||= []
+        grouped["="].each do |ver|
+          grouped[">="] << ver
+          grouped["<="] << ver
         end
-        grouped.delete('=')
+        grouped.delete("=")
       end
-      if(grouped['>'] || grouped['>='])
-        if(grouped['>='] && (grouped['>'].nil? || grouped['>='].min <= grouped['>'].min))
-          grouped['>='] = [grouped['>='].min]
-          grouped.delete('>')
+      if grouped[">"] || grouped[">="]
+        if grouped[">="] && (grouped[">"].nil? || grouped[">="].min <= grouped[">"].min)
+          grouped[">="] = [grouped[">="].min]
+          grouped.delete(">")
         else
-          grouped['>'] = [grouped['>'].min]
-          grouped.delete('>=')
+          grouped[">"] = [grouped[">"].min]
+          grouped.delete(">=")
         end
       end
-      if(grouped['<'] || grouped['<='])
-        if(grouped['<='] && (grouped['<'].nil? || grouped['<='].max >= grouped['<'].max))
-          grouped['<='] = [grouped['<='].max]
-          grouped.delete('<')
+      if grouped["<"] || grouped["<="]
+        if grouped["<="] && (grouped["<"].nil? || grouped["<="].max >= grouped["<"].max)
+          grouped["<="] = [grouped["<="].max]
+          grouped.delete("<")
         else
-          grouped['<'] = [grouped['<'].max]
-          grouped.delete('<=')
+          grouped["<"] = [grouped["<"].max]
+          grouped.delete("<=")
         end
       end
       grouped.map do |comp, vers|
@@ -316,12 +335,13 @@ module Batali
     # @param path [String] path to environment
     # @return [Smash]
     def parse_environment(path)
+      path = Utility.clean_path(path)
       case File.extname(path)
-      when '.json'
+      when ".json"
         env = MultiJson.load(
           File.read(path)
         ).to_smash
-      when '.rb'
+      when ".rb"
         struct = Struct.new
         struct.set_state!(:value_collapse => true)
         struct.instance_eval(File.read(path), path, 1)
@@ -335,8 +355,8 @@ 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
 
@@ -344,7 +364,5 @@ module Batali
     def debug(s)
       Batali.debug(s)
     end
-
   end
-
 end