rdm 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8377b7dfecb66758dde63451e2117b1733bb7eb
-  data.tar.gz: 73ab78e25fbd86f975f94bbafed0fe23a2b8a439
+  metadata.gz: ccd255c90b9282d7099a6d56209702df3a6ae2ea
+  data.tar.gz: 45f8f4f7c203d6c9f24145df9f78ec150bad091f
 SHA512:
-  metadata.gz: 747ce43ea4638a8a1de99f06256d29ba512913ac3f440938ae86afca60e50b8b06f064c97b47ca1e43a9e5cf62ee4a37c7d9ff4d9009ca8f409405382264b7a5
-  data.tar.gz: dbc190dcab54d208dc8e361b7d1e8e02a47913572f268cbf5d92e7fcc4d8f6ff58dde7f25f3842c83e78e173aebf06034e0659b0ad037d8145cccb3d75a45308
+  metadata.gz: 43e2df557a1921a6ee3edc8d998113fd97efa8632ddcd3d7bb60596fdb63ca9f75f261666d305a149bcb75f6d91a3f01b60980db609f8e4422d681f552358a77
+  data.tar.gz: 037effcac344e15c413e24cc4b676ef5840eecadd0c70b2ce2752243541d9967c9e75f07fd6955a43177d6198b2b6bb83bfd102081b11f1b8d5a89b117d09969

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rdm (0.3.3)
+    rdm (0.4.0)
       activesupport
       commander (~> 4.4)
 

data/example/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    rdm (0.2.0)
+    rdm (0.3.4)
       activesupport
       commander (~> 4.4)
 

data/example/Rdm.packages

@@ -1,10 +1,15 @@
 setup do
   role "production"
+
   configs_dir "configs"
   config_path ":configs_dir/:config_name/default.yml"
   role_config_path ":configs_dir/:config_name/:role.yml"
+
+  env_files_dir "env_files"
+
   package_subdir_name "package"
-  compile_path "/tmp/rdm_compiled"
+
+  compile_path "/tmp/rdm/:package_name"
 end
 
 config :database

data/example/bin/console

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+require 'bundler/setup'
+require 'rdm'
+
+ENV['RUBY_ENV'] ||= 'development'
+
+source_file      = Rdm::SourceLocator.locate(__dir__)
+source           = Rdm::SourceParser.read_and_init_source(source_file)
+package_consoles = source.packages.inject([]) do |res, (name,data)|
+  package_console_file = File.join(data.path, 'bin/console')
+  File.exists?(package_console_file) ? 
+    res.push(name: name, path: package_console_file) : 
+    res
+end
+
+if package_consoles.empty?
+  puts "Console files were not found"
+  exit(0)
+end
+
+puts "Select package:"
+package_consoles.each_with_index do |package, idx|
+  puts "#{idx+1}. #{package[:name]}"
+end
+
+print "Type number for selected package: "
+
+select_result = gets.chomp
+if select_result == "exit" || select_result.to_i == 0
+  exit(0)
+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)
+
+

data/example/env_files/development.env

@@ -0,0 +1 @@
+RUBY_ENV=development

data/example/env_files/production.env

@@ -0,0 +1,3 @@
+RUBY_ENV=production
+
+EXAMPLE_API_KEY=example_key_value

data/example/env_files/test.env

@@ -0,0 +1 @@
+RUBY_ENV=test

data/example/server/bin/console

@@ -0,0 +1,16 @@
+#!/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.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start

data/lib/rdm/cli/gen_package.rb

@@ -2,14 +2,14 @@ module Rdm
   module CLI
     class GenPackage
       class << self
-        def run(package_name:, current_path:, local_path:, locals: {}, stdout: $stdout)
-          Rdm::CLI::GenPackage.new(package_name, current_path, local_path, locals, stdout).run
+        def run(package_name:, current_path:, path:, locals: {}, stdout: $stdout)
+          Rdm::CLI::GenPackage.new(package_name, current_path, path, locals, stdout).run
         end
       end
 
-      def initialize(package_name, current_path, local_path, locals, stdout)
+      def initialize(package_name, current_path, path, locals, stdout)
         @current_path = current_path
