batali 0.4.10 → 0.5.0

data/lib/batali/chefspec.rb

@@ -1,13 +1,12 @@
-require 'batali'
-require 'stringio'
-require 'fileutils'
-require 'tmpdir'
+require "batali"
+require "stringio"
+require "fileutils"
+require "tmpdir"
 
 # ChefSpec namespace
 module ChefSpec
   # Batali integration class
   class Batali
-
     class << self
       extend Forwardable
       def_delegators :instance, :setup!, :teardown!
@@ -17,24 +16,24 @@ module ChefSpec
 
     # Create new instance
     def initialize
-      @vendor_path = Dir.mktmpdir
+      @vendor_path = Utility.clean_path(Dir.mktmpdir)
     end
 
     # Setup the environment (load cookbooks)
     def setup!
-      output = ''
+      output = ""
       begin
         ::Batali::Command::Update.new(
           Smash.new(
-            :file => File.join(Dir.pwd, 'Batali'),
+            :file => Utility.join_path(Dir.pwd, "Batali"),
             :path => @vendor_path,
             :update => {
-              :install => true
+              :install => true,
             },
             :ui => Bogo::Ui.new(
-              :app_name => 'Batali',
-              :output_to => StringIO.new(output)
-            )
+              :app_name => "Batali",
+              :output_to => StringIO.new(output),
+            ),
           ),
           []
         ).execute!
@@ -50,15 +49,14 @@ module ChefSpec
 
     # Clean up after complete
     def teardown!
-      if(File.directory?(@vendor_path))
+      if File.directory?(@vendor_path)
         FileUtils.rm_rf(@vendor_path)
       end
     end
-
   end
 end
 
 RSpec.configure do |config|
-  config.before(:suite){ ChefSpec::Batali.setup! }
-  config.after(:suite){ ChefSpec::Batali.teardown! }
+  config.before(:suite) { ChefSpec::Batali.setup! }
+  config.after(:suite) { ChefSpec::Batali.teardown! }
 end

data/lib/batali/command.rb

@@ -1,21 +1,20 @@
-require 'batali'
-require 'fileutils'
+require "batali"
+require "fileutils"
 
 module Batali
   # Customized command base for Batali
   class Command < Bogo::Cli::Command
-
-    DEFAULT_CONFIGURATION_FILES = ['.batali']
+    DEFAULT_CONFIGURATION_FILES = [".batali"]
 
     include Bogo::Memoization
 
-    autoload :Cache, 'batali/command/cache'
-    autoload :Configure, 'batali/command/configure'
-    autoload :Display, 'batali/command/display'
-    autoload :Install, 'batali/command/install'
-    autoload :Resolve, 'batali/command/resolve'
-    autoload :Supermarket, 'batali/command/supermarket'
-    autoload :Update, 'batali/command/update'
+    autoload :Cache, "batali/command/cache"
+    autoload :Configure, "batali/command/configure"
+    autoload :Display, "batali/command/display"
+    autoload :Install, "batali/command/install"
+    autoload :Resolve, "batali/command/resolve"
+    autoload :Supermarket, "batali/command/supermarket"
+    autoload :Update, "batali/command/update"
 
     # Set UI when loading via command
     def initialize(*_)
@@ -27,14 +26,14 @@ module Batali
     def batali_file
       memoize(:batali_file) do
         # TODO: Add directory traverse searching
-        path = config.fetch(:file, File.join(Dir.pwd, 'Batali'))
+        path = Utility.clean_path(config.fetch(:file, File.join(Dir.pwd, "Batali")))
         ui.verbose "Loading Batali file from: #{path}"
         bfile = BFile.new(path, cache_directory)
-        if(bfile.discover)
+        if bfile.discover
           bfile.auto_discover!(config[:environment])
         end
         bfile.data.keys.each do |key|
-          unless(bfile.respond_to?(key))
+          unless bfile.respond_to?(key)
             ui.warn "Unknown keyword used within Batali file: #{key.inspect}"
           end
         end
@@ -45,23 +44,32 @@ module Batali
     # @return [Manifest]
     def manifest
       memoize(:manifest) do
-        path = File.join(
+        path = Utility.join_path(
           File.dirname(
-            config.fetch(:file, File.join(Dir.pwd, 'batali.manifest'))
-          ), 'batali.manifest'
+            config.fetch(:file, File.join(Dir.pwd, "batali.manifest"))
+          ), "batali.manifest"
         )
         ui.verbose "Loading manifest file from: #{path}"
         Manifest.build(path)
       end
     end
 
+    # @return [String] correct user home location for platform
+    def user_home
+      if (RUBY_PLATFORM =~ /mswin|mingw|windows/)
+        Utility.clean_path(ENV.fetch("LOCALAPPDATA", Dir.home))
+      else
+        Utility.clean_path(Dir.home)
+      end
+    end
+
     # @return [String] path to local cache
     def cache_directory(*args)
