mortar 0.13.0 → 0.13.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/lib/mortar/command/base.rb +8 -7
- data/lib/mortar/version.rb +1 -1
- data/spec/mortar/command/base_spec.rb +7 -8
- metadata +17 -41
checksums.yaml
ADDED
@@ -0,0 +1,7 @@
|
|
1
|
+
---
|
2
|
+
SHA1:
|
3
|
+
metadata.gz: 67d3ed5faec8d91449aa2ff2a655473b299751b2
|
4
|
+
data.tar.gz: f89c8144659270c49215daba688bd29396bc3f8e
|
5
|
+
SHA512:
|
6
|
+
metadata.gz: b24095b9ad94d8393fcd388fecab1be47bc91d63ab8054e5142598a73a3f52447c4b7a8138c890623f937afa160c88f36a365b67690b540ccf955c301ebe16c1
|
7
|
+
data.tar.gz: dd41a82424d176336eb5525a15d1399f940e6fe4b5d6721474d751134f1565781585253456882ed3c3964ad34780217566625717f95ff92a1537ab6d7c577dbf
|
data/lib/mortar/command/base.rb
CHANGED
@@ -189,13 +189,8 @@ protected
|
|
189
189
|
end
|
190
190
|
|
191
191
|
def self.replace_templates(help)
|
192
|
-
|
193
|
-
|
194
|
-
# #line.gsub!("<PIG_VERSION_OPTIONS>", "0.9 (default) and 0.12 (beta)")
|
195
|
-
#
|
196
|
-
#end
|
197
|
-
help.reject! do |line|
|
198
|
-
line.include?("<PIG_VERSION_OPTIONS>")
|
192
|
+
help.each do |line|
|
193
|
+
line.gsub!("<PIG_VERSION_OPTIONS>", "0.9 (default) and 0.12 (beta)")
|
199
194
|
end
|
200
195
|
end
|
201
196
|
|
@@ -378,6 +373,12 @@ protected
|
|
378
373
|
if default_options.groups.include?(section_name)
|
379
374
|
default_options[section_name].each do |k, v|
|
380
375
|
unless @original_options.include? k.to_sym
|
376
|
+
if v == 'true'
|
377
|
+
v = true
|
378
|
+
elsif v == 'false'
|
379
|
+
v = false
|
380
|
+
end
|
381
|
+
|
381
382
|
@options[k.to_sym] = v
|
382
383
|
end
|
383
384
|
end
|
data/lib/mortar/version.rb
CHANGED
@@ -81,8 +81,7 @@ other\tgit@github.com:other.git (push)
|
|
81
81
|
context "method_added" do
|
82
82
|
it "replaces help templates" do
|
83
83
|
lines = Base.replace_templates(["line", "start <PIG_VERSION_OPTIONS>"])
|
84
|
-
|
85
|
-
lines.join("").should == 'line'
|
84
|
+
lines.join("").should == 'linestart 0.9 (default) and 0.12 (beta)'
|
86
85
|
end
|
87
86
|
end
|
88
87
|
|
@@ -101,7 +100,7 @@ other\tgit@github.com:other.git (push)
|
|
101
100
|
pigversion=0.12
|
102
101
|
|
103
102
|
[other]
|
104
|
-
no_browser=
|
103
|
+
no_browser=true
|
105
104
|
"""
|
106
105
|
write_file(File.join(p.root_path, ".mortar-defaults"), text)
|
107
106
|
|
@@ -120,7 +119,7 @@ no_browser=True
|
|
120
119
|
pigversion=0.12
|
121
120
|
|
122
121
|
[other]
|
123
|
-
no_browser=
|
122
|
+
no_browser=true
|
124
123
|
"""
|
125
124
|
write_file(File.join(p.root_path, ".mortar-defaults"), text)
|
126
125
|
|
@@ -148,7 +147,7 @@ no_browser=True
|
|
148
147
|
pigversion=0.12
|
149
148
|
|
150
149
|
[my_script]
|
151
|
-
no_browser=
|
150
|
+
no_browser=true
|
152
151
|
"""
|
153
152
|
write_file(File.join(p.root_path, ".mortar-defaults"), text)
|
154
153
|
|
@@ -160,7 +159,7 @@ no_browser=True
|
|
160
159
|
write_file(File.join(p.pigscripts_path, "my_script.pig"))
|
161
160
|
|
162
161
|
stderr, stdout, d = execute_and_return_command("describe pigscripts/my_script.pig my_alias --polling_interval 0.05", p, git)
|
163
|
-
d.options.should == {:pigversion => "0.12", :polling_interval => "0.05", :no_browser =>
|
162
|
+
d.options.should == {:pigversion => "0.12", :polling_interval => "0.05", :no_browser => true}
|
164
163
|
end
|
165
164
|
end
|
166
165
|
|
@@ -172,7 +171,7 @@ no_browser=True
|
|
172
171
|
text = """
|
173
172
|
[DEFAULTS]
|
174
173
|
clustersize=5
|
175
|
-
no_browser=
|
174
|
+
no_browser=true
|
176
175
|
|
177
176
|
[my_script]
|
178
177
|
clustersize=10
|
@@ -188,7 +187,7 @@ polling_interval=10
|
|
188
187
|
write_file(File.join(p.pigscripts_path, "my_script.pig"))
|
189
188
|
|
190
189
|
stderr, stdout, d = execute_and_return_command("describe pigscripts/my_script.pig my_alias --polling_interval 0.05", p, git)
|
191
|
-
d.options.should == {:polling_interval => "0.05", :no_browser =>
|
190
|
+
d.options.should == {:polling_interval => "0.05", :no_browser => true, :clustersize => "10"}
|
192
191
|
end
|
193
192
|
end
|
194
193
|
|
metadata
CHANGED
@@ -1,36 +1,32 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: mortar
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.13.
|
5
|
-
prerelease:
|
4
|
+
version: 0.13.1
|
6
5
|
platform: ruby
|
7
6
|
authors:
|
8
7
|
- Mortar Data
|
9
8
|
autorequire:
|
10
9
|
bindir: bin
|
11
10
|
cert_chain: []
|
12
|
-
date: 2014-01-
|
11
|
+
date: 2014-01-15 00:00:00.000000000 Z
|
13
12
|
dependencies:
|
14
13
|
- !ruby/object:Gem::Dependency
|
15
14
|
name: rdoc
|
16
15
|
requirement: !ruby/object:Gem::Requirement
|
17
|
-
none: false
|
18
16
|
requirements:
|
19
|
-
- -
|
17
|
+
- - '>='
|
20
18
|
- !ruby/object:Gem::Version
|
21
19
|
version: 4.0.0
|
22
20
|
type: :runtime
|
23
21
|
prerelease: false
|
24
22
|
version_requirements: !ruby/object:Gem::Requirement
|
25
|
-
none: false
|
26
23
|
requirements:
|
27
|
-
- -
|
24
|
+
- - '>='
|
28
25
|
- !ruby/object:Gem::Version
|
29
26
|
version: 4.0.0
|
30
27
|
- !ruby/object:Gem::Dependency
|
31
28
|
name: mortar-api-ruby
|
32
29
|
requirement: !ruby/object:Gem::Requirement
|
33
|
-
none: false
|
34
30
|
requirements:
|
35
31
|
- - ~>
|
36
32
|
- !ruby/object:Gem::Version
|
@@ -38,7 +34,6 @@ dependencies:
|
|
38
34
|
type: :runtime
|
39
35
|
prerelease: false
|
40
36
|
version_requirements: !ruby/object:Gem::Requirement
|
41
|
-
none: false
|
42
37
|
requirements:
|
43
38
|
- - ~>
|
44
39
|
- !ruby/object:Gem::Version
|
@@ -46,7 +41,6 @@ dependencies:
|
|
46
41
|
- !ruby/object:Gem::Dependency
|
47
42
|
name: netrc
|
48
43
|
requirement: !ruby/object:Gem::Requirement
|
49
|
-
none: false
|
50
44
|
requirements:
|
51
45
|
- - ~>
|
52
46
|
- !ruby/object:Gem::Version
|
@@ -54,7 +48,6 @@ dependencies:
|
|
54
48
|
type: :runtime
|
55
49
|
prerelease: false
|
56
50
|
version_requirements: !ruby/object:Gem::Requirement
|
57
|
-
none: false
|
58
51
|
requirements:
|
59
52
|
- - ~>
|
60
53
|
- !ruby/object:Gem::Version
|
@@ -62,7 +55,6 @@ dependencies:
|
|
62
55
|
- !ruby/object:Gem::Dependency
|
63
56
|
name: launchy
|
64
57
|
requirement: !ruby/object:Gem::Requirement
|
65
|
-
none: false
|
66
58
|
requirements:
|
67
59
|
- - ~>
|
68
60
|
- !ruby/object:Gem::Version
|
@@ -70,7 +62,6 @@ dependencies:
|
|
70
62
|
type: :runtime
|
71
63
|
prerelease: false
|
72
64
|
version_requirements: !ruby/object:Gem::Requirement
|
73
|
-
none: false
|
74
65
|
requirements:
|
75
66
|
- - ~>
|
76
67
|
- !ruby/object:Gem::Version
|
@@ -78,7 +69,6 @@ dependencies:
|
|
78
69
|
- !ruby/object:Gem::Dependency
|
79
70
|
name: parseconfig
|
80
71
|
requirement: !ruby/object:Gem::Requirement
|
81
|
-
none: false
|
82
72
|
requirements:
|
83
73
|
- - ~>
|
84
74
|
- !ruby/object:Gem::Version
|
@@ -86,7 +76,6 @@ dependencies:
|
|
86
76
|
type: :runtime
|
87
77
|
prerelease: false
|
88
78
|
version_requirements: !ruby/object:Gem::Requirement
|
89
|
-
none: false
|
90
79
|
requirements:
|
91
80
|
- - ~>
|
92
81
|
- !ruby/object:Gem::Version
|
@@ -94,7 +83,6 @@ dependencies:
|
|
94
83
|
- !ruby/object:Gem::Dependency
|
95
84
|
name: excon
|
96
85
|
requirement: !ruby/object:Gem::Requirement
|
97
|
-
none: false
|
98
86
|
requirements:
|
99
87
|
- - ~>
|
100
88
|
- !ruby/object:Gem::Version
|
@@ -102,7 +90,6 @@ dependencies:
|
|
102
90
|
type: :development
|
103
91
|
prerelease: false
|
104
92
|
version_requirements: !ruby/object:Gem::Requirement
|
105
|
-
none: false
|
106
93
|
requirements:
|
107
94
|
- - ~>
|
108
95
|
- !ruby/object:Gem::Version
|
@@ -110,7 +97,6 @@ dependencies:
|
|
110
97
|
- !ruby/object:Gem::Dependency
|
111
98
|
name: fakefs
|
112
99
|
requirement: !ruby/object:Gem::Requirement
|
113
|
-
none: false
|
114
100
|
requirements:
|
115
101
|
- - ~>
|
116
102
|
- !ruby/object:Gem::Version
|
@@ -118,7 +104,6 @@ dependencies:
|
|
118
104
|
type: :development
|
119
105
|
prerelease: false
|
120
106
|
version_requirements: !ruby/object:Gem::Requirement
|
121
|
-
none: false
|
122
107
|
requirements:
|
123
108
|
- - ~>
|
124
109
|
- !ruby/object:Gem::Version
|
@@ -126,65 +111,57 @@ dependencies:
|
|
126
111
|
- !ruby/object:Gem::Dependency
|
127
112
|
name: gem-release
|
128
113
|
requirement: !ruby/object:Gem::Requirement
|
129
|
-
none: false
|
130
114
|
requirements:
|
131
|
-
- -
|
115
|
+
- - '>='
|
132
116
|
- !ruby/object:Gem::Version
|
133
117
|
version: '0'
|
134
118
|
type: :development
|
135
119
|
prerelease: false
|
136
120
|
version_requirements: !ruby/object:Gem::Requirement
|
137
|
-
none: false
|
138
121
|
requirements:
|
139
|
-
- -
|
122
|
+
- - '>='
|
140
123
|
- !ruby/object:Gem::Version
|
141
124
|
version: '0'
|
142
125
|
- !ruby/object:Gem::Dependency
|
143
126
|
name: rake
|
144
127
|
requirement: !ruby/object:Gem::Requirement
|
145
|
-
none: false
|
146
128
|
requirements:
|
147
|
-
- -
|
129
|
+
- - '>='
|
148
130
|
- !ruby/object:Gem::Version
|
149
131
|
version: '0'
|
150
132
|
type: :development
|
151
133
|
prerelease: false
|
152
134
|
version_requirements: !ruby/object:Gem::Requirement
|
153
|
-
none: false
|
154
135
|
requirements:
|
155
|
-
- -
|
136
|
+
- - '>='
|
156
137
|
- !ruby/object:Gem::Version
|
157
138
|
version: '0'
|
158
139
|
- !ruby/object:Gem::Dependency
|
159
140
|
name: rr
|
160
141
|
requirement: !ruby/object:Gem::Requirement
|
161
|
-
none: false
|
162
142
|
requirements:
|
163
|
-
- -
|
143
|
+
- - '>='
|
164
144
|
- !ruby/object:Gem::Version
|
165
145
|
version: '0'
|
166
146
|
type: :development
|
167
147
|
prerelease: false
|
168
148
|
version_requirements: !ruby/object:Gem::Requirement
|
169
|
-
none: false
|
170
149
|
requirements:
|
171
|
-
- -
|
150
|
+
- - '>='
|
172
151
|
- !ruby/object:Gem::Version
|
173
152
|
version: '0'
|
174
153
|
- !ruby/object:Gem::Dependency
|
175
154
|
name: rspec
|
176
155
|
requirement: !ruby/object:Gem::Requirement
|
177
|
-
none: false
|
178
156
|
requirements:
|
179
|
-
- -
|
157
|
+
- - '>='
|
180
158
|
- !ruby/object:Gem::Version
|
181
159
|
version: '0'
|
182
160
|
type: :development
|
183
161
|
prerelease: false
|
184
162
|
version_requirements: !ruby/object:Gem::Requirement
|
185
|
-
none: false
|
186
163
|
requirements:
|
187
|
-
- -
|
164
|
+
- - '>='
|
188
165
|
- !ruby/object:Gem::Version
|
189
166
|
version: '0'
|
190
167
|
description: Client library and command-line tool to interact with the Mortar service.
|
@@ -319,26 +296,25 @@ files:
|
|
319
296
|
- spec/support/display_message_matcher.rb
|
320
297
|
homepage: http://mortardata.com/
|
321
298
|
licenses: []
|
299
|
+
metadata: {}
|
322
300
|
post_install_message:
|
323
301
|
rdoc_options: []
|
324
302
|
require_paths:
|
325
303
|
- lib
|
326
304
|
required_ruby_version: !ruby/object:Gem::Requirement
|
327
|
-
none: false
|
328
305
|
requirements:
|
329
|
-
- -
|
306
|
+
- - '>='
|
330
307
|
- !ruby/object:Gem::Version
|
331
308
|
version: 1.8.7
|
332
309
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
333
|
-
none: false
|
334
310
|
requirements:
|
335
|
-
- -
|
311
|
+
- - '>='
|
336
312
|
- !ruby/object:Gem::Version
|
337
313
|
version: '0'
|
338
314
|
requirements: []
|
339
315
|
rubyforge_project:
|
340
|
-
rubygems_version:
|
316
|
+
rubygems_version: 2.0.6
|
341
317
|
signing_key:
|
342
|
-
specification_version:
|
318
|
+
specification_version: 4
|
343
319
|
summary: Client library and CLI to interact with the Mortar service.
|
344
320
|
test_files: []
|