-        @local_path   = local_path
+        @path         = path
         @package_name = package_name
         @locals       = locals
         @stdout       = stdout
@@ -18,12 +18,12 @@ module Rdm
       def run
         generated_files_list = Rdm::Gen::Package.generate(
           current_path: @current_path,
-          local_path:   @local_path,
+          local_path:   @path,
           package_name: @package_name,
           locals:       @locals
         )
 
-        generated_files_list.each { |file| @stdout.puts "Generated: #{file}" }
+        generated_files_list.compact.each { |file| @stdout.puts "Generated: #{file}" }
       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 Rdm::Errors::PackageExists
@@ -34,6 +34,8 @@ module Rdm
         @stdout.puts "Rdm.packages was not found. Run 'rdm init' to create it"
       rescue Rdm::Errors::PackageDirExists => e
         @stdout.puts "Error. Directory #{e.message} exists. Package was not generated"
+      rescue NoMethodError => e
+        @stdout.puts e.message
       end
     end
   end

data/lib/rdm/cli/init.rb

@@ -21,7 +21,7 @@ module Rdm
           console:      @console
         )
 
-        generated_files_list.each { |file| @stdout.puts "Generated: #{file}" }
+        generated_files_list.compact.each { |file| @stdout.puts "Generated: #{file}" }
       rescue Errno::ENOENT => e
         @stdout.puts "Error occurred. Possible reasons:\n #{@current_path} not found. Please run on empty directory \n#{e.inspect}"
       rescue Rdm::Errors::ProjectAlreadyInitialized

data/lib/rdm/gen/init.rb

@@ -36,6 +36,7 @@ module Rdm
           @template_detector.gem_template_folder('package'),
           @template_detector.project_template_folder('package')
         )
+        
         Rdm::Handlers::TemplateHandler.generate(
           template_name:      TEMPLATE_NAME,
           current_path:       @current_path,

data/lib/rdm/gen/package.rb

@@ -24,16 +24,13 @@ module Rdm
         raise Rdm::Errors::PackageNameNotSpecified           if @package_name.nil? || @package_name.empty?
         raise Rdm::Errors::PackageExists                     if source.packages.keys.include?(@package_name)
 
-        File.open(File.join(source.root_path, Rdm::SOURCE_FILENAME), 'a+') {|f| f.write("package '#{@local_path}'")}
+        File.open(File.join(source.root_path, Rdm::SOURCE_FILENAME), 'a+') {|f| f.write("\npackage '#{@local_path}'")}
 
         Rdm::Handlers::TemplateHandler.generate(
           template_name: TEMPLATE_NAME,
           current_path:  @current_path,
           local_path:    @local_path,
-          locals: {
-            package_name:           @package_name,
-            package_name_camelized: Rdm::Utils::StringUtils.camelize(@package_name)
-          }.merge(@locals)
+          locals:        { package_name: @package_name }.merge(@locals)
         )
       end
 

data/lib/rdm/git/diff_command.rb

@@ -1,13 +1,11 @@
-require 'open3'
-
 class Rdm::Git::DiffCommand
   class << self
     def get_only_diff_filenames(revision:, path:)
       command = `cd #{path} && git diff --name-only #{revision}`
 
       raise Rdm::Errors::GitCommandError, command unless $?.success?
-    
+
       command.split("\n")
     end
   end
-end
+end

data/lib/rdm/git/diff_manager.rb

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

data/lib/rdm/handlers/template_handler.rb

@@ -4,6 +4,9 @@ require 'fileutils'
 module Rdm
   module Handlers
     class TemplateHandler
+      REJECTED_TEMPLATE_FILES   = %W(.DS_Store)
+      NOT_HANDLED_TEMPLATES_EXT = %W(.erb)
+
       class << self
         def generate(template_name:, local_path:, current_path:, locals: {}, 
                      ignore_source_file: false, stdout: STDOUT, stdin: STDIN)
@@ -30,7 +33,8 @@ module Rdm
         @missing_variables  = []
         @stdout             = stdout
         @stdin              = stdin
-        
+
+        default_locals     = { package_subdir_name: Rdm.settings.send(:package_subdir_name) }
         @locals            = default_locals.merge(locals)
       end
 
@@ -38,38 +42,31 @@ module Rdm
         project_path      = @ignore_source_file ? @current_path : File.dirname(Rdm::SourceLocator.locate(@current_path))
         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)
+
         @template_directory    = template_detector.detect_template_folder(@template_name)
         @destination_directory = File.join(project_path, @local_path)
 
-        template_files_list = Dir[ 
-          File.join(@template_directory, '**', '.?*'), 
-          File.join(@template_directory, '**', '*') 
-        ]
-        .select { |p| File.file?(p) }
-        .reject { |p| File.basename(p) == '.DS_Store' }
+        template_files_list = Dir
+          .glob(File.join(@template_directory, '**', '*'), File::FNM_DOTMATCH)
+          .reject { |path| REJECTED_TEMPLATE_FILES.include? File.basename(path)  }
 
-        template_dir_list   = Dir[ File.join(@template_directory, '**', '*') ].select { |p| File.directory? p }
+        template_files_list.each do |path|
+          @missing_variables.concat(
+            Rdm::Templates::TemplateRenderer.get_undefined_variables(get_destination_path(path), @locals)
+          ) 
 
-        template_files_list.each do |file|
-          missings = Rdm::Templates::TemplateRenderer.get_undefined_variables(get_destination_path(file), @locals)
-          
-          if File.extname(file) != '.erb'
-            missings.push(
-              *Rdm::Templates::TemplateRenderer.get_undefined_variables(File.read(file), @locals)
+          if handle_file_content?(path)
+            @missing_variables.concat(
+              Rdm::Templates::TemplateRenderer.get_undefined_variables(File.read(path), @locals)
             ) 
           end
-          
-          @missing_variables.push(*missings)
-        end
-
-        template_dir_list.each do |dir|
-          @missing_variables.push(
-            *Rdm::Templates::TemplateRenderer.get_undefined_variables(get_destination_path(dir), @locals)
-          )
         end
 
-        @missing_variables.uniq!
         if @missing_variables.any?
+          @missing_variables.uniq!
+
           @stdout.puts "Undefined variables were found:"
           @missing_variables.size.times {|t| @stdout.puts "  #{t+1}. #{@missing_variables[t]}"}
 
@@ -79,28 +76,32 @@ module Rdm
           end
         end
 
-        template_dir_list.each do |dir|
-          rendered_abs_path = Rdm::Templates::TemplateRenderer.handle(get_destination_path(dir), @locals)
-          FileUtils.mkdir_p rendered_abs_path
-        end
-
-        template_files_list.map do |file|
-          rendered_abs_path = Rdm::Templates::TemplateRenderer.handle(get_destination_path(file), @locals)
+        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.exists?(rendered_abs_path)
-            @stdout.puts "Warning! #{file} already exists. Skipping file creation..."
+          if File.file?(rendered_abs_path) && File.exists?(rendered_abs_path)
+            @stdout.puts "Warning! #{rendered_rel_path} already exists. Skipping file creation..."
+            next
+          end
+
+          if File.directory?(path)
+            FileUtils.mkdir_p rendered_abs_path
             next
           end
           
-          rendered_file_content = File.extname(file) == '.erb' ?
-            File.read(file) :
-            Rdm::Templates::TemplateRenderer.handle(File.read(file), @locals)
+          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 }
 
-          Pathname.new(rendered_abs_path).relative_path_from Pathname.new(project_path)
+          rendered_rel_path
         end
+
+        template_files_list.compact
       end
 
       private
@@ -112,10 +113,8 @@ module Rdm
         File.join(@destination_directory, template_rel_path)
       end   
 
-      def default_locals
-        {
-          package_subdir_name: Rdm.settings.send(:package_subdir_name)
-        }
+      def handle_file_content?(path)
+        File.file?(path) && !NOT_HANDLED_TEMPLATES_EXT.include?(File.extname(path))
       end
     end
   end

data/lib/rdm/packages/compiler_service.rb

