batali 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 848af492e8e0f263b8d8577dd3830ce985a2de5f
-  data.tar.gz: f3484364c7e5e2f9f83f1f93dd99b70a0490dfd3
+  metadata.gz: b932231673eb1265232f82a6a4e5e201e0324058
+  data.tar.gz: 64b947c6f2c44899a0e220800981a2eec1ff6954
 SHA512:
-  metadata.gz: 22ee3396473217e237facd53e3e0e07357fd6afc5595bb814c944484015aea4ec6724b28cf23b92832628fc3c8d77459f5fffaf365c504b065ab14359149bb1f
-  data.tar.gz: 4d3eae0ae14d20cca5cdbbc1574401146c236a8e04d4b5862e5ff72248d71119d08b062ead31c64dfbb722d245b034179c2f2281c749c727d209ed58777c496b
+  metadata.gz: 815ced6e99320cc992db4a985dddebe8f426ee2dafce37ca6d542105b52e41e000d1ba19993c0005b88c1d606b422a33e6b93452599a1f248bc284efbc59a201
+  data.tar.gz: 7b40082eb73d94ff5216d83fd5089ec9fd29c376e966b37d6de770049f10b163ce813c0b07efc76bd56d435f49ef06f2eda25deed772dfeb8fe0e23c40d84ca4

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.2.2
+* Add guard when switching resolution types (#14)
+* Cache HTTP requests (#20)
+* Prune cookbook results for infrastructure resolution (#21)
+* Provide least impact behavior when resolving infrastructure (#19)
+
 # v0.2.0
 * Add proxy support (#18)
 * Transition to "beta" state

data/batali.gemspec

@@ -11,7 +11,7 @@ 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.0'
+  s.add_runtime_dependency 'grimoire', '~> 0.2.1'
   s.add_runtime_dependency 'bogo', '~> 0.1.18'
   s.add_runtime_dependency 'bogo-cli', '~> 0.1.12'
   s.add_runtime_dependency 'bogo-config', '~> 0.1.10'

data/lib/batali/command/resolve.rb

@@ -61,6 +61,9 @@ module Batali
           end
         ]
         ui.info 'Performing single path resolution.'
+        if(manifest.infrastructure)
+          ui.ask 'Current manifest is resolved for infrastucture. Convert to single path?'
+        end
         results = []
         run_action 'Resolving dependency constraints' do
           results = solv.generate!
@@ -72,7 +75,10 @@ module Batali
           ideal_solution = results.pop
           dry_run('manifest file write') do
             run_action 'Writing manifest' do
-              manifest = Manifest.new(:cookbook => ideal_solution.units)
+              manifest = Manifest.new(
+                :cookbook => ideal_solution.units,
+                :infrastructure => false
+              )
               File.open('batali.manifest', 'w') do |file|
                 file.write MultiJson.dump(manifest, :pretty => true)
               end
@@ -106,13 +112,20 @@ module Batali
       # @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?'
+        end
         run_action 'Writing infrastructure manifest file' do
           File.open(manifest.path, 'w') do |file|
-            manifest = Manifest.new(:cookbook => solv.world.units.values.flatten)
+            manifest = Manifest.new(
+              :cookbook => solv.world.units.values.flatten,
+              :infrastructure => true
+            )
             file.write MultiJson.dump(manifest, :pretty => true)
             nil
           end
         end
+        solv.prune_world!
         ui.info 'Infrastructure manifest solution:'
         solv.world.units.sort_by(&:first).each do |name, units|
           ui.puts "#{name} <#{units.map(&:version).sort.map(&:to_s).join(', ')}>"

data/lib/batali/git.rb

@@ -47,7 +47,7 @@ module Batali
       klass.class_eval do
         attribute :url, String, :required => true
         attribute :ref, String, :required => true
-        attribute :cache, String
+        attribute :cache, String, :default => File.expand_path('~/.batali/cache/remote_site')
       end
     end
 

data/lib/batali/manifest.rb

@@ -7,6 +7,7 @@ module Batali
     include Bogo::Memoization
 
     attribute :path, String
+    attribute :infrastructure, [TrueClass, FalseClass]
     attribute :cookbook, Batali::Unit, :multiple => true, :coerce => lambda{|v| Batali::Unit.new(v)}, :default => []
 
     # Build manifest from given path. If no file exists, empty

data/lib/batali/origin/remote_site.rb

@@ -33,9 +33,10 @@ module Batali
       # @return [String] cache directory path
       def cache_directory
         memoize(:cache_directory) do
-          path = File.join(cache, identifier)
-          FileUtils.mkdir_p(path)
-          path
+          ['entitystore', 'metastore', identifier].each do |leaf|
+            FileUtils.mkdir_p(File.join(cache, leaf))
+          end
+          File.join(cache, leaf)
         end
       end
 
@@ -83,7 +84,10 @@ module Batali
         if(do_fetch)
           t_uni = "#{universe_path}.#{SecureRandom.urlsafe_base64}"
           File.open(t_uni, 'w') do |file|
-            file.write HTTP.get(URI.join(endpoint, 'universe')).body.to_s
+            file.write HTTP.with_cache(
+              :metastore => File.join(cache, 'metastore'),
+              :entitystore => File.join(cache, 'entitystore')
+            ).get(URI.join(endpoint, 'universe')).body.to_s
           end
           FileUtils.mv(t_uni, universe_path)
         end

data/lib/batali/score_keeper.rb

@@ -18,7 +18,8 @@ module Batali
     # @param unit [Unit] unit to score
     # @param idx [Integer] current index location
     # @return [Numeric, NilClass]
-    def score_for(unit, idx=0)
+    def score_for(unit, *args)
+      opts = args.detect{|a| a.is_a?(Hash)} || {}
       multiplier = 1
       manifest_unit = manifest.cookbook.detect do |m_unit|
         m_unit.name == unit.name
@@ -28,6 +29,12 @@ module Batali
         # should be _the_ preferred version
         if(manifest_unit.version == unit.version)
           multiplier = 10000000
+        elsif(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
+          end
+          multiplier = 10000000 if new_world_unit
         else
           # If the unit version satisfies within the patch segment of
           # the manifest version score those versions highest for upgrade
@@ -49,6 +56,14 @@ module Batali
             multiplier = multi_val + (multi_val * distance)
           end
         end
+      else
+        if(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
+          end
+          multiplier = 10000000 if new_world_unit
+        end
       end
       score = []
       # Generate a "value" for each segment of the version with

data/lib/batali/source/site.rb

@@ -38,14 +38,33 @@ module Batali
         deps.to_a
       end
 
+      # @return [String] path to cache
+      def cache_directory
+        memoize(:cache_directory) do
+          unless(@cache)
+            @cache = File.expand_path('~/.batali/cache/remote_site')
+          end
+          ['entitystore', 'metastore'].each do |leaf|
+            FileUtils.mkdir_p(File.join(cache, leaf))
+          end
+          cache
+        end
+      end
+
       # @return [String] directory
       def asset
-        path = File.join(cache, Base64.urlsafe_encode64(url))
+        path = File.join(cache_directory, Base64.urlsafe_encode64(url))
         unless(File.directory?(path))
           FileUtils.mkdir_p(path)
-          result = HTTP.get(url)
+          result = HTTP.with_cache(
+            :metastore => File.join(cache_directory, 'metastore'),
+            :entitystore => File.join(cache_directory, 'entitystore')
+          ).get(url)
           while(result.code == 302)
-            result = HTTP.get(result.headers['Location'])
+            result = HTTP.with_cache(
+              :metastore => File.join(cache_directory, 'metastore'),
+              :entitystore => File.join(cache_directory, 'entitystore')
+            ).get(result.headers['Location'])
           end
           File.open(a_path = File.join(path, 'asset'), 'w') do |file|
             while(content = result.body.readpartial(2048))

data/lib/batali/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: bogo
   requirement: !ruby/object:Gem::Requirement