batali 0.4.10 → 0.5.0

data/lib/batali/command/supermarket.rb

@@ -1,7 +1,7 @@
-require 'batali'
-require 'tempfile'
-require 'rubygems/package'
-require 'zlib'
+require "batali"
+require "tempfile"
+require "rubygems/package"
+require "zlib"
 
 module Batali
   class Command
@@ -10,25 +10,25 @@ module Batali
 
       # Generate supermarket
       def execute!
-        ui.info "Batali supermarket generator #{ui.color('started', :bold)}"
-        if(config[:skip_install])
-          ui.warn 'Skipping cookbook installation.'
+        ui.info "Batali supermarket generator #{ui.color("started", :bold)}"
+        if config[:skip_install]
+          ui.warn "Skipping cookbook installation."
         else
           Install.new(config.merge(:ui => ui, :install => {}), arguments).execute!
         end
-        run_action 'Prepare supermarket destination directory' do
-          FileUtils.mkdir_p(File.join(config[:supermarket_path], 'api', 'v1', 'cookbooks'))
+        run_action "Prepare supermarket destination directory" do
+          FileUtils.mkdir_p(Utility.join_path(config[:supermarket_path], "api", "v1", "cookbooks"))
           FileUtils.mkdir_p(config[:assets_path])
           nil
         end
         new_universe = new_universe_file = universe_diff = nil
-        run_action 'Generate supermarket universe.json file' do
+        run_action "Generate supermarket universe.json file" do
           new_universe, new_universe_file = generate_universe
           nil
         end
-        unless(config[:universe_only])
-          if(config[:clean_assets])
-            Dir.glob(File.join(config[:assets_path], '*')).each do |old_asset|
+        unless config[:universe_only]
+          if config[:clean_assets]
+            Dir.glob(Utility.join_path(config[:assets_path], "*")).each do |old_asset|
               FileUtils.rm(old_asset)
             end
           end
@@ -39,16 +39,16 @@ module Batali
           prune_universe(valid_items)
           populate_universe(valid_items)
         end
-        run_action 'Write supermarket universe file' do
+        run_action "Write supermarket universe file" do
           FileUtils.cp(
             new_universe_file.path,
-            File.join(config[:supermarket_path], 'universe')
+            Utility.join_path(config[:supermarket_path], "universe")
           )
-          FileUtils.chmod(0644, File.join(config[:supermarket_path], 'universe'))
+          FileUtils.chmod(0644, Utility.join_path(config[:supermarket_path], "universe"))
           new_universe_file.delete
           nil
         end
-        ui.info "Batali supermarket generator #{ui.color('complete!', :bold, :green)}"
+        ui.info "Batali supermarket generator #{ui.color("complete!", :bold, :green)}"
         ui.puts "  Supermarket content written to: #{config[:supermarket_path]}"
       end
 
@@ -58,24 +58,24 @@ module Batali
           base_name = "#{ckbk.name}-#{ckbk.version}.tgz"
           ckbk_name = infrastructure? ? "#{ckbk.name}-#{ckbk.version}" : ckbk.name
           tar_ckbk_name = "#{ckbk.name}-#{ckbk.version}"
-          ckbk_content_path = File.join('cookbooks', ckbk_name)
-          ckbk_path = File.join(config[:assets_path], base_name)
-          unless(File.exist?(ckbk_path))
-            ckbk_io = File.open(ckbk_path, 'wb')
+          ckbk_content_path = Utility.join_path("cookbooks", ckbk_name)
+          ckbk_path = Utility.join_path(config[:assets_path], base_name)
+          unless File.exist?(ckbk_path)
+            ckbk_io = File.open(ckbk_path, "wb")
             gz_io = Zlib::GzipWriter.new(ckbk_io, Zlib::BEST_COMPRESSION)
             begin
               gz_io.mtime = Time.now
               Gem::Package::TarWriter.new(gz_io) do |tar|
-                unless(File.directory?(ckbk_content_path))
+                unless File.directory?(ckbk_content_path)
                   raise "Cookbook path not found! Run `install`. (#{ckbk_content_path})"
                 end
-                Dir.glob(File.join(ckbk_content_path, '**', '**', '*')).each do |c_file|
+                Dir.glob(Utility.join_path(ckbk_content_path, "**", "**", "*")).each do |c_file|
                   next unless File.file?(c_file)
                   stat = File.stat(c_file)
-                  c_path = c_file.sub(File.join(ckbk_content_path, ''), '')
+                  c_path = c_file.sub(Utility.join_path(ckbk_content_path, ""), "")
                   tar.add_file_simple(File.join(tar_ckbk_name, c_path), stat.mode, stat.size) do |dst|
-                    File.open(c_file, 'rb') do |src|
-                      until(src.eof?)
+                    File.open(c_file, "rb") do |src|
+                      until src.eof?
                         dst.write src.read(4096)
                       end
                     end
@@ -108,35 +108,32 @@ module Batali
       #
       # @return [Smash, File] universe content hash, universe file
       def generate_universe
