batali 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a62524ceac899f5554c34d8efa5ca6f072d9103b
-  data.tar.gz: cf3772dace3e7fa574fc280b1791550fd8a5b38f
+  metadata.gz: 4d28d45a002212d3e60e0fc27ec6ecdababeb466
+  data.tar.gz: d480ecd14e8677e238e14a39fc8cb4f5a51b1691
 SHA512:
-  metadata.gz: 995481f64d68154dd36d959a55cda7bc731e6ea071ee13a5010a2c2abff43a6c0760bd526109113557d4efba2148da0fb46235cb2d80eda4674c794a82df3c80
-  data.tar.gz: 38653dbfc9133ed45da0654d81dfbf5f536d8b360133ef45de7705e2e3748c887143bc42026cb2415b51591b2816f42738a03304c2b89aebae7d8a5efae1def6
+  metadata.gz: 0c4555efca2da01eb9699d7ef17b74e8a42974be165eb9c07232d00c986bb73f87d33ed2f8053b480892d33ad72f0cac55eb4234577ddaf195dea419b0549a62
+  data.tar.gz: 1440bc351f97db12810f6af1063ff148503bc2cee0a046b7e5432561c103d1d26d1570b34ae1b46f8727a6a551a7aaebfb8d6ba002b4cde615d9cb44c92f3bb4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.3.6
+* [task] Removed http cache usage due to support removal
+* [fix] Fixed file system issues on windows (#62 and #63)
+ * Thanks to @kenny-evitt and @webframp for helping to chase down the windows issues
+
 # v0.3.4
 * [fix] Open file as binary when storing compressed asset (#60 and #61 thanks @kenny-evitt!)
 

data/batali.gemspec

@@ -16,8 +16,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'bogo-cli', '~> 0.1.23'
   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 'http', '>= 0.8.2', '< 1.0.0'
   s.add_runtime_dependency 'git'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'pry'

data/lib/batali/command.rb

@@ -57,7 +57,7 @@ module Batali
     # @return [String] path to local cache
     def cache_directory(*args)
       memoize(['cache_directory', *args].join('_')) do
-        directory = config.fetch(:cache_directory, File.join(Dir.home, '.batali/cache'))
+        directory = config.fetch(:cache_directory, File.join(Dir.home, '.batali', 'cache'))
         ui.debug "Cache directory to persist cookbooks: #{directory}"
         unless(args.empty?)
           directory = File.join(directory, *args.map(&:to_s))

data/lib/batali/git.rb

@@ -47,7 +47,7 @@ module Batali
       klass.class_eval do
         attribute :url, String, :required => true, :equivalent => true
         attribute :ref, String, :required => true, :equivalent => true
-        attribute :cache, String, :default => File.join(Dir.home, '.batali/cache/git')
+        attribute :cache, String, :default => File.join(Dir.home, '.batali', 'cache', 'git')
       end
     end
 

data/lib/batali/origin/remote_site.rb

@@ -19,7 +19,7 @@ module Batali
       attribute :endpoint, String, :required => true
       attribute :force_update, [TrueClass, FalseClass], :required => true, :default => false
       attribute :update_interval, Integer, :required => true, :default => 60
-      attribute :cache, String, :default => File.join(Dir.home, '.batali/cache/remote_site'), :required => true
+      attribute :cache, String, :default => File.join(Dir.home, '.batali', 'cache', 'remote_site'), :required => true
 
       def initialize(*_)
         super
@@ -33,10 +33,9 @@ module Batali
       # @return [String] cache directory path
       def cache_directory
         memoize(:cache_directory) do
-          ['entitystore', 'metastore', identifier].each do |leaf|
-            FileUtils.mkdir_p(File.join(cache, leaf))
-          end
-          File.join(cache, identifier)
+          c_path = File.join(cache, identifier)
+          FileUtils.mkdir_p(c_path)
+          c_path
         end
       end
 
@@ -84,11 +83,11 @@ module Batali
         end
         if(do_fetch)
           t_uni = "#{universe_path}.#{SecureRandom.urlsafe_base64}"
+          result = HTTP.get(URI.join(endpoint, 'universe'))
           File.open(t_uni, 'w') do |file|
-            file.write HTTP.with_cache(
-              :metastore => "file:#{File.join(cache, 'metastore')}",
-              :entitystore => "file:#{File.join(cache, 'entitystore')}"
-            ).get(URI.join(endpoint, 'universe')).body.to_s
+            while(content = result.body.readpartial(2048))
+              file.write content
+            end
           end
           FileUtils.mv(t_uni, universe_path)
         end

data/lib/batali/source/chef_server.rb

@@ -49,7 +49,7 @@ module Batali
       def cache_directory
         memoize(:cache_directory) do
           unless(@cache)
-            @cache = File.join(Dir.home, '.batali/cache/chef_server', endpoint)
+            @cache = File.join(Dir.home, '.batali', 'cache', 'chef_server', endpoint)
           end
           cache
         end

data/lib/batali/source/site.rb

@@ -44,10 +44,7 @@ module Batali
       def cache_directory
         memoize(:cache_directory) do
           unless(@cache)
-            @cache = File.join(Dir.home, '.batali/cache/remote_site')
-          end
-          ['entitystore', 'metastore'].each do |leaf|
-            FileUtils.mkdir_p(File.join(cache, leaf))
+            @cache = File.join(Dir.home, '.batali', 'cache', 'remote_site')
           end
           cache
         end
@@ -60,15 +57,9 @@ module Batali
           retried = false
           begin
             FileUtils.mkdir_p(path)
-            result = HTTP.with_cache(
-              :metastore => "file:#{File.join(cache_directory, 'metastore')}",
-              :entitystore => "file:#{File.join(cache_directory, 'entitystore')}"
-            ).get(url)
+            result = HTTP.get(url)
             while(result.code == 302)
-              result = HTTP.with_cache(
-                :metastore => "file:#{File.join(cache_directory, 'metastore')}",
-                :entitystore => "file:#{File.join(cache_directory, 'entitystore')}"
-              ).get(result.headers['Location'])
+              result = HTTP.get(result.headers['Location'])
             end
             File.open(a_path = File.join(path, 'asset'), 'wb') do |file|
               while(content = result.body.readpartial(2048))
@@ -89,7 +80,11 @@ module Batali
                 end
               end
             end
-            FileUtils.rm(a_path)
+            begin
+              FileUtils.rm(a_path)
+            rescue Errno::EACCES
+              # windows is dumb some times
+            end
           rescue => e
             FileUtils.rm_rf(path)
             unless(retried)
@@ -100,7 +95,7 @@ module Batali
             raise
           end
         end
-        Dir.glob(File.join(path, '*')).first
+        Dir.glob(File.join(path, '*')).reject{|i| i.end_with?('/asset') }.first
       end
 
       # @return [TrueClass, FalseClass]

data/lib/batali/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: batali
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attribute_struct
@@ -98,30 +98,22 @@ dependencies:
   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:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement