rdm 0.4.14 → 0.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4ae5738c0a6b6daefdcdc6d3cf7c75c299fbec69
-  data.tar.gz: cd16a76625d211d29fcbf30b0b2d15059b622485
+SHA256:
+  metadata.gz: 67aa6a9d7a25fc2a4453684a55772e59ca5304ff097b2f115eadbf6a4d3862a4
+  data.tar.gz: a35e83a3002b1a4143b6cf1b1f336e350caf8d3bec8c834e8ea5d5312e9b471d
 SHA512:
-  metadata.gz: 24648c9f36d158e9bb75de5bb3b76ee330399320e9ad51484325021df3d5d3707a143de173e0a4ced317f0b4017d8a620494716d7337b5faf23bf170674187a2
-  data.tar.gz: 00f3f4e83362075aafd25bdd50b9b1a3e68b842ed8cec7dd9010249dcda08f869a61e93f09c899b5fdab1fb04969bb14c8c68a71bacb0af6804aaefa25afa49d
+  metadata.gz: 3aa14248780cd0b00516e758ff9cc31c3c0b269d14d2f785cbdfbd7862175c9dedc720814f503b150614f62e5c9ebfb81d4e94f1c99d2e95d8ac02d7471a3f23
+  data.tar.gz: 5b33aa37a0e1ff1b07dd7c8704cfa21fbba11ac57ce620b95eee81d81e5a17e3d58843b9c07c750e65b1d5bca911c70f207dda407e175f357043c6aff7c450d6

data/Gemfile.lock

@@ -1,34 +1,35 @@
 PATH
   remote: .
   specs:
-    rdm (0.4.14)
+    rdm (0.4.19)
       activesupport
       commander (~> 4.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.2)
+    activesupport (5.2.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     ast (2.3.0)
     byebug (9.0.6)
-    codecov (0.1.10)
+    codecov (0.2.5)
+      colorize
       json
       simplecov
-      url
-    commander (4.4.3)
-      highline (~> 1.7.2)
-    concurrent-ruby (1.0.5)
+    colorize (0.8.1)
+    commander (4.5.2)
+      highline (~> 2.0.0)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
-    docile (1.1.5)
-    highline (1.7.8)
-    i18n (0.9.1)
+    docile (1.3.2)
+    highline (2.0.3)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    json (2.0.3)
-    minitest (5.10.2)
+    json (2.3.1)
+    minitest (5.14.2)
     parser (2.3.3.1)
       ast (~> 2.2)
     powerpack (0.1.1)
@@ -54,22 +55,21 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.17.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.1.2)
-    url (0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.3)
+  bundler
   byebug
   codecov
   rake
@@ -78,4 +78,4 @@ DEPENDENCIES
   rubocop (~> 0.46)
 
 BUNDLED WITH
-   1.16.0
+   2.1.4

data/bin/rdm

@@ -60,7 +60,7 @@ class RdmCliRunner
       c.action do |args, options|
         package_name = (args.first || "")
         defaults = {
-          current_path: `pwd`.chomp,
+          current_path: File.expand_path(`pwd`.chomp),
           package_name: package_name,
           path:         package_name.downcase.gsub(/\s+/, '_')
         }
@@ -82,7 +82,7 @@ class RdmCliRunner
       c.action do |args, options|
         revision = (args.first || "HEAD")
         options = {
-          path:     `pwd`.chomp,
+          path:     File.expand_path(`pwd`.chomp),
           revision: revision,
         }
         Rdm::CLI::DiffPackage.run(options)
@@ -100,7 +100,7 @@ class RdmCliRunner
       c.action do |args, options|
         package_name = (args.first || "")
         opts = {
-          project_path: `pwd`.chomp,
+          project_path: File.expand_path(`pwd`.chomp),
           package_name: package_name,
           compile_path: options.path
         }
@@ -125,7 +125,7 @@ class RdmCliRunner
 
         Rdm::CLI::TemplateGenerator.run(
           template_name: template_name,
-          current_path:  `pwd`.chomp,
+          current_path:  File.expand_path(`pwd`.chomp),
           local_path:    options_hash.delete(:path),
           locals:        options_hash
         )
@@ -143,7 +143,7 @@ class RdmCliRunner
 
         Rdm::CLI::DependenciesController.run(
           package_name: package_name,
-          project_path: `pwd`.chomp
+          project_path: File.expand_path(`pwd`.chomp)
         )
       end
     end
@@ -162,7 +162,7 @@ class RdmCliRunner
 
         Rdm::CLI::Config.run(
           config_name:  config_name,
-          current_path: `pwd`.chomp,
+          current_path: File.expand_path(`pwd`.chomp),
           config_data:  options_hash
         )
       end
@@ -193,11 +193,11 @@ class RdmCliRunner
         options_hash = options.__hash__
         options_hash.delete(:trace)
 
-        Rdm.root(`pwd`.chomp)
+        Rdm.root(File.expand_path(`pwd`.chomp))
         Rdm::SpecRunner.run(
           package:                package_name,
           spec_matcher:           spec_matcher,
-          path:                   `pwd`.chomp,
+          path:                   File.expand_path(`pwd`.chomp),
           skip_ignored_packages:  true,
           show_missing_packages:  true,
           from:                   options_hash[:from]
@@ -221,11 +221,11 @@ class RdmCliRunner
         revision = args[0]
 
         ENV['RUBY_ENV'] = 'test'
-        Rdm.root(`pwd`.chomp)
+        Rdm.root(File.expand_path(`pwd`.chomp))
 
         Rdm::CLI::DiffSpecRunner.run(
           revision: revision,
-          path:     `pwd`.chomp
+          path:     File.expand_path(`pwd`.chomp)
         )
       end
     end

data/lib/rdm/package_importer.rb

@@ -62,14 +62,14 @@ class Rdm::PackageImporter
 
     # also import local dependencies
     package.local_dependencies(group).each do |dependency|
-      import_package(dependency, source: source)
+      import_package(dependency, source: source, group: group)
     end
 
     # also import config dependencies
     package.config_dependencies(group).each do |dependency|
       import_config(dependency, source: source)
     end
-    
+
     # only after importing dependencies - require package itself
     begin
       require package_name

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
@@ -170,7 +168,7 @@ class Rdm::SpecRunner::Runner
       start_from = running_packages.index {|cmd_params| cmd_params.package_name == @from}
 
       if start_from.nil?
-        puts "Pacakge :#{@from} does not exists"
+        puts "Package :#{@from} does not exists"
         exit(1)
       end
 
@@ -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.14'.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.14
+  version: 0.4.19
 platform: ruby
 authors:
 - Droid Labs
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-12 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
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.4'
 description: Ruby Dependency Manager
-email: 
+email:
 executables:
 - rdm
 - rubocop
@@ -280,10 +280,10 @@ files:
 - spec/rdm/templates/template_detector_spec.rb
 - spec/rdm/templates/template_renderer_spec.rb
 - spec/spec_helper.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -298,9 +298,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Ruby Dependency Manager
 test_files: