mortar 0.15.40 → 0.15.41

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 +5 -13
  2. data/lib/mortar/project.rb +1 -0
  3. data/lib/mortar/version.rb +1 -1
  4. data/spec/mortar/project_spec.rb +11 -0
  5. metadata +32 -31
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- YTVjMGVkNTRjZGJjMjQyODI3Yjg3ZDkzMjE5NzU3ZThjZDE4NGNlZA==
5
- data.tar.gz: !binary |-
6
- YTRkN2M3MDQ3YTA4MDY1MDMyOWRmY2YzYjc5NGRjZjYzM2IyNjk5Nw==
2
+ SHA1:
3
+ metadata.gz: b044334778c580f1d843b3b54e23f1fe578a2dd6
4
+ data.tar.gz: 7a008ed4eb1731996fdf99fc4e81146c7ce43389
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- MTk1ZTZmNGZlMjRmYWU3OGM4OTUzYmI0NTg1M2RlM2Q1Mjk2MmFlY2U1MWRh
10
- MjVkZWZlZjhkYjE5MWMzYzFmNDhlN2QyZjZhNDhiYzIyMjM4NzliNTczZjUy
11
- YjM0MzQ3NDI1NzRiZjAyY2I2YmZkYWFmNzdkNGQxMGI2NWFkN2U=
12
- data.tar.gz: !binary |-
13
- YzExMTA1YjgxMzU5NjQ3NTBlYjdlYzgyZTJlMzEyOGZhYWFmNjc3MjcyZTU5
14
- OTVlZTA2NDc4ODA0ZWM5NDk4MGEwM2EyY2JkMDFhNzJmNDVmYTk2Nzg4NmQ0
15
- MTU1ZDQ0NmZiNTZhYTEwM2U2YzUwYjIwYzNmNjYyNDk1M2ZhMjk=
6
+ metadata.gz: b4beb2c48ed879a607382546da3db8a2ace42ae5170e38664a11c9c5572df964a26f9a921bbcbe05a8b0248b4461aadac31757630a24bcf0a5d4c3116e30819e
7
+ data.tar.gz: e69edb190416ff681bea8292e8acc90b01b6d077b140e5439daef1681b7467d083d99b025954ee4baf6cffb218fa17e5f827cdecadcb4877f88b2da533d67049
data/lib/mortar/project.rb CHANGED
@@ -159,6 +159,7 @@ module Mortar
159
159
 
160
160
  #Check for duplicates.
161
161
  name_groups = scripts.group_by{ |x| x[0] }
162
+ name_groups.delete("__init__")
162
163
  duplicates = name_groups.find_all{ |k,v| v.length > 1 }
163
164
  if duplicates.length > 0
164
165
  raise ProjectError, "Multiple scripts found with the same name. Each script must have a unique name regardless of what directory it is in. Duplicate script names found: #{duplicates.collect{|d| d[0]}}"
data/lib/mortar/version.rb CHANGED
@@ -16,5 +16,5 @@
16
16
 
17
17
  module Mortar
18
18
  # see http://semver.org/
19
- VERSION = "0.15.40"
19
+ VERSION = "0.15.41"
20
20
  end
data/spec/mortar/project_spec.rb CHANGED
@@ -89,6 +89,17 @@ module Mortar
89
89
  lambda { p.pigscripts }.should raise_error(Mortar::Project::ProjectError)
90
90
  end
91
91
  end
92
+
93
+ it "doesn't throw an error on duplicate __init__.py files" do
94
+ with_blank_project do |p|
95
+ luigiscript_path = File.join(p.luigiscripts_path, "__init__.py")
96
+ write_file luigiscript_path
97
+ luigiscript_path = File.join(p.luigiscripts_path, "subdir", "__init__.py")
98
+ write_file luigiscript_path
99
+
100
+ lambda { p.luigiscripts }.should_not raise_error(Mortar::Project::ProjectError)
101
+ end
102
+ end
92
103
 
93
104
  it "finds multiple scripts in subdirectories with the same name" do
94
105
  end
metadata CHANGED
@@ -1,195 +1,195 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mortar
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.15.40
4
+ version: 0.15.41
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mortar Data
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-04-22 00:00:00.000000000 Z
11
+ date: 2016-05-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rdoc
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ! '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: 4.0.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ! '>='
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: 4.0.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: mortar-api-ruby
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: 0.8.15
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: 0.8.15
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: netrc
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0.7'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0.7'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: launchy
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
61
  version: '2.1'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: '2.1'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: parseconfig
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ~>
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
75
  version: 1.0.2
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ~>
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: 1.0.2
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: aws-sdk
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ~>
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
89
  version: '1.0'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ~>
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: '1.0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: nokogiri
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ~>
101
+ - - "~>"
102
102
  - !ruby/object:Gem::Version
103
103
  version: 1.5.0
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ~>
108
+ - - "~>"
109
109
  - !ruby/object:Gem::Version
110
110
  version: 1.5.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: excon
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ~>
115
+ - - "~>"
116
116
  - !ruby/object:Gem::Version
117
117
  version: '0.28'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ~>
122
+ - - "~>"
123
123
  - !ruby/object:Gem::Version
124
124
  version: '0.28'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: fakefs
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ~>
129
+ - - "~>"
130
130
  - !ruby/object:Gem::Version
131
131
  version: 0.4.2
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ~>
136
+ - - "~>"
137
137
  - !ruby/object:Gem::Version
138
138
  version: 0.4.2
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: gem-release
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ! '>='
143
+ - - ">="
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ! '>='
150
+ - - ">="
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: rake
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ~>
157
+ - - "~>"
158
158
  - !ruby/object:Gem::Version
159
159
  version: 10.1.1
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ~>
164
+ - - "~>"
165
165
  - !ruby/object:Gem::Version
166
166
  version: 10.1.1
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: rr
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ! '>='
171
+ - - ">="
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ! '>='
178
+ - - ">="
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: rspec
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ~>
185
+ - - "~>"
186
186
  - !ruby/object:Gem::Version
187
187
  version: '2.0'
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ~>
192
+ - - "~>"
193
193
  - !ruby/object:Gem::Version
194
194
  version: '2.0'
195
195
  description: Client library and command-line tool to interact with the Mortar service.
@@ -352,18 +352,19 @@ require_paths:
352
352
  - lib
353
353
  required_ruby_version: !ruby/object:Gem::Requirement
354
354
  requirements:
355
- - - ! '>='
355
+ - - ">="
356
356
  - !ruby/object:Gem::Version
357
357
  version: 1.8.7
358
358
  required_rubygems_version: !ruby/object:Gem::Requirement
359
359
  requirements:
360
- - - ! '>='
360
+ - - ">="
361
361
  - !ruby/object:Gem::Version
362
362
  version: '0'
363
363
  requirements: []
364
364
  rubyforge_project:
365
- rubygems_version: 2.4.3
365
+ rubygems_version: 2.6.3
366
366
  signing_key:
367
367
  specification_version: 4
368
368
  summary: Client library and CLI to interact with the Mortar service.
369
369
  test_files: []
370
+ has_rdoc: