rdm 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec7392add4bff744020f08554065f66d2b1c2155
-  data.tar.gz: 39ac10317b4c8ae71816e6844ec922b06025a74c
+  metadata.gz: 396c2803b01c338a4c6297bc2f2a5df629d96a9b
+  data.tar.gz: 45f399f0dd90357c6754fc9c35562b7fc3375b45
 SHA512:
-  metadata.gz: 705e6d22a68e2c9e5c2499bc197885bcb624f02777ba0601647cee6e93a034afb6c3c91dbef73da21ff5381d5e4f4d103f423193eaf6490c0fc0113badca3c21
-  data.tar.gz: 1a00c19c72dcdc189d84f9e1ac11412963bc04b7e4df69d3a6f1393bce683d9ae269180f35db35917bab16e1f6708f3778fe8f3bccff80dcaae91970fd1da638
+  metadata.gz: f65d094c45b7e596bf7bd7950e6a3fa8c167171db762e4e060080f5907c9ad47b4ed0c820951e7f11bac00266634b302b16673e4fc11d246065064c17957f9ab
+  data.tar.gz: f584ad64900d94cc77e4596245ff006d5a1560f8d77cb2076de5199798bc20e59ea88c911a4f8c2234abdcb44968eded70a4d592e85e51c74b0378689e872b3c

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - 2.2.2
+  # - 2.2.2
   - 2.3.0
   - 2.4.0
+  - 2.4.1
 
 before_install:
   - gem update --system

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rdm (0.4.1)
+    rdm (0.4.2)
       activesupport
       commander (~> 4.4)
 
@@ -25,7 +25,7 @@ GEM
     diff-lcs (1.3)
     docile (1.1.5)
     highline (1.7.8)
-    i18n (0.8.4)
+    i18n (0.8.6)
     json (2.0.3)
     minitest (5.10.2)
     parser (2.3.3.1)

data/bin/rdm

@@ -33,7 +33,10 @@ class RdmCliRunner
           console:      "irb",
           current_path: `pwd`.strip
         }
-        options_with_defaults = defaults.merge!(options.__hash__)
+        options_hash = options.__hash__
+        options_hash.delete(:trace)
+
+        options_with_defaults = defaults.merge!(options_hash)
         Rdm::CLI::Init.run(options_with_defaults)
       end
     end
@@ -58,7 +61,10 @@ class RdmCliRunner
           package_name: package_name,
           path:         package_name.downcase.gsub(/\s+/, '_')
         }
-        options_with_defaults = defaults.merge!(options.__hash__)
+        options_hash = options.__hash__
+        options_hash.delete(:trace)
+
+        options_with_defaults = defaults.merge!(options_hash)
         Rdm::CLI::GenPackage.run(options_with_defaults)
       end
     end
@@ -106,10 +112,13 @@ class RdmCliRunner
       c.option '--path [DESTINATION_PATH]', String, 'Location of generated folders'
       c.option '--OPTION_NAME [OPTION_VALUE]', String, 'Local variables for template handler'
       c.action do |args, options|
-        options_hash = options.__hash__
+        options_hash  = options.__hash__
+        options_hash.delete(:trace)
+        
+        template_name = args.first || ""
 
         Rdm::CLI::TemplateGenerator.run(
-          template_name: (args.first || ""),
+          template_name: template_name,
           current_path:  `pwd`.chomp,
           local_path:    options_hash.delete(:path),
           locals:        options_hash
@@ -133,6 +142,26 @@ class RdmCliRunner
       end
     end
 
+    command :"gen.config" do |c|
+      c.syntax = 'rdm gen.config CONFIG_NAME --CONFIG_KEY=CONFIG_VALUE'
+      c.description = 'generate config file with passed arguments'
+      c.summary = '> ' + c.description
+      c.example 'generate config `mailing_system` with `host: localhost`', 
+                'rdm gen.config mailing_system --host=localhost'
+      
+      c.action do |args, options|
+        config_name  = args.first || ""
+        options_hash = options.__hash__
+        options_hash.delete(:trace)
+
+        Rdm::CLI::Config.run(
+          config_name:  config_name,
+          current_path: `pwd`.chomp,
+          config_data:  options_hash
+        )
+      end
+    end
+
     run!
   end
 end

data/example/.runignore

@@ -0,0 +1,4 @@
+# type in packages, they will be ignored upon the start of the specs
+# for example:
+# entities
+# repository

data/example/configs/app/default.yml

@@ -1 +1,2 @@
-app_name: "Sample app"
+app:
+  name: "Sample app"

data/example/configs/app/production.yml

@@ -1 +1,2 @@
-app_name: "Sample app (Production)"
+app:
+  name: "Sample app (Production)"

data/example/tests/diff_run

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+
+ENV['RUBY_ENV'] = 'test'
+require 'rdm'
+
+REVISION = ARGV.clone.first
+PATH     = File.expand_path(__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,
+      show_missing_packages: false
+    )
+  end
+  
+
+rescue Rdm::Errors::GitRepositoryNotInitialized
+  puts "Git repository is not initialized. Use `git init .`"
+  exit(1)
+end
+
+

data/example/tests/run

@@ -0,0 +1,42 @@
+#!/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'
+
+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!) }
+
+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.last,
+    path:             File.expand_path(__FILE__),
+    skipped_packages: skipped_packages,
+    show_missing_packages: true
+  )
+end

data/lib/rdm.rb

@@ -15,6 +15,7 @@ module Rdm
   require 'rdm/cli/diff_package'
   require 'rdm/cli/template_generator'
   require 'rdm/cli/dependencies_controller'
+  require 'rdm/cli/config'
 
   # Runtime part
   require 'rdm/config'
@@ -27,10 +28,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'
 
   # Package part
   require 'rdm/packages/compiler_service'
@@ -39,6 +42,7 @@ module Rdm
   # Handlers part
   require 'rdm/gen/package'
   require 'rdm/gen/init'
+  require 'rdm/gen/config'
   require 'rdm/handlers/diff_package_handler'
   require 'rdm/handlers/template_handler'
   require 'rdm/handlers/dependencies_handler'

data/lib/rdm/cli/config.rb

@@ -0,0 +1,31 @@
+class Rdm::CLI::Config
+  def self.run(current_path:, config_name:, config_data: {}, stdout: $stdout)
+    Rdm::CLI::Config.new(current_path, config_name, config_data, stdout).run
+  end
+
+  def initialize(current_path, config_name, config_data, stdout)
+    @current_path = current_path
+    @config_name  = config_name
+    @config_data  = config_data
+    @stdout       = stdout
+  end
+
+  def run
+    generated_files = Rdm::Gen::Config.generate(
+      current_path: @current_path,
+      config_name:  @config_name,
+      config_data:  @config_data
+    )
+
+    puts "Following files were generated:"
+    puts generated_files
+  rescue Errno::ENOENT => e
+    @stdout.puts "Error occurred. Possible reasons:\n #{Rdm::SOURCE_FILENAME} not found. Please run on directory containing #{Rdm::SOURCE_FILENAME} \n#{e.inspect}"
+  rescue NoMethodError => e
+    @stdout.puts e.message
+  rescue Rdm::Errors::SourceFileDoesNotExist => e
+    @stdout.puts "Rdm.packages was not found. Run 'rdm init' to create it"
+  rescue Rdm::Errors::ConfigExists => e
+    @stdout.puts "Config :#{e.message} already exists! Use other name"
+  end
+end

data/lib/rdm/config_locals.rb

@@ -0,0 +1,11 @@
+class Rdm::ConfigLocals
+  def initialize(locals = {})
+    @locals = locals
+  end
+
+  def to_s
+    @locals
+      .map {|key, value| "#{key}: #{value}"}
+      .join("\n")
+  end
+end

data/lib/rdm/gen/config.rb

