batali 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b932231673eb1265232f82a6a4e5e201e0324058
-  data.tar.gz: 64b947c6f2c44899a0e220800981a2eec1ff6954
+  metadata.gz: 3d07b92c629d84ed1ca5fe885ee8eae8b7426c30
+  data.tar.gz: a17f9cbb2e9e42f0f8881ac196a5320176a93376
 SHA512:
-  metadata.gz: 815ced6e99320cc992db4a985dddebe8f426ee2dafce37ca6d542105b52e41e000d1ba19993c0005b88c1d606b422a33e6b93452599a1f248bc284efbc59a201
-  data.tar.gz: 7b40082eb73d94ff5216d83fd5089ec9fd29c376e966b37d6de770049f10b163ce813c0b07efc76bd56d435f49ef06f2eda25deed772dfeb8fe0e23c40d84ca4
+  metadata.gz: 4209014fa64523d06c2bdb05451a199da4508fffccf33a92af7f5d1b10cd8b4db7c1aefb2df1f32ef7572bfb5f9963b8bd6fe4273490909e91fe6486caffd723
+  data.tar.gz: f05d9c4cdca2a6e1e7d3770ed24894d8c2fb04e8fa4e0736bbc8a50b252435488fa146b85c58563c46d0690a2d71835fd9fd91dd6864af3ee25aa813cb9ffb60

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.2.4
+* Fix caching support
+
 # v0.2.2
 * Add guard when switching resolution types (#14)
 * Cache HTTP requests (#20)

data/batali.gemspec

@@ -16,8 +16,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'bogo-cli', '~> 0.1.12'
   s.add_runtime_dependency 'bogo-config', '~> 0.1.10'
   s.add_runtime_dependency 'bogo-ui', '~> 0.1.6'
+  s.add_runtime_dependency 'http', '~> 0.8.2'
+  s.add_runtime_dependency 'rack-cache'
   s.add_runtime_dependency 'git'
-  s.add_runtime_dependency 'http'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'pry'
   s.executables << 'batali'

data/lib/batali/origin/remote_site.rb

@@ -36,7 +36,7 @@ module Batali
           ['entitystore', 'metastore', identifier].each do |leaf|
             FileUtils.mkdir_p(File.join(cache, leaf))
           end
-          File.join(cache, leaf)
+          File.join(cache, identifier)
         end
       end
 
@@ -75,6 +75,7 @@ module Batali
       # @return [String] path to universe file
       def fetch
         do_fetch = true
+        cache_directory # init directory creation
         if(File.exists?(universe_path))
           age = Time.now - File.mtime(universe_path)
           if(age < update_interval)
@@ -85,8 +86,8 @@ module Batali
           t_uni = "#{universe_path}.#{SecureRandom.urlsafe_base64}"
           File.open(t_uni, 'w') do |file|
             file.write HTTP.with_cache(
-              :metastore => File.join(cache, 'metastore'),
-              :entitystore => File.join(cache, 'entitystore')
+              :metastore => "file:#{File.join(cache, 'metastore')}",
+              :entitystore => "file:#{File.join(cache, 'entitystore')}"
             ).get(URI.join(endpoint, 'universe')).body.to_s
           end
           FileUtils.mv(t_uni, universe_path)

data/lib/batali/score_keeper.rb

@@ -29,7 +29,7 @@ module Batali
         # should be _the_ preferred version
         if(manifest_unit.version == unit.version)
           multiplier = 10000000
-        elsif(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
@@ -57,7 +57,7 @@ module Batali
           end
         end
       else
-        if(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

data/lib/batali/source/site.rb

@@ -9,6 +9,8 @@ module Batali
     # Site based source
     class Site < Source
 
+      include Bogo::Memoization
+
       # @return [Array<Hash>] dependency strings
       attr_reader :dependencies
       # @return [String] version
@@ -57,13 +59,13 @@ module Batali
         unless(File.directory?(path))
           FileUtils.mkdir_p(path)
           result = HTTP.with_cache(
-            :metastore => File.join(cache_directory, 'metastore'),
-            :entitystore => File.join(cache_directory, 'entitystore')
+            :metastore => "file:#{File.join(cache_directory, 'metastore')}",
+            :entitystore => "file:#{File.join(cache_directory, 'entitystore')}"
           ).get(url)
           while(result.code == 302)
             result = HTTP.with_cache(
-              :metastore => File.join(cache_directory, 'metastore'),
-              :entitystore => File.join(cache_directory, 'entitystore')
+              :metastore => "file:#{File.join(cache_directory, 'metastore')}",
+              :entitystore => "file:#{File.join(cache_directory, 'entitystore')}"
             ).get(result.headers['Location'])
           end
           File.open(a_path = File.join(path, 'asset'), 'w') do |file|

data/lib/batali/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Chris Roberts
@@ -95,7 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.6
 - !ruby/object:Gem::Dependency
-  name: git
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: rack-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: http
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="