rdm 0.4.12 → 0.4.14
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +6 -6
- data/bin/rdm +14 -6
- data/lib/rdm/handlers/dependencies_handler.rb +5 -2
- data/lib/rdm/source_modifier.rb +7 -5
- data/lib/rdm/spec_runner.rb +2 -0
- data/lib/rdm/spec_runner/runner.rb +18 -0
- data/lib/rdm/version.rb +1 -1
- data/spec/rdm/cli/dependencies_controller_spec.rb +5 -3
- data/spec/rdm/gen/package_spec.rb +1 -1
- data/spec/rdm/handlers/dependencies_handler_spec.rb +11 -7
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4ae5738c0a6b6daefdcdc6d3cf7c75c299fbec69
|
4
|
+
data.tar.gz: cd16a76625d211d29fcbf30b0b2d15059b622485
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 24648c9f36d158e9bb75de5bb3b76ee330399320e9ad51484325021df3d5d3707a143de173e0a4ced317f0b4017d8a620494716d7337b5faf23bf170674187a2
|
7
|
+
data.tar.gz: 00f3f4e83362075aafd25bdd50b9b1a3e68b842ed8cec7dd9010249dcda08f869a61e93f09c899b5fdab1fb04969bb14c8c68a71bacb0af6804aaefa25afa49d
|
data/Gemfile.lock
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
rdm (0.4.
|
4
|
+
rdm (0.4.14)
|
5
5
|
activesupport
|
6
6
|
commander (~> 4.4)
|
7
7
|
|
8
8
|
GEM
|
9
9
|
remote: https://rubygems.org/
|
10
10
|
specs:
|
11
|
-
activesupport (5.1.
|
11
|
+
activesupport (5.1.2)
|
12
12
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
13
13
|
i18n (~> 0.7)
|
14
14
|
minitest (~> 5.1)
|
@@ -25,10 +25,10 @@ GEM
|
|
25
25
|
diff-lcs (1.3)
|
26
26
|
docile (1.1.5)
|
27
27
|
highline (1.7.8)
|
28
|
-
i18n (0.9.
|
28
|
+
i18n (0.9.1)
|
29
29
|
concurrent-ruby (~> 1.0)
|
30
30
|
json (2.0.3)
|
31
|
-
minitest (5.10.
|
31
|
+
minitest (5.10.2)
|
32
32
|
parser (2.3.3.1)
|
33
33
|
ast (~> 2.2)
|
34
34
|
powerpack (0.1.1)
|
@@ -60,7 +60,7 @@ GEM
|
|
60
60
|
simplecov-html (~> 0.10.0)
|
61
61
|
simplecov-html (0.10.0)
|
62
62
|
thread_safe (0.3.6)
|
63
|
-
tzinfo (1.2.
|
63
|
+
tzinfo (1.2.4)
|
64
64
|
thread_safe (~> 0.1)
|
65
65
|
unicode-display_width (1.1.2)
|
66
66
|
url (0.3.2)
|
@@ -78,4 +78,4 @@ DEPENDENCIES
|
|
78
78
|
rubocop (~> 0.46)
|
79
79
|
|
80
80
|
BUNDLED WITH
|
81
|
-
1.16.0
|
81
|
+
1.16.0
|
data/bin/rdm
CHANGED
@@ -169,7 +169,7 @@ class RdmCliRunner
|
|
169
169
|
end
|
170
170
|
|
171
171
|
command :"rspec.run" do |c|
|
172
|
-
c.syntax = 'rdm rspec.run PACKAGE_NAME SPEC_MATCHER'
|
172
|
+
c.syntax = 'rdm rspec.run PACKAGE_NAME SPEC_MATCHER --from=START_FROM_PACKAGE_NAME'
|
173
173
|
c.description = 'run tests for specified package and spec file matcher'
|
174
174
|
c.summary = '> ' + c.description
|
175
175
|
|
@@ -179,20 +179,28 @@ class RdmCliRunner
|
|
179
179
|
'rdm rspec.run mailing_system'
|
180
180
|
c.example 'run tests for `mailing_system` package and files, matches `events` string',
|
181
181
|
'rdm rspec.run mailing_system events'
|
182
|
+
c.example 'run tests for all packages from cache_system',
|
183
|
+
'rdm rspec.run --from=cache_system'
|
184
|
+
|
185
|
+
c.option '--from [FROM_PACKAGE_NAME]', String, 'Rspec will start for all package from passed package_name'
|
182
186
|
|
183
187
|
c.action do |args, options|
|
184
188
|
package_name = args[0]
|
185
189
|
spec_matcher = args[1]
|
186
190
|
|
187
191
|
ENV['RUBY_ENV'] = 'test'
|
192
|
+
|
193
|
+
options_hash = options.__hash__
|
194
|
+
options_hash.delete(:trace)
|
188
195
|
|
189
196
|
Rdm.root(`pwd`.chomp)
|
190
197
|
Rdm::SpecRunner.run(
|
191
|
-
package:
|
192
|
-
spec_matcher:
|
193
|
-
path:
|
194
|
-
skip_ignored_packages:
|
195
|
-
show_missing_packages:
|
198
|
+
package: package_name,
|
199
|
+
spec_matcher: spec_matcher,
|
200
|
+
path: `pwd`.chomp,
|
201
|
+
skip_ignored_packages: true,
|
202
|
+
show_missing_packages: true,
|
203
|
+
from: options_hash[:from]
|
196
204
|
)
|
197
205
|
end
|
198
206
|
end
|
@@ -2,6 +2,9 @@ module Rdm
|
|
2
2
|
module Handlers
|
3
3
|
class DependenciesHandler
|
4
4
|
ALREADY_MENTIONED_DEPS = '...'
|
5
|
+
HYPHEN = "\xE2\x94\x80" * 2
|
6
|
+
CORNER = "\xE2\x94\x80" + HYPHEN + " "
|
7
|
+
MIDDLE_CORNER = "\xE2\x94\x9C" + HYPHEN + " "
|
5
8
|
|
6
9
|
class << self
|
7
10
|
def show_names(package_name:, project_path:)
|
@@ -67,10 +70,10 @@ module Rdm
|
|
67
70
|
local_dependencies.delete(k)
|
68
71
|
|
69
72
|
if local_dependencies.empty?
|
70
|
-
tmp_self_predicate = child_predicate +
|
73
|
+
tmp_self_predicate = child_predicate + CORNER
|
71
74
|
tmp_child_predicate = child_predicate + ' '
|
72
75
|
else
|
73
|
-
tmp_self_predicate = child_predicate +
|
76
|
+
tmp_self_predicate = child_predicate + MIDDLE_CORNER
|
74
77
|
tmp_child_predicate = child_predicate + '| '
|
75
78
|
end
|
76
79
|
|
data/lib/rdm/source_modifier.rb
CHANGED
@@ -22,7 +22,7 @@ class Rdm::SourceModifier
|
|
22
22
|
|
23
23
|
def add_package(package_path)
|
24
24
|
rebuild_file do
|
25
|
-
@package_lines.push "package
|
25
|
+
@package_lines.push "package '#{package_path}'"
|
26
26
|
end
|
27
27
|
end
|
28
28
|
|
@@ -36,12 +36,14 @@ class Rdm::SourceModifier
|
|
36
36
|
|
37
37
|
def rebuild_file
|
38
38
|
File.open(@source_path).each_line do |line|
|
39
|
+
line.gsub!("\n", '')
|
40
|
+
|
39
41
|
case line
|
40
42
|
when PACKAGE_LINE_REGEX
|
41
43
|
@package_lines.push line
|
42
44
|
when CONFIG_LINE_REGEX
|
43
45
|
@config_lines.push line
|
44
|
-
when "
|
46
|
+
when ""
|
45
47
|
# DO NOTHING
|
46
48
|
else
|
47
49
|
@setup_lines.push line
|
@@ -51,13 +53,13 @@ class Rdm::SourceModifier
|
|
51
53
|
yield
|
52
54
|
|
53
55
|
File.open(@source_path, 'w') do |file|
|
54
|
-
file.write @setup_lines.join
|
56
|
+
file.write @setup_lines.join("\n")
|
55
57
|
file.write(RDM_CONTENT_SPACES)
|
56
58
|
|
57
|
-
file.write @config_lines.join
|
59
|
+
file.write @config_lines.join("\n")
|
58
60
|
file.write(RDM_CONTENT_SPACES)
|
59
61
|
|
60
|
-
file.write @package_lines.join
|
62
|
+
file.write @package_lines.join("\n")
|
61
63
|
end
|
62
64
|
|
63
65
|
@package_lines = []
|
data/lib/rdm/spec_runner.rb
CHANGED
@@ -3,6 +3,7 @@ module Rdm::SpecRunner
|
|
3
3
|
path: nil,
|
4
4
|
package: nil,
|
5
5
|
spec_matcher: nil,
|
6
|
+
from: nil,
|
6
7
|
show_missing_packages: true,
|
7
8
|
skip_ignored_packages: false,
|
8
9
|
stdout: STDOUT,
|
@@ -13,6 +14,7 @@ module Rdm::SpecRunner
|
|
13
14
|
path: path,
|
14
15
|
package: package,
|
15
16
|
spec_matcher: spec_matcher,
|
17
|
+
from: from,
|
16
18
|
show_missing_packages: show_missing_packages,
|
17
19
|
skip_ignored_packages: skip_ignored_packages,
|
18
20
|
show_output: show_output,
|
@@ -10,6 +10,7 @@ class Rdm::SpecRunner::Runner
|
|
10
10
|
package: nil,
|
11
11
|
spec_matcher: nil,
|
12
12
|
path: nil,
|
13
|
+
from: nil,
|
13
14
|
show_missing_packages: true,
|
14
15
|
skip_ignored_packages: false,
|
15
16
|
stdout: STDOUT,
|
@@ -26,6 +27,7 @@ class Rdm::SpecRunner::Runner
|
|
26
27
|
@skipped_packages = []
|
27
28
|
@stdout = stdout
|
28
29
|
@show_output = show_output
|
30
|
+
@from = from
|
29
31
|
end
|
30
32
|
|
31
33
|
def run
|
@@ -164,6 +166,22 @@ class Rdm::SpecRunner::Runner
|
|
164
166
|
.reject { |cmd_params| @skipped_packages.include?(cmd_params.package_name) }
|
165
167
|
.sort_by { |cmd_params| cmd_params.package_name }
|
166
168
|
|
169
|
+
if @from
|
170
|
+
start_from = running_packages.index {|cmd_params| cmd_params.package_name == @from}
|
171
|
+
|
172
|
+
if start_from.nil?
|
173
|
+
puts "Pacakge :#{@from} does not exists"
|
174
|
+
exit(1)
|
175
|
+
end
|
176
|
+
|
177
|
+
if @skipped_packages.include?(start_from)
|
178
|
+
puts "Package :#{@from} skipped by .runignore file"
|
179
|
+
exit(1)
|
180
|
+
end
|
181
|
+
|
182
|
+
running_packages = running_packages[start_from..-1]
|
183
|
+
end
|
184
|
+
|
167
185
|
if @run_all
|
168
186
|
puts <<~EOF
|
169
187
|
Rspec tests will run for packages:
|
data/lib/rdm/version.rb
CHANGED
@@ -18,12 +18,14 @@ describe Rdm::CLI::DependenciesController do
|
|
18
18
|
stdout: stdout
|
19
19
|
)
|
20
20
|
|
21
|
+
mod = Rdm::Handlers::DependenciesHandler
|
22
|
+
|
21
23
|
expect(stdout.output.last).to match(
|
22
24
|
[
|
23
25
|
"web",
|
24
|
-
"
|
25
|
-
"|
|
26
|
-
"
|
26
|
+
"#{mod::MIDDLE_CORNER}core",
|
27
|
+
"| #{mod::CORNER}repository",
|
28
|
+
"#{mod::CORNER}repository (test)"
|
27
29
|
]
|
28
30
|
)
|
29
31
|
end
|
@@ -62,12 +62,14 @@ describe Rdm::Handlers::DependenciesHandler do
|
|
62
62
|
)
|
63
63
|
}
|
64
64
|
it "returns hash structure of dependencies" do
|
65
|
+
mod = Rdm::Handlers::DependenciesHandler
|
66
|
+
|
65
67
|
expect(result).to match(
|
66
68
|
[
|
67
69
|
"web",
|
68
|
-
"
|
69
|
-
"|
|
70
|
-
"
|
70
|
+
"#{mod::MIDDLE_CORNER}core",
|
71
|
+
"| #{mod::CORNER}repository",
|
72
|
+
"#{mod::CORNER}repository (test)"
|
71
73
|
]
|
72
74
|
)
|
73
75
|
end
|
@@ -89,13 +91,15 @@ describe Rdm::Handlers::DependenciesHandler do
|
|
89
91
|
}
|
90
92
|
|
91
93
|
it "use one at time" do
|
94
|
+
mod = Rdm::Handlers::DependenciesHandler
|
95
|
+
|
92
96
|
expect(result).to match(
|
93
97
|
[
|
94
98
|
"web",
|
95
|
-
"
|
96
|
-
"|
|
97
|
-
"|
|
98
|
-
"
|
99
|
+
"#{mod::MIDDLE_CORNER}core",
|
100
|
+
"| #{mod::CORNER}web",
|
101
|
+
"| #{mod::CORNER}...",
|
102
|
+
"#{mod::CORNER}repository (test)"
|
99
103
|
]
|
100
104
|
)
|
101
105
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rdm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.14
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Droid Labs
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2018-01-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|