rdm 0.4.7 → 0.4.8

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

@@ -1,35 +1,3 @@
 #!/usr/bin/env ruby
 
-ENV['RUBY_ENV'] = 'test'
-require 'rdm'
-
-REVISION = ARGV.clone.first
-PATH     = File.expand_path(__FILE__)
-
-Rdm.root(__FILE__)
-
-begin
-  changed_packages = Rdm::Handlers::DiffPackageHandler.handle(
-    path:     PATH, 
-    revision: REVISION
-  )
-
-  puts "Tests for the following packages will run:"
-  puts changed_packages
-
-  changed_packages.each do |package| 
-    Rdm::SpecRunner.run(
-      package:               package,
-      path:                  PATH,
-      skip_ignored_packages: false,
-      show_missing_packages: true
-    )
-  end
-  
-
-rescue Rdm::Errors::GitRepositoryNotInitialized
-  puts "Git repository is not initialized. Use `git init .`"
-  exit(1)
-end
-
-
+system("bundle exec rdm rspec.diff_run #{ARGV.join(' ')}", out: STDOUT, err: :out)

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

@@ -1,41 +1,3 @@
 #!/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'
-
-Rdm.root(__FILE__)
-
-if ENV['TEST_RUN']
-  require 'minitest/autorun'
-  describe Rdm::SpecRunner::Runner do
-    before do
-      @runner = Rdm::SpecRunner::Runner.new({})
-    end
-
-    describe 'works ' do
-      it 'assert true' do
-        assert 2 == 2
-      end
-    end
-  end
-else
-  Rdm::SpecRunner.run(
-    package:          ARGV.clone.first,
-    spec_matcher:     ARGV.clone[1],,
-    path:             File.expand_path(__FILE__),
-    skip_ignored_packages: true,
-    show_missing_packages: true
-  )
-end
+system("bundle exec rdm rspec.run #{ARGV.join(' ')}", out: STDOUT, err: :out)

data/lib/rdm/version.rb

@@ -1,3 +1,3 @@
 module Rdm
-  VERSION = '0.4.7'.freeze
+  VERSION = '0.4.8'.freeze
 end

data/spec/helpers/example_project_helper.rb

@@ -28,190 +28,5 @@ module ExampleProjectHelper
       
       FileUtils.rm_rf(File.join(@example_project_path, '.rdm'))
     end
