batali 0.4.10 → 0.5.0

data/lib/batali/origin/path.rb

@@ -1,4 +1,4 @@
-require 'batali'
+require "batali"
 
 module Batali
   class Origin
@@ -13,7 +13,7 @@ module Batali
         # @return [Constant]
         def self.const_missing(const)
           [::Object, ::ObjectSpace].map do |root|
-            if(root.const_defined?(const))
+            if root.const_defined?(const)
               root.const_get(const)
             end
           end.compact.first || super
@@ -23,7 +23,6 @@ module Batali
           set!(:depends, args)
           self
         end
-
       end
 
       include Bogo::Memoization
@@ -32,8 +31,9 @@ module Batali
 
       def initialize(*_)
         super
+        self.path = Utility.clean_path(path)
         self.identifier = Smash.new(:path => path).checksum
-        unless(name?)
+        unless name?
           self.name = identifier
         end
       end
@@ -42,16 +42,16 @@ module Batali
       def units
         memoize(:units) do
           info = load_metadata
-          if(info[:depends])
-            unless(info[:depends].first.is_a?(Array))
+          if info[:depends]
+            unless info[:depends].first.is_a?(Array)
               info[:depends] = [info[:depends]]
             end
             info[:depends] = info[:depends].map do |dep|
               case dep
               when String
-                [dep, '> 0']
+                [dep, "> 0"]
               else
-                dep.size == 1 ? dep.push('> 0') : dep
+                dep.size == 1 ? dep.push("> 0") : dep
               end
             end
           end
@@ -65,9 +65,9 @@ module Batali
                 :version => info[:version],
                 :path => path,
                 :dependencies => info.fetch(:depends, []),
-                :cache_path => cache_path
-              )
-            )
+                :cache_path => cache_path,
+              ),
+            ),
           ]
         end
       end
@@ -75,9 +75,9 @@ module Batali
       # @return [Smash] metadata information
       def load_metadata
         memoize(:metadata) do
-          if(File.exist?(json = File.join(path, 'metadata.json')))
-            MultiJson.load(json).to_smash
-          elsif(File.exist?(rb = File.join(path, 'metadata.rb')))
+          if File.exist?(json = File.join(path, "metadata.json"))
+            MultiJson.load(File.read(json)).to_smash
+          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)
@@ -87,7 +87,6 @@ module Batali
           end
         end
       end
-
     end
   end
 end

data/lib/batali/origin/remote_site.rb

@@ -1,8 +1,8 @@
-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
@@ -10,7 +10,7 @@ module Batali
     class RemoteSite < Origin
 
       # Site suffix for API endpoint
-      API_SUFFIX = 'api/v1/'
+      API_SUFFIX = "api/v1/"
 
       include Bogo::Memoization
 
@@ -25,7 +25,7 @@ module Batali
         # NOTE: We currently don't require API_SUFFIX information
         # self.endpoint = URI.join(endpoint, API_SUFFIX).to_s
         self.identifier = Digest::SHA256.hexdigest(endpoint)
-        unless(name?)
+        unless name?
           self.name = identifier
         end
       end
@@ -33,7 +33,7 @@ module Batali
       # @return [String] cache directory path
       def cache_directory
         memoize(:cache_directory) do
-          c_path = File.join(cache_path, 'remote_site', identifier)
+          c_path = Utility.join_path(cache_path, "remote_site", identifier)
           FileUtils.mkdir_p(c_path)
           c_path
         end
@@ -53,8 +53,8 @@ module Batali
                   :url => info[:download_url],
                   :version => version,
                   :dependencies => info[:dependencies],
-                  :cache_path => cache_path
-                )
+                  :cache_path => cache_path,
+                ),
               )
             end
           end.flatten
@@ -76,17 +76,17 @@ module Batali
       def fetch
         do_fetch = true
         cache_directory # init directory creation
-        if(File.exist?(universe_path))
+        if File.exist?(universe_path)
           age = Time.now - File.mtime(universe_path)
-          if(age < update_interval)
+          if age < update_interval
             do_fetch = false
           end
         end
-        if(do_fetch)
+        if do_fetch
           t_uni = "#{universe_path}.#{SecureRandom.urlsafe_base64}"
-          result = HTTP.get(URI.join(endpoint, 'universe'))
-          File.open(t_uni, 'w') do |file|
-            while(content = result.body.readpartial(2048))
+          result = HTTP.get(URI.join(endpoint, "universe"))
+          File.open(t_uni, "w") do |file|
+            while content = result.body.readpartial(2048)
               file.write content
             end
           end
@@ -97,9 +97,8 @@ module Batali
 
       # @return [String] path to universe file
       def universe_path