@@ -0,0 +1,61 @@
+class Rdm::Gen::Config
+  TEMPLATE_NAME = 'configs'
+
+  def self.generate(config_name:, current_path:, config_data: {})
+    Rdm::Gen::Config.new(config_name, current_path, config_data = {}).generate
+  end
+
+  def initialize(config_name, current_path, config_data)
+    @current_path = current_path
+    @config_name  = config_name
+    @source       = get_source
+
+    @config_locals  = Rdm::ConfigLocals.new(config_data)
+  end
+
+  def generate
+    @source.config(@config_name)
+
+    @locals = {
+      config_name:      @config_name,
+      config_locals:    @config_locals,
+      config_path:      config_path(@config_name),
+      role_config_path: role_config_path(@config_name)
+    }
+
+    generated_files = Rdm::Handlers::TemplateHandler.generate(
+      current_path:       @current_path,
+      locals:             @locals,
+      template_name:      TEMPLATE_NAME,
+      local_path:         './'
+    )
+
+    Rdm::SourceComposer.run(@source)
+    
+    generated_files
+  end
+
+  private 
+
+  def get_source
+    @source ||= Rdm::SourceParser.read_and_init_source(Rdm::SourceLocator.locate(@current_path))
+  end
+
+  def config_path(config_name)
+    Rdm.settings.read_setting(
+      :config_path, 
+      vars: { 
+        config_name: config_name
+      }
+    )
+  end
+
+  def role_config_path(config_name)
+    Rdm.settings.read_setting(
+      :role_config_path, 
+      vars: { 
+        config_name: config_name
+      }
+    )
+  end
+end

data/lib/rdm/gen/package.rb

@@ -17,14 +17,17 @@ module Rdm
         @package_name = package_name
         @local_path   = local_path
         @locals       = locals
+        @source       = get_source
       end
 
       def create
-        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)
+        @source.package(@local_path)
 
-        File.open(File.join(source.root_path, Rdm::SOURCE_FILENAME), 'a+') {|f| f.write("\npackage '#{@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(
           template_name: TEMPLATE_NAME,
@@ -34,7 +37,7 @@ module Rdm
         )
       end
 
-      def source
+      def get_source
         @source ||= Rdm::SourceParser.read_and_init_source(Rdm::SourceLocator.locate(@current_path))
       end
     end

data/lib/rdm/handlers/template_handler.rb

@@ -79,7 +79,7 @@ module Rdm
         template_files_list.map! do |path|
           rendered_abs_path = Rdm::Templates::TemplateRenderer.handle(get_destination_path(path), @locals)
           rendered_rel_path = Pathname.new(rendered_abs_path).relative_path_from Pathname.new(project_path)
-          
+
           if File.file?(rendered_abs_path) && File.exists?(rendered_abs_path)
             @stdout.puts "Warning! #{rendered_rel_path} already exists. Skipping file creation..."
             next
@@ -89,12 +89,11 @@ module Rdm
             FileUtils.mkdir_p rendered_abs_path
             next
           end
-          
+
           rendered_file_content = handle_file_content?(path) ?
             Rdm::Templates::TemplateRenderer.handle(File.read(path), @locals) :
             File.read(path)
             
-            
           FileUtils.mkdir_p(File.dirname(rendered_abs_path))
           File.open(rendered_abs_path, 'w') { |f| f.write rendered_file_content }
 

data/lib/rdm/settings.rb

@@ -1,4 +1,6 @@
 class Rdm::Settings
+  attr_reader :settings
+
   SETTING_KEYS = [
     :role, :package_subdir_name, :configs_dir, :config_path, :role_config_path,
     :silence_missing_package_file, :silence_missing_package, :compile_path,
@@ -24,13 +26,14 @@ class Rdm::Settings
     ])
     compile_add_files([
       'Gemfile',
-      'Gemfile.lock',
+      'Gemfile.lock'
     ])
     compile_path('/tmp/rdm/:package_name')
   end
 
   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
@@ -39,7 +42,8 @@ class Rdm::Settings
     if value.nil? && !block_given?
       read_setting(key)
     else
-      write_setting(key, value || block)
+      write_value = value.nil? ? block : value
+      write_setting(key, write_value)
     end
   end
 

data/lib/rdm/source.rb

@@ -16,7 +16,10 @@ class Rdm::Source
   # Add config to list of known configs
   # @param config_name [String] Config name
   def config(config_name)
-    @config_names << config_name.to_s
+    config_name = config_name.to_s
+    raise Rdm::Errors::ConfigExists, config_name if @config_names.include?(config_name)
+
+    @config_names << config_name
   end
 
   # Add package to list of known packages

data/lib/rdm/source_composer.rb

@@ -0,0 +1,38 @@
+class Rdm::SourceComposer
+  def self.run(source)
+    Rdm::SourceComposer.new(source).run
+  end
+
+  def initialize(source)
+    @source  = source
+    @content = []
+  end
+
+  def run
+    @content.push "setup do"
+    Rdm.settings.settings.each do |setting, value|
+      @content.push "  #{setting} #{format_value(value)}"
+    end
+    @content.push "end"
+    
+    @content.push "\n"
+
+    @source.config_names.each do |config, _|
+      @content.push "config :#{config}"
+    end
+
+    @content.push "\n"
+
+    @source.package_paths.each do |package, _|
+      @content.push "package \"#{package}\""
+    end
+
+    File.open(Rdm.root(@source.root_path), 'w') {|f| f.puts @content}
+  end
+
+  def format_value(value)
+    return "\"#{value}\""  if value.is_a?(String)
+    
+    value.to_s
+  end
+end

data/lib/rdm/spec_runner.rb

@@ -1,5 +1,17 @@
 module Rdm::SpecRunner
-  def self.run(path: nil, package: nil, spec_matcher: nil)
-    Rdm::SpecRunner::Runner.new(path: path, package: package, spec_matcher: spec_matcher).run
+  def self.run(
+    path:                  nil, 
+    package:               nil, 
+    spec_matcher:          nil, 
+    show_missing_packages: nil, 
+    skipped_packages:      []
+  )
+    Rdm::SpecRunner::Runner.new(
+      path:                  path, 
+      package:               package, 
+      spec_matcher:          spec_matcher, 
+      show_missing_packages: show_missing_packages,
+      skipped_packages:      skipped_packages
+    ).run
   end
 end

data/lib/rdm/spec_runner/runner.rb

@@ -1,20 +1,28 @@
 class Rdm::SpecRunner::Runner
-  attr_accessor :skipped_packages
+  attr_accessor :no_specs_packages
   attr_accessor :prepared_command_params
   attr_accessor :command
   
-  def initialize(package: nil, spec_matcher: nil, path: nil)
-    @package          = package,
-    @spec_matcher     = spec_matcher.to_s
-    @skipped_packages = []
-    @path             = path
-    @run_all          = @package.nil?
+  def initialize(
+    package:               nil, 
+    spec_matcher:          nil, 
+    path:                  nil, 
+    show_missing_packages: nil,
+    skipped_packages:      []
+  )
+    @package               = package,
+    @spec_matcher          = spec_matcher.to_s
+    @no_specs_packages     = []
+    @skipped_packages      = skipped_packages
+    @path                  = path
+    @run_all               = @package.nil?
+    @show_missing_packages = show_missing_packages
   end
 
   def run
     prepare!
     check_input_params!
-    display_missing_specs
+    display_missing_specs if @show_missing_packages
     execute_command
   end
 
@@ -44,7 +52,7 @@ class Rdm::SpecRunner::Runner
         )
       end
 
-      if skipped_packages.include?(@package_name)
+      if no_specs_packages.include?(@package_name)
         exit_with_message(
           view.no_specs_for_package(@package_name)
         )
@@ -60,10 +68,10 @@ class Rdm::SpecRunner::Runner
 
   def prepare!
     prepared_command_params = []
-    skipped_packages        = []
+    no_specs_packages       = []
     command                 = nil
     prepare_command_params
-    prepare_skipped_packages
+    prepare_no_specs_packages
     prepare_command
   end
 
@@ -77,10 +85,10 @@ class Rdm::SpecRunner::Runner
     end
   end
 
-  def prepare_skipped_packages
+  def prepare_no_specs_packages
     prepared_command_params
       .select { |cp| cp.spec_count == 0 }
-      .map { |cp| skipped_packages << cp.package_name }
+      .map { |cp| no_specs_packages << cp.package_name }
   end
 
   def prepare_command
@@ -101,17 +109,24 @@ class Rdm::SpecRunner::Runner
   end
 
   def prepare_command_for_packages(packages_command_params)
-    packages_command_params.select do |cmd_params|
-      cmd_params.spec_count > 0
-    end.sort_by do |cmd_params|
-      - cmd_params.spec_count
-    end.map(&:command).join(' && ')
+    packages_command_params
+      .select  { |cmd_params| cmd_params.spec_count > 0 }
+      .reject  { |cmd_params| @skipped_packages.include?(cmd_params.package_name) }
+      .sort_by { |cmd_params| - cmd_params.spec_count }
+      .map(&:command)
+      .join(' && ')
   end
 
   def display_missing_specs
-    unless skipped_packages.empty?
-      print_message view.missing_specs_message(skipped_packages)
+    unless no_specs_packages.empty?
+      print_message view.missing_specs_message(no_specs_packages)
     end
+
+    unless @skipped_packages.empty?
+      print_message view.skipping_specs_message(@skipped_packages)
+    end
+
+    print_message view.specs_header_message
   end
 
   def execute_command

data/lib/rdm/spec_runner/view.rb

@@ -11,7 +11,15 @@ class Rdm::SpecRunner::View
   end
 
   def missing_specs_message(skipped_packages)
-    "NO SPECS FOUND FOR PACKAGES: \n#{skipped_packages.map { |x| " - #{x}" }.join("\n")}\n\n**** SPECS *****: "
+    "NO SPECS FOUND FOR PACKAGES: \n#{skipped_packages.map { |x| " - #{x}" }.join("\n")}\n\n"
+  end
+
+  def skipping_specs_message(skipped_packages)
+    "FOLLOWING PACKAGES WERE SKIPPED BY .runignore FILE: \n#{skipped_packages.map { |x| " - #{x}" }.join("\n")}\n\n"
+  end
+
+  def specs_header_message
+    "**** SPECS *****"
   end
 
   def no_specs_for_package(package_name)

data/lib/rdm/templates/configs/<%=config_path%>

@@ -0,0 +1,2 @@
+<%=config_name%>:
+  <%=config_locals%>

data/lib/rdm/templates/configs/<%=role_config_path%>

@@ -0,0 +1,2 @@
+<%=config_name%>:
+  <%=config_locals%>

data/lib/rdm/templates/init/.runignore

@@ -0,0 +1,4 @@
+# type in packages, they will be ignored upon the start of the specs
+# for example:
+# entities
+# repository

data/lib/rdm/templates/init/env_files/development.env

@@ -1 +1,3 @@
-RUBY_ENV=development
+RUBY_ENV=development
+
+APP_NAME=Application

data/lib/rdm/templates/init/env_files/production.env

@@ -1 +1,3 @@
-RUBY_ENV=production
+RUBY_ENV=production
+
+APP_NAME=Application

data/lib/rdm/templates/init/env_files/test.env

@@ -1 +1,3 @@
-RUBY_ENV=test
+RUBY_ENV=test
+
+APP_NAME=Application

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

@@ -12,14 +12,17 @@ begin
     revision: REVISION
   )
 
-  puts "No changed packages found!" if changed_packages.count == 0
+  puts "Tests for the following packages will run:"
+  puts changed_packages
 
   changed_packages.each do |package| 
     Rdm::SpecRunner.run(
-      package:      package,
-      path:         PATH
+      package:               package,
+      path:                  PATH,
+      show_missing_packages: false
     )
   end
+  
 
 rescue Rdm::Errors::GitRepositoryNotInitialized
   puts "Git repository is not initialized. Use `git init .`"

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

@@ -15,6 +15,9 @@
 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!) }
+
 if ENV['TEST_RUN']
   require 'minitest/autorun'
   describe Rdm::SpecRunner::Runner do
@@ -30,8 +33,10 @@ if ENV['TEST_RUN']
   end
 else
   Rdm::SpecRunner.run(
-    package:      ARGV.clone.first,
-    spec_matcher: ARGV.clone.last,
-    path:         File.expand_path(__FILE__)
+    package:          ARGV.clone.first,
+    spec_matcher:     ARGV.clone.last,
+    path:             File.expand_path(__FILE__),
+    skipped_packages: skipped_packages,
+    show_missing_packages: true
   )
 end

data/lib/rdm/version.rb

@@ -1,3 +1,3 @@
 module Rdm
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.4.2'.freeze
 end

data/spec/rdm/gen/config_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Rdm::Gen::Config do
+  include ExampleProjectHelper
+
+  subject { described_class }
+
+  describe "::generate" do
+    before { initialize_example_project }
+    after  { reset_example_project }
+
+    context "sample config" do
+      before do
+        subject.generate(
+          config_name:  'mailing_system',
+          current_path: example_project_path
+        )
+      end
+
+      it "generates sample config" do
+        FileUtils.cd(example_project_path) do
+          ensure_exists("configs/mailing_system/default.yml")
+        end
+      end
+
+      it "add config line to Rdm.packages" do
+        ensure_content(rdm_source_file, 'config :mailing_system')
+      end
+    end
+  end
+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/rdm_spec.rb

@@ -34,6 +34,8 @@ describe Rdm do
   end
 
   context "root=" do
+    after { Rdm.root = nil }
+
     it "sets root" do
       Rdm.root = "/some/path"
       expect(Rdm.root).to eq("/some/path")

data/spec/rdm/source_composer_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe Rdm::SourceComposer do
+  include ExampleProjectHelper
+
+  subject { described_class }
+
+  before { initialize_example_project }
+  after  { reset_example_project }
+
+  describe '::run' do
+    context 'setup block' do
+      before do
+        @rdm_source = Rdm::SourceParser.read_and_init_source(rdm_source_file)
+        described_class.run(@rdm_source)
+      end
+
+      it "composes with explicit options" do
+        ensure_content(rdm_source_file, 'role "production"')
+        ensure_content(rdm_source_file, 'env_file_name "production"')
+        ensure_content(rdm_source_file, 'env_files_dir "env_files"')
+        ensure_content(rdm_source_file, 'config_path ":configs_dir/:config_name/default.yml"')
+        ensure_content(rdm_source_file, 'role_config_path ":configs_dir/:config_name/:role.yml"')
+        ensure_content(rdm_source_file, 'package_subdir_name "package"')
+        ensure_content(rdm_source_file, 'compile_path "/tmp/rdm/:package_name"')
+      end
+
+      it "composes with default options" do
+        ensure_content(rdm_source_file, 'silence_missing_package false')
+        ensure_content(rdm_source_file, 'silence_missing_package_file true') # From 'spec_helper' settings, should be false
+        expect(
+          File.read(rdm_source_file)
+        ).to include('compile_ignore_files [".gitignore", ".byebug_history", ".irbrc", ".rspec", "*_spec.rb", "*.log"]')
+        expect(
+          File.read(rdm_source_file)
+        ).to include('compile_add_files ["Gemfile", "Gemfile.lock"]')
+      end
+    end
+
+    context 'configs' do
+      before do
+        @rdm_source = Rdm::SourceParser.read_and_init_source(rdm_source_file)
+        @rdm_source.config(:mailing_system)
+        described_class.run(@rdm_source)
+      end
+
+      it "composes with old configs" do
+        ensure_content(rdm_source_file, 'config :database')
+        ensure_content(rdm_source_file, 'config :app')
+      end
+
+      it "composes with new configs" do
+        ensure_content(rdm_source_file, 'config :mailing_system')
+      end
+    end
+
+    context 'packages' do
+      before do
+        @rdm_source = Rdm::SourceParser.read_and_init_source(rdm_source_file)
+        @rdm_source.package('mailing_system')
+        described_class.run(@rdm_source)
+      end
+      
+      it "composes with old configs" do
+        ensure_content(rdm_source_file, 'package "server"')
+        ensure_content(rdm_source_file, 'package "domain/core"')
+        ensure_content(rdm_source_file, 'package "infrastructure/repository"')
+        ensure_content(rdm_source_file, 'package "application/web"')
+      end
+
+      it "composes with new configs" do
+        ensure_content(rdm_source_file, 'package "mailing_system"')
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,10 @@
 require 'simplecov'
+SimpleCov.start do
+  add_filter "/spec/"
+  add_filter "/.direnv/"
+  add_filter "/rdm/templates"
+end
+
 require 'rdm'
 require 'byebug'
 require 'fileutils'
@@ -6,16 +12,18 @@ require 'fileutils'
 require_relative 'helpers/example_project_helper'
 require_relative 'helpers/git_commands_helper'
 
-SimpleCov.start do
-  add_filter "/spec/"
-  add_filter "/.direnv/"
-  add_filter "/rdm/templates"
-end
 if ENV['CI']=='true'
   require 'codecov'
   SimpleCov.formatter = SimpleCov::Formatter::Codecov
 end
 
+# setup GIT so specs for GIT run properly on Travis
+if ENV['CI'] == 'true'
+  %x{ git config --global user.email "travisci@example.com" }
+  %x{ git config --global user.name "TravisCI Developer" }
+end
+
+
 Rdm.setup do
   silence_missing_package_file true
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdm
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Droid Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,6 +141,7 @@ files:
 - example/.rdm/templates/repository/mapper/<%=name%>_mapper.rb
 - example/.rdm/templates/repository/repository/<%=name%>_repository.rb
 - example/.rdm/templates/repository/views/users.html.erb
+- example/.runignore
 - example/Gemfile
 - example/Gemfile.lock
 - example/Makefile
@@ -170,15 +171,18 @@ files:
 - example/tests/run
 - lib/rdm.rb
 - lib/rdm/cli/compile_package.rb
+- lib/rdm/cli/config.rb
 - lib/rdm/cli/dependencies_controller.rb
 - lib/rdm/cli/diff_package.rb
 - lib/rdm/cli/gen_package.rb
 - lib/rdm/cli/init.rb
 - lib/rdm/cli/template_generator.rb
 - lib/rdm/config.rb
+- lib/rdm/config_locals.rb
 - lib/rdm/config_manager.rb
 - lib/rdm/config_scope.rb
 - lib/rdm/errors.rb
+- lib/rdm/gen/config.rb
 - lib/rdm/gen/init.rb
 - lib/rdm/gen/package.rb
 - lib/rdm/git/diff_command.rb
@@ -195,6 +199,7 @@ files:
 - lib/rdm/packages/locator.rb
 - lib/rdm/settings.rb
 - lib/rdm/source.rb
+- lib/rdm/source_composer.rb
 - lib/rdm/source_locator.rb
 - lib/rdm/source_parser.rb
 - lib/rdm/spec_runner.rb
@@ -203,7 +208,10 @@ files:
 - lib/rdm/spec_runner/package_fetcher.rb
 - lib/rdm/spec_runner/runner.rb
 - lib/rdm/spec_runner/view.rb
+- lib/rdm/templates/configs/<%=config_path%>
+- lib/rdm/templates/configs/<%=role_config_path%>
 - lib/rdm/templates/init/.rdm/helpers/render_helper.rb
+- lib/rdm/templates/init/.runignore
 - lib/rdm/templates/init/Gemfile
 - lib/rdm/templates/init/Rdm.packages
 - lib/rdm/templates/init/Readme.md
@@ -239,6 +247,7 @@ files:
 - spec/rdm/cli/gen_package_spec.rb
 - spec/rdm/cli/init_spec.rb
 - spec/rdm/config_manager_spec.rb
+- spec/rdm/gen/config_spec.rb
 - spec/rdm/gen/init_spec.rb
 - spec/rdm/gen/package_spec.rb
 - spec/rdm/git/diff_manager_spec.rb
@@ -253,6 +262,7 @@ files:
 - spec/rdm/package_parser_spec.rb
 - spec/rdm/rdm_spec.rb
 - spec/rdm/settings_spec.rb
+- spec/rdm/source_composer_spec.rb
 - spec/rdm/source_locator_spec.rb
 - spec/rdm/source_parser_spec.rb
 - spec/rdm/spec_runner/runner_spec.rb
@@ -295,6 +305,7 @@ test_files:
 - spec/rdm/cli/gen_package_spec.rb
 - spec/rdm/cli/init_spec.rb
 - spec/rdm/config_manager_spec.rb
+- spec/rdm/gen/config_spec.rb
 - spec/rdm/gen/init_spec.rb
 - spec/rdm/gen/package_spec.rb
 - spec/rdm/git/diff_manager_spec.rb
@@ -309,6 +320,7 @@ test_files:
 - spec/rdm/package_parser_spec.rb
 - spec/rdm/rdm_spec.rb
 - spec/rdm/settings_spec.rb
+- spec/rdm/source_composer_spec.rb
 - spec/rdm/source_locator_spec.rb
 - spec/rdm/source_parser_spec.rb
 - spec/rdm/spec_runner/runner_spec.rb