rdm 0.4.7 → 0.4.8

data/lib/rdm.rb

@@ -16,6 +16,7 @@ module Rdm
   require 'rdm/cli/template_generator'
   require 'rdm/cli/dependencies_controller'
   require 'rdm/cli/config'
+  require 'rdm/cli/diff_spec_runner.rb'
 
   # Runtime part
   require 'rdm/config'
@@ -28,12 +29,12 @@ module Rdm
   require 'rdm/settings'
   require 'rdm/source'
   require 'rdm/source_parser'
-  require 'rdm/source_composer'
   require 'rdm/source_locator'
   require 'rdm/git/diff_manager'
   require 'rdm/git/diff_command'
   require 'rdm/git/repository_locator'
   require 'rdm/config_locals'
+  require 'rdm/source_modifier'
 
   # Package part
   require 'rdm/packages/compiler_service'

data/lib/rdm/cli/dependencies_controller.rb

@@ -24,6 +24,8 @@ module Rdm
         @stdout.puts e.message
       rescue Rdm::Errors::PackageHasNoDependencies => e
         @stdout.puts "Package `#{e.message}` has no dependencies"
+      rescue Rdm::Errors::PackageDoesNotExist => e
+        @stdout.puts "Package `#{e.message}` is not defined"
       end
     end
   end

data/lib/rdm/cli/diff_spec_runner.rb

@@ -0,0 +1,42 @@
+class Rdm::CLI::DiffSpecRunner
+  def self.run(revision: 'HEAD', path:, stdout: STDOUT, show_output: true)
+    Rdm::CLI::DiffSpecRunner.new(revision, path, stdout, show_output).run
+  end
+
+  def initialize(revision, path, stdout, show_output)
+    @revision    = revision
+    @path        = path
+    @stdout      = stdout
+    @show_output = show_output
+  end
+
+  def run
+    changed_packages = Rdm::Handlers::DiffPackageHandler.handle(
+      path:     @path, 
+      revision: @revision
+    )
+    
+    if changed_packages.empty?
+      @stdout.puts "No modified packages were found. Type `git add .` to index all changes..."
+      
+      return nil
+    end
+
+    @stdout.puts "Tests for the following packages will run:\n  - #{changed_packages.join("\n  - ")}\n\n"
+  
+    changed_packages.each do |package| 
+      Rdm::SpecRunner.run(
+        package:               package,
+        path:                  @path,
+        show_missing_packages: false,
+        stdout:                @stdout,
+        show_output:           @show_output
+      )
+    end
+  
+  rescue Rdm::Errors::GitRepositoryNotInitialized
+    @stdout.puts "Git repository is not initialized. Use `git init .`"
+    
+    return nil
+  end
+end

data/lib/rdm/errors.rb

@@ -53,5 +53,8 @@ module Rdm
 
     class SpecMatcherMultipleFiles < StandardError
     end
+
+    class ConfigExists < StandardError
+    end
   end
 end

data/lib/rdm/gen/config.rb

@@ -14,8 +14,6 @@ class Rdm::Gen::Config
   end
 
   def generate
-    @source.config(@config_name)
-
     @locals = {
       config_name:      @config_name,
       config_locals:    @config_locals,
@@ -30,7 +28,7 @@ class Rdm::Gen::Config
       local_path:         './'
     )
 
-    Rdm::SourceComposer.run(@source)
+    Rdm::SourceModifier.add_config(@config_name, get_source.root_path)
     
     generated_files
   end

data/lib/rdm/gen/init.rb

@@ -31,20 +31,26 @@ module Rdm
         if File.exist?(File.join(@current_path, Rdm::SOURCE_FILENAME))
           raise Rdm::Errors::ProjectAlreadyInitialized, "#{@current_path} has already #{Rdm::SOURCE_FILENAME}"
         end
-
-        FileUtils.mkdir_p(local_templates_path)
-        FileUtils.cp_r(
-          @template_detector.gem_template_folder('package'),
-          @template_detector.project_template_folder('package')
-        )
         
-        Rdm::Handlers::TemplateHandler.generate(
+        generated_files = Rdm::Handlers::TemplateHandler.generate(
           template_name:      TEMPLATE_NAME,
           current_path:       @current_path,
           local_path:         INIT_PATH,
           ignore_source_file: true,
           stdout:             @stdout
         )
+
+        FileUtils.mkdir_p(local_templates_path)
+        FileUtils.cp_r(
+          @template_detector.gem_template_folder('package'),
+          File.dirname(@template_detector.project_template_folder('package'))
+        )
+        FileUtils.cp_r(
+          @template_detector.gem_template_folder('configs'),
+          File.dirname(@template_detector.project_template_folder('configs'))
+        )
+
+        generated_files
       end
 
       private

data/lib/rdm/gen/package.rb

@@ -21,20 +21,20 @@ module Rdm
       end
 
       def create
-        @source.package(@local_path)
-
         raise Rdm::Errors::PackageDirExists.new(@local_path) if Dir.exist?(File.join(@source.root_path, @local_path))
         raise Rdm::Errors::PackageNameNotSpecified           if @package_name.nil? || @package_name.empty?
         raise Rdm::Errors::PackageExists                     if @source.packages.keys.include?(@package_name)
-        
-        Rdm::SourceComposer.run(@source)
-
-        Rdm::Handlers::TemplateHandler.generate(
+                
+        generated_files = Rdm::Handlers::TemplateHandler.generate(
           template_name: TEMPLATE_NAME,
           current_path:  @current_path,
           local_path:    @local_path,
           locals:        { package_name: @package_name }.merge(@locals)
         )
+
+        Rdm::SourceModifier.add_package(@local_path, get_source.root_path)
+
+        generated_files  
       end
 
       def get_source

data/lib/rdm/handlers/dependencies_handler.rb

@@ -24,17 +24,14 @@ module Rdm
       def initialize(package_name, project_path)
         @package_name = package_name
         @project_path = project_path
+
+        check_params!(
+          package_name: @package_name, 
+          project_path: @project_path
+        )
       end
 
-      def show_names
-        if @package_name.nil? || @package_name.empty?
-          raise Rdm::Errors::InvalidParams, "Package name should be specified" 
-        end
-        
-        if @project_path.nil? || @project_path.empty?
-          raise Rdm::Errors::InvalidParams, "Project directory should be specified" 
-        end
-        
+      def show_names        
         recursive_find_dependencies([@package_name])
       end
 
@@ -90,6 +87,14 @@ module Rdm
 
       private
 
+      def check_params!(package_name:, project_path:)
+        raise Rdm::Errors::InvalidParams, "Package name should be specified" if package_name.empty?
+        raise Rdm::Errors::InvalidParams, "Project directory should be specified" if project_path.empty?
+        raise Rdm::Errors::PackageDoesNotExist, package_name if source.packages[package_name].nil?
+
+        nil
+      end
+
       def source
         @source ||= Rdm::SourceParser.read_and_init_source(Rdm::SourceLocator.locate(@project_path))
       end

data/lib/rdm/handlers/diff_package_handler.rb

@@ -21,11 +21,12 @@ module Rdm
 
         modified_packages = Rdm::Git::DiffManager
           .run(path: path, revision: revision)
+          .reject { |file| file.include?(Rdm::Gen::Init::LOCAL_TEMPLATES_PATH) }
           .map { |file| Rdm::Packages::Locator.locate(file) rescue nil }
           .map { |path_to_package| Rdm::PackageParser.parse_file(path_to_package).name rescue nil }
           .reject(&:blank?)
           .uniq
-        
+
         return get_dependencies(modified_packages) || []
       end
 

data/lib/rdm/handlers/template_handler.rb

@@ -43,7 +43,7 @@ module Rdm
         template_detector = Rdm::Templates::TemplateDetector.new(project_path)
 
         render_helper_path = "#{project_path}/.rdm/helpers/render_helper.rb"
-        require_relative render_helper_path if File.exist?(render_helper_path)
+        require_relative File.expand_path(render_helper_path) if File.exist?(render_helper_path)
 
         @template_directory    = template_detector.detect_template_folder(@template_name)
         @destination_directory = File.join(project_path, @local_path)
@@ -99,7 +99,7 @@ module Rdm
 
           rendered_rel_path
         end
-
+        
         template_files_list.compact
       end
 

data/lib/rdm/settings.rb

@@ -33,7 +33,6 @@ class Rdm::Settings
 
   SETTING_KEYS.each do |key|
     define_method(key) do |value = nil, &block|
-      # debugger if key == :compile_ignore_files
       fetch_setting key, value, &block
     end
   end

data/lib/rdm/source_modifier.rb

@@ -0,0 +1,69 @@
+class Rdm::SourceModifier
+  PACKAGE_LINE_REGEX = /package\s+['"]([\d\w\/\-_]+)['"]/
+  CONFIG_LINE_REGEX  = /config\s+([:\w\-_\d]+)/
+  RDM_CONTENT_SPACES = "\n\n"
+
+  class << self
+    def add_package(package_path, root_path)
+      Rdm::SourceModifier.new(root_path).add_package(package_path)
+    end
+
+    def add_config(config_name, root_path)
+      Rdm::SourceModifier.new(root_path).add_config(config_name)
+    end
+  end
+
+  def initialize(root_path)
+    @source_path   = File.join(root_path, Rdm::SOURCE_FILENAME)
+    @package_lines = []
+    @config_lines  = []
+    @setup_lines   = []
+  end
+
+  def add_package(package_path)
+    rebuild_file do
+      @package_lines.push "package \"#{package_path}\""
+    end
+  end
+
+  def add_config(config_name)
+    rebuild_file do
+      @config_lines.push "config :#{config_name}"
+    end
+  end
+
+  private
+
+  def rebuild_file
+    File.open(@source_path).each_line do |line|
+      case line
+      when PACKAGE_LINE_REGEX
+        @package_lines.push line
+      when CONFIG_LINE_REGEX
+        @config_lines.push line
+      when "\n"
+        # DO NOTHING
+      else
+        @setup_lines.push line
+      end
+    end
+
+    yield 
+    
+    File.open(@source_path, 'w') do |file|
+      file.write @setup_lines.join
+      file.write(RDM_CONTENT_SPACES)
+
+      file.write @config_lines.join
+      file.write(RDM_CONTENT_SPACES)
+
+      file.write @package_lines.join
+    end
+
+    @package_lines = []
+    @config_lines  = []
+    @setup_lines   = []
+
+    nil
+  end
+end

data/lib/rdm/spec_runner.rb

@@ -6,14 +6,17 @@ module Rdm::SpecRunner
     show_missing_packages: true, 
     skip_ignored_packages: false,
     stdout:                STDOUT,
-    stdin:                 STDIN
+    stdin:                 STDIN, 
+    show_output:           true
   )
     Rdm::SpecRunner::Runner.new(
       path:                  path, 
       package:               package, 
       spec_matcher:          spec_matcher, 
       show_missing_packages: show_missing_packages,
-      skip_ignored_packages: skip_ignored_packages
+      skip_ignored_packages: skip_ignored_packages,
+      show_output:           show_output,
+      stdout:                stdout
     ).run
 
   rescue Rdm::Errors::SpecMatcherNoFiles => e

data/lib/rdm/spec_runner/command_generator.rb

@@ -1,9 +1,10 @@
 class Rdm::SpecRunner::CommandGenerator
   attr_accessor :package_name, :package_path, :spec_matcher
-  def initialize(package_name:, package_path:, spec_matcher:)
+  def initialize(package_name:, package_path:, spec_matcher:, show_output: true)
     @package_name = package_name
     @package_path = package_path
     @spec_matcher = spec_matcher
+    @output       = show_output ? '$stdout' : 'File::NULL'
   end
 
   def spec_count
@@ -14,7 +15,7 @@ class Rdm::SpecRunner::CommandGenerator
     "print_message(
         '**** Package: #{package_name}  *****') \\
           && system('cd #{package_path} \\
-          && bundle exec rspec --color --tty #{spec_matcher}', out: $stdout, err: :out)"
+          && bundle exec rspec --color --tty #{spec_matcher}', out: #{@output.to_s}, err: :out)"
   end
 
   def generate

data/lib/rdm/spec_runner/runner.rb

@@ -1,5 +1,6 @@
 class Rdm::SpecRunner::Runner
-  RUNIGNORE_PATH = 'tests/.runignore'.freeze
+  RUNIGNORE_PATH    = 'tests/.runignore'.freeze
+  RUNIGNORE_COMMENT = '#'
 
   attr_accessor :no_specs_packages
   attr_accessor :prepared_command_params
@@ -10,7 +11,9 @@ class Rdm::SpecRunner::Runner
     spec_matcher:          nil, 
     path:                  nil, 
     show_missing_packages: true,
-    skip_ignored_packages: false
+    skip_ignored_packages: false,
+    stdout:                STDOUT,
+    show_output:           true
   )
     @package_name          = package
     @no_specs_packages     = []
@@ -21,6 +24,8 @@ class Rdm::SpecRunner::Runner
     @show_missing_packages = show_missing_packages
     @skip_ignored_packages = skip_ignored_packages
     @skipped_packages      = []
+    @stdout                = stdout
+    @show_output           = show_output
   end
 
   def run
@@ -33,7 +38,7 @@ class Rdm::SpecRunner::Runner
         format_string_number = @spec_string_number == 0 ? "" : ":#{@spec_string_number}" 
         @spec_matcher = @spec_file_matches.first + format_string_number
 
-        puts "Following spec matches your input: #{@spec_matcher}"
+        @stdout.puts "Following spec matches your input: #{@spec_matcher}"
       else
         raise Rdm::Errors::SpecMatcherMultipleFiles, @spec_file_matches.join("\n")
       end
@@ -57,7 +62,7 @@ class Rdm::SpecRunner::Runner
   end
 
   def print_message(msg)
-    puts msg
+    @stdout.puts msg
     true
   end
 
@@ -101,7 +106,10 @@ 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, spec_matcher: @spec_matcher
+          package_name: package.name, 
+          package_path: package.path, 
+          spec_matcher: @spec_matcher,
+          show_output:  @show_output
         ).generate
       end
     end
@@ -140,11 +148,12 @@ class Rdm::SpecRunner::Runner
         .map(&:strip)
         .reject(&:empty?) rescue []
       
-      @skipped_packages = skipped_package_list.reject {|line| !package_list.include?(line)}
-      invalid_ignore_packages = skipped_package_list - @skipped_packages
+      @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
 
       if !invalid_ignore_packages.empty?
-        puts "WARNING: #{RUNIGNORE_PATH} contains invalid package names: #{invalid_ignore_packages.inspect}"
+        @stdout.puts "WARNING: #{RUNIGNORE_PATH} contains invalid package names: \n#{invalid_ignore_packages.join("\n")}"
       end
     else
       @skipped_packages = []
@@ -175,5 +184,6 @@ class Rdm::SpecRunner::Runner
     if $? && !$?.success?
       exit(1)
     end
+
   end
 end

data/lib/rdm/templates/init/bin/console

@@ -31,6 +31,6 @@ end
 
 path_to_selected_console = package_consoles[select_result.to_i - 1][:path]
 exit(0) if path_to_selected_console.nil?
-system(path_to_selected_console)
+system("chmod +x #{path_to_selected_console} && #{path_to_selected_console}")