-      memoize(['cache_directory', *args].join('_')) do
-        directory = config.fetch(:cache_directory, File.join(Dir.home, '.batali', 'cache'))
+      memoize(["cache_directory", *args].join("_")) do
+        directory = Utility.clean_path(config.fetch(:cache_directory, File.join(user_home, ".batali", "cache")))
         ui.debug "Cache directory to persist cookbooks: #{directory}"
-        unless(args.empty?)
-          directory = File.join(directory, *args.map(&:to_s))
+        unless args.empty?
+          directory = Utility.join_path(directory, *args.map(&:to_s))
         end
         FileUtils.mkdir_p(directory)
         directory
@@ -73,7 +81,7 @@ module Batali
     # @param action [String] action to be performed
     # @yield block to execute
     def dry_run(action)
-      if(config[:dry_run])
+      if config[:dry_run]
         ui.warn "Dry run disabled: #{action}"
       else
         yield
@@ -82,11 +90,8 @@ module Batali
 
     # @return [TrueClass, FalseClass] infrastructure mode
     def infrastructure?
-      config[:infrastructure] || (
-        config[:infrastructure].nil? &&
-        manifest.infrastructure
-      )
+      config[:infrastructure] || (config[:infrastructure].nil? &&
+                                  manifest.infrastructure)
     end
-
   end
 end

data/lib/batali/command/cache.rb

@@ -1,4 +1,4 @@
-require 'batali'
+require "batali"
 
 module Batali
   class Command
@@ -8,17 +8,17 @@ module Batali
 
       # Display information from manifest
       def execute!
-        if(opts[:scrub])
+        if opts[:scrub]
           scrub!
         end
-        ui.puts ui.color('Batali cache information:', :bold) + "\n"
+        ui.puts ui.color("Batali cache information:", :bold) + "\n"
         display
       end
 
       # Remove all contents from local cache
       def scrub!
-        ui.confirm "Remove all contents from local cache (#{cache_directory})"
-        run_action 'Scrubbing local cache' do
+        ui.confirm "Remove all contents from local cache (#{cache_directory})" unless opts[:yes]
+        run_action "Scrubbing local cache" do
           FileUtils.rm_rf(cache_directory)
           nil
         end
@@ -26,19 +26,17 @@ module Batali
 
       # Display local cache information
       def display
-        cache_size = Dir.glob(File.join(cache_directory, '**', '**', '*')).map do |path|
+        cache_size = Dir.glob(Utility.join_path(cache_directory, "**", "**", "*")).map do |path|
           File.size(path) if File.file?(path)
         end.compact.inject(&:+).to_i
-        cache_size = "#{sprintf('%.2f', ((cache_size / 1024.to_f) / 1024))}M"
+        cache_size = "#{sprintf("%.2f", ((cache_size / 1024.to_f) / 1024))}M"
         [
-          "#{ui.color('Path:', :bold)} #{cache_directory}",
-          "#{ui.color('Size:', :bold)} #{cache_size}"
+          "#{ui.color("Path:", :bold)} #{cache_directory}",
+          "#{ui.color("Size:", :bold)} #{cache_size}",
         ].each do |line|
           ui.puts "  #{line}"
         end
       end
-
     end
-
   end
 end

data/lib/batali/command/configure.rb

@@ -1,12 +1,10 @@
-require 'batali'
+require "batali"
 
 module Batali
   class Command
 
     # Create/Update Batali configuration
     class Configure < Batali::Command
-
     end
-
   end
 end

data/lib/batali/command/display.rb

@@ -1,4 +1,4 @@
-require 'batali'
+require "batali"
 
 module Batali
   class Command
@@ -8,7 +8,7 @@ module Batali
 
       # Display information from manifest
       def execute!
-        ui.puts ui.color('Batali manifest information:', :bold) + "\n"
+        ui.puts ui.color("Batali manifest information:", :bold) + "\n"
         display(arguments)
       end
 
@@ -40,8 +40,6 @@ module Batali
           end
         end
       end
-
     end
-
   end
 end

data/lib/batali/command/install.rb

@@ -1,5 +1,5 @@
-require 'batali'
-require 'fileutils'
+require "batali"
+require "fileutils"
 
 module Batali
   class Command
@@ -9,34 +9,34 @@ module Batali
 
       # Install cookbooks
       def execute!
-        dry_run('Cookbook installation') do
-          install_path = config.fetch(:path, 'cookbooks')
-          run_action('Readying installation destination') do
+        dry_run("Cookbook installation") do
+          install_path = Utility.clean_path(config.fetch(:path, "cookbooks"))
+          run_action("Readying installation destination") do
             FileUtils.rm_rf(install_path)
             FileUtils.mkdir_p(install_path)
             nil
           end
