rdm 0.4.18 → 0.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ef547c24828be0e76ebfead89103580691c5eb09fb7ccae8fbf6e679ceb90c0
-  data.tar.gz: d5bce320cb6593f1ecbe6346acc6b109824f4320ef04300ab842f08cbb316aa8
+  metadata.gz: 67aa6a9d7a25fc2a4453684a55772e59ca5304ff097b2f115eadbf6a4d3862a4
+  data.tar.gz: a35e83a3002b1a4143b6cf1b1f336e350caf8d3bec8c834e8ea5d5312e9b471d
 SHA512:
-  metadata.gz: d0784e0a54cdd0e0e1a5129460684cea9d5ed3606c997d390902a0393019082ddf163995b6efe44fe929c987d9b3c529377529ccf3e6c049fe10c5e072f499a5
-  data.tar.gz: 070261bcff5bb4be884fc6ad9c7ade948598c091dc141c3181e79d9146d09a5204d935929e15c16f4de6a60674506fac673cc433e5fd7d3c43f8e59db7b1b147
+  metadata.gz: 3aa14248780cd0b00516e758ff9cc31c3c0b269d14d2f785cbdfbd7862175c9dedc720814f503b150614f62e5c9ebfb81d4e94f1c99d2e95d8ac02d7471a3f23
+  data.tar.gz: 5b33aa37a0e1ff1b07dd7c8704cfa21fbba11ac57ce620b95eee81d81e5a17e3d58843b9c07c750e65b1d5bca911c70f207dda407e175f357043c6aff7c450d6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rdm (0.4.18)
+    rdm (0.4.19)
       activesupport
       commander (~> 4.4)
 
@@ -69,7 +69,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3)
+  bundler
   byebug
   codecov
   rake
@@ -78,4 +78,4 @@ DEPENDENCIES
   rubocop (~> 0.46)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/lib/rdm/spec_runner/runner.rb

@@ -4,12 +4,11 @@ class Rdm::SpecRunner::Runner
 
   attr_accessor :no_specs_packages
   attr_accessor :prepared_command_params
-  attr_accessor :command
-  
+
   def initialize(
-    package:               nil, 
-    spec_matcher:          nil, 
-    path:                  nil, 
+    package:               nil,
+    spec_matcher:          nil,
+    path:                  nil,
     from:                  nil,
     show_missing_packages: true,
     skip_ignored_packages: false,
@@ -22,12 +21,13 @@ class Rdm::SpecRunner::Runner
     @spec_string_number    = spec_matcher.to_s.split(':')[1].to_i
     @path                  = path
     @run_all               = @package_name.nil?
-    @show_missing_packages = show_missing_packages && !@package_name  
+    @show_missing_packages = show_missing_packages && !@package_name
     @skip_ignored_packages = skip_ignored_packages
     @skipped_packages      = []
     @stdout                = stdout
     @show_output           = show_output
     @from                  = from
+    @command_list          = []
   end
 
   def run
@@ -37,7 +37,7 @@ class Rdm::SpecRunner::Runner
       when 0
         raise Rdm::Errors::SpecMatcherNoFiles, "No specs were found for '#{@spec_matcher}'"
       when 1
-        format_string_number = @spec_string_number == 0 ? "" : ":#{@spec_string_number}" 
+        format_string_number = @spec_string_number == 0 ? "" : ":#{@spec_string_number}"
         @spec_matcher = @spec_file_matches.first + format_string_number
 
         @stdout.puts "Following spec matches your input: #{@spec_matcher}"
@@ -51,7 +51,7 @@ class Rdm::SpecRunner::Runner
     display_missing_specs if @show_missing_packages
     display_ignored_specs if @skip_ignored_packages
     print_message view.specs_header_message if @show_missing_packages || @skip_ignored_packages
-    
+
     execute_command
   end
 
@@ -98,7 +98,7 @@ class Rdm::SpecRunner::Runner
   def prepare!
     prepared_command_params = []
     no_specs_packages       = []
-    command                 = nil
+    @command_list            = []
     prepare_command_params
     prepare_no_specs_packages
     prepare_command
@@ -108,8 +108,8 @@ class Rdm::SpecRunner::Runner
     @prepared_command_params ||= begin
       packages.map do |_name, package|
         Rdm::SpecRunner::CommandGenerator.new(
-          package_name: package.name, 
-          package_path: package.path, 
+          package_name: package.name,
+          package_path: package.path,
           spec_matcher: @spec_matcher,
           show_output:  @show_output
         ).generate
@@ -124,23 +124,21 @@ class Rdm::SpecRunner::Runner
   end
 
   def prepare_command
-    @command ||= begin
-      if @package_name
-        prepare_single_package_command(@package_name)
-      else
-        prepare_command_for_packages(prepared_command_params)
-      end
+    if @package_name
+      @command_list += prepare_single_package_command(@package_name)
+    else
+      @command_list += prepare_commands_for_packages(prepared_command_params)
     end
   end
 
   def prepare_single_package_command(package_name)
-    selected = prepared_command_params.select do |cmd_params|
+    selected = prepared_command_params.detect do |cmd_params|
       cmd_params.package_name == package_name
     end
-    prepare_command_for_packages(selected)
+    prepare_commands_for_packages([selected])
   end
 
-  def prepare_command_for_packages(packages_command_params)
+  def prepare_commands_for_packages(packages_command_params)
     if @skip_ignored_packages && !@package_name
       runignore_path = File.expand_path(File.join(Rdm.root_dir, RUNIGNORE_PATH))
       package_list   = Rdm::SourceParser.read_and_init_source(Rdm.root).packages.keys
@@ -149,7 +147,7 @@ class Rdm::SpecRunner::Runner
         .lines
         .map(&:strip)
         .reject(&:empty?) rescue []
-      
+
       @skipped_packages       = skipped_package_list.select {|line| package_list.include?(line)}
       comment_runignore_lines = skipped_package_list.select {|line| line.start_with?(RUNIGNORE_COMMENT)}
       invalid_ignore_packages = skipped_package_list - @skipped_packages - comment_runignore_lines
@@ -188,10 +186,8 @@ class Rdm::SpecRunner::Runner
         #{(packages.keys - no_specs_packages).map {|pkg| " - #{pkg}"}.sort.join("\n")}\n
       EOF
     end
-    
-    running_packages
-      .map(&:command)
-      .join('; ')
+
+    running_packages.map(&:command)
   end
 
   def display_missing_specs
@@ -207,10 +203,11 @@ class Rdm::SpecRunner::Runner
   end
 
   def execute_command
-    eval(command)
-    if $? && !$?.success?
-      exit(1)
-    end
+    has_failed_packages = @command_list
+      .map {|cmd| eval(cmd); $?}
+      .reject {|result| result.success?}
+      .any?
 
+    exit(1) if has_failed_packages
   end
 end

data/lib/rdm/version.rb

@@ -1,3 +1,3 @@
 module Rdm
-  VERSION = '0.4.18'.freeze
+  VERSION = '0.4.19'.freeze
 end

data/rdm.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "byebug"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rdm
 version: !ruby/object:Gem::Version
-  version: 0.4.18
+  version: 0.4.19
 platform: ruby
 authors:
 - Droid Labs
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement