batali 0.3.4 → 0.3.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/batali.gemspec +1 -2
- data/lib/batali/command.rb +1 -1
- data/lib/batali/git.rb +1 -1
- data/lib/batali/origin/remote_site.rb +8 -9
- data/lib/batali/source/chef_server.rb +1 -1
- data/lib/batali/source/site.rb +9 -14
- data/lib/batali/version.rb +1 -1
- metadata +9 -17
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4d28d45a002212d3e60e0fc27ec6ecdababeb466
|
4
|
+
data.tar.gz: d480ecd14e8677e238e14a39fc8cb4f5a51b1691
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0c4555efca2da01eb9699d7ef17b74e8a42974be165eb9c07232d00c986bb73f87d33ed2f8053b480892d33ad72f0cac55eb4234577ddaf195dea419b0549a62
|
7
|
+
data.tar.gz: 1440bc351f97db12810f6af1063ff148503bc2cee0a046b7e5432561c103d1d26d1570b34ae1b46f8727a6a551a7aaebfb8d6ba002b4cde615d9cb44c92f3bb4
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,8 @@
|
|
1
|
+
# v0.3.6
|
2
|
+
* [task] Removed http cache usage due to support removal
|
3
|
+
* [fix] Fixed file system issues on windows (#62 and #63)
|
4
|
+
* Thanks to @kenny-evitt and @webframp for helping to chase down the windows issues
|
5
|
+
|
1
6
|
# v0.3.4
|
2
7
|
* [fix] Open file as binary when storing compressed asset (#60 and #61 thanks @kenny-evitt!)
|
3
8
|
|
data/batali.gemspec
CHANGED
@@ -16,8 +16,7 @@ Gem::Specification.new do |s|
|
|
16
16
|
s.add_runtime_dependency 'bogo-cli', '~> 0.1.23'
|
17
17
|
s.add_runtime_dependency 'bogo-config', '~> 0.1.10'
|
18
18
|
s.add_runtime_dependency 'bogo-ui', '~> 0.1.6'
|
19
|
-
s.add_runtime_dependency 'http', '
|
20
|
-
s.add_runtime_dependency 'rack-cache'
|
19
|
+
s.add_runtime_dependency 'http', '>= 0.8.2', '< 1.0.0'
|
21
20
|
s.add_runtime_dependency 'git'
|
22
21
|
s.add_development_dependency 'minitest'
|
23
22
|
s.add_development_dependency 'pry'
|
data/lib/batali/command.rb
CHANGED
@@ -57,7 +57,7 @@ module Batali
|
|
57
57
|
# @return [String] path to local cache
|
58
58
|
def cache_directory(*args)
|
59
59
|
memoize(['cache_directory', *args].join('_')) do
|
60
|
-
directory = config.fetch(:cache_directory, File.join(Dir.home, '.batali
|
60
|
+
directory = config.fetch(:cache_directory, File.join(Dir.home, '.batali', 'cache'))
|
61
61
|
ui.debug "Cache directory to persist cookbooks: #{directory}"
|
62
62
|
unless(args.empty?)
|
63
63
|
directory = File.join(directory, *args.map(&:to_s))
|
data/lib/batali/git.rb
CHANGED
@@ -47,7 +47,7 @@ module Batali
|
|
47
47
|
klass.class_eval do
|
48
48
|
attribute :url, String, :required => true, :equivalent => true
|
49
49
|
attribute :ref, String, :required => true, :equivalent => true
|
50
|
-
attribute :cache, String, :default => File.join(Dir.home, '.batali
|
50
|
+
attribute :cache, String, :default => File.join(Dir.home, '.batali', 'cache', 'git')
|
51
51
|
end
|
52
52
|
end
|
53
53
|
|
@@ -19,7 +19,7 @@ module Batali
|
|
19
19
|
attribute :endpoint, String, :required => true
|
20
20
|
attribute :force_update, [TrueClass, FalseClass], :required => true, :default => false
|
21
21
|
attribute :update_interval, Integer, :required => true, :default => 60
|
22
|
-
attribute :cache, String, :default => File.join(Dir.home, '.batali
|
22
|
+
attribute :cache, String, :default => File.join(Dir.home, '.batali', 'cache', 'remote_site'), :required => true
|
23
23
|
|
24
24
|
def initialize(*_)
|
25
25
|
super
|
@@ -33,10 +33,9 @@ module Batali
|
|
33
33
|
# @return [String] cache directory path
|
34
34
|
def cache_directory
|
35
35
|
memoize(:cache_directory) do
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
File.join(cache, identifier)
|
36
|
+
c_path = File.join(cache, identifier)
|
37
|
+
FileUtils.mkdir_p(c_path)
|
38
|
+
c_path
|
40
39
|
end
|
41
40
|
end
|
42
41
|
|
@@ -84,11 +83,11 @@ module Batali
|
|
84
83
|
end
|
85
84
|
if(do_fetch)
|
86
85
|
t_uni = "#{universe_path}.#{SecureRandom.urlsafe_base64}"
|
86
|
+
result = HTTP.get(URI.join(endpoint, 'universe'))
|
87
87
|
File.open(t_uni, 'w') do |file|
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
).get(URI.join(endpoint, 'universe')).body.to_s
|
88
|
+
while(content = result.body.readpartial(2048))
|
89
|
+
file.write content
|
90
|
+
end
|
92
91
|
end
|
93
92
|
FileUtils.mv(t_uni, universe_path)
|
94
93
|
end
|
data/lib/batali/source/site.rb
CHANGED
@@ -44,10 +44,7 @@ module Batali
|
|
44
44
|
def cache_directory
|
45
45
|
memoize(:cache_directory) do
|
46
46
|
unless(@cache)
|
47
|
-
@cache = File.join(Dir.home, '.batali
|
48
|
-
end
|
49
|
-
['entitystore', 'metastore'].each do |leaf|
|
50
|
-
FileUtils.mkdir_p(File.join(cache, leaf))
|
47
|
+
@cache = File.join(Dir.home, '.batali', 'cache', 'remote_site')
|
51
48
|
end
|
52
49
|
cache
|
53
50
|
end
|
@@ -60,15 +57,9 @@ module Batali
|
|
60
57
|
retried = false
|
61
58
|
begin
|
62
59
|
FileUtils.mkdir_p(path)
|
63
|
-
result = HTTP.
|
64
|
-
:metastore => "file:#{File.join(cache_directory, 'metastore')}",
|
65
|
-
:entitystore => "file:#{File.join(cache_directory, 'entitystore')}"
|
66
|
-
).get(url)
|
60
|
+
result = HTTP.get(url)
|
67
61
|
while(result.code == 302)
|
68
|
-
result = HTTP.
|
69
|
-
:metastore => "file:#{File.join(cache_directory, 'metastore')}",
|
70
|
-
:entitystore => "file:#{File.join(cache_directory, 'entitystore')}"
|
71
|
-
).get(result.headers['Location'])
|
62
|
+
result = HTTP.get(result.headers['Location'])
|
72
63
|
end
|
73
64
|
File.open(a_path = File.join(path, 'asset'), 'wb') do |file|
|
74
65
|
while(content = result.body.readpartial(2048))
|
@@ -89,7 +80,11 @@ module Batali
|
|
89
80
|
end
|
90
81
|
end
|
91
82
|
end
|
92
|
-
|
83
|
+
begin
|
84
|
+
FileUtils.rm(a_path)
|
85
|
+
rescue Errno::EACCES
|
86
|
+
# windows is dumb some times
|
87
|
+
end
|
93
88
|
rescue => e
|
94
89
|
FileUtils.rm_rf(path)
|
95
90
|
unless(retried)
|
@@ -100,7 +95,7 @@ module Batali
|
|
100
95
|
raise
|
101
96
|
end
|
102
97
|
end
|
103
|
-
Dir.glob(File.join(path, '*')).first
|
98
|
+
Dir.glob(File.join(path, '*')).reject{|i| i.end_with?('/asset') }.first
|
104
99
|
end
|
105
100
|
|
106
101
|
# @return [TrueClass, FalseClass]
|
data/lib/batali/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: batali
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Chris Roberts
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-12-
|
11
|
+
date: 2015-12-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: attribute_struct
|
@@ -98,30 +98,22 @@ dependencies:
|
|
98
98
|
name: http
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
|
-
- - "
|
101
|
+
- - ">="
|
102
102
|
- !ruby/object:Gem::Version
|
103
103
|
version: 0.8.2
|
104
|
-
|
105
|
-
prerelease: false
|
106
|
-
version_requirements: !ruby/object:Gem::Requirement
|
107
|
-
requirements:
|
108
|
-
- - "~>"
|
104
|
+
- - "<"
|
109
105
|
- !ruby/object:Gem::Version
|
110
|
-
version: 0.
|
111
|
-
- !ruby/object:Gem::Dependency
|
112
|
-
name: rack-cache
|
113
|
-
requirement: !ruby/object:Gem::Requirement
|
114
|
-
requirements:
|
115
|
-
- - ">="
|
116
|
-
- !ruby/object:Gem::Version
|
117
|
-
version: '0'
|
106
|
+
version: 1.0.0
|
118
107
|
type: :runtime
|
119
108
|
prerelease: false
|
120
109
|
version_requirements: !ruby/object:Gem::Requirement
|
121
110
|
requirements:
|
122
111
|
- - ">="
|
123
112
|
- !ruby/object:Gem::Version
|
124
|
-
version:
|
113
|
+
version: 0.8.2
|
114
|
+
- - "<"
|
115
|
+
- !ruby/object:Gem::Version
|
116
|
+
version: 1.0.0
|
125
117
|
- !ruby/object:Gem::Dependency
|
126
118
|
name: git
|
127
119
|
requirement: !ruby/object:Gem::Requirement
|