-          if(manifest.cookbook.nil? || manifest.cookbook.empty?)
-            ui.error 'No cookbooks defined within manifest! Try resolving first. (`batali resolve`)'
+          if manifest.cookbook.nil? || manifest.cookbook.empty?
+            ui.error "No cookbooks defined within manifest! Try resolving first. (`batali resolve`)"
           else
-            run_action('Installing cookbooks') do
+            run_action("Installing cookbooks") do
               manifest.cookbook.each_slice(100) do |units_slice|
                 units_slice.map do |unit|
                   Thread.new do
                     ui.debug "Starting unit install for: #{unit.name}<#{unit.version}>"
-                    if(unit.source.respond_to?(:cache_path))
+                    if unit.source.respond_to?(:cache_path)
                       unit.source.cache_path = cache_directory(
-                        Bogo::Utility.snake(unit.source.class.name.split('::').last)
+                        Bogo::Utility.snake(unit.source.class.name.split("::").last)
                       )
                     end
                     asset_path = unit.source.asset
-                    final_path = File.join(install_path, unit.name)
-                    if(infrastructure?)
+                    final_path = Utility.join_path(install_path, unit.name)
+                    if infrastructure?
                       final_path << "-#{unit.version}"
                     end
                     begin
                       FileUtils.cp_r(
-                        File.join(asset_path, '.'),
+                        Utility.join_path(asset_path, "."),
                         final_path
                       )
                       ui.debug "Completed unit install for: #{unit.name}<#{unit.version}>"
@@ -54,8 +54,6 @@ module Batali
           end
         end
       end
-
     end
-
   end
 end

data/lib/batali/command/resolve.rb

@@ -1,4 +1,4 @@
-require 'batali'
+require "batali"
 
 module Batali
   class Command
@@ -10,27 +10,27 @@ module Batali
       # and dump serialized manifest
       def execute!
         system = Grimoire::System.new
-        run_action 'Loading sources' do
+        run_action "Loading sources" do
           UnitLoader.new(
             :file => batali_file,
             :system => system,
             :cache => cache_directory(:git),
-            :auto_path_restrict => !infrastructure?
+            :auto_path_restrict => !infrastructure?,
           ).populate!
           nil
         end
         requirements = Grimoire::RequirementList.new(
           :name => :batali_resolv,
-          :requirements => batali_file.cookbook.map{ |ckbk|
-            [ckbk.name, (ckbk.constraint.nil? || ckbk.constraint.empty? ? ['> 0'] : ckbk.constraint)]
-          }
+          :requirements => batali_file.cookbook.map { |ckbk|
+            [ckbk.name, (ckbk.constraint.nil? || ckbk.constraint.empty? ? ["> 0"] : ckbk.constraint)]
+          },
         )
         solv = Grimoire::Solver.new(
           :requirements => requirements,
           :system => system,
-          :score_keeper => score_keeper
+          :score_keeper => score_keeper,
         )
-        if(infrastructure?)
+        if infrastructure?
           infrastructure_resolution(solv)
         else
           single_path_resolution(solv)
@@ -41,7 +41,7 @@ module Batali
       def score_keeper
         memoize(:score_keeper) do
           sk_manifest = Manifest.new(:cookbook => manifest.cookbook)
-          unless(config[:least_impact])
+          unless config[:least_impact]
             sk_manifest.cookbook.clear
           end
           sk_manifest.cookbook.delete_if do |unit|
@@ -61,50 +61,50 @@ module Batali
             [unit.name, unit.version]
           end
         ]
-        ui.info 'Performing single path resolution.'
-        if(manifest.infrastructure)
-          ui.confirm 'Current manifest is resolved for infrastucture. Convert to single path?'
+        ui.info "Performing single path resolution."
+        if manifest.infrastructure
+          ui.confirm "Current manifest is resolved for infrastucture. Convert to single path?"
         end
         results = []
-        run_action 'Resolving dependency constraints' do
+        run_action "Resolving dependency constraints" do
           results = solv.generate!
           nil
         end
-        if(results.empty?)
-          ui.error 'No solutions found defined requirements!'
+        if results.empty?
+          ui.error "No solutions found defined requirements!"
         else
           ideal_solution = results.pop
-          ui.debug 'Full solution raw contents:'
+          ui.debug "Full solution raw contents:"
           ideal_solution.units.each do |unit|
-            ui.debug [unit.name, unit.version].join(' -> ')
+            ui.debug [unit.name, unit.version].join(" -> ")
           end
-          dry_run('manifest file write') do
-            run_action 'Writing manifest' do
+          dry_run("manifest file write") do
+            run_action "Writing manifest" do
               manifest = Manifest.new(
                 :cookbook => ideal_solution.units,
-                :infrastructure => false
+                :infrastructure => false,
               )
-              File.open('batali.manifest', 'w') do |file|
+              File.open("batali.manifest", "w") do |file|
                 file.write MultiJson.dump(manifest, :pretty => true)
               end
               nil
             end
           end
           # ui.info "Number of solutions collected for defined requirements: #{results.size + 1}"
-          ui.info 'Ideal solution:'
-          solution_units = Smash[ideal_solution.units.map{|unit| [unit.name, unit]}]
-          manifest_units = Smash[manifest.cookbook.map{|unit| [unit.name, unit]}]
+          ui.info "Ideal solution:"
+          solution_units = Smash[ideal_solution.units.map { |unit| [unit.name, unit] }]
+          manifest_units = Smash[manifest.cookbook.map { |unit| [unit.name, unit] }]
           (solution_units.keys + manifest_units.keys).compact.uniq.sort.each do |unit_name|
-            if(manifest_units[unit_name])
-              if(solution_units[unit_name])
-                if(solution_units[unit_name].same?(manifest_units[unit_name]))
+            if manifest_units[unit_name]
+              if solution_units[unit_name]
+                if solution_units[unit_name].same?(manifest_units[unit_name])
                   ui.puts "#{unit_name} <#{solution_units[unit_name].version}>"
                 else
                   u_diff = manifest_units[unit_name].diff(solution_units[unit_name])
-                  version_output = u_diff[:version] ? u_diff[:version].join(' -> ') : solution_units[unit_name].version
+                  version_output = u_diff[:version] ? u_diff[:version].join(" -> ") : solution_units[unit_name].version
                   u_diff.delete(:version)
-                  unless(u_diff.empty?)
-                    diff_output = "[#{u_diff.values.map{|v| v.join(' -> ')}.join(' | ')}]"
+                  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)
                 end
@@ -123,27 +123,27 @@ module Batali
       # @param solv [Grimoire::Solver]
       # @return [TrueClass]
       def infrastructure_resolution(solv)
-        ui.info 'Performing infrastructure path resolution.'
-        if(manifest.infrastructure == false)
-          ui.ask 'Current manifest is resolved single path. Convert to infrastructure?'
+        ui.info "Performing infrastructure path resolution."
+        if manifest.infrastructure == false
+          ui.ask "Current manifest is resolved single path. Convert to infrastructure?"
         end
-        run_action 'Resolving dependency constraints' do
+        run_action "Resolving dependency constraints" do
           solv.prune_world!
           nil
         end
-        dry_run('manifest file write') do
-          run_action 'Writing infrastructure manifest file' do
-            File.open(manifest.path, 'w') do |file|
+        dry_run("manifest file write") do
+          run_action "Writing infrastructure manifest file" do
+            File.open(manifest.path, "w") do |file|
               manifest = Manifest.new(
                 :cookbook => solv.world.units.values.flatten,
-                :infrastructure => true
+                :infrastructure => true,
               )
               file.write MultiJson.dump(manifest, :pretty => true)
               nil
             end
           end
         end
-        ui.info 'Infrastructure manifest solution:'
+        ui.info "Infrastructure manifest solution:"
 
         solution_units = solv.world.units
         manifest_units = Smash.new.tap do |mu|
@@ -153,41 +153,39 @@ module Batali
           end
         end
         (solution_units.keys + manifest_units.keys).compact.uniq.sort.each do |unit_name|
-          if(manifest_units[unit_name])
-            if(solution_units[unit_name])
+          if manifest_units[unit_name]
+            if solution_units[unit_name]
               removed = manifest_units[unit_name].find_all do |m_unit|
                 solution_units[unit_name].none? do |s_unit|
                   m_unit.same?(s_unit)
                 end
-              end.map{|u| [u.version, :red] }
+              end.map { |u| [u.version, :red] }
               added = solution_units[unit_name].find_all do |s_unit|
                 manifest_units[unit_name].none? do |m_unit|
                   s_unit.same?(m_unit)
                 end
-              end.map{|u| [u.version, :green]}
+              end.map { |u| [u.version, :green] }
               persisted = solution_units[unit_name].find_all do |s_unit|
                 manifest_units[unit_name].any? do |m_unit|
                   s_unit.same?(m_unit)
                 end
-              end.map{|u| [u.version, nil]}
+              end.map { |u| [u.version, nil] }
               unit_versions = (removed + added + persisted).sort_by(&:first).map do |uv|
                 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)}" # rubocop:disable Metrics/LineLength
+              unless added.empty? && removed.empty?
+                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(', ')}>"
+                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) # rubocop:disable Metrics/LineLength
+              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) # rubocop:disable Metrics/LineLength
+            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
-
     end
-
   end
 end