batali 0.1.8 → 0.1.10

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.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +3 -0
  3. data/lib/batali/b_file.rb +8 -32
  4. data/lib/batali/version.rb +1 -1
  5. metadata +86 -85
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e518ea6ec9a6d6bb6374bb42532cdece1b016cab
4
- data.tar.gz: 3b8640ca8b7450a2d177eba35225ca23c1fa083e
3
+ metadata.gz: 583f2ea83e2fb2813e041d122c3578f4816b84cc
4
+ data.tar.gz: 2aebd3e383e3b91e58c22f11452779603c0fd923
5
5
  SHA512:
6
- metadata.gz: eb6553c1ec9cf13319939da5f558559ba2d16c63a84895199c5982d652a958c537e320c7724e0fb67995ebb2a0c323662e1d494d347ab2afae58a8253128ee6d
7
- data.tar.gz: 21c1665c35095d1f802fe95ee4c2e59bcd5a25ff8f18b7303c16b99f820e67318c2e68465131118f638161066557435ac9068e8c3eb58309bd28d3de329fe155
6
+ metadata.gz: e5e0d6735a93edba1c9d58db7d2078e0b5a79afe5c4947124ca6b04626e48618276055bf5cafed3f946721c4dc571b4d5e1765d97371118fc15484cc9644b978
7
+ data.tar.gz: ac5e8c16532a66e3b7e706e3db2cf6a2e07bea66c69feeaae0269635a72878fa3138cd6259303839ce17461b564af2cf1deeeba4579d5a6209977ad9209990c7
data/CHANGELOG.md CHANGED
@@ -1,3 +1,6 @@
1
+ # v0.1.10
2
+ * Bug fix for Batali file parsing to provide expected format on processing
3
+
1
4
  # v0.1.8
2
5
  * Provide helpful exception message when source is not found
3
6
  * Allow using default classes when building items
data/lib/batali/b_file.rb CHANGED
@@ -4,8 +4,12 @@ module Batali
4
4
 
5
5
  class Struct < AttributeStruct
6
6
 
7
- def cookbook(*args, &block)
8
- set!(:cookbook, args, &block)
7
+ def cookbook(*args)
8
+ unless(self[:cookbook])
9
+ set!(:cookbook, ::AttributeStruct::CollapseArray.new.push(args))
10
+ else
11
+ set!(:cookbook, args)
12
+ end
9
13
  self
10
14
  end
11
15
 
@@ -27,36 +31,8 @@ module Batali
27
31
  # @return [Proc] cookbook convert
28
32
  def self.cookbook_coerce
29
33
  proc do |v|
30
- case v
31
- when Array
32
- case v.last
33
- when String
34
- Cookbook.new(
35
- :name => v.first,
36
- :constraint => v.slice(1, v.size)
37
- )
38
- when Hash
39
- c_name = v.first
40
- Cookbook.new(
41
- v.last.merge(
42
- :name => c_name
43
- )
44
- )
45
- else
46
- raise ArgumentError.new "Unable to coerce given type `#{v.class}` to `Batali::BFile::Cookbook`!"
47
- end
48
- when String
49
- Cookbook.new(:name => v)
50
- when Hash
51
- c_name = v.first
52
- Cookbook.new(
53
- v.last.merge(
54
- :name => c_name
55
- )
56
- )
57
- else
58
- raise ArgumentError.new "Unable to coerce given type `#{v.class}` to `Batali::BFile::Cookbook`!"
59
- end
34
+ name, args = v
35
+ Cookbook.new(Smash.new(:name => name).merge(args || {}))
60
36
  end
61
37
  end
62
38
 
data/lib/batali/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Batali
2
2
  # Current version
3
- VERSION = Gem::Version.new('0.1.8')
3
+ VERSION = Gem::Version.new('0.1.10')
4
4
  end
metadata CHANGED
@@ -1,141 +1,141 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: batali
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8
4
+ version: 0.1.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Roberts
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-12 00:00:00.000000000 Z
11
+ date: 2015-03-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: attribute_struct
15
- version_requirements: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - '>='
18
- - !ruby/object:Gem::Version
19
- version: 0.2.14
20
15
  requirement: !ruby/object:Gem::Requirement
21
16
  requirements:
22
- - - '>='
17
+ - - ">="
23
18
  - !ruby/object:Gem::Version
24
19
  version: 0.2.14
25
- prerelease: false
26
20
  type: :runtime
27
- - !ruby/object:Gem::Dependency
28
- name: grimoire
21
+ prerelease: false
29
22
  version_requirements: !ruby/object:Gem::Requirement
30
23
  requirements:
31
- - - '>='
24
+ - - ">="
32
25
  - !ruby/object:Gem::Version
33
- version: 0.1.4
26
+ version: 0.2.14
27
+ - !ruby/object:Gem::Dependency
28
+ name: grimoire
34
29
  requirement: !ruby/object:Gem::Requirement
35
30
  requirements:
36
- - - '>='
31
+ - - ">="
37
32
  - !ruby/object:Gem::Version
38
33
  version: 0.1.4
39
- prerelease: false
40
34
  type: :runtime
41
- - !ruby/object:Gem::Dependency
42
- name: bogo
35
+ prerelease: false
43
36
  version_requirements: !ruby/object:Gem::Requirement
44
37
  requirements:
45
- - - '>='
38
+ - - ">="
46
39
  - !ruby/object:Gem::Version
47
- version: 0.1.12
40
+ version: 0.1.4
41
+ - !ruby/object:Gem::Dependency
42
+ name: bogo
48
43
  requirement: !ruby/object:Gem::Requirement
49
44
  requirements:
50
- - - '>='
45
+ - - ">="
51
46
  - !ruby/object:Gem::Version
52
47
  version: 0.1.12
53
- prerelease: false
54
48
  type: :runtime
55
- - !ruby/object:Gem::Dependency
56
- name: bogo-cli
49
+ prerelease: false
57
50
  version_requirements: !ruby/object:Gem::Requirement
58
51
  requirements:
59
- - - '>='
52
+ - - ">="
60
53
  - !ruby/object:Gem::Version
61
- version: 0.1.8
54
+ version: 0.1.12
55
+ - !ruby/object:Gem::Dependency
56
+ name: bogo-cli
62
57
  requirement: !ruby/object:Gem::Requirement
63
58
  requirements:
64
- - - '>='
59
+ - - ">="
65
60
  - !ruby/object:Gem::Version
66
61
  version: 0.1.8
67
- prerelease: false
68
62
  type: :runtime
69
- - !ruby/object:Gem::Dependency
70
- name: bogo-config
63
+ prerelease: false
71
64
  version_requirements: !ruby/object:Gem::Requirement
72
65
  requirements:
73
- - - '>='
66
+ - - ">="
74
67
  - !ruby/object:Gem::Version
75
- version: 0.1.10
68
+ version: 0.1.8
69
+ - !ruby/object:Gem::Dependency
70
+ name: bogo-config
76
71
  requirement: !ruby/object:Gem::Requirement
77
72
  requirements:
78
- - - '>='
73
+ - - ">="
79
74
  - !ruby/object:Gem::Version
80
75
  version: 0.1.10
81
- prerelease: false
82
76
  type: :runtime
83
- - !ruby/object:Gem::Dependency
84
- name: git
77
+ prerelease: false
85
78
  version_requirements: !ruby/object:Gem::Requirement
86
79
  requirements:
87
- - - '>='
80
+ - - ">="
88
81
  - !ruby/object:Gem::Version
89
- version: '0'
82
+ version: 0.1.10
83
+ - !ruby/object:Gem::Dependency
84
+ name: git
90
85
  requirement: !ruby/object:Gem::Requirement
91
86
  requirements:
92
- - - '>='
87
+ - - ">="
93
88
  - !ruby/object:Gem::Version
94
89
  version: '0'
95
- prerelease: false
96
90
  type: :runtime
97
- - !ruby/object:Gem::Dependency
98
- name: http
91
+ prerelease: false
99
92
  version_requirements: !ruby/object:Gem::Requirement
100
93
  requirements:
101
- - - '>='
94
+ - - ">="
102
95
  - !ruby/object:Gem::Version
103
96
  version: '0'
97
+ - !ruby/object:Gem::Dependency
98
+ name: http
104
99
  requirement: !ruby/object:Gem::Requirement
105
100
  requirements:
106
- - - '>='
101
+ - - ">="
107
102
  - !ruby/object:Gem::Version
108
103
  version: '0'
109
- prerelease: false
110
104
  type: :runtime
111
- - !ruby/object:Gem::Dependency
112
- name: minitest
105
+ prerelease: false
113
106
  version_requirements: !ruby/object:Gem::Requirement
114
107
  requirements:
115
- - - '>='
108
+ - - ">="
116
109
  - !ruby/object:Gem::Version
117
110
  version: '0'
111
+ - !ruby/object:Gem::Dependency
112
+ name: minitest
118
113
  requirement: !ruby/object:Gem::Requirement
