rdm 0.4.17 → 0.4.18

data/lib/rdm/gen/init.rb

@@ -45,6 +45,10 @@ module Rdm
           @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

data/lib/rdm/package.rb

@@ -2,11 +2,6 @@ class Rdm::Package
   DEFAULT_GROUP = '_default_'.freeze
 
   attr_accessor :metadata, :local_dependencies, :external_dependencies, :file_dependencies, :config_dependencies, :path
-  attr_reader :environments
-
-  def inspect
-    "Rdm::Package(name: #{name}, path: #{path})"
-  end
 
   def local_dependencies(group = nil)
     fetch_dependencies(@local_dependencies || {}, group)
@@ -20,6 +15,10 @@ class Rdm::Package
     fetch_dependencies(@file_dependencies || {}, group)
   end
 
+  def config_dependencies(group = nil)
+    fetch_dependencies(@config_dependencies || {}, group)
+  end
+
   def local_dependencies_with_groups
     return {} if @local_dependencies.nil?
     @local_dependencies.each_with_object(
@@ -50,7 +49,11 @@ class Rdm::Package
     @file_dependencies[current_group] << file
   end
 
-  def import_config(*args)
+  # Import config dependency
+  def import_config(dependency)
+    @config_dependencies ||= {}
+    @config_dependencies[current_group] ||= []
+    @config_dependencies[current_group] << dependency
   end
 
   def package
@@ -81,18 +84,6 @@ class Rdm::Package
     other_package.name == name
   end
 
-  def set_environments(&block)
-    environments.children = Rdm::EnvConfigDSL.new.instance_exec(&block) if block_given?
-  end
-
-  def environments
-    @environments ||= Rdm::EnvConfig.new(
-      name:     name,
-      type:     Rdm::EnvConfig::Types::HASH,
-      optional: false
-    )
-  end
-
   private
 
   def current_group

data/lib/rdm/package_importer.rb

@@ -31,7 +31,6 @@ class Rdm::PackageImporter
   # @return [Rdm::Package] Current package
   def import_file(package_path, group: nil)
     package = Rdm::PackageParser.parse_file(package_path)
-
     source  = read_and_init_source(package.source)
 
     # Init Rdm.root based on Rdm.packages directory
@@ -47,6 +46,10 @@ class Rdm::PackageImporter
     @imported_packages ||= []
   end
 
+  def imported_configs
+    @imported_configs ||= []
+  end
+
   # Import package and initialize module
   def import_package(package_name, source:, group: nil)
     return imported_packages if imported_packages.include?(package_name.to_s)
@@ -62,6 +65,11 @@ class Rdm::PackageImporter
       import_package(dependency, source: source, group: group)
     end
 
+    # also import config dependencies
+    package.config_dependencies(group).each do |dependency|
+      import_config(dependency, source: source)
+    end
+
     # only after importing dependencies - require package itself
     begin
       require package_name
@@ -97,13 +105,19 @@ class Rdm::PackageImporter
       require File.join(package.path, file_path)
     end
 
-    Rdm::ConfigManager.load_config(envs: package.environments, path_to_config: Rdm.settings.config_path)
-
     unless ActiveSupport::Dependencies.autoload_paths.include?(package_dir_name)
       ActiveSupport::Dependencies.autoload_paths << package_dir_name
     end
   end
 
+  def import_config(config_name, source:)
+    return if imported_configs.include?(config_name)
+    config = source.configs[config_name.to_s]
+    raise "Can't find config with name: #{config_name}" if config.nil?
+    Rdm.config.load_config(config, source: source)
+    imported_configs << config_name
+  end
+
   def read_and_init_source(source_path)
     source_parser.read_and_init_source(source_path)
   end

data/lib/rdm/package_parser.rb

@@ -16,7 +16,6 @@ class Rdm::PackageParser
 
     def parse(package_content)
       spec = Rdm::Package.new
-
       spec.instance_eval(package_content)
       spec
     end

data/lib/rdm/packages/compiler_service.rb

@@ -56,7 +56,13 @@ module Rdm
           end
         end
 
-        # TODO: paste generated env files to compile directory
+        FileUtils.cp_r(File.join(@project_path, 'configs'), File.join(@compile_path, 'configs'))
+        if Dir.exists?(File.join(@project_path, Rdm.settings.env_files_dir))
+          FileUtils.cp_r(
+            File.join(@project_path, Rdm.settings.env_files_dir), 
+            File.join(@compile_path, Rdm.settings.env_files_dir)
+          )
+        end
 
         Rdm.settings.compile_ignore_files.each do |file|
           Dir["#{@compile_path}/**/#{file}"].each do |file_to_remove|

data/lib/rdm/settings.rb

@@ -2,22 +2,33 @@ class Rdm::Settings
   attr_reader :settings
 
   SETTING_KEYS = [
-    :role, :package_subdir_name, :config_path,
+    :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, :env_file_name
   ].freeze
 
-  SETTING_VARIABLES = [:role].freeze
+  SETTING_VARIABLES = [:role, :configs_dir, :config_path, :role_config_path].freeze
 
   # Default settings
   def initialize
-    silence_missing_package       false
-    silence_missing_package_file  false
-    package_subdir_name           'package'
-    compile_ignore_files          %w(.gitignore .byebug_history .irbrc .rspec *_spec.rb *.log)
-    compile_add_files             %w(Gemfile Gemfile.lock)
-    compile_path                  '/tmp/rdm/:package_name'
-    config_path                   'config/:role.yml'
+    silence_missing_package(false)
+    silence_missing_package_file(false)
+    package_subdir_name('package')
+    configs_dir('configs')
+    env_files_dir('env_files')
+    compile_ignore_files([
+      '.gitignore',
+      '.byebug_history',
+      '.irbrc',
+      '.rspec',
+      '*_spec.rb',
+      '*.log'
+    ])
+    compile_add_files([
+      'Gemfile',
+      'Gemfile.lock'
+    ])
+    compile_path('/tmp/rdm/:package_name')
   end
 
   SETTING_KEYS.each do |key|

data/lib/rdm/source.rb

@@ -3,6 +3,7 @@ class Rdm::Source
 
   def initialize(root_path:)
     @root_path = root_path
+    @config_names = []
     @package_paths = []
   end
 
@@ -12,6 +13,15 @@ class Rdm::Source
     @setup_block = block
   end
 
+  # Add config to list of known configs
+  # @param config_name [String] Config name
+  def config(config_name)
+    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
   # @param package_path [String] Package path
   def package(package_path)
@@ -22,8 +32,9 @@ class Rdm::Source
   # @param value [Hash<String: Rdm::Package>] Hash of packages by it's name
   # @param value [Hash<String: Rdm::Config>] Hash of configs by it's name
   # @return [Hash<String: Rdm::Package>] Hash of packages by it's name
-  def init_with(packages:)
+  def init_with(packages:, configs:)
     @packages = packages
+    @configs = configs
   end
 
   # Read initialized packages
@@ -31,4 +42,10 @@ class Rdm::Source
   def packages
     @packages || {}
   end
+
+  # Read initialized configs
+  # @return [Hash<String: Rdm::Config>] Hash of configs by it's name
+  def configs
+    @configs || {}
+  end
 end

data/lib/rdm/source_parser.rb

@@ -15,7 +15,7 @@ class Rdm::SourceParser
     @stdout      = stdout || STDOUT
   end
 
-  # Read source file, parse and init it's packages
+  # Read source file, parse and init it's packages and configs
   # @param source_path [String] Source file path
   # @return [Rdm::Source] Source
   def read_and_init_source
@@ -28,7 +28,9 @@ class Rdm::SourceParser
     validate_rdm_settings!
 
     init_and_set_packages(source)
-    source.init_with(packages: packages)
+    init_and_set_configs(source)
+    init_and_set_env_variables(source)
+    source.init_with(packages: packages, configs: configs)
     source
   end
 
@@ -55,6 +57,37 @@ class Rdm::SourceParser
     end
   end
 
+  def init_and_set_configs(source)
+    source.config_names.each do |config_name|
+      default_path         = settings.read_setting(:config_path, vars: { config_name: config_name })
+      role_path            = settings.read_setting(:role_config_path, vars: { config_name: config_name })
+      config               = Rdm::Config.new
+      config.default_path  = default_path
+      config.role_path     = role_path
+      config.name          = config_name
+      configs[config_name] = config
+    end
+  end
+
+  def init_and_set_env_variables(source)
+    return unless settings.read_setting(:env_file_name)
+    
+    unless File.exists?(env_file_path)
+      @stdout.puts "WARNING! Environment file '#{settings.read_setting(:env_file_name)}' was not found. Please, add #{env_file_path} file..."
+      return
+    end
+
+    File.foreach(env_file_path) do |line|
+      key, value = line.split('=').map(&:strip)
+      
+      if ENV.has_key?(key) && ENV[key] != value
+        @stdout.puts "WARNING! Environment file '#{settings.read_setting(:env_file_name)}' 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?
@@ -69,6 +102,12 @@ class Rdm::SourceParser
     File.dirname(source_path)
   end
 
+  def env_file_path
+    file_path = File.join(root_path, settings.read_setting(:env_files_dir), "#{settings.read_setting(:env_file_name)}")
+
+    file_path.gsub(/\.env$/, '').concat('.env')
+  end
+
   # [String] Source file content
   def source_content
     @source_content ||= File.read(source_path)
@@ -78,6 +117,10 @@ class Rdm::SourceParser
     @packages ||= {}
   end
 
+  def configs
+    @configs ||= {}
+  end
+
   def settings
     Rdm.settings
   end

data/lib/rdm/spec_runner/runner.rb

@@ -170,7 +170,7 @@ class Rdm::SpecRunner::Runner
       start_from = running_packages.index {|cmd_params| cmd_params.package_name == @from}
 
       if start_from.nil?
-        puts "Pacakge :#{@from} does not exists"
+        puts "Package :#{@from} does not exists"
         exit(1)
       end
 
@@ -191,7 +191,7 @@ class Rdm::SpecRunner::Runner
     
     running_packages
       .map(&:command)
-      .join(' && ')
+      .join('; ')
   end
 
   def display_missing_specs

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/Rdm.packages

@@ -3,10 +3,22 @@ setup do
     ENV['RUBY_ENV'] || raise('please set RUBY_ENV environment variable')
   end
 
+  env_file_name do
+    ENV['ENV_FILE']
+  end
+
+  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
 
+config :database
+config :logging
+
 
 # package 'core/application/commands'
 # package 'core/utils'

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

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

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

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

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

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

data/lib/rdm/version.rb

@@ -1,3 +1,3 @@
 module Rdm
-  VERSION = '0.4.17'.freeze
+  VERSION = '0.4.18'.freeze
 end

data/rdm.gemspec

@@ -23,7 +23,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "codecov"
   spec.add_dependency "activesupport"
   spec.add_dependency "commander", "~> 4.4"
-  spec.add_dependency "morf"
-  spec.add_dependency "hcast"
-  spec.add_dependency "attr_validator"
 end

data/spec/fixtures/SampleSource.rb

@@ -1,8 +1,10 @@
 setup do
-  role                    'example'
-  config_path             'app.yml'
+  role "example"
+  config_path "config"
   silence_missing_package true
 end
 
+config :database
+
 package "application/web"
 package "domain/core"

data/spec/fixtures/config.yml

@@ -0,0 +1,2 @@
+development:
+  foo: "<%= 'bar' %>"

data/spec/rdm/cli/gen_package_spec.rb

@@ -98,4 +98,6 @@ describe Rdm::CLI::GenPackage do
       expect(stdout.output).to include("Package name was not specified!")
     end
   end
+
+
 end

data/spec/rdm/config_manager_spec.rb

@@ -0,0 +1,136 @@
+require 'spec_helper'
+
+describe Rdm::ConfigManager do
+  subject { Rdm::ConfigManager.new }
+
+  let(:example_path) {
+    Pathname.new(
+      File.join(File.expand_path('../../../', __FILE__), 'example')
+    )
+  }
+  let(:config_manager) { Rdm::ConfigManager.new }
+  let(:source_file) { example_path.join('Rdm.packages').to_s }
+  let(:source) { Rdm::SourceParser.read_and_init_source(source_file)}
+
+  describe "#load_config" do
+    context "config.default_path" do
+      let(:config){ Rdm::Config.build(name: "name", default_path: "configs/app/default.yml", role_path: nil) }
+      it "works" do
+        config_manager.load_config(config, source: source)
+      end
+    end
+
+    context "config.role_path" do
+      let(:config){ Rdm::Config.build(name: "name", default_path: nil, role_path: "configs/app/production.yml") }
+      it "works" do
+        config_manager.load_config(config, source: source)
+      end
+    end
+  end
+
+  describe "#update_using_file" do
+    context "file missing and raise_if_missing=true" do
+      let(:config){ Rdm::Config.build(name: "name", default_path: "configs/app/not-there.yml", role_path: nil) }
+      it "raises" do
+        expect{
+          config_manager.load_config(config, source: source)
+        }.to raise_error(RuntimeError, Regexp.new("Config file is not found at path"))
+      end
+    end
+  end
+
+  describe "#update_using_file" do
+    let(:fixtures_path) {
+      File.join(File.expand_path("../../", __FILE__), 'fixtures')
+    }
+
+    before :each do
+      subject.update_using_file(File.join(fixtures_path, "config.yml"))
+    end
+
+    it "parses yml with erb correctly" do
+      expect(subject.development.foo).to eq("bar")
+    end
+  end
+
+  describe "#update_using_hash" do
+    before :each do
+      subject.update_using_hash(
+        database: {
+          username: "foo",
+          password: "bar"
+        },
+        lib_name: "rdm",
+        version: 1,
+        published: true,
+        draft: false,
+        features: ["dependency_manager", "config_manager"]
+      )
+    end
+
+    it "returns given value for string" do
+      expect(subject.lib_name).to eq("rdm")
+    end
+
+    it "returns given value for int" do
+      expect(subject.version).to eq(1)
+    end
+
+    it "returns given value for true bool" do
+      expect(subject.published).to eq(true)
+    end
+
+    it "returns given value for false bool" do
+      expect(subject.draft).to eq(false)
+    end
+
+    it "returns given value for array" do
+      expect(subject.features).to eq(["dependency_manager", "config_manager"])
+    end
+
+    it "creates another child scope for nested hash" do
+      expect(subject.database).to be_instance_of(Rdm::ConfigScope)
+      expect(subject.database.username).to eq("foo")
+      expect(subject.database.password).to eq("bar")
+    end
+
+    context "when already has config" do
+      before :each do
+        subject.update_using_hash(
+          database: {
+            username: "new_username",
+            password: "new_password"
+          }
+        )
+      end
+
+      it "keeps old configs" do
+        expect(subject.lib_name).to eq('rdm')
+      end
+
+      it "rewrites new configs" do
+        expect(subject.database.username).to eq('new_username')
+      end
+    end
+  end
+
+  describe "to_h" do
+    before :each do
+      subject.update_using_hash(
+        site_name: "Sample app",
+        database: {
+          username: "username",
+          password: "password"
+        }
+      )
+    end
+
+    it "returns attributes in root scope" do
+      expect(subject.to_h["site_name"]).to eq("Sample app")
+    end
+
+    it "returns attributes in child scope" do
+      expect(subject.to_h["database"]["username"]).to eq("username")
+    end
+  end
+end