-        File.join(cache_directory, 'universe.json')
+        Utility.join_path(cache_directory, "universe.json")
       end
-
     end
   end
 end

data/lib/batali/requirement_list.rb

@@ -1,15 +1,14 @@
-require 'batali'
+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)
-      }
-    )
+              :multiple => true,
+              :default => [],
+              :coerce => lambda { |v|
+                Batali::UnitDependency.new(val.first, *val.last)
+              })
   end
 end

data/lib/batali/score_keeper.rb

@@ -1,4 +1,4 @@
-require 'batali'
+require "batali"
 
 module Batali
   # Provide scores for units
@@ -9,7 +9,7 @@ module Batali
       :preferred => 10_000_000,
       :patch => 1_000_000,
       :minor => 1_000,
-      :major => 100
+      :major => 100,
     }
 
     attribute :manifest, Manifest, :required => true
@@ -27,17 +27,17 @@ module Batali
     # @param idx [Integer] current index location
     # @return [Numeric, NilClass]
     def score_for(unit, *args)
-      opts = args.detect{|a| a.is_a?(Hash)} || {}
+      opts = args.detect { |a| a.is_a?(Hash) } || {}
       multiplier = 1
       manifest_unit = manifest.cookbook.detect do |m_unit|
         m_unit.name == unit.name
       end
-      if(manifest_unit)
+      if manifest_unit
         # If the unit version matches the manifest version, this
         # should be _the_ preferred version
-        if(manifest_unit.version == unit.version)
+        if manifest_unit.version == unit.version
           multiplier = MULTIPLIERS[:preferred]
-        elsif(opts[:solver] && opts[:solver].new_world)
+        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
@@ -46,7 +46,7 @@ module Batali
         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))
+          if UnitRequirement.new("~> #{manifest_unit.version}").satisfied_by?(unit.version)
             multiplier = MULTIPLIERS[:patch]
           else
             # If the unit version satisfies within the minor or major
@@ -54,12 +54,12 @@ module Batali
             # value up (with satisfaction within minor segment being
             # worth more than satisfaction within major segment)
             satisfied = UnitRequirement.new(
-              "~> #{manifest_unit.version.segments.slice(0, 2).join('.')}"
+              "~> #{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)
+            if distance > 0
               distance = 1.0 / distance
             else
               distance = 0
@@ -68,7 +68,7 @@ module Batali
           end
         end
       else
-        if(opts[:solver] && opts[:solver].new_world)
+        if 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
@@ -80,10 +80,10 @@ module Batali
       # 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, v_pos|
-        if(val == 0)
+        if val == 0
           score.push 0
         else
-          score << (2 - (1.0 / val)) * ((v_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
@@ -94,6 +94,5 @@ module Batali
       debug "Score <#{unit.name}:#{unit.version}>: #{score}"
       score
     end
-
   end
 end

data/lib/batali/source.rb

@@ -1,42 +1,41 @@
-require 'batali'
+require "batali"
 
 module Batali
   # Source of asset
   class Source < Utility
-
-    autoload :Path, 'batali/source/path'
-    autoload :Site, 'batali/source/site'
-    autoload :Git, 'batali/source/git'
-    autoload :ChefServer, 'batali/source/chef_server'
+    autoload :Path, "batali/source/path"
+    autoload :Site, "batali/source/site"
+    autoload :Git, "batali/source/git"
+    autoload :ChefServer, "batali/source/chef_server"
 
     # @return [String] path to local cache
     attr_accessor :cache_path
 
-    attribute :type, String, :required => true, :default => lambda{ self.name } # rubocop:disable Style/RedundantSelf
+    attribute :type, String, :required => true, :default => lambda { self.name } # rubocop:disable Style/RedundantSelf
 
-    def initialize(args={})
-      @cache_path = args.delete(:cache_path)
+    def initialize(args = {})
+      @cache_path = Utility.clean_path(args.delete(:cache_path))
       super
     end
 
     # @return [String]
     def unit_version
-      raise NotImplementedError.new 'Abstract class'
+      raise NotImplementedError.new "Abstract class"
     end
 
     # @return [Array<Array<name, constraints>>]
     def unit_dependencies
-      raise NotImplementedError.new 'Abstract class'
+      raise NotImplementedError.new "Abstract class"
     end
 
     # @return [String] directory containing contents
     def asset
-      raise NotImplementedError.new 'Abstract class'
+      raise NotImplementedError.new "Abstract class"
     end
 
     # @return [TrueClass, FalseClass]
     def clean_asset(asset_path)
-      if(cache_path && asset_path.include?(cache_path) && File.exist?(asset_path))
+      if cache_path && asset_path.include?(cache_path) && File.exist?(asset_path)
         FileUtils.rm_rf(asset_path)
         true
       else
@@ -60,9 +59,9 @@ module Batali
     def diff(s)
       Smash.new.tap do |_diff|
         self.class.attributes.each do |k, v|
-          if(v[:equivalent])
+          if v[:equivalent]
             s_attrs = s.respond_to?(:attributes) ? s.attributes : {}
-            unless(attributes[k] == s_attrs[k])
+            unless attributes[k] == s_attrs[k]
               _diff[k] = [attributes[k], s_attrs[k]]
             end
           end
@@ -77,19 +76,18 @@ module Batali
     # @note uses `:type` to build concrete source
     def self.build(args)
       type = args.delete(:type)
-      unless(type)
-        raise ArgumentError.new 'Missing required option `:type`!'
+      unless type
+        raise ArgumentError.new "Missing required option `:type`!"
       end
-      unless(type.to_s.include?('::'))
-        type = [name, Bogo::Utility.camel(type)].join('::')
+      unless type.to_s.include?("::")
+        type = [name, Bogo::Utility.camel(type)].join("::")
       end
       klass = Bogo::Utility.constantize(type)
-      unless(klass)
+      unless klass
         raise TypeError.new "Unknown source type provided `#{type}`!"
       else
         klass.new(args.merge(:type => type))
       end
     end
-
   end
 end

data/lib/batali/source/chef_server.rb

@@ -1,11 +1,10 @@
-require 'batali'
-require 'tmpdir'
+require "batali"
+require "tmpdir"
 
 module Batali
   class Source
     # Chef Server based source
     class ChefServer < Source
-
       include Bogo::Memoization
       include Utility::Chef
 
@@ -22,7 +21,7 @@ module Batali
       #
       # @param args [Hash]
       # @return [self]
-      def initialize(args={})
+      def initialize(args = {})
         @deps = args.delete(:dependencies) || {}
         super
         init_chef!
@@ -48,25 +47,25 @@ module Batali
       # @return [String] path to cache
       def cache_directory
         memoize(:cache_directory) do
-          @cache ||= File.join(cache_path, 'chef_server', endpoint)
+          @cache ||= Utility.join_path(cache_path, "chef_server", endpoint)
           cache
         end
       end
 
       # @return [String] directory
       def asset
-        path = File.join(cache_directory, name, version)
+        path = Utility.join_path(cache_directory, name, version)
         begin
           FileUtils.mkdir_p(path)
           cookbook = rest.get_rest("cookbooks/#{name}/#{version}")
           manifest = cookbook.manifest
           Chef::CookbookVersion::COOKBOOK_SEGMENTS.each do |segement|
-            if(manifest.key?(segment))
+            if manifest.key?(segment)
               manifest[segement].each do |s_file|
-                new_path = File.join(path, s_file['path'].gsub('/', File::SEPARATOR))
+                new_path = Utility.join_path(path, s_file["path"].gsub("/", File::SEPARATOR))
                 FileUtils.mkdir_p(File.dirname(new_path))
                 api_service.sign_on_redirect = false
-                t_file = api_service.get_rest(s_file['url'], true)
+                t_file = api_service.get_rest(s_file["url"], true)
                 FilUtils.mv(t_file.path, new_path)
               end
             end
@@ -78,7 +77,6 @@ module Batali
         end
         path
       end
-
     end
   end
 end

data/lib/batali/source/git.rb

@@ -1,24 +1,29 @@
-require 'batali'
-require 'fileutils'
-require 'tmpdir'
+require "batali"
+require "fileutils"
+require "tmpdir"
 
 module Batali
   # Source of asset
   class Source
     # Path based source
     class Git < Path
-
       include Bogo::Memoization
       include Batali::Git
 
       attribute :subdirectory, String, :equivalent => true
       attribute :path, String
 
+      def initialize(*_, &block)
+        super
+        self.subdirectory = Utility.clean_path(subdirectory)
+        self.path = Utility.clean_path(path)
+      end
+
       # @return [String] directory containing contents
       def asset
         clone_repository
         clone_path = ref_dup
-        self.path = File.join(*[ref_dup, subdirectory].compact)
+        self.path = Utility.join_path(*[ref_dup, subdirectory].compact)
         result = super
         self.path = clone_path
         result
@@ -31,11 +36,10 @@ module Batali
             :url => url,
             :ref => ref,
             :type => self.class.name,
-            :subdirectory => subdirectory
+            :subdirectory => subdirectory,
           ), *args
         )
       end
-
     end
   end
 end