-
-  #   FileUtils.mkdir_p(File.join(path, 'configs'))
-  #   FileUtils.mkdir_p(File.join(path, 'application/web/package/web'))
-  #   FileUtils.mkdir_p(File.join(path, 'domain/core/package/core'))
-  #   FileUtils.mkdir_p(File.join(path, 'subsystems/mailing_system/package/mailing_system'))
-  #   FileUtils.mkdir_p(File.join(path, 'subsystems/api/package/api'))
-  #   FileUtils.mkdir_p(File.join(path, 'tests'))
-    
-  #   if package_template
-  #     FileUtils.mkdir_p(File.join(path, '.rdm/templates/package'))
-  #     File.open(File.join(path, '.rdm/templates/package/Package.rb'), 'w') do |f|
-  #       f.write <<~EOF
-  #         package do
-  #           name '<%= package_name %>'
-  #           version "1.0"
-  #         end
-
-  #         dependency do
-  #           # import "core"
-  #         end
-  #       EOF
-  #     end
-  #   end
-
-  #   File.open(File.join(path, 'tests/run'), 'w') do |f| 
-  #     f.write <<~EOF
-  #       # how to start tests for your project with rdm
-  #     EOF
-  #   end
-
-  #   File.open(File.join(path, 'Readme.md'), 'w') do |f| 
-  #     f.write <<~EOF
-  #       Some content about your project
-  #     EOF
-  #   end
-
-  #   File.open(File.join(path, 'Gemfile'), 'w') do |f| 
-  #     f.write <<~EOF
-  #       gem 'rdm'
-  #     EOF
-  #   end
-
-  #   File.open(File.join(path, 'Gemfile.lock'), 'w') do |f| 
-  #     f.write <<~EOF
-  #       gem 'rdm'
-  #     EOF
-  #   end
-
-  #   File.open(File.join(path, 'Gemfile.lock'), 'w') do |f| 
-  #     f.write <<~EOF
-  #       gem 'rdm'
-  #     EOF
-  #   end
-
-  #   File.open(File.join(path, Rdm::SOURCE_FILENAME), 'w') do |f| 
-  #     f.write <<~EOF
-  #       setup do
-  #         role                "production"
-  #         configs_dir         "configs"
-  #         config_path         ":configs_dir/:config_name/default.yml"
-  #         role_config_path    ":configs_dir/:config_name/:role.yml"
-  #         package_subdir_name "package"
-  #         compile_path        "/tmp/example_compile"
-  #         compile_ignore_files [
-  #           '.gitignore',
-  #           '.byebug_history',
-  #           '.irbrc',
-  #           '.rspec',
-  #           '*_spec.rb',
-  #           '*.log'
-  #         ]
-  #         compile_add_files [
-  #           'Gemfile',
-  #           'Gemfile.lock'
-  #         ]
-  #       end
-
-  #       package "application/web"
-  #       package "domain/core"
-  #       package "subsystems/api"
-  #     EOF
-  #   end
-
-  #   File.open(File.join(path, "application/web", Rdm::PACKAGE_FILENAME), 'w') do |f|
-  #     f.write <<~EOF
-  #       package do
-  #         name "web"
-  #         version "1.0"
-  #       end
-
-  #       dependency do
-  #         import "core"
-  #       end
-  #     EOF
-  #   end
-
-  #   File.open(File.join(path, "domain/core", Rdm::PACKAGE_FILENAME), 'w') do |f|
-  #     f.write <<~EOF
-  #       package do
-  #         name "core"
-  #         version "1.0"
-  #       end
-
-  #       dependency do
-  #       end
-  #     EOF
-  #   end
-
-  #   File.open(File.join(path, "subsystems/api", Rdm::PACKAGE_FILENAME), 'w') do |f|
-  #     f.write <<~EOF
-  #       package do
-  #         name "api"
-  #         version "1.0"
-  #       end
-
-  #       dependency do
-  #         import "web"
-  #       end
-  #     EOF
-  #   end
-
-  #   File.open(File.join(path, "application/web/package/web/", "sample_controller.rb"), 'w') do |f|
-  #     f.write <<~EOF
-  #       class Web::SampleController
-  #         def perform
-  #           sample_service.perform
-  #         end
-
-  #         def sample_service
-  #           Core::SampleService.new
-  #         end
-  #       end
-  #     EOF
-  #   end
-
-  #   File.open(File.join(path, "application/web/package/", "web.rb"), 'w') do |f|
-  #     f.write <<~EOF
-  #       require 'active_support'
-  #       require 'active_support/dependencies'
-  #       require 'active_support/core_ext'
-
-  #       ActiveSupport::Dependencies.autoload_paths << Pathname.new(__FILE__).parent.to_s
-
-  #       module Web
-  #       end
-  #     EOF
-  #   end
-
-  #   File.open(File.join(path, "domain/core/package/core/", "sample_service.rb"), 'w') do |f|
-  #     f.write <<~EOF
-  #       class Core::SampleService
-  #         def perform
-  #           puts "Core::SampleService called..."
-  #         end
-  #       end
-  #     EOF
-  #   end
-
-  #   File.open(File.join(path, "domain/core/package/", "core.rb"), 'w') do |f|
-  #     f.write <<~EOF
-  #       require 'active_support'
-  #       require 'active_support/dependencies'
-  #       require 'active_support/core_ext'
-
-  #       ActiveSupport::Dependencies.autoload_paths << Pathname.new(__FILE__).parent.to_s
-
-  #       module Core
-  #       end
-  #     EOF
-  #   end
-
-  #   File.open(File.join(path, "subsystems/api/package", "api.rb"), 'w') do |f|
-  #     f.write <<~EOF
-  #       require 'active_support'
-  #       require 'active_support/dependencies'
-  #       require 'active_support/core_ext'
-
-  #       ActiveSupport::Dependencies.autoload_paths << Pathname.new(__FILE__).parent.to_s
-
-  #       module Api
-  #       end
-  #     EOF
-  #   end
-
-  #   return path
   end
 end

data/spec/rdm/cli/diff_spec_runner_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Rdm::CLI::DiffSpecRunner do
+  include ExampleProjectHelper
+  include GitCommandsHelper
+
+  subject      { described_class }
+  let(:stdout) { SpecLogger.new }
+
+  before { initialize_example_project }
+  after do 
+    reset_example_project
+    stdout.clean
+  end
+
+  describe '::run' do
+    context 'for not initialized git repository' do
+      it 'puts message to initialize git repository' do
+        subject.run(path: example_project_path, stdout: stdout)
+
+        expect(stdout.output).to include("Git repository is not initialized. Use `git init .`")
+      end
+    end
+
+    context 'for initialized git repository' do
+      context 'if no files were changed' do
+        it 'puts message about no changed packages were found' do
+          git_initialize_repository(example_project_path)
+          git_commit_changes(example_project_path)
+
+          subject.run(path: example_project_path, stdout: stdout)
+
+          expect(stdout.output).to include("No modified packages were found. Type `git add .` to index all changes...")
+        end
+      end
+
+      context 'if any files were changed' do
+        it 'puts the list of changed packages' do
+          git_initialize_repository(example_project_path)
+          git_commit_changes(example_project_path)
+
+          File.open(
+            File.join(example_project_path, 'server/package/server.rb'), 'w+'
+          ) {|f| f.write '# some comment message'}
+
+          git_index_changes(example_project_path)
+
+          subject.run(path: example_project_path, stdout: stdout, show_output: false)
+
+          expect(stdout.output).to include("Tests for the following packages will run:\n  - server\n\n")
+        end
+      end
+    end
+  end
+end

data/spec/rdm/cli/init_spec.rb

@@ -23,8 +23,6 @@ describe Rdm::CLI::Init do
         ensure_exists("Rdm.packages")
         ensure_exists("Gemfile")
         ensure_exists("Readme.md")
-        ensure_exists("tests/run")
-        ensure_exists("tests/diff_run")
       end
     end
 

data/spec/rdm/gen/init_spec.rb

@@ -17,7 +17,6 @@ describe Rdm::Gen::Init do
         ensure_exists("Rdm.packages")
         ensure_exists("Gemfile")
         ensure_exists("Readme.md")
-        ensure_exists("tests/run")
         ensure_exists("bin/console")
         ensure_exists("env_files/test.env")
         ensure_exists("env_files/development.env")
@@ -37,6 +36,15 @@ describe Rdm::Gen::Init do
         ensure_exists(".rdm/templates/package/bin/console")
       end
     end
+
+    it "has generated config templates" do
+      subject.generate(current_path: example_project_path, stdout: stdout)
+
+      FileUtils.cd(example_project_path) do
+        ensure_exists(".rdm/templates/configs/<%=config_path%>")
+        ensure_exists(".rdm/templates/configs/<%=role_config_path%>")
+      end
+    end
   end
 
   context "prevents double execution" do

data/spec/rdm/handlers/dependencies_handler_spec.rb

@@ -17,6 +17,15 @@ describe Rdm::Handlers::DependenciesHandler do
         )
       ).to match(["core", "repository", "web"])
     end
+
+    it "raises Rdm::Errors::PackageDoesNotExist for invalid package name" do
+      expect{
+        subject.show_names(
+          package_name: 'invalid_package',
+          project_path: example_project_path
+        )
+      }.to raise_error(Rdm::Errors::PackageDoesNotExist)
+    end
   end
 
   context ":show_packages" do
