rdm 0.4.14.2 → 0.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a13427e067b489518c6a2ed9555043e73f0a8894
-  data.tar.gz: 987c4ee06c9b461f8345ee3d6bedaea3548a27d0
+SHA256:
+  metadata.gz: f92289ab666f058d12097df562312b6adcb7311433781270958fe4c550a02659
+  data.tar.gz: 9ebc9af89030643d8368659966bcec6dbc3aee536b065ea204e5d6868bf1ed22
 SHA512:
-  metadata.gz: b7137d6ac2db182e73c7fce9c93295b93f9b49ed1e6e63d68cd36945900bc5051990ed6e5b5f99073128cc39c8e37a126c3c7bda8cd857427a85e5a5c291f018
-  data.tar.gz: e41d71721c8b497ab395b743e28e1d98101ae68ac85b9ccf5fdce193b6a466a5180f9bccd3cf8c72d0678557d9abbbc9b71f3fc462dd21863cb5f4ccb097c81d
+  metadata.gz: 3bdb3f4ab4ae1eec9732364df1ec3061c4d7f480f34b33af1e5508a8bae4945e602d584243ce6cfb3015ac05063e49da8b6a4dd0ae098f6be96103aba65b31d6
+  data.tar.gz: 21db2cc6cbb6e57347aa6b06a4a5bb8a8988a4b6b8d4a1c045b84b66513f6d80b2b9e9ccfc9218fe8e6866df702c054f474214379129d7d9974aa0a90f292520

data/Gemfile.lock

@@ -1,34 +1,42 @@
 PATH
   remote: .
   specs:
-    rdm (0.4.14)
+    rdm (0.4.17)
       activesupport
+      attr_validator
       commander (~> 4.4)
+      hcast
+      morf
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.1.2)
+    activesupport (5.2.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     ast (2.3.0)
+    attr_validator (0.2.3)
+      i18n
     byebug (9.0.6)
-    codecov (0.1.10)
+    codecov (0.2.5)
+      colorize
       json
       simplecov
-      url
-    commander (4.4.3)
-      highline (~> 1.7.2)
-    concurrent-ruby (1.0.5)
+    colorize (0.8.1)
+    commander (4.5.2)
+      highline (~> 2.0.0)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
-    docile (1.1.5)
-    highline (1.7.8)
-    i18n (0.9.1)
+    docile (1.3.2)
+    hcast (0.3.0)
+    highline (2.0.3)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    json (2.0.3)
-    minitest (5.10.2)
+    json (2.3.1)
+    minitest (5.14.2)
+    morf (0.0.3)
     parser (2.3.3.1)
       ast (~> 2.2)
     powerpack (0.1.1)
@@ -54,16 +62,15 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.17.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.1.2)
-    url (0.3.2)
 
 PLATFORMS
   ruby
@@ -78,4 +85,4 @@ DEPENDENCIES
   rubocop (~> 0.46)
 
 BUNDLED WITH
-   1.16.0
+   1.17.3

data/bin/rdm

@@ -60,7 +60,7 @@ class RdmCliRunner
       c.action do |args, options|
         package_name = (args.first || "")
         defaults = {
-          current_path: File.expand_path(`pwd`.chomp),
+          current_path: `pwd`.chomp,
           package_name: package_name,
           path:         package_name.downcase.gsub(/\s+/, '_')
         }
@@ -82,7 +82,7 @@ class RdmCliRunner
       c.action do |args, options|
         revision = (args.first || "HEAD")
         options = {
-          path:     File.expand_path(`pwd`.chomp),
+          path:     `pwd`.chomp,
           revision: revision,
         }
         Rdm::CLI::DiffPackage.run(options)
@@ -100,7 +100,7 @@ class RdmCliRunner
       c.action do |args, options|
         package_name = (args.first || "")
         opts = {
-          project_path: File.expand_path(`pwd`.chomp),
+          project_path: `pwd`.chomp,
           package_name: package_name,
           compile_path: options.path
         }
@@ -125,7 +125,7 @@ class RdmCliRunner
 
         Rdm::CLI::TemplateGenerator.run(
           template_name: template_name,
-          current_path:  File.expand_path(`pwd`.chomp),
+          current_path:  `pwd`.chomp,
           local_path:    options_hash.delete(:path),
           locals:        options_hash
         )
@@ -143,7 +143,7 @@ class RdmCliRunner
 
         Rdm::CLI::DependenciesController.run(
           package_name: package_name,
-          project_path: File.expand_path(`pwd`.chomp)
+          project_path: `pwd`.chomp
         )
       end
     end
@@ -162,7 +162,7 @@ class RdmCliRunner
 
         Rdm::CLI::Config.run(
           config_name:  config_name,
-          current_path: File.expand_path(`pwd`.chomp),
+          current_path: `pwd`.chomp,
           config_data:  options_hash
         )
       end
@@ -193,11 +193,11 @@ class RdmCliRunner
         options_hash = options.__hash__
         options_hash.delete(:trace)
 
-        Rdm.root(File.expand_path(`pwd`.chomp))
+        Rdm.root(`pwd`.chomp)
         Rdm::SpecRunner.run(
           package:                package_name,
           spec_matcher:           spec_matcher,
-          path:                   File.expand_path(`pwd`.chomp),
+          path:                   `pwd`.chomp,
           skip_ignored_packages:  true,
           show_missing_packages:  true,
           from:                   options_hash[:from]
@@ -221,11 +221,11 @@ class RdmCliRunner
         revision = args[0]
 
         ENV['RUBY_ENV'] = 'test'
-        Rdm.root(File.expand_path(`pwd`.chomp))
+        Rdm.root(`pwd`.chomp)
 
         Rdm::CLI::DiffSpecRunner.run(
           revision: revision,
-          path:     File.expand_path(`pwd`.chomp)
+          path:     `pwd`.chomp
         )
       end
     end

data/example/Rdm.packages

@@ -3,25 +3,9 @@ setup do
     ENV['RUBY_ENV'] || "production"
   end
 
-  env_file_name do
-    ENV['ENV_FILE'] || "production"
-  end
-
-  env_files_dir "env_files"
-
-  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/rdm/:package_name"
+  config_path 'config/app.yml'
 end
 
-config :database
-config :app
-
 package "server"
 package "application/web"
 package "domain/core"

data/example/config/app.yml

@@ -0,0 +1,6 @@
+database:
+  username: "root"
+  password: "root"
+core:
+  app_name: "RdmExampleProject"
+

data/example/infrastructure/repository/Package.rb

@@ -5,5 +5,4 @@ end
 
 dependency do
   # require "sequel"
-  import_config :app
 end

data/example/infrastructure/repository/fixture.txt

@@ -0,0 +1 @@
+Repository spec working here!

data/lib/rdm.rb

@@ -1,3 +1,5 @@
+require 'morf'
+
 module Rdm
   SOURCE_FILENAME = 'Rdm.packages'.freeze
   PACKAGE_FILENAME = 'Package.rb'.freeze
@@ -6,6 +8,7 @@ module Rdm
   require 'rdm/utils/render_util'
   require 'rdm/utils/string_utils'
   require 'rdm/utils/file_utils'
+  require 'rdm/utils/ostruct_utils'
   require 'rdm/version'
 
   # CLI part
@@ -15,13 +18,9 @@ module Rdm
   require 'rdm/cli/diff_package'
   require 'rdm/cli/template_generator'
   require 'rdm/cli/dependencies_controller'
-  require 'rdm/cli/config'
   require 'rdm/cli/diff_spec_runner.rb'
 
   # Runtime part
-  require 'rdm/config'
-  require 'rdm/config_scope'
-  require 'rdm/config_manager'
   require 'rdm/errors'
   require 'rdm/package'
   require 'rdm/package_parser'
@@ -33,7 +32,6 @@ module Rdm
   require 'rdm/git/diff_manager'
   require 'rdm/git/diff_command'
   require 'rdm/git/repository_locator'
-  require 'rdm/config_locals'
   require 'rdm/source_modifier'
 
   # Package part
@@ -43,7 +41,6 @@ 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'
@@ -62,6 +59,13 @@ module Rdm
   require 'rdm/spec_runner/view'
   require 'rdm/spec_runner/spec_filename_matcher'
 
+  require 'rdm/yml_config/env_config_dsl'
+  require 'rdm/yml_config/validate_config'
+  require 'rdm/yml_config/env_config'
+  require 'rdm/yml_config/config_caster'
+  require 'rdm/yml_config/config_manager'
+  require 'rdm/yml_config/config_validator'
+
   extend Rdm::Helpers::PathHelper
 
   class << self
@@ -70,6 +74,9 @@ module Rdm
       @stdout = stdout
       
       Rdm::PackageImporter.import_file(package_path, group: group)
+    rescue Rdm::Errors::InvalidConfig => e
+      puts e.message
+      exit(0)
     end
 
     # Rdm's internal settings
@@ -79,7 +86,7 @@ module Rdm
 
     # Rdm's managed configuration
     def config
-      @config ||= Rdm::ConfigManager.new
+      @config ||= Rdm::ConfigManager
     end
 
     # Setup Rdm's internal settings

data/lib/rdm/errors.rb

@@ -56,5 +56,8 @@ module Rdm
 
     class ConfigExists < StandardError
     end
+
+    class InvalidConfig < StandardError
+    end
   end
 end

data/lib/rdm/gen/init.rb

@@ -45,10 +45,6 @@ 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,6 +2,11 @@ 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)
@@ -15,10 +20,6 @@ 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(
@@ -49,11 +50,7 @@ class Rdm::Package
     @file_dependencies[current_group] << file
   end
 
-  # Import config dependency
-  def import_config(dependency)
-    @config_dependencies ||= {}
-    @config_dependencies[current_group] ||= []
-    @config_dependencies[current_group] << dependency
+  def import_config(*args)
   end
 
   def package
@@ -84,6 +81,18 @@ 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,6 +31,7 @@ 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
@@ -46,10 +47,6 @@ 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,14 +59,9 @@ class Rdm::PackageImporter
 
     # also import local dependencies
     package.local_dependencies(group).each do |dependency|
-      import_package(dependency, source: source)
+      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
@@ -105,19 +97,13 @@ 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,6 +16,7 @@ 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,13 +56,7 @@ module Rdm
           end
         end
 
-        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
+        # TODO: paste generated env files to compile directory
 
         Rdm.settings.compile_ignore_files.each do |file|
           Dir["#{@compile_path}/**/#{file}"].each do |file_to_remove|