rdm 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 030a4105373d24a3ba5d97a52cb34d0bf2c79d2f
-  data.tar.gz: af38a6d0eeb9354bfe33d1beba9c1d289b75fcd5
+  metadata.gz: 66772ce18f205894e338d4488a739f64251fc1a7
+  data.tar.gz: 787ec81e2d74245cb9c7e8344da6638e4a27a731
 SHA512:
-  metadata.gz: d042a73c45f127800653f8dab0fc5a4cb40c5ab1fdddd0a1c842e2579c245205523389d751099b301a128b89eea3e59a896998ee9764e341b682e0f6c4ece6c3
-  data.tar.gz: 056d522dc8c85d7ebfe1450ad119431bda4e33ccf54c7e0a015ff9c749f0c2de4328836b700f6e32757941a9f25e04e946339825ae632c4d800a4f6ffebdac2d
+  metadata.gz: e14981c363eb19b7c2bd57feaa3af786421821db7872d266132929d70e9555475a9a06d8cd385a9bee808191ab2422d48070c9bdcade6fff0f3c64e7dca9615e
+  data.tar.gz: c3525e1e6ad865d092fe46dab42b7e676864c6e4e8455d861b98f0eaccda2321eaadbba0f233c712efa76dbae70bfb3afdd788a9269ccfb7c310dd0fcb496538

data/bin/rdm-generate

@@ -46,8 +46,8 @@ puts "Generating package #{package_name} to #{options[:path]}"
 
 begin
   Rdm::PackageGenerator.generate_package(current_dir, package_name, options[:path], options[:skip_rspec])
-rescue Errno::ENOENT
-  puts "#{Rdm::SOURCE_FILENAME} not found. Please run on directory containing #{Rdm::SOURCE_FILENAME}"
+rescue Errno::ENOENT => e
+  puts "Error occurred. Possible reasons:\n #{Rdm::SOURCE_FILENAME} not found. Please run on directory containing #{Rdm::SOURCE_FILENAME} \n#{e.inspect}"
 rescue Rdm::Errors::PackageExists
   puts "Error. Package already exist. Package was not generated"
 rescue Rdm::Errors::PackageDirExists

data/bin/rdm-install

@@ -8,6 +8,6 @@ require 'rdm'
 source_path = File.join(`pwd`.chomp, Rdm::SOURCE_FILENAME)
 begin
   Rdm::SourceInstaller.install(source_path)
-rescue Errno::ENOENT
-  puts "#{Rdm::SOURCE_FILENAME} not found. Please run on directory containing #{Rdm::SOURCE_FILENAME}"
-end
+rescue Errno::ENOENT => e
+  puts "Error occurred. Possible reasons:\n #{Rdm::SOURCE_FILENAME} not found. Please run on directory containing #{Rdm::SOURCE_FILENAME} \n#{e.inspect}"
+end

data/lib/rdm.rb

@@ -15,6 +15,7 @@ module Rdm
   require "rdm/config"
   require "rdm/config_scope"
   require "rdm/config_manager"
+  require "rdm/auto_updater"
 
   class << self
     # Initialize current package using Package.rb

data/lib/rdm/auto_updater.rb

@@ -0,0 +1,41 @@
+module Rdm
+  class AutoUpdater
+    class << self
+      def update(path)
+        Rdm::AutoUpdater.new(path).update
+      end
+    end
+
+    attr_accessor :path
+    def initialize(path)
+      @path = path
+    end
+
+    def update
+      begin
+        source_path = find_source_path_in_hierarchy(path)
+        Rdm::SourceInstaller.install(source_path)
+      rescue Rdm::Errors::SourceFileDoesNotExist => e
+        puts "*** #{path} does not include any #{Rdm::SOURCE_FILENAME} in its tree hierarchy!"
+      end
+    end
+
+    def find_source_path_in_hierarchy(some_path)
+      some_path = File.expand_path(some_path)
+      raise SourceFileDoesNotExist if some_path == "/"
+      if is_present?(some_path)
+        return potential_file(some_path)
+      else
+        find_source_path_in_hierarchy(File.dirname(some_path))
+      end
+    end
+
+    def is_present?(some_path)
+      File.exists?(potential_file(some_path))
+    end
+
+    def potential_file(some_path)
+      File.join(some_path, Rdm::SOURCE_FILENAME)
+    end
+  end
+end

data/lib/rdm/errors.rb

@@ -5,5 +5,8 @@ module Rdm
 
     class PackageDirExists < StandardError
     end
+
+    class SourceFileDoesNotExist < StandardError
+    end
   end
 end

data/lib/rdm/package_generator.rb

@@ -49,6 +49,7 @@ class Rdm::PackageGenerator
 
     Dir.chdir(current_dir) do
       ensure_file([package_relative_path, '.gitignore'])
+      ensure_file([package_relative_path, package_subdir_name, package_name, '.gitignore'])
       ensure_file(
         [package_relative_path, package_subdir_name, "#{package_name}.rb"],
         template_content("main_module_file.rb.erb", {package_name_camelized: package_name.camelize})

data/lib/rdm/package_importer.rb

@@ -8,6 +8,7 @@ class Rdm::PackageImporter
     # @param group [Optional<String>] Dependency group
     # @return [Rdm::Package] Current package
     def import_file(package_path, group: nil)
+      ensure_updated(package_path)
       if File.directory?(package_path)
         package_path = File.join(package_path, Rdm::PACKAGE_LOCK_FILENAME)
       end
@@ -25,6 +26,10 @@ class Rdm::PackageImporter
       package
     end
 
+    def ensure_updated(package_path)
+      Rdm::AutoUpdater.update(package_path)
+    end
+
     # Import package and initialize module
     def import_package(package_name, source:, imported_packages: [], imported_configs: [], group: nil)
       return if imported_packages.include?(package_name.to_s)

data/lib/rdm/templates/bin/console_irb

@@ -1,8 +1,11 @@
 #!/usr/bin/env ruby
 require "bundler/setup"
 require "rdm"
+
+ENV["RUBY_ENV"] ||= "development"
 Rdm.init(File.expand_path('../../', __FILE__))
 
+
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 

data/lib/rdm/templates/tests/run

@@ -0,0 +1,244 @@
+#!/usr/bin/env ruby
+
+## # run own tests:
+## $ TEST_RUN=1 tests/run
+
+## # run application tests:
+## $ tests/run
+
+## # run package tests:
+## $ tests/run commands
+
+## # run spec in a package:
+## $ tests/run commands some_spec.rb
+
+ENV['RUBY_ENV'] = 'test'
+require 'rdm'
+
+module SpecRunner
+  class InputParams
+    attr_accessor :package_name, :spec_matcher, :run_all
+    def initialize(argv)
+      @package_name = argv[0].to_s if !argv[0].nil?
+      @spec_matcher = argv[1].to_s if !argv[1].nil?
+      @run_all      = !@package_name
+    end
+  end
+
+  class CommandParams
+    attr_accessor :package_name, :package_path, :spec_matcher, :spec_count, :command
+  end
+
+  class CommandGenerator
+    attr_accessor :package_name, :package_path, :spec_matcher
+    def initialize(package_name:, package_path:, spec_matcher:)
+      @package_name = package_name
+      @package_path = package_path
+      @spec_matcher = spec_matcher
+    end
+
+    def spec_count
+      Dir[File.join(package_path, 'spec/**/*_spec.rb')].size
+    end
+
+    def command
+      "print_message(
+          '**** Package: #{package_name}  *****') \\
+            && system('cd #{package_path} \\
+            && bundle exec rspec --color --tty #{spec_matcher}', out: $stdout, err: :out)"
+    end
+
+    def generate
+      CommandParams.new.tap do |cp|
+        cp.package_name = package_name
+        cp.package_path = package_path
+        cp.command      = command
+        cp.spec_count   = spec_count
+      end
+    end
+  end
+
+  class PackageFetcher
+    def packages
+      Rdm::SourceParser.read_and_init_source(rdm_packages_path).packages
+    end
+
+    def rdm_packages_path
+      File.join(app_path, 'Rdm.packages')
+    end
+
+    def app_path
+      File.join(File.dirname(__FILE__), '..')
+    end
+  end
+
+  class View
+    def packages_menu(prepared_command_params)
+      prepared_command_params
+      .sort_by{|x| x.package_path }
+      .map{|x| " - #{x.package_name} (#{x.spec_count} spec files)"}
+      .join("\n")
+    end
+
+    def package_not_found_message(package_name, prepared_command_params)
+      "Package #{package_name} not found! \nPossible packages:\n\n#{packages_menu(prepared_command_params)}"
+    end
+
+    def missing_specs_message(skipped_packages)
+      "NO SPECS FOUND FOR PACKAGES: \n#{skipped_packages.map{|x| " - #{x}"}.join("\n")}\n\n**** SPECS *****: "
+    end
+
+    def no_specs_for_package(package_name)
+      "Package #{package_name} has no specs to execute!"
+    end
+  end
+
+  class Runner
+    attr_accessor :input_params
+    attr_accessor :skipped_packages
+    attr_accessor :prepared_command_params
+    attr_accessor :command
+    def initialize(input_params)
+      @input_params     = input_params
+      @skipped_packages = []
+    end
+
+    def run
+      prepare!
+      check_input_params!
+      display_missing_specs
+      execute_command
+    end
+
+    def packages
+      @packages ||= PackageFetcher.new.packages
+    end
+
+    def view
+      @view ||= View.new
+    end
+
+    def print_message(msg)
+      puts msg
+      true
+    end
+
+    def exit_with_message(msg)
+      print_message(msg)
+      exit 1
+    end
+
+    def check_input_params!
+      if input_params.package_name
+        if not is_package_included?(input_params.package_name)
+          exit_with_message(
+            view.package_not_found_message(input_params.package_name, prepared_command_params)
+          )
+        end
+
+        if skipped_packages.include?(input_params.package_name)
+          exit_with_message(
+            view.no_specs_for_package(input_params.package_name)
+          )
+        end
+      end
+    end
+
+    def is_package_included?(package_name)
+      prepared_command_params.select{|x|
+        x.package_name == package_name
+      }.size > 0
+    end
+
+    def prepare!
+      prepared_command_params = []
+      skipped_packages        = []
+      command                 = nil
+      prepare_command_params
+      prepare_skipped_packages
+      prepare_command
+    end
+
+    def prepare_command_params
+      @prepared_command_params ||= begin
+        packages.map{|name, package|
+          CommandGenerator.new(
+            package_name: package.name, package_path: package.path, spec_matcher: spec_matcher
+          ).generate
+        }
+      end
+    end
+
+    def prepare_skipped_packages
+      prepared_command_params
+        .select{|cp| cp.spec_count == 0}
+        .map{|cp|  skipped_packages << cp.package_name}
+    end
+
+    def prepare_command
+      @command ||= begin
+        if input_params.package_name
+          prepare_single_package_command(input_params.package_name)
+        else
+          prepare_command_for_packages(prepared_command_params)
+        end
+      end
+    end
+
+    def prepare_single_package_command(package_name)
+      selected = prepared_command_params.select{|cmd_params|
+        cmd_params.package_name == package_name
+      }
+      prepare_command_for_packages(selected)
+    end
+
+    def prepare_command_for_packages(packages_command_params)
+      packages_command_params.select{|cmd_params|
+        cmd_params.spec_count > 0
+      }.sort_by{|cmd_params|
+        - cmd_params.spec_count
+      }.map{|cmd_params|
+        cmd_params.command
+      }.join(" && ")
+    end
+
+    def display_missing_specs
+      if !skipped_packages.empty?
+        print_message view.missing_specs_message(skipped_packages)
+      end
+    end
+
+    def execute_command
+      eval(command)
+      if !$?.success?
+        exit(1)
+      end
+    end
+
+    def spec_matcher
+      input_params.spec_matcher || ""
+    end
+  end
+
+  def self.run
+    input_params = InputParams.new(ARGV.clone)
+    Runner.new(input_params).run
+  end
+end
+
+unless ENV["TEST_RUN"]
+  SpecRunner.run
+else
+  require "minitest/autorun"
+  describe SpecRunner::Runner do
+    before do
+      @runner = SpecRunner::Runner.new({})
+    end
+
+    describe "works " do
+      it "assert true" do
+        assert 2 == 2
+      end
+    end
+  end
+end

data/lib/rdm/version.rb

@@ -1,3 +1,3 @@
 module Rdm
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdm
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Droid Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - example/server/package/server.rb
 - example/server/server.rb
 - lib/rdm.rb
+- lib/rdm/auto_updater.rb
 - lib/rdm/config.rb
 - lib/rdm/config_manager.rb
 - lib/rdm/config_scope.rb
@@ -119,6 +120,7 @@ files:
 - lib/rdm/templates/main_module_file.rb.erb
 - lib/rdm/templates/package.rb.erb
 - lib/rdm/templates/spec/spec_helper.rb
+- lib/rdm/templates/tests/run
 - lib/rdm/version.rb
 - rdm.gemspec
 - spec/fixtures/SampleSource.rb