batali 0.2.8 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e09935acfcbc04835f428e88c65c46d5effbc164
-  data.tar.gz: 5d9b81aacd71727b823947a744a050962908e197
+  metadata.gz: 26d1612a3534961100e76d695b09186fdfd8fa31
+  data.tar.gz: 4e7804e3d98b4cfe9f9fde3be6a78357945cffd6
 SHA512:
-  metadata.gz: cfa3f9193ac35a32b7d467d4f46dbc687c67e944f8ae0ffc95d5ca952d8613a93dde468af54a7310004677ed177cb78f44f581f6135c53899b64ad4e60af60c6
-  data.tar.gz: 05a5d1eff7e95a0b584a52f1a3e2ca38a17511a17dd5641f8256a8627027368e9db748df7be50b9078f6f43f2819ab0abcbc96a472b8fbe76915c095fe2b2565
+  metadata.gz: dd028fa13dd2eb38f133d309f6c402add91bd70665dd9c55dec1db2da13312765e43bbd499eac4550e4aba292169d94a80c03fe4965eca5244c07892dffbe9c5
+  data.tar.gz: e2c1f1f064380fabc81c4366477af941fc60172cbf00840e649a2c7aa5d9501b0b84ea05c71ad013a9dd540fbfcaee6e7e6c54cf5523f53f1eca5a9fbffd239d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.2.10
+* Parse full metadata file on path sources to properly discover all deps (#26)
+* Allow source to be optionally defined for Units
+* Provide better handling when encountering Units with no possible solution
+* Include `no_proxy` environment variable support
+
 # v0.2.8
 * Include missing infrastructure configuration flag on install command
 * Default the cache directory to home directory to isolate users

data/batali.gemspec

@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.license = 'Apache 2.0'
   s.add_runtime_dependency 'attribute_struct', '~> 0.2.14'
-  s.add_runtime_dependency 'grimoire', '~> 0.2.1'
-  s.add_runtime_dependency 'bogo', '~> 0.1.18'
+  s.add_runtime_dependency 'grimoire', '~> 0.2.3'
+  s.add_runtime_dependency 'bogo', '~> 0.1.20'
   s.add_runtime_dependency 'bogo-cli', '~> 0.1.18'
   s.add_runtime_dependency 'bogo-config', '~> 0.1.10'
   s.add_runtime_dependency 'bogo-ui', '~> 0.1.6'

data/lib/batali/command/resolve.rb

@@ -87,20 +87,27 @@ module Batali
           end
           # ui.info "Number of solutions collected for defined requirements: #{results.size + 1}"
           ui.info 'Ideal solution:'
-          solution = Smash[ideal_solution.units.map{|unit| [unit.name, unit.version]}]
-          (original_units.keys + solution.keys).compact.uniq.sort.each do |unit_name|
-            if(original_units[unit_name])
-              if(solution[unit_name])
-                if(solution[unit_name] == original_units[unit_name])
-                  ui.puts "#{unit_name} <#{solution[unit_name]}>"
+          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]))
+                  ui.puts "#{unit_name} <#{solution_units[unit_name].version}>"
                 else
-                  ui.puts ui.color("#{unit_name} <#{original_units[unit_name]} -> #{solution[unit_name]}>", :yellow)
+                  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
+                  u_diff.delete(:version)
+                  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
               else
-                ui.puts ui.color("#{unit_name} <#{original_units[unit_name]}>", :red)
+                ui.puts ui.color("#{unit_name} <#{manifest_units[unit_name].version}>", :red)
               end
             else
-              ui.puts ui.color("#{unit_name} <#{solution[unit_name]}>", :green)
+              ui.puts ui.color("#{unit_name} <#{solution_units[unit_name].version}>", :green)
             end
           end
         end

data/lib/batali/git.rb

@@ -45,9 +45,9 @@ module Batali
     # Load attributes into class
     def self.included(klass)
       klass.class_eval do
-        attribute :url, String, :required => true
-        attribute :ref, String, :required => true
-        attribute :cache, String, :default => File.expand_path('~/.batali/cache/remote_site')
+        attribute :url, String, :required => true, :equivalent => true
+        attribute :ref, String, :required => true, :equivalent => true
+        attribute :cache, String, :default => File.expand_path('~/.batali/cache/git')
       end
     end
 

data/lib/batali/monkey.rb

@@ -1,4 +1,5 @@
 require 'batali'
+require 'bogo/http_proxy'
 
 module Batali
   # Simple stubs mostly for naming
@@ -16,25 +17,3 @@ module Batali
     end
   end
 end
-
-require 'resolv'
-require 'http'
-require 'http/request'
-
-class HTTP::Request
-
-  def proxy
-    if(_proxy_point = ENV["#{uri.scheme}_proxy"])
-      _proxy = URI.parse(_proxy_point)
-      Hash.new.tap do |opts|
-        opts[:proxy_address] = _proxy.host
-        opts[:proxy_port] = _proxy.port
-        opts[:proxy_username] = _proxy.user if _proxy.user
-        opts[:proxy_password] = _proxy.password if _proxy.password
-      end
-    else
-      @proxy
-    end
-  end
-
-end

data/lib/batali/origin/path.rb

@@ -7,6 +7,17 @@ module Batali
 
       class Metadata < AttributeStruct
 
+        # Perform constant lookup if required
+        #
+        # @return [Constant]
+        def self.const_missing(const)
+          [::Object, ::ObjectSpace].map do |root|
+            if(root.const_defined?(const))
+              root.const_get(const)
+            end
+          end.compact.first || super
+        end
+
         def depends(*args)
           set!(:depends, args)
           self
@@ -67,13 +78,7 @@ module Batali
           elsif(File.exists?(rb = File.join(path, 'metadata.rb')))
             struct = Metadata.new
             struct.set_state!(:value_collapse => true)
-            File.readlines(rb).find_all do |line|
-              line.start_with?('name') ||
-                line.start_with?('version') ||
-                line.start_with?('depends')
-            end.each do |line|
-              struct.instance_eval(line)
-            end
+            struct.instance_eval(File.read(rb), rb, 1)
             struct._dump.to_smash
           else
             raise Errno::ENOENT.new("Failed to locate metadata file in cookbook directory! (path: #{path})")

data/lib/batali/source/path.rb

@@ -10,7 +10,7 @@ module Batali
 
       include Bogo::Memoization
 
-      attribute :path, String, :required => true
+      attribute :path, String, :required => true, :equivalent => true
 
       # @return [String] directory containing contents
       def asset

data/lib/batali/source/site.rb

@@ -18,8 +18,8 @@ module Batali
       # @return [String] local cache path
       attr_accessor :cache
 
-      attribute :url, String, :required => true
-      attribute :version, String, :required => true
+      attribute :url, String, :required => true, :equivalent => true
+      attribute :version, String, :required => true, :equivalent => true
 
       # Extract extra info before allowing super to load data
       #

data/lib/batali/source.rb

@@ -39,6 +39,32 @@ module Batali
       end
     end
 
+    # @return [TrueClass, FalseClass]
+    def ==(s)
+      s.is_a?(Source) && attributes.map do |key, attr|
+        key if attr[:equivalent]
+      end.compact.all? do |key|
+        attributes[key] == s.attributes[key]
+      end
+    end
+
+    # Detect differences in equivalency
+    #
+    # @param s [Source]
+    # @return [Smash]
+    def diff(s)
+      Smash.new.tap do |_diff|
+        self.class.attributes.each do |k,v|
+          if(v[:equivalent])
+            s_attrs = s.respond_to?(:attributes) ? s.attributes : {}
+            unless(attributes[k] == s_attrs[k])
+              _diff[k] = [attributes[k], s_attrs[k]]
+            end
+          end
+        end
+      end
+    end
+
     # Build a source
     #
     # @param args [Hash]

data/lib/batali/unit.rb

@@ -3,8 +3,33 @@ require 'batali'
 module Batali
   # Customized Unit
   class Unit < Grimoire::Unit
-    attribute :source, Source, :required => true, :coerce => lambda{|v| Batali::Source.build(v)}
+    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)}
+
+    # @return [TrueClass, FalseClass]
+    def diff?(u)
+      !same?(u)
+    end
+
+    # @return [TrueClass, FalseClass]
+    def same?(u)
+      diff(u).empty?
+    end
+
+    # @return [String] difference output
+    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)]
+          end
+        end
+        if(source)
+          _diff.merge!(source.diff(u.source))
+        end
+      end
+    end
+
   end
 end

data/lib/batali/version.rb

@@ -1,4 +1,4 @@
 module Batali
   # Current version
-  VERSION = Gem::Version.new('0.2.8')
+  VERSION = Gem::Version.new('0.2.10')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.10
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: bogo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.18
+        version: 0.1.20
 - !ruby/object:Gem::Dependency
   name: bogo-cli
   requirement: !ruby/object:Gem::Requirement