rdm 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 396c2803b01c338a4c6297bc2f2a5df629d96a9b
-  data.tar.gz: 45f399f0dd90357c6754fc9c35562b7fc3375b45
+  metadata.gz: 83bd9b5b0c49c3d089749d9477dce36de86f5b14
+  data.tar.gz: 4e5cfeb3b965d86b46fa90deaf7796640328133b
 SHA512:
-  metadata.gz: f65d094c45b7e596bf7bd7950e6a3fa8c167171db762e4e060080f5907c9ad47b4ed0c820951e7f11bac00266634b302b16673e4fc11d246065064c17957f9ab
-  data.tar.gz: f584ad64900d94cc77e4596245ff006d5a1560f8d77cb2076de5199798bc20e59ea88c911a4f8c2234abdcb44968eded70a4d592e85e51c74b0378689e872b3c
+  metadata.gz: 6451ce0cb4b6bbe08cb412bed7928c43556160f85af7bd8968b7ec5caa75e0b9ffa2953360f2e20fd86664b84b32388f1ab0c74c48984eb45d7c378523c25986
+  data.tar.gz: b36fe34e37cd30435db7ec20fef64023d1b6fca1c04102d42bf46e96bdca8305f0d95fc054cf7f7221ed5c8c54265e0df30c19b9813b7e1d74441757c90fd051

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rdm (0.4.2)
+    rdm (0.4.3)
       activesupport
       commander (~> 4.4)
 

data/lib/rdm.rb

@@ -101,5 +101,13 @@ module Rdm
         
       @root
     end
+
+    def root_dir
+      if !root
+        raise ArgumentError, "Rdm.root is not initialized. Run Rdm.root(ANY_PROJECT_FILE_PATH) to init it"
+      end
+
+      File.dirname(root)
+    end
   end
 end

data/lib/rdm/spec_runner.rb

@@ -3,15 +3,15 @@ module Rdm::SpecRunner
     path:                  nil, 
     package:               nil, 
     spec_matcher:          nil, 
-    show_missing_packages: nil, 
-    skipped_packages:      []
+    show_missing_packages: true, 
+    skip_ignored_packages: false
   )
     Rdm::SpecRunner::Runner.new(
       path:                  path, 
       package:               package, 
       spec_matcher:          spec_matcher, 
       show_missing_packages: show_missing_packages,
-      skipped_packages:      skipped_packages
+      skip_ignored_packages: skip_ignored_packages
     ).run
   end
 end

data/lib/rdm/spec_runner/runner.rb

@@ -1,4 +1,6 @@
 class Rdm::SpecRunner::Runner
+  RUNIGNORE_PATH = 'tests/.runignore'.freeze
+
   attr_accessor :no_specs_packages
   attr_accessor :prepared_command_params
   attr_accessor :command
@@ -7,22 +9,26 @@ class Rdm::SpecRunner::Runner
     package:               nil, 
     spec_matcher:          nil, 
     path:                  nil, 
-    show_missing_packages: nil,
-    skipped_packages:      []
+    show_missing_packages: true,
+    skip_ignored_packages: false
   )
     @package               = package,
     @spec_matcher          = spec_matcher.to_s
     @no_specs_packages     = []
-    @skipped_packages      = skipped_packages
     @path                  = path
     @run_all               = @package.nil?
     @show_missing_packages = show_missing_packages
+    @skip_ignored_packages = skip_ignored_packages
+    @skipped_packages      = []
   end
 
   def run
     prepare!
     check_input_params!
     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
 
@@ -109,6 +115,25 @@ class Rdm::SpecRunner::Runner
   end
 
   def prepare_command_for_packages(packages_command_params)
+    if @skip_ignored_packages
+      runignore_path = File.expand_path(File.join(Rdm.root_dir, RUNIGNORE_PATH))
+      package_list   = Rdm::SourceParser.read_and_init_source(Rdm.root).packages.keys
+
+      skipped_package_list = File.read(runignore_path)
+        .lines
+        .map(&:strip)
+        .reject(&:empty?) rescue  []
+      
+      @skipped_packages = skipped_package_list.reject {|line| !package_list.include?(line)}
+      invalid_ignore_packages = skipped_package_list - @skipped_packages
+
+      if !invalid_ignore_packages.empty?
+        puts "WARNING: #{RUNIGNORE_PATH} contains invalid package names: #{invalid_ignore_packages.inspect}"
+      end
+    else
+      @skipped_packages = []
+    end
+
     packages_command_params
       .select  { |cmd_params| cmd_params.spec_count > 0 }
       .reject  { |cmd_params| @skipped_packages.include?(cmd_params.package_name) }
@@ -118,15 +143,15 @@ class Rdm::SpecRunner::Runner
   end
 
   def display_missing_specs
-    unless no_specs_packages.empty?
+    if !no_specs_packages.empty?
       print_message view.missing_specs_message(no_specs_packages)
     end
+  end
 
-    unless @skipped_packages.empty?
+  def display_ignored_specs
+    if !@skipped_packages.empty?
       print_message view.skipping_specs_message(@skipped_packages)
     end
-
-    print_message view.specs_header_message
   end
 
   def execute_command

data/lib/rdm/templates/init/tests/diff_run

@@ -19,7 +19,8 @@ begin
     Rdm::SpecRunner.run(
       package:               package,
       path:                  PATH,
-      show_missing_packages: false
+      skip_ignored_packages: false,
+      show_missing_packages: true
     )
   end
   

data/lib/rdm/templates/init/tests/run

@@ -15,8 +15,7 @@
 ENV['RUBY_ENV'] = 'test'
 require 'rdm'
 
-runignore_path = File.expand_path(File.join(File.dirname(Rdm.root(__FILE__)), '.runignore'))
-skipped_packages = File.open(runignore_path).each_line.inject([]) { |all, line| all.push(line.chomp!) }
+Rdm.root(__FILE__)
 
 if ENV['TEST_RUN']
   require 'minitest/autorun'
@@ -36,7 +35,7 @@ else
     package:          ARGV.clone.first,
     spec_matcher:     ARGV.clone.last,
     path:             File.expand_path(__FILE__),
-    skipped_packages: skipped_packages,
+    skip_ignored_packages: true,
     show_missing_packages: true
   )
 end

data/lib/rdm/version.rb

@@ -1,3 +1,3 @@
 module Rdm
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.4.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdm
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Droid Labs