+        supermarket_url = config[:remote_supermarket_url].sub(%r{/$}, "")
         universe = Smash.new.tap do |uni|
           manifest.cookbook.each do |ckbk|
-            uni.set(ckbk.name, ckbk.version.to_s,
-              Smash.new(
-                :location_type => config[:location_type],
-                :location_path => File.join(config[:remote_supermarket_url], 'api', 'v1'),
-                :download_url => File.join(
-                  config[:remote_supermarket_url],
-                  config[:download_prefix],
-                  "#{ckbk.name}-#{ckbk.version}.tgz"
-                ),
-                :dependencies => Smash[
-                  ckbk.dependencies.map do |dep|
-                    [dep.name, dep.requirement]
-                  end
-                ]
-              )
-            )
+            uni.set(ckbk.name, ckbk.version.to_s, Smash.new(
+              :location_type => config[:location_type],
+              :location_path => [supermarket_url, "api", "v1"].join("/"),
+              :download_url => [
+                supermarket_url,
+                config[:download_prefix],
+                "#{ckbk.name}-#{ckbk.version}.tgz",
+              ].map { |i| i.to_s.gsub(%r{(^/|/$)}, "") }.join("/"),
+              :dependencies => Smash[
+                ckbk.dependencies.map do |dep|
+                  [dep.name, dep.requirement]
+                end
+              ],
+            ))
           end
         end
 
-        new_universe_file = Tempfile.new('batali-universe')
+        new_universe_file = Tempfile.new("batali-universe")
         new_universe_file.puts MultiJson.dump(universe, :pretty => !!config[:pretty_universe])
         new_universe_file.flush
         new_universe_file.rewind
         [universe, new_universe_file]
       end
-
     end
-
   end
 end

data/lib/batali/command/update.rb

@@ -1,19 +1,16 @@
-require 'batali'
+require "batali"
 
 module Batali
   class Command
 
     # Update cookbook manifest
     class Update < Batali::Command
-
       def execute!
         Resolve.new(config.merge(:ui => ui), arguments).execute!
-        if(opts[:install])
+        if opts[:install]
           Install.new(config.merge(:ui => ui, :install => {}), arguments).execute!
         end
       end
-
     end
-
   end
 end

data/lib/batali/config.rb

@@ -1,7 +1,6 @@
-require 'batali'
+require "batali"
 
 module Batali
   class Config < Bogo::Config
-
   end
 end

data/lib/batali/git.rb

@@ -1,5 +1,5 @@
-require 'git'
-require 'batali'
+require "git"
+require "batali"
 
 # Batali namespace
 module Batali
@@ -8,16 +8,16 @@ module Batali
 
     # @return [String] path to repository clone
     def base_path
-      File.join(cache_path, Base64.urlsafe_encode64(url))
+      Utility.join_path(cache_path, Base64.urlsafe_encode64(url))
     end
 
     # Clone the repository to the local machine
     #
     # @return [TrueClass]
     def clone_repository
-      if(File.directory?(base_path))
+      if File.directory?(base_path)
         repo = ::Git.open(base_path)
-        repo.checkout('master')
+        repo.checkout("master")
         repo.pull
         repo.fetch
       else
@@ -33,13 +33,13 @@ module Batali
     def ref_dup
       git = ::Git.open(base_path)
       git.checkout(ref)
-      git.pull('origin', ref)
+      git.pull("origin", ref)
       self.ref = git.log.first.sha
-      self.path = File.join(cache_path, 'git', ref)
-      unless(File.directory?(path))
+      self.path = Utility.join_path(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'))
+        FileUtils.cp_r(Utility.join_path(base_path, "."), path)
+        FileUtils.rm_rf(Utility.join_path(path, ".git"))
       end
       path
     end
@@ -51,6 +51,5 @@ module Batali
         attribute :ref, String, :required => true, :equivalent => true
       end
     end
-
   end
 end

data/lib/batali/manifest.rb

@@ -1,14 +1,13 @@
-require 'batali'
+require "batali"
 
 module Batali
   # Collection of resolved units
   class Manifest < Utility
-
     include Bogo::Memoization
 
     attribute :path, String
     attribute :infrastructure, [TrueClass, FalseClass]
-    attribute :cookbook, Batali::Unit, :multiple => true, :coerce => lambda{|v| Batali::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.
@@ -16,7 +15,8 @@ module Batali
     # @param path [String] path to manifest
     # @return [Manifest]
     def self.build(path)
-      if(File.exist?(path))
+      path = Utility.join_path(path)
+      if File.exist?(path)
         new(Bogo::Config.new(path).data.merge(:path => path))
       else
         new(:path => path)
@@ -29,7 +29,7 @@ module Batali
     # @return [TrueClass, FalseClass]
     def include?(unit)
       memoize(unit.inspect) do
-        if(cookbook)
+        if cookbook
           !!cookbook.detect do |ckbk|
             ckbk.name == unit.name &&
               ckbk.version == unit.version
@@ -39,6 +39,5 @@ module Batali
         end
       end
     end
-
   end
 end

data/lib/batali/monkey.rb

@@ -1,11 +1,13 @@
-require 'bogo/http_proxy'
+require "bogo/http_proxy"
 
 # Batali namespace
 module Batali
   # 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
@@ -13,12 +15,12 @@ module Batali
       result = [
         name,
         *requirement.requirements.map do |req|
-          req.join(' ')
-        end
+          req.join(" ")
+        end,
       ]
       # Prevent stupid conversion errors of
       # JSON::Ext::Generator::State into Hash
-      args.map!{|v| v.respond_to?(:to_h) ? v.to_h : v}
+      args.map! { |v| v.respond_to?(:to_h) ? v.to_h : v }
       MultiJson.dump(result, *args)
     end
   end

data/lib/batali/origin.rb

@@ -1,22 +1,25 @@
-require 'batali'
+require "batali"
 
-module  Batali
+module Batali
   # Cookbook source origin
   class Origin < Utility
-
-    autoload :ChefServer, 'batali/origin/chef_server'
-    autoload :RemoteSite, 'batali/origin/remote_site'
-    autoload :Git, 'batali/origin/git'
-    autoload :Path, 'batali/origin/path'
+    autoload :ChefServer, "batali/origin/chef_server"
+    autoload :RemoteSite, "batali/origin/remote_site"
+    autoload :Git, "batali/origin/git"
+    autoload :Path, "batali/origin/path"
 
     attribute :name, String, :required => true
     attribute :cache_path, String, :required => true
     attribute :identifier, String
 
+    def initialize(*_, &block)
+      super
+      self.cache_path = Utility.clean_path(cache_path)
+    end
+
     # @return [Array<Unit>] all units
     def units
-      raise NotImplementedError.new 'Abstract class'
+      raise NotImplementedError.new "Abstract class"
     end
-
   end
 end

data/lib/batali/origin/chef_server.rb

@@ -1,14 +1,13 @@
-require 'batali'
-require 'digest/sha2'
-require 'securerandom'
-require 'http'
-require 'fileutils'
+require "batali"
+require "digest/sha2"
+require "securerandom"
+require "http"
+require "fileutils"
 
 module Batali
   class Origin
     # Fetch unit information from chef server
     class ChefServer < Origin
-
       include Bogo::Memoization
       include Utility::Chef
 
@@ -19,7 +18,7 @@ module Batali
         super
         init_chef!
         self.identifier = Digest::SHA256.hexdigest(endpoint)
-        unless(name?)
+        unless name?
           self.name = identifier
         end
       end
@@ -28,13 +27,13 @@ module Batali
       def units
         memoize(:units) do
           debug "Fetching units from chef server: #{endpoint}"
-          units = api_service.get_rest('cookbooks?num_versions=all').map do |c_name, meta|
-            meta['versions'].map do |info|
-              "#{c_name}/#{info['version']}"
+          units = api_service.get_rest("cookbooks?num_versions=all").map do |c_name, meta|
+            meta["versions"].map do |info|
+              "#{c_name}/#{info["version"]}"
             end
           end.flatten.map do |ckbk|
             debug "Unit information from #{endpoint}: #{ckbk.inspect}"
-            c_name, c_version = ckbk.split('/', 2)
+            c_name, c_version = ckbk.split("/", 2)
             c_deps = api_service.get_rest(
               "cookbooks/#{c_name}/#{c_version}"
             ).metadata.dependencies.to_a
@@ -49,13 +48,12 @@ module Batali
                 :endpoint => endpoint,
                 :client_key => client_key,
                 :client_name => client_name,
-                :cache_path => cache_path
-              )
+                :cache_path => cache_path,
+              ),
             )
           end.flatten
         end
       end
-
     end
   end
 end

data/lib/batali/origin/git.rb

@@ -1,23 +1,22 @@
-require 'git'
-require 'batali'
+require "git"
+require "batali"
 
 module Batali
   class Origin
     # Fetch unit from local path
     class Git < Path
-
       include Batali::Git
       attribute :path, String, :required => false
       attribute :subdirectory, String
 
-      def initialize(args={})
+      def initialize(args = {})
         super
         self.identifier = Smash.new(
           :url => url,
           :ref => ref,
-          :subdirectory => subdirectory
+          :subdirectory => subdirectory,
         ).checksum
-        unless(name?)
+        unless name?
           self.name = identifier
         end
       end
@@ -30,7 +29,7 @@ module Batali
             :url => url,
             :ref => ref,
             :subdirectory => subdirectory,
-            :cache_path => cache_path
+            :cache_path => cache_path,
           )
           items
         end
@@ -40,7 +39,7 @@ module Batali
       def load_metadata
         fetch_repo
         original_path = path.dup
-        self.path = File.join(*[path, subdirectory].compact)
+        self.path = Utility.path_join(*[path, subdirectory].compact)
         result = super
         self.path = original_path
         result
@@ -53,7 +52,6 @@ module Batali
           ref_dup
         end
       end
-
     end
   end
 end