rdm 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83bd9b5b0c49c3d089749d9477dce36de86f5b14
-  data.tar.gz: 4e5cfeb3b965d86b46fa90deaf7796640328133b
+  metadata.gz: c0109c0981419bf5541e8a6f8468f5d8c2985277
+  data.tar.gz: 92f5f415961848c52167d5320b8b0841ce9c5dac
 SHA512:
-  metadata.gz: 6451ce0cb4b6bbe08cb412bed7928c43556160f85af7bd8968b7ec5caa75e0b9ffa2953360f2e20fd86664b84b32388f1ab0c74c48984eb45d7c378523c25986
-  data.tar.gz: b36fe34e37cd30435db7ec20fef64023d1b6fca1c04102d42bf46e96bdca8305f0d95fc054cf7f7221ed5c8c54265e0df30c19b9813b7e1d74441757c90fd051
+  metadata.gz: cb326efb447f26b50ffceaaf272e177849962d7199edaa96f3e9ba0c041623e64379c437420dba0a9c4cea6427c741afbb00801de49386e4b1679f2782be3ed5
+  data.tar.gz: afca747cd4fe39e13f2a1b60028631479dc81302aa49254db9da00a07c4a163adca4511add7f1440859723c992d0e83a3f3b0c56eca9726bf194867e69a58269

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rdm (0.4.3)
+    rdm (0.4.5)
       activesupport
       commander (~> 4.4)
 
@@ -77,4 +77,4 @@ DEPENDENCIES
   rubocop (~> 0.46)
 
 BUNDLED WITH
-   1.15.1
+   1.15.3

data/example/application/web/Package.rb

@@ -5,4 +5,8 @@ end
 
 dependency do
   import "core"
+end
+
+dependency :test do
+  import "repository"
 end

data/example/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'
@@ -34,9 +33,9 @@ if ENV['TEST_RUN']
 else
   Rdm::SpecRunner.run(
     package:          ARGV.clone.first,
-    spec_matcher:     ARGV.clone.last,
+    spec_matcher:     ARGV.clone[1],
     path:             File.expand_path(__FILE__),
-    skipped_packages: skipped_packages,
+    skip_ignored_packages: true,
     show_missing_packages: true
   )
 end

data/lib/rdm.rb

@@ -59,6 +59,7 @@ module Rdm
   require 'rdm/spec_runner/package_fetcher'
   require 'rdm/spec_runner/runner'
   require 'rdm/spec_runner/view'
+  require 'rdm/spec_runner/spec_filename_matcher'
 
   extend Rdm::Helpers::PathHelper
 

data/lib/rdm/cli/init.rb

@@ -18,7 +18,8 @@ module Rdm
         generated_files_list = Rdm::Gen::Init.generate(
           current_path: @current_path,
           test:         @test,
-          console:      @console
+          console:      @console,
+          stdout:       @stdout
         )
 
         generated_files_list.compact.each { |file| @stdout.puts "Generated: #{file}" }

data/lib/rdm/errors.rb

@@ -47,5 +47,11 @@ module Rdm
 
     class PackageHasNoDependencies < StandardError
     end
+
+    class SpecMatcherNoFiles < StandardError
+    end
+
+    class SpecMatcherMultipleFiles < StandardError
+    end
   end
 end

data/lib/rdm/gen/init.rb

@@ -9,16 +9,17 @@ module Rdm
       LOCAL_TEMPLATES_PATH = '.rdm/templates'
 
       class << self
-        def generate(current_path:, test: 'rspec', console: 'irb')
-          Rdm::Gen::Init.new(current_path, test, console).generate
+        def generate(current_path:, test: 'rspec', console: 'irb', stdout: STDOUT)
+          Rdm::Gen::Init.new(current_path, test, console, stdout).generate
         end
       end
 
-      def initialize(current_path, test, console)
+      def initialize(current_path, test, console, stdout)
         @current_path      = current_path
         @test              = test
         @console           = console
         @template_detector = Rdm::Templates::TemplateDetector.new(current_path)
+        @stdout            = stdout
       end
 
       def generate
@@ -41,7 +42,8 @@ module Rdm
           template_name:      TEMPLATE_NAME,
           current_path:       @current_path,
           local_path:         INIT_PATH,
-          ignore_source_file: true
+          ignore_source_file: true,
+          stdout:             @stdout
         )
       end
 

data/lib/rdm/git/diff_command.rb

@@ -1,4 +1,6 @@
 class Rdm::Git::DiffCommand
+  GIT_FILE_REPLACE_REGEX = /{(?<old>[\w_\d\.]+)\s*=>\s*(?<new>[\w_\d\.]+)}/
+
   class << self
     def get_only_diff_filenames(revision:, path:)
       command = `cd #{path} && git diff --name-only #{revision}`
@@ -7,5 +9,36 @@ class Rdm::Git::DiffCommand
 
       command.split("\n")
     end
+
+    def get_diff_stat(revision:, path:)
+      command = `cd #{path} && git diff --stat #{revision}`
+      
+      raise Rdm::Errors::GitCommandError, command unless $?.success?
+
+      format_diff_stat_command(command)
+    end
+
+    private
+
+    def format_diff_stat_command(command)
+      files_list = command
+        .split("\n")[0..-2] # remove last string with statistics
+        .map do |stat_string|
+          file_name = stat_string.split('|').first.strip
+
+          match_data = GIT_FILE_REPLACE_REGEX.match(file_name)
+
+          if match_data
+            file_name = [
+              file_name.gsub(GIT_FILE_REPLACE_REGEX, match_data[:old]),
+              file_name.gsub(GIT_FILE_REPLACE_REGEX, match_data[:new])
+            ]
+          end
+
+          file_name
+        end
+
+      files_list.flatten
+    end
   end
 end

data/lib/rdm/git/diff_manager.rb

@@ -13,7 +13,8 @@ module Rdm
           check_repository_initialized!(abs_path)
 
           return Rdm::Git::DiffCommand
-            .get_only_diff_filenames(revision: revision, path: abs_path)
+            .get_diff_stat(revision: revision, path: abs_path)
+            .reject(&:empty?)
             .map { |filename| File.expand_path(File.join(abs_path, filename)) }
         end
 

data/lib/rdm/handlers/dependencies_handler.rb

@@ -13,6 +13,10 @@ module Rdm
         end
         
         def draw(package_name:, project_path:)
+          if package_name.to_s.empty?
+            raise Rdm::Errors::InvalidParams, "Type package name, ex: rdm gen.deps repository" 
+          end
+        
           new(package_name, project_path).draw
         end
       end
@@ -42,34 +46,43 @@ module Rdm
         end
       end
 
-      def draw(pkg_name = @package_name, uniq_packages = [], self_predicate = '', child_predicate = '')
-        raise Rdm::Errors::InvalidParams, "Type package name, ex: rdm gen.deps repository" if pkg_name.to_s.empty?
+      def draw(package_data = nil, uniq_packages = [], self_predicate = '', child_predicate = '')
+        package_data    ||= { 
+          name:   @package_name,
+          groups: [Rdm::Package::DEFAULT_GROUP] 
+        }
+
         raise Rdm::Errors::PackageHasNoDependencies, @package_name if source.packages[@package_name].local_dependencies.empty?
 
-        node = [format(pkg_name, self_predicate)]
+        node = [format_package_name(package_data[:name], package_data[:groups], self_predicate)]
         
-        return node if pkg_name == ALREADY_MENTIONED_DEPS
+        return node if package_data[:name] == ALREADY_MENTIONED_DEPS
 
-        local_dependencies = source.packages[pkg_name].local_dependencies.dup
+        local_dependencies = source.packages[package_data[:name]].local_dependencies_with_groups
 
-        if uniq_packages.include?(pkg_name)
-          local_dependencies = local_dependencies.count == 0 ? [] : [ALREADY_MENTIONED_DEPS]
+        if uniq_packages.include?(package_data[:name])
+          local_dependencies = local_dependencies.keys.count == 0 ? {} : {ALREADY_MENTIONED_DEPS => [Rdm::Package::DEFAULT_GROUP]}
         else
-          uniq_packages.push(pkg_name)
+          uniq_packages.push(package_data[:name])
         end
 
-        local_dependencies.count.times do
-          dependency = local_dependencies.pop
+        local_dependencies.each do |k, v|
+          local_dependencies.delete(k)
 
           if local_dependencies.empty?
-            tmp_self_predicate = child_predicate + '2'
-            tmp_child_predicate = child_predicate + '0'
+            tmp_self_predicate = child_predicate  + '└── '
+            tmp_child_predicate = child_predicate + '    '
           else
-            tmp_self_predicate = child_predicate + '1'
-            tmp_child_predicate = child_predicate + '3'
+            tmp_self_predicate = child_predicate  + '├── '
+            tmp_child_predicate = child_predicate + '|   '
           end
-          
-          node.push(*draw(dependency, uniq_packages, tmp_self_predicate, tmp_child_predicate))
+
+          next_package_group = {
+            name:   k,
+            groups: v
+          }
+
+          node.push(*draw(next_package_group, uniq_packages, tmp_self_predicate, tmp_child_predicate))
         end
 
         node
@@ -81,13 +94,10 @@ module Rdm
         @source ||= Rdm::SourceParser.read_and_init_source(Rdm::SourceLocator.locate(@project_path))
       end
 
-      def format(pkg_name, predicate)
-        predicate
-          .concat(pkg_name)
-          .gsub(/0/, '    ')
-          .gsub(/1/, '├── ')
-          .gsub(/2/, '└── ')
-          .gsub(/3/, '|   ')
+      def format_package_name(package_name, package_groups, predicate)
+        package_groups.include?(Rdm::Package::DEFAULT_GROUP) ? 
+          "#{predicate}#{package_name}" : 
+          "#{predicate}#{package_name} (#{package_groups.join(', ')})"
       end
 
       def recursive_find_dependencies(package_names)

data/lib/rdm/package.rb

@@ -19,6 +19,15 @@ class Rdm::Package
     fetch_dependencies(@config_dependencies || {}, group)
   end
 
+  def local_dependencies_with_groups
+    return {} if @local_dependencies.nil?
+    @local_dependencies.each_with_object(
+      Hash.new { |h,k| h[k]=[] }
+    ) do|(k,v), h| 
+      v.map { |t| h[t] << k }
+    end
+  end
+
   # Import local dependency, e.g another package
   def import(dependency)
     @local_dependencies ||= {}

data/lib/rdm/spec_runner.rb

@@ -4,7 +4,9 @@ module Rdm::SpecRunner
     package:               nil, 
     spec_matcher:          nil, 
     show_missing_packages: true, 
-    skip_ignored_packages: false
+    skip_ignored_packages: false,
+    stdout:                STDOUT,
+    stdin:                 STDIN
   )
     Rdm::SpecRunner::Runner.new(
       path:                  path, 
@@ -13,5 +15,34 @@ module Rdm::SpecRunner
       show_missing_packages: show_missing_packages,
       skip_ignored_packages: skip_ignored_packages
     ).run
+
+  rescue Rdm::Errors::SpecMatcherNoFiles => e
+    stdout.puts e.message
+  rescue Rdm::Errors::SpecMatcherMultipleFiles => e
+    spec_files        = e.message.split("\n")
+    format_spec_files = spec_files.map.with_index {|file, idx| "#{idx+1}. #{file}"}.join("\n")
+    
+    stdout.puts "Following specs match your input:"
+    stdout.puts format_spec_files
+    stdout.print "Enter space-separated file numbers, ex: '1 2': "
+    selected_files_numbers = stdin.gets.chomp
+      .split(' ')
+      .map {|x| Integer(x) rescue nil }
+      .compact
+      .map {|n| n - 1}
+      .reject {|n| n >= spec_files.size}
+
+    spec_files
+      .select
+      .with_index {|_file, idx| selected_files_numbers.include?(idx)}
+      .each do |file|
+        Rdm::SpecRunner::Runner.new(
+          path:                  path, 
+          package:               package, 
+          spec_matcher:          file, 
+          show_missing_packages: show_missing_packages,
+          skip_ignored_packages: skip_ignored_packages
+        ).run
+      end
   end
 end

data/lib/rdm/spec_runner/runner.rb

@@ -12,9 +12,9 @@ class Rdm::SpecRunner::Runner
     show_missing_packages: true,
     skip_ignored_packages: false
   )
-    @package               = package,
-    @spec_matcher          = spec_matcher.to_s
+    @package_name          = package
     @no_specs_packages     = []
+    @spec_matcher          = spec_matcher.to_s
     @path                  = path
     @run_all               = @package.nil?
     @show_missing_packages = show_missing_packages
@@ -23,6 +23,19 @@ class Rdm::SpecRunner::Runner
   end
 
   def run
+    if !@spec_matcher.empty?
+      @spec_file_matches = Rdm::SpecRunner::SpecFilenameMatcher.find_matches(package_path: packages[@package_name].path, spec_matcher: @spec_matcher)
+      case @spec_file_matches.size
+      when 0
+        raise Rdm::Errors::SpecMatcherNoFiles, "No specs were found for '#{@spec_matcher}'"
+      when 1
+        @spec_matcher = @spec_file_matches.first
+        puts "Following spec matches your input: #{@spec_matcher}"
+      else
+        raise Rdm::Errors::SpecMatcherMultipleFiles, @spec_file_matches.join("\n")
+    end
+  end
+
     prepare!
     check_input_params!
     display_missing_specs if @show_missing_packages
@@ -115,14 +128,14 @@ class Rdm::SpecRunner::Runner
   end
 
   def prepare_command_for_packages(packages_command_params)
-    if @skip_ignored_packages
+    if @skip_ignored_packages && !@package
       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  []
+        .reject(&:empty?) rescue []
       
       @skipped_packages = skipped_package_list.reject {|line| !package_list.include?(line)}
       invalid_ignore_packages = skipped_package_list - @skipped_packages

data/lib/rdm/spec_runner/spec_filename_matcher.rb

@@ -0,0 +1,26 @@
+class Rdm::SpecRunner::SpecFilenameMatcher
+  class << self
+    def find_matches(package_path:, spec_matcher:)
+      Rdm::SpecRunner::SpecFilenameMatcher.new(package_path, spec_matcher).find_matches
+    end
+  end
+
+  def initialize(package_path, spec_matcher)
+    @package_path = package_path
+    @spec_matcher = spec_matcher
+  end
+
+  def find_matches
+    expected_filename = File.join(@package_path, @spec_matcher)
+
+    if File.exists?(expected_filename)
+      return Rdm::Utils::FileUtils.relative_path(path: expected_filename, from: @package_path).split
+    end
+
+    Dir.glob(File.join(@package_path, '**/*_spec.rb'))
+      .select { |fn| File.file?(fn) }
+      .map {|file| Rdm::Utils::FileUtils.relative_path(path: file, from: @package_path) }
+      .grep(/#{@spec_matcher.split('').join('.*')}/)
+  end
+  
+end

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

@@ -6,6 +6,8 @@ require 'rdm'
 REVISION = ARGV.clone.first
 PATH     = File.expand_path(__FILE__)
 
+Rdm.root(__FILE__)
+
 begin
   changed_packages = Rdm::Handlers::DiffPackageHandler.handle(
     path:     PATH, 

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

@@ -33,7 +33,7 @@ if ENV['TEST_RUN']
 else
   Rdm::SpecRunner.run(
     package:          ARGV.clone.first,
-    spec_matcher:     ARGV.clone.last,
+    spec_matcher:     ARGV.clone[1],,
     path:             File.expand_path(__FILE__),
     skip_ignored_packages: true,
     show_missing_packages: true

data/lib/rdm/utils/file_utils.rb

@@ -16,5 +16,9 @@ class Rdm::Utils::FileUtils
       FileUtils.cp(tmp_file, original_file)
       FileUtils.rm(tmp_file)
     end
+
+    def relative_path(path:, from:)
+      Pathname.new(path).relative_path_from(Pathname.new(from)).to_s
+    end
   end
 end

data/lib/rdm/version.rb

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

data/spec/rdm/cli/dependencies_controller_spec.rb

@@ -18,11 +18,12 @@ describe Rdm::CLI::DependenciesController do
         stdout:       stdout
       )
       
-      expect(stdout.output).to include(
+      expect(stdout.output.last).to match(
         [
           "web", 
-          "└── core",
-          "    └── repository"
+          "├── core", 
+          "|   └── repository", 
+          "└── repository (test)"
         ]
       )
     end

data/spec/rdm/gen/init_spec.rb

@@ -3,14 +3,15 @@ require "spec_helper"
 describe Rdm::Gen::Init do
   include ExampleProjectHelper
 
-  subject { described_class }
+  subject       { described_class }
+  let(:stdout)  { SpecLogger.new }
 
   before { initialize_example_project(skip_rdm_init: true) }
   after  { reset_example_project }
 
   context "sample project" do
     it "has generated correct files" do
-      subject.generate(current_path: example_project_path)
+      subject.generate(current_path: example_project_path, stdout: stdout)
 
       FileUtils.cd(example_project_path) do
         ensure_exists("Rdm.packages")
@@ -25,7 +26,7 @@ describe Rdm::Gen::Init do
     end
 
     it "has generated package templates" do
-      subject.generate(current_path: example_project_path)
+      subject.generate(current_path: example_project_path, stdout: stdout)
 
       FileUtils.cd(example_project_path) do
         ensure_exists(".rdm/templates/package/Package.rb")
@@ -40,10 +41,10 @@ describe Rdm::Gen::Init do
 
   context "prevents double execution" do
     it "raises on second project generation" do
-      subject.generate(current_path: example_project_path)
+      subject.generate(current_path: example_project_path, stdout: stdout)
 
       expect {
-        subject.generate(current_path: example_project_path)
+        subject.generate(current_path: example_project_path, stdout: stdout)
       }.to raise_error(Rdm::Errors::ProjectAlreadyInitialized)
     end
   end

data/spec/rdm/handlers/dependencies_handler_spec.rb

@@ -47,8 +47,9 @@ describe Rdm::Handlers::DependenciesHandler do
         expect(result).to match(
           [
             "web", 
-            "└── core",
-            "    └── repository"
+            "├── core", 
+            "|   └── repository", 
+            "└── repository (test)"
           ]
         )
       end
@@ -73,9 +74,10 @@ describe Rdm::Handlers::DependenciesHandler do
         expect(result).to match(
           [
             "web", 
-            "└── core", 
-            "    └── web", 
-            "        └── ..." 
+            "├── core", 
+            "|   └── web", 
+            "|       └── ...", 
+            "└── repository (test)"
           ]
         )
       end

data/spec/rdm/spec_runner/spec_filename_matcher_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Rdm::SpecRunner::SpecFilenameMatcher do
+  include ExampleProjectHelper
+  
+  before { initialize_example_project }
+  after  { reset_example_project }
+
+  subject              { described_class }
+  let(:existing_file)  { 'spec/core/one_more_spec.rb' }
+  let(:short_filename) { 'sc.rb' }
+  let(:package_path)   { File.join(example_project_path, 'domain/core') }
+
+  context 'file_path exists' do
+    it 'returns array with file_path matches' do
+      expect(
+        subject.find_matches(package_path: package_path, spec_matcher: existing_file)
+      ).to eq([existing_file])
+    end
+  end
+
+  context 'file_path does not exist' do
+    it 'returns array of relative to package matches' do
+      expect(
+        subject.find_matches(package_path: package_path, spec_matcher: short_filename)
+      ).to match(["spec/core/one_more_spec.rb", "spec/core/sample_service_spec.rb"])
+    end
+  end
+end

data/spec/rdm/spec_runner_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Rdm::SpecRunner do
+  include ExampleProjectHelper
+  
+  before { initialize_example_project }
+  after  { reset_example_project }
+
+  subject      { described_class }
+  let(:stdout) { SpecLogger.new }
+
+  context "for specified spec_matcher" do
+    context "if no files match spec_matcher" do
+      it 'output warning message' do
+        subject.run(
+          path:         example_project_path, 
+          package:      'core',
+          spec_matcher: 'not_existing_file.rb',
+          stdout:       stdout
+        )
+
+        expect(stdout.output).to include("No specs were found for 'not_existing_file.rb'")
+      end
+    end
+
+    context "if multiple files match spec_matcher" do
+      it 'output list of matches' do
+        subject.run(
+          path:         example_project_path, 
+          package:      'core',
+          spec_matcher: 'spec.rb',
+          stdout:       stdout,
+          stdin:        SpecLogger.new(stdin: "exit\n")
+        )
+
+        expect(stdout.output).to match(["Following specs match your input:", "1. spec/core/one_more_spec.rb\n2. spec/core/sample_service_spec.rb", "Enter space-separated file numbers, ex: '1 2': "])
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdm
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - Droid Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,6 +157,8 @@ files:
 - example/domain/core/Package.rb
 - example/domain/core/package/core.rb
 - example/domain/core/package/core/sample_service.rb
+- example/domain/core/spec/core/one_more_spec.rb
+- example/domain/core/spec/core/sample_service_spec.rb
 - example/env_files/development.env
 - example/env_files/production.env
 - example/env_files/test.env
@@ -207,6 +209,7 @@ files:
 - lib/rdm/spec_runner/command_params.rb
 - lib/rdm/spec_runner/package_fetcher.rb
 - lib/rdm/spec_runner/runner.rb
+- lib/rdm/spec_runner/spec_filename_matcher.rb
 - lib/rdm/spec_runner/view.rb
 - lib/rdm/templates/configs/<%=config_path%>
 - lib/rdm/templates/configs/<%=role_config_path%>
@@ -266,6 +269,8 @@ files:
 - spec/rdm/source_locator_spec.rb
 - spec/rdm/source_parser_spec.rb
 - spec/rdm/spec_runner/runner_spec.rb
+- spec/rdm/spec_runner/spec_filename_matcher_spec.rb
+- spec/rdm/spec_runner_spec.rb
 - spec/rdm/templates/template_detector_spec.rb
 - spec/rdm/templates/template_renderer_spec.rb
 - spec/spec_helper.rb
@@ -324,6 +329,8 @@ test_files:
 - spec/rdm/source_locator_spec.rb
 - spec/rdm/source_parser_spec.rb
 - spec/rdm/spec_runner/runner_spec.rb
+- spec/rdm/spec_runner/spec_filename_matcher_spec.rb
+- spec/rdm/spec_runner_spec.rb
 - spec/rdm/templates/template_detector_spec.rb
 - spec/rdm/templates/template_renderer_spec.rb
 - spec/spec_helper.rb