@@ -14,15 +14,12 @@ module Rdm
       end
 
       def initialize(compile_path:, project_path:, package_name:)
-        @compile_path = compile_path
+        @compile_path = compile_path.gsub(/:package_name/, package_name)
         @project_path = project_path
         @package_name = package_name
       end
 
       def compile
-        render_helper_path = "#{@project_path}/.rdm/helpers/render_helper.rb"
-        require_relative render_helper_path if File.exist?(render_helper_path)
-
         FileUtils.rm_rf(@compile_path) if Dir.exists?(@compile_path)
         FileUtils.mkdir_p(@compile_path)
 
@@ -60,6 +57,7 @@ module Rdm
         end
 
         FileUtils.cp_r(File.join(@project_path, 'configs'), File.join(@compile_path, 'configs'))
+        FileUtils.cp_r(File.join(@project_path, Rdm.settings.env_files_dir), File.join(@compile_path, Rdm.settings.env_files_dir))
 
         Rdm.settings.compile_ignore_files.each do |file|
           Dir["#{@compile_path}/**/#{file}"].each do |file_to_remove|

data/lib/rdm/settings.rb

@@ -2,7 +2,7 @@ class Rdm::Settings
   SETTING_KEYS = [
     :role, :package_subdir_name, :configs_dir, :config_path, :role_config_path,
     :silence_missing_package_file, :silence_missing_package, :compile_path,
-    :compile_ignore_files, :compile_add_files
+    :compile_ignore_files, :compile_add_files, :env_files_dir
   ].freeze
 
   SETTING_VARIABLES = [:role, :configs_dir, :config_path, :role_config_path].freeze
@@ -13,6 +13,7 @@ class Rdm::Settings
     silence_missing_package_file(false)
     package_subdir_name('package')
     configs_dir('configs')
+    env_files_dir('env_files')
     compile_ignore_files([
       '.gitignore',
       '.byebug_history',
@@ -23,7 +24,7 @@ class Rdm::Settings
     ])
     compile_add_files([
       'Gemfile',
-      'Gemfile.lock'
+      'Gemfile.lock',
     ])
   end
 

data/lib/rdm/source_parser.rb

@@ -3,15 +3,16 @@ class Rdm::SourceParser
   end
 
   class << self
-    def read_and_init_source(source_path)
-      Rdm::SourceParser.new(source_path).read_and_init_source
+    def read_and_init_source(source_path, stdout: nil)
+      Rdm::SourceParser.new(source_path, stdout).read_and_init_source
     end
   end
 
   attr_accessor :source_path
 
-  def initialize(source_path)
+  def initialize(source_path, stdout)
     @source_path = source_path
+    @stdout      = stdout || STDOUT
   end
 
   # Read source file, parse and init it's packages and configs
@@ -28,6 +29,7 @@ class Rdm::SourceParser
 
     init_and_set_packages(source)
     init_and_set_configs(source)
+    init_and_set_env_variables(source)
     source.init_with(packages: packages, configs: configs)
     source
   end
@@ -67,6 +69,25 @@ class Rdm::SourceParser
     end
   end
 
+  def init_and_set_env_variables(source)
+    role = settings.read_setting(:role)
+
+    unless File.exists?(env_file_path(role))
+      @stdout.puts "WARNING! Environment file for role '#{role}' was not found. Please, add #{env_file_path(role)} file..."
+      return
+    end
+
+    File.foreach(env_file_path(role)) do |line|
+      key, value = line.split('=').map(&:strip)
+      
+      if ENV.has_key?(key) && ENV[key] != value
+        @stdout.puts "WARNING! Environment file '#{role}' overwrites ENV['#{key}'] variable from '#{ENV.fetch(key, nil)}' to '#{value}' ..."
+      end
+      
+      ENV[key] = value
+    end
+  end
+
   # Make sure that all required settings are in place
   def validate_rdm_settings!
     if settings.read_setting(:role).nil?
@@ -81,6 +102,10 @@ class Rdm::SourceParser
     File.dirname(source_path)
   end
 
+  def env_file_path(role)
+    File.join(root_path, settings.read_setting(:env_files_dir), "#{role}.env")
+  end
+
   # [String] Source file content
   def source_content
     @source_content ||= File.read(source_path)

data/lib/rdm/spec_runner.rb

@@ -1,5 +1,5 @@
 module Rdm::SpecRunner
-  def self.run(path: nil, package: nil, spec_mather: nil)
-    Rdm::SpecRunner::Runner.new(path: path, package: package, spec_mather: spec_matcher).run
+  def self.run(path: nil, package: nil, spec_matcher: nil)
+    Rdm::SpecRunner::Runner.new(path: path, package: package, spec_matcher: spec_matcher).run
   end
 end

data/lib/rdm/spec_runner/runner.rb

@@ -2,6 +2,7 @@ class Rdm::SpecRunner::Runner
   attr_accessor :skipped_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

data/lib/rdm/templates/init/Rdm.packages

@@ -6,6 +6,8 @@ setup do
   configs_dir             'configs'
   config_path             ':configs_dir/:config_name/default.yml'
   role_config_path        ':configs_dir/:config_name/:role.yml'
+
+  env_files_dir           'env_files'
   package_subdir_name     'package'
   silence_missing_package true
 end

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

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+require 'bundler/setup'
+require 'rdm'
+
+ENV['RUBY_ENV'] ||= 'development'
+
+source_file      = Rdm::SourceLocator.locate(__dir__)
+source           = Rdm::SourceParser.read_and_init_source(source_file)
+package_consoles = source.packages.inject([]) do |res, (name,data)|
+  package_console_file = File.join(data.path, 'bin/console')
+  File.exists?(package_console_file) ? 
+    res.push(name: name, path: package_console_file) : 
+    res
+end
+
+if package_consoles.empty?
+  puts "Console files were not found"
+  exit(0)
+end
+
+puts "Select package:"
+package_consoles.each_with_index do |package, idx|
+  puts "#{idx+1}. #{package[:name]}"
+end
+print "Type number for selected package: "
+
+select_result = gets.chomp
+if select_result == "exit" || select_result.to_i == 0
+  exit(0)
+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)
+
+

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

@@ -0,0 +1 @@
+RUBY_ENV=development

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

@@ -0,0 +1 @@
+RUBY_ENV=production

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

@@ -0,0 +1 @@
+RUBY_ENV=test

data/lib/rdm/templates/template_renderer.rb

@@ -15,7 +15,8 @@ module Rdm
 
       def initialize(template, locals)
         @template = template
-        @locals = locals
+        @locals   = locals
+        @undefined_variables = []
       end 
 
       def handle 
@@ -25,17 +26,26 @@ module Rdm
       end
 
       def get_undefined_variables
-        get_template_variables - get_passed_variables
+        Rdm::Utils::RenderUtil.render(@template, @locals)
+
+        @undefined_variables
+      rescue NameError => e
+        raise NoMethodError, "Undefined method for template. Please, add :#{e.name} method to .rdm/helpers/render_helper.rb file!" if @undefined_variables.include?(e.name)
+
+        @locals[e.name] = e.name.to_s
+        @undefined_variables.push(e.name)
+
+        retry
       end
 
       private
 
       def get_template_variables
-        @template
-          .scan(TEMPLATE_VARIABLE)
-          .flatten
-          .map(&:intern)
-          .uniq
+        Rdm::Utils::RenderUtil.render(@template, {})
+      rescue NameError => e
+        @locals
+
+        get_template_variables(@template, fake_locals, undefined_variables)
       end
 
       def get_passed_variables

data/lib/rdm/version.rb

@@ -1,3 +1,3 @@
 module Rdm
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/spec/rdm/cli/compile_package_spec.rb

@@ -4,8 +4,8 @@ describe Rdm::CLI::CompilePackage do
   include ExampleProjectHelper
 
   subject                     { described_class }
-  let(:default_compile_path)  { '/tmp/rdm_compiled' }
-  let(:new_compile_path)      { '/tmp/new_rdm_compiled' }
+  let(:tmp_rdm)               { '/tmp/rdm' }
+  let(:new_compile_path)      { '/tmp/rdm/custom_name' }
 
   describe "::compile" do
     before :each do
@@ -14,8 +14,7 @@ describe Rdm::CLI::CompilePackage do
 
     after :each do
       reset_example_project
-      FileUtils.rm_rf(default_compile_path)
-      FileUtils.rm_rf(new_compile_path)
+      FileUtils.rm_rf(tmp_rdm)
     end
 
     context "setup compile_path at Rdm.packages" do
@@ -24,7 +23,8 @@ describe Rdm::CLI::CompilePackage do
           subject.compile(
             project_path:        example_project_path,
             package_name:        'core',
-            overwrite_directory: ->() { true }
+            overwrite_directory: ->() { true },
+            compile_path:        nil
           )
         }.to output(
           <<~EOF

data/spec/rdm/cli/gen_package_spec.rb

@@ -3,9 +3,8 @@ require "spec_helper"
 describe Rdm::CLI::GenPackage do
   include ExampleProjectHelper
 
-  subject { described_class }
-
-  let(:stdout)          { SpecLogger.new }
+  subject      { described_class }
+  let(:stdout) { SpecLogger.new }
 
   before { initialize_example_project }
   after  { reset_example_project }
@@ -15,7 +14,7 @@ describe Rdm::CLI::GenPackage do
       subject.run(
         package_name: "database",
         current_path: example_project_path,
-        local_path:   "infrastructure/database",
+        path:         "infrastructure/database",
         stdout:       stdout
       )
 
@@ -35,7 +34,7 @@ describe Rdm::CLI::GenPackage do
       subject.run(
         package_name: "database",
         current_path: example_project_path,
-        local_path:   "infrastructure/database",
+        path:         "infrastructure/database",
         stdout:       stdout
       )
 
@@ -48,7 +47,7 @@ describe Rdm::CLI::GenPackage do
       subject.run(
         package_name: "database",
         current_path: File.dirname(example_project_path),
-        local_path:   "infrastructure/database",
+        path:         "infrastructure/database",
         stdout:       stdout
       )
 
@@ -59,14 +58,14 @@ describe Rdm::CLI::GenPackage do
       subject.run(
         package_name: "database",
         current_path: example_project_path,
-        local_path:   "infrastructure/database",
+        path:         "infrastructure/database",
         stdout:       stdout
       )
       
       subject.run(
         package_name: "database",
         current_path: example_project_path,
-        local_path:   "infrastructure/database",
+        path:         "infrastructure/database",
         stdout:       stdout
       )
       expect(stdout.output).to include("Error. Directory infrastructure/database exists. Package was not generated")
@@ -76,14 +75,14 @@ describe Rdm::CLI::GenPackage do
       subject.run(
         package_name: "database",
         current_path: example_project_path,
-        local_path:   "infrastructure/database",
+        path:         "infrastructure/database",
         stdout:       stdout
       )
 
       subject.run(
         package_name: "database",
         current_path: example_project_path,
-        local_path:   "database",
+        path:         "database",
         stdout:       stdout
       )
       expect(stdout.output).to include("Error. Package already exist. Package was not generated")
@@ -93,7 +92,7 @@ describe Rdm::CLI::GenPackage do
       subject.run(
         package_name: "",
         current_path: example_project_path,
-        local_path:   "infrastructure/database",
+        path:         "infrastructure/database",
         stdout:       stdout
       )
       expect(stdout.output).to include("Package name was not specified!")

data/spec/rdm/gen/init_spec.rb

@@ -17,6 +17,10 @@ describe Rdm::Gen::Init do
         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")
+        ensure_exists("env_files/production.env")
       end
     end
 

data/spec/rdm/gen/package_spec.rb

@@ -9,13 +9,13 @@ describe Rdm::Gen::Package do
   after  { reset_example_project }
 
   context "sample package" do
-    it "has generated correct files" do
-      FileUtils.rm_rf(File.join(example_project_path, '.rdm'))
+    it "generates correct files" do
+      FileUtils.rm_rf(File.join(example_project_path, '.rdm', 'templates'))
 
       subject.generate(
         current_path: example_project_path,
         package_name: "some",
-        local_path:   "domain/some",
+        local_path:   "domain/some"
       )
 
       FileUtils.cd(example_project_path) do

data/spec/rdm/package/compiler_service_spec.rb

@@ -3,24 +3,33 @@ require 'spec_helper'
 describe Rdm::Packages::CompilerService do
   include ExampleProjectHelper
 
-  subject             { described_class }
-  let(:source_parser) { Rdm::SourceParser }
-  let(:source_path)   { File.join(compile_path, Rdm::SOURCE_FILENAME) } 
-  let(:compile_path)  { "/tmp/example_compile" }
+  subject                       { described_class }
+  let(:source_parser)           { Rdm::SourceParser }
+  let(:source_path)             { File.join(compile_path, Rdm::SOURCE_FILENAME) }
+  let(:fixed_compile_path)      { "/tmp/rdm/custom_name" }
+  let(:compile_path_template)   { "/tmp/rdm/:package_name" }
+
+  def compile_path(package_name)
+    compile_path_template.gsub(/:package_name/, package_name)
+  end
+
+  def source_path(package_name)
+    File.join(compile_path(package_name), Rdm::SOURCE_FILENAME)
+  end
 
   describe "::compile" do
     before { initialize_example_project }
     
     after do
       reset_example_project
-      FileUtils.rm_rf compile_path
+      FileUtils.rm_rf File.dirname(fixed_compile_path)
     end
 
     context "to existing directory" do
       before do
         subject.compile(
           package_name: 'web',
-          compile_path: compile_path,
+          compile_path: fixed_compile_path,
           project_path: example_project_path
         )
       end
@@ -29,20 +38,20 @@ describe Rdm::Packages::CompilerService do
         before do
           subject.compile(
             package_name: 'core', 
-            compile_path: compile_path,
+            compile_path: fixed_compile_path,
             project_path: example_project_path
           ) 
         end
-
+        
         it "deletes old unused package from file structure" do
           expect(
-            File.exists?(File.join(compile_path, 'application/web/package/web.rb'))
+            File.exists?(File.join(fixed_compile_path, 'application/web/package/web.rb'))
           ).to be false
         end
 
         it "deletes old unused package from Rdm.packages" do
           package_names = source_parser
-            .read_and_init_source(source_path)
+            .read_and_init_source(source_path('custom_name'))
             .packages
             .values
             .map(&:name)
@@ -57,28 +66,28 @@ describe Rdm::Packages::CompilerService do
       before do
         subject.compile(
           package_name: 'repository', 
-          compile_path: compile_path,
+          compile_path: compile_path_template,
           project_path: example_project_path
         ) 
       end
       
       it "creates folder" do
-        expect(Dir.exists?(compile_path)).to be true
+        expect(Dir.exists?(compile_path('repository'))).to be true
       end
 
       it "creates Rdm.packges" do
-        expect(File.exists?(source_path)).to be true
+        expect(File.exists?(source_path('repository'))).to be true
       end
 
       it "copies files structure from original package" do
         expect(
-          File.exists?(File.join(compile_path, 'infrastructure/repository/package/repository.rb'))
+          File.exists?(File.join(compile_path('repository'), 'infrastructure/repository/package/repository.rb'))
         ).to be true
       end
 
       it "add only required package name to Rdm.packages" do
         package_names = source_parser
-          .read_and_init_source(source_path)
+          .read_and_init_source(source_path('repository'))
           .packages
           .values
           .map(&:name)
@@ -92,24 +101,24 @@ describe Rdm::Packages::CompilerService do
       before do
         subject.compile(
           package_name: 'web',
-          compile_path: compile_path,
+          compile_path: compile_path_template,
           project_path: example_project_path
         )
       end
 
       it "copies files structure for each dependent package" do
         expect(
-          File.exists?(File.join(compile_path, 'domain/core/package/core.rb'))
+          File.exists?(File.join(compile_path('web'), 'domain/core/package/core.rb'))
         ).to be true
 
         expect(
-          File.exists?(File.join(compile_path, 'application/web/package/web.rb'))
+          File.exists?(File.join(compile_path('web'), 'application/web/package/web.rb'))
         ).to be true
       end
 
       it "add only required package name to Rdm.packages" do
         package_names = source_parser
-          .read_and_init_source(source_path)
+          .read_and_init_source(source_path('web'))
           .packages
           .values
           .map(&:name)

data/spec/rdm/source_parser_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Rdm::SourceParser do
+  include ExampleProjectHelper
+
   describe "#parse" do
     subject { Rdm::SourceParser }
 
@@ -17,7 +19,7 @@ describe Rdm::SourceParser do
     }
 
     before :each do
-      @source = subject.read_and_init_source(source_path)
+      @source = subject.read_and_init_source(source_path, stdout: SpecLogger.new)
     end
 
     it "returns Source object" do
@@ -55,7 +57,7 @@ describe Rdm::SourceParser do
     }
 
     before :each do
-      @source = subject.read_and_init_source(source_path)
+      @source = subject.read_and_init_source(source_path, stdout: SpecLogger.new)
     end
 
     it "returns Source object" do
@@ -75,4 +77,50 @@ describe Rdm::SourceParser do
       expect(names).to include("database")
     end
   end
+
+  describe "::read_and_init_source" do
+    before { initialize_example_project }
+    after  { reset_example_project }
+
+    subject { described_class }
+    let(:stdout) { SpecLogger.new }
+
+    describe "#init_and_set_env_variables" do
+      context "with defined role" do
+        it "load env_file variables into ENV hash" do
+          subject.read_and_init_source(@rdm_source_file)
+
+          expect(ENV['EXAMPLE_API_KEY']).to eq('example_key_value')
+        end
+      end
+
+      context "with undefined role" do
+        it "puts warning message" do
+          Rdm::Utils::FileUtils.change_file @rdm_source_file do |line|
+            line.include?('role "production"') ? 'role "stading"' : line
+          end
+          
+          subject.read_and_init_source(@rdm_source_file, stdout: stdout)
+
+          expect(stdout.output).to include("WARNING! Environment file for role 'stading' was not found. Please, add /tmp/example/env_files/stading.env file...")
+        end
+      end
+
+      context "when try to overwrite ENV variable" do
+        before do
+          ENV['RUBY_ENV'] = 'test'
+          
+          subject.read_and_init_source(@rdm_source_file, stdout: stdout)
+        end
+
+        it 'puts warning message' do
+          expect(stdout.output).to include("WARNING! Environment file 'production' overwrites ENV['RUBY_ENV'] variable from 'test' to 'production' ...")
+        end
+
+        it 'overwrites ENV variable' do
+          expect(ENV['RUBY_ENV']).to eq('production')
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdm
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Droid Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,16 +149,21 @@ files:
 - example/application/web/Package.rb
 - example/application/web/package/web.rb
 - example/application/web/package/web/sample_controller.rb
+- example/bin/console
 - example/configs/app/default.yml
 - example/configs/app/production.yml
 - example/configs/database/default.yml
 - example/domain/core/Package.rb
 - example/domain/core/package/core.rb
 - example/domain/core/package/core/sample_service.rb
+- example/env_files/development.env
+- example/env_files/production.env
+- example/env_files/test.env
 - example/infrastructure/repository/Package.rb
 - example/infrastructure/repository/package/repository.rb
 - example/infrastructure/repository/package/repository/sample_repository.rb
 - example/server/Package.rb
+- example/server/bin/console
 - example/server/package/server.rb
 - example/server/server.rb
 - example/tests/diff_run
@@ -202,6 +207,10 @@ files:
 - lib/rdm/templates/init/Gemfile
 - lib/rdm/templates/init/Rdm.packages
 - lib/rdm/templates/init/Readme.md
+- lib/rdm/templates/init/bin/console
+- lib/rdm/templates/init/env_files/development.env
+- lib/rdm/templates/init/env_files/production.env
+- lib/rdm/templates/init/env_files/test.env
 - lib/rdm/templates/init/tests/diff_run
 - lib/rdm/templates/init/tests/run
 - lib/rdm/templates/package/.gitignore