@@ -33,6 +42,15 @@ describe Rdm::Handlers::DependenciesHandler do
     it "returns array with proper size" do
       expect(result.first).to be_a Rdm::Package
     end
+
+    it "raises Rdm::Errors::PackageDoesNotExist for invalid package name" do
+      expect{
+        subject.show_packages(
+          package_name: 'invalid_package',
+          project_path: example_project_path
+        )
+      }.to raise_error(Rdm::Errors::PackageDoesNotExist)
+    end
   end
 
   context ":format_for_draw" do
@@ -82,5 +100,14 @@ describe Rdm::Handlers::DependenciesHandler do
         )
       end
     end
+
+    it "raises Rdm::Errors::PackageDoesNotExist for invalid package name" do
+      expect{
+        subject.draw(
+          package_name: 'invalid_package',
+          project_path: example_project_path
+        )
+      }.to raise_error(Rdm::Errors::PackageDoesNotExist)
+    end
   end
 end

data/spec/rdm/source_parser_spec.rb

@@ -98,9 +98,8 @@ describe Rdm::SourceParser do
       context "with undefined role" do
         it "puts warning message" do
           Rdm::Utils::FileUtils.change_file @rdm_source_file do |line|
-            line.include?('env_file_name "production"') ? 'env_file_name "stading"' : line
+            line.include?("ENV['ENV_FILE'] || \"production\"") ? 'env_file_name "stading"' : line
           end
-          
           subject.read_and_init_source(@rdm_source_file, stdout: stdout)
 
           expect(stdout.output).to include("WARNING! Environment file 'stading' was not found. Please, add /tmp/example/env_files/stading.env file...")

data/spec/rdm/spec_runner/runner_spec.rb

@@ -3,10 +3,68 @@ require 'spec_helper'
 describe Rdm::SpecRunner::Runner do
   include ExampleProjectHelper
 
-  before { initialize_example_project }
-  after  { reset_example_project }
+  let(:stdout) { SpecLogger.new }
 
-  it 'run some test' do
+  before  { initialize_example_project }
+  after   { reset_example_project }
 
+  describe "::run" do
+    it 'run all test without errors' do  
+      expect{
+        described_class.new(
+          path:                  example_project_path, 
+          package:               nil, 
+          spec_matcher:          nil, 
+          show_missing_packages: false,
+          skip_ignored_packages: false,
+          stdout:                stdout,
+          show_output:           false
+        ).run
+      }.not_to raise_error 
+    end
+
+    it 'run tests for specified package without errors' do  
+      expect{
+        described_class.new(
+          path:                  example_project_path, 
+          package:               'repository', 
+          spec_matcher:          nil, 
+          show_missing_packages: false,
+          skip_ignored_packages: false,
+          stdout:                stdout,
+          show_output:           false
+        ).run
+      }.not_to raise_error 
+    end
+
+    it 'run tests for specified package and spec_matcher without errors' do  
+      expect{
+        described_class.new(
+          path:                  example_project_path, 
+          package:               'repository', 
+          spec_matcher:          'example_spec.rb', 
+          show_missing_packages: false,
+          skip_ignored_packages: false,
+          stdout:                stdout,
+          show_output:           false
+        ).run
+      }.not_to raise_error 
+    end
+
+    it 'execute spec content' do
+      described_class.new(
+        path:                  example_project_path, 
+        package:               'repository', 
+        spec_matcher:          'example_spec.rb', 
+        show_missing_packages: false,
+        skip_ignored_packages: false,
+        stdout:                stdout,
+        show_output:           false
+      ).run
+
+      expect(
+        File.read(File.join(example_project_path, 'infrastructure/repository/fixture.txt'))
+      ).to eq('Repository spec working here!')
+    end
   end
 end