119
114
  requirements:
120
- - - '>='
115
+ - - ">="
121
116
  - !ruby/object:Gem::Version
122
117
  version: '0'
123
- prerelease: false
124
118
  type: :development
125
- - !ruby/object:Gem::Dependency
126
- name: pry
119
+ prerelease: false
127
120
  version_requirements: !ruby/object:Gem::Requirement
128
121
  requirements:
129
- - - '>='
122
+ - - ">="
130
123
  - !ruby/object:Gem::Version
131
124
  version: '0'
125
+ - !ruby/object:Gem::Dependency
126
+ name: pry
132
127
  requirement: !ruby/object:Gem::Requirement
133
128
  requirements:
134
- - - '>='
129
+ - - ">="
135
130
  - !ruby/object:Gem::Version
136
131
  version: '0'
137
- prerelease: false
138
132
  type: :development
133
+ prerelease: false
134
+ version_requirements: !ruby/object:Gem::Requirement
135
+ requirements:
136
+ - - ">="
137
+ - !ruby/object:Gem::Version
138
+ version: '0'
139
139
  description: Magic
140
140
  email: code@chrisroberts.org
141
141
  executables:
@@ -143,59 +143,60 @@ executables:
143
143
  extensions: []
144
144
  extra_rdoc_files: []
145
145
  files:
146
+ - CHANGELOG.md
147
+ - CONTRIBUTING.md
148
+ - LICENSE
149
+ - README.md
150
+ - batali.gemspec
151
+ - bin/batali
146
152
  - lib/batali.rb
147
- - lib/batali/origin.rb
148
- - lib/batali/manifest.rb
149
- - lib/batali/score_keeper.rb
150
- - lib/batali/utility.rb
151
- - lib/batali/source.rb
152
- - lib/batali/command.rb
153
- - lib/batali/version.rb
154
- - lib/batali/monkey.rb
155
- - lib/batali/requirement_list.rb
156
- - lib/batali/unit.rb
157
- - lib/batali/config.rb
158
- - lib/batali/git.rb
159
153
  - lib/batali/b_file.rb
160
- - lib/batali/unit_loader.rb
161
- - lib/batali/source/git.rb
162
- - lib/batali/source/path.rb
163
- - lib/batali/source/site.rb
154
+ - lib/batali/command.rb
164
155
  - lib/batali/command/configure.rb
165
156
  - lib/batali/command/install.rb
166
- - lib/batali/command/update.rb
167
157
  - lib/batali/command/resolve.rb
168
- - lib/batali/origin/remote_site.rb
158
+ - lib/batali/command/update.rb
159
+ - lib/batali/config.rb
160
+ - lib/batali/git.rb
161
+ - lib/batali/manifest.rb
162
+ - lib/batali/monkey.rb
163
+ - lib/batali/origin.rb
169
164
  - lib/batali/origin/git.rb
170
165
  - lib/batali/origin/path.rb
171
- - bin/batali
172
- - batali.gemspec
173
- - README.md
174
- - CHANGELOG.md
175
- - CONTRIBUTING.md
176
- - LICENSE
166
+ - lib/batali/origin/remote_site.rb
167
+ - lib/batali/requirement_list.rb
168
+ - lib/batali/score_keeper.rb
169
+ - lib/batali/source.rb
170
+ - lib/batali/source/git.rb
171
+ - lib/batali/source/path.rb
172
+ - lib/batali/source/site.rb
173
+ - lib/batali/unit.rb
174
+ - lib/batali/unit_loader.rb
175
+ - lib/batali/utility.rb
176
+ - lib/batali/version.rb
177
177
  homepage: https://github.com/hw-labs/batali
178
178
  licenses:
179
179
  - Apache 2.0
180
180
  metadata: {}
181
- post_install_message:
181
+ post_install_message:
182
182
  rdoc_options: []
183
183
  require_paths:
184
184
  - lib
185
185
  required_ruby_version: !ruby/object:Gem::Requirement
186
186
  requirements:
187
- - - '>='
187
+ - - ">="
188
188
  - !ruby/object:Gem::Version
189
189
  version: '0'
190
190
  required_rubygems_version: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - '>='
192
+ - - ">="
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
195
  requirements: []
196
- rubyforge_project:
197
- rubygems_version: 2.1.9
198
- signing_key:
196
+ rubyforge_project:
197
+ rubygems_version: 2.2.2
198
+ signing_key:
199
199
  specification_version: 4
200
200
  summary: Magic
201
201
  test_files: []
202
+ has_rdoc: