rdm 0.4.12 → 0.4.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8532099a569ca0ead3b9e7646e0a99d871a5cfad
-  data.tar.gz: 0583cf48e99f885cbaaa63546c097243c388a71b
+SHA256:
+  metadata.gz: 7ef547c24828be0e76ebfead89103580691c5eb09fb7ccae8fbf6e679ceb90c0
+  data.tar.gz: d5bce320cb6593f1ecbe6346acc6b109824f4320ef04300ab842f08cbb316aa8
 SHA512:
-  metadata.gz: 54672fe5503d6ce8e1cdc6f55c9395aacbdcc64bb3c63ef14444407eebca956b43edfacc7abce3c9416cf9a056f858e2d8cfa55035d6ef11982fea691d8b9b72
-  data.tar.gz: e959324f6f44d58bb672fb09382036b2cb0a1245098f13f93b2fa4f19e458dbf5c5b23a3240766e7acb33833e2bc623c3a204de735fcaf84bb34f7cccd42e519
+  metadata.gz: d0784e0a54cdd0e0e1a5129460684cea9d5ed3606c997d390902a0393019082ddf163995b6efe44fe929c987d9b3c529377529ccf3e6c049fe10c5e072f499a5
+  data.tar.gz: 070261bcff5bb4be884fc6ad9c7ade948598c091dc141c3181e79d9146d09a5204d935929e15c16f4de6a60674506fac673cc433e5fd7d3c43f8e59db7b1b147

data/Gemfile.lock

@@ -1,34 +1,35 @@
 PATH
   remote: .
   specs:
-    rdm (0.4.9)
+    rdm (0.4.18)
       activesupport
       commander (~> 4.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.4)
+    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.0)
+    docile (1.3.2)
+    highline (2.0.3)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    json (2.0.3)
-    minitest (5.10.3)
+    json (2.3.1)
+    minitest (5.14.2)
     parser (2.3.3.1)
       ast (~> 2.2)
     powerpack (0.1.1)
@@ -54,16 +55,15 @@ 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.3)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.1.2)
-    url (0.3.2)
 
 PLATFORMS
   ruby
@@ -78,4 +78,4 @@ DEPENDENCIES
   rubocop (~> 0.46)
 
 BUNDLED WITH
-   1.16.0.pre.3
+   1.17.3

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,14 +162,14 @@ 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
     end
     
     command :"rspec.run" do |c|
-      c.syntax      = 'rdm rspec.run PACKAGE_NAME SPEC_MATCHER'
+      c.syntax      = 'rdm rspec.run PACKAGE_NAME SPEC_MATCHER --from=START_FROM_PACKAGE_NAME'
       c.description = 'run tests for specified package and spec file matcher'
       c.summary     = '> ' + c.description
 
@@ -179,20 +179,28 @@ class RdmCliRunner
                     'rdm rspec.run mailing_system'
       c.example     'run tests for `mailing_system` package and files, matches `events` string',
                     'rdm rspec.run mailing_system events'
+      c.example     'run tests for all packages from cache_system',
+                    'rdm rspec.run --from=cache_system'
+      
+      c.option '--from [FROM_PACKAGE_NAME]', String, 'Rspec will start for all package from passed package_name'
       
       c.action do |args, options|
         package_name = args[0]
         spec_matcher = args[1]
 
         ENV['RUBY_ENV'] = 'test'
+        
+        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,
-          skip_ignored_packages: true,
-          show_missing_packages: true
+          package:                package_name,
+          spec_matcher:           spec_matcher,
+          path:                   File.expand_path(`pwd`.chomp),
+          skip_ignored_packages:  true,
+          show_missing_packages:  true,
+          from:                   options_hash[:from]
         )
       end
     end
@@ -213,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/handlers/dependencies_handler.rb

@@ -2,6 +2,9 @@ module Rdm
   module Handlers
     class DependenciesHandler
       ALREADY_MENTIONED_DEPS = '...'
+      HYPHEN                 = "\xE2\x94\x80" * 2
+      CORNER                 = "\xE2\x94\x80" + HYPHEN + " "
+      MIDDLE_CORNER          = "\xE2\x94\x9C" + HYPHEN + " "
       
       class << self
         def show_names(package_name:, project_path:)
@@ -67,10 +70,10 @@ module Rdm
           local_dependencies.delete(k)
 
           if local_dependencies.empty?
-            tmp_self_predicate = child_predicate  + '└── '
+            tmp_self_predicate = child_predicate  + CORNER
             tmp_child_predicate = child_predicate + '    '
           else
-            tmp_self_predicate = child_predicate  + '├── '
+            tmp_self_predicate = child_predicate  + MIDDLE_CORNER
             tmp_child_predicate = child_predicate + '|   '
           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/source_modifier.rb

@@ -22,7 +22,7 @@ class Rdm::SourceModifier
 
   def add_package(package_path)
     rebuild_file do
-      @package_lines.push "package \"#{package_path}\""
+      @package_lines.push "package '#{package_path}'"
     end
   end
 
@@ -36,12 +36,14 @@ class Rdm::SourceModifier
 
   def rebuild_file
     File.open(@source_path).each_line do |line|
+      line.gsub!("\n", '')
+
       case line
       when PACKAGE_LINE_REGEX
         @package_lines.push line
       when CONFIG_LINE_REGEX
         @config_lines.push line
-      when "\n"
+      when ""
         # DO NOTHING
       else
         @setup_lines.push line
@@ -51,13 +53,13 @@ class Rdm::SourceModifier
     yield 
     
     File.open(@source_path, 'w') do |file|
-      file.write @setup_lines.join
+      file.write @setup_lines.join("\n")
       file.write(RDM_CONTENT_SPACES)
 
-      file.write @config_lines.join
+      file.write @config_lines.join("\n")
       file.write(RDM_CONTENT_SPACES)
 
-      file.write @package_lines.join
+      file.write @package_lines.join("\n")
     end
 
     @package_lines = []

data/lib/rdm/spec_runner.rb

@@ -3,6 +3,7 @@ module Rdm::SpecRunner
     path:                  nil, 
     package:               nil, 
     spec_matcher:          nil, 
+    from:                  nil,
     show_missing_packages: true, 
     skip_ignored_packages: false,
     stdout:                STDOUT,
@@ -13,6 +14,7 @@ module Rdm::SpecRunner
       path:                  path, 
       package:               package, 
       spec_matcher:          spec_matcher, 
+      from:                  from,
       show_missing_packages: show_missing_packages,
       skip_ignored_packages: skip_ignored_packages,
       show_output:           show_output,

data/lib/rdm/spec_runner/runner.rb

@@ -10,6 +10,7 @@ class Rdm::SpecRunner::Runner
     package:               nil, 
     spec_matcher:          nil, 
     path:                  nil, 
+    from:                  nil,
     show_missing_packages: true,
     skip_ignored_packages: false,
     stdout:                STDOUT,
@@ -26,6 +27,7 @@ class Rdm::SpecRunner::Runner
     @skipped_packages      = []
     @stdout                = stdout
     @show_output           = show_output
+    @from                  = from
   end
 
   def run
@@ -164,6 +166,22 @@ class Rdm::SpecRunner::Runner
       .reject  { |cmd_params| @skipped_packages.include?(cmd_params.package_name) }
       .sort_by { |cmd_params| cmd_params.package_name }
 
+    if @from
+      start_from = running_packages.index {|cmd_params| cmd_params.package_name == @from}
+
+      if start_from.nil?
+        puts "Package :#{@from} does not exists"
+        exit(1)
+      end
+
+      if @skipped_packages.include?(start_from)
+        puts "Package :#{@from} skipped by .runignore file"
+        exit(1)
+      end
+
+      running_packages = running_packages[start_from..-1]
+    end
+
     if @run_all
       puts <<~EOF
         Rspec tests will run for packages:
@@ -173,7 +191,7 @@ class Rdm::SpecRunner::Runner
     
     running_packages
       .map(&:command)
-      .join(' && ')
+      .join('; ')
   end
 
   def display_missing_specs

data/lib/rdm/version.rb

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

data/spec/rdm/cli/dependencies_controller_spec.rb

@@ -18,12 +18,14 @@ describe Rdm::CLI::DependenciesController do
         stdout:       stdout
       )
       
+      mod = Rdm::Handlers::DependenciesHandler
+
       expect(stdout.output.last).to match(
         [
           "web", 
-          "├── core", 
-          "|   └── repository", 
-          "└── repository (test)"
+          "#{mod::MIDDLE_CORNER}core", 
+          "|   #{mod::CORNER}repository", 
+          "#{mod::CORNER}repository (test)"
         ]
       )
     end

data/spec/rdm/gen/package_spec.rb

@@ -54,7 +54,7 @@ describe Rdm::Gen::Package do
       )
 
       FileUtils.cd(example_project_path) do
-        ensure_content("Rdm.packages", 'package "domain/some"')
+        ensure_content("Rdm.packages", "package 'domain/some'")
       end
     end
   end

data/spec/rdm/handlers/dependencies_handler_spec.rb

@@ -62,12 +62,14 @@ describe Rdm::Handlers::DependenciesHandler do
         )
       }
       it "returns hash structure of dependencies" do
+        mod = Rdm::Handlers::DependenciesHandler
+
         expect(result).to match(
           [
             "web", 
-            "├── core", 
-            "|   └── repository", 
-            "└── repository (test)"
+            "#{mod::MIDDLE_CORNER}core", 
+            "|   #{mod::CORNER}repository", 
+            "#{mod::CORNER}repository (test)"
           ]
         )
       end
@@ -89,13 +91,15 @@ describe Rdm::Handlers::DependenciesHandler do
       }
 
       it "use one at time" do
+        mod = Rdm::Handlers::DependenciesHandler
+        
         expect(result).to match(
           [
             "web", 
-            "├── core", 
-            "|   └── web", 
-            "|       └── ...", 
-            "└── repository (test)"
+            "#{mod::MIDDLE_CORNER}core", 
+            "|   #{mod::CORNER}web", 
+            "|       #{mod::CORNER}...", 
+            "#{mod::CORNER}repository (test)"
           ]
         )
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdm
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.18
 platform: ruby
 authors:
 - Droid Labs
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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: