rdm 0.4.17 → 0.4.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f92289ab666f058d12097df562312b6adcb7311433781270958fe4c550a02659
-  data.tar.gz: 9ebc9af89030643d8368659966bcec6dbc3aee536b065ea204e5d6868bf1ed22
+  metadata.gz: 7ef547c24828be0e76ebfead89103580691c5eb09fb7ccae8fbf6e679ceb90c0
+  data.tar.gz: d5bce320cb6593f1ecbe6346acc6b109824f4320ef04300ab842f08cbb316aa8
 SHA512:
-  metadata.gz: 3bdb3f4ab4ae1eec9732364df1ec3061c4d7f480f34b33af1e5508a8bae4945e602d584243ce6cfb3015ac05063e49da8b6a4dd0ae098f6be96103aba65b31d6
-  data.tar.gz: 21db2cc6cbb6e57347aa6b06a4a5bb8a8988a4b6b8d4a1c045b84b66513f6d80b2b9e9ccfc9218fe8e6866df702c054f474214379129d7d9974aa0a90f292520
+  metadata.gz: d0784e0a54cdd0e0e1a5129460684cea9d5ed3606c997d390902a0393019082ddf163995b6efe44fe929c987d9b3c529377529ccf3e6c049fe10c5e072f499a5
+  data.tar.gz: 070261bcff5bb4be884fc6ad9c7ade948598c091dc141c3181e79d9146d09a5204d935929e15c16f4de6a60674506fac673cc433e5fd7d3c43f8e59db7b1b147

data/Gemfile.lock

@@ -1,12 +1,9 @@
 PATH
   remote: .
   specs:
-    rdm (0.4.17)
+    rdm (0.4.18)
       activesupport
-      attr_validator
       commander (~> 4.4)
-      hcast
-      morf
 
 GEM
   remote: https://rubygems.org/
@@ -17,8 +14,6 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     ast (2.3.0)
-    attr_validator (0.2.3)
-      i18n
     byebug (9.0.6)
     codecov (0.2.5)
       colorize
@@ -30,13 +25,11 @@ GEM
     concurrent-ruby (1.1.7)
     diff-lcs (1.3)
     docile (1.3.2)
-    hcast (0.3.0)
     highline (2.0.3)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     json (2.3.1)
     minitest (5.14.2)
-    morf (0.0.3)
     parser (2.3.3.1)
       ast (~> 2.2)
     powerpack (0.1.1)

data/bin/rdm

@@ -60,7 +60,7 @@ class RdmCliRunner
       c.action do |args, options|
         package_name = (args.first || "")
         defaults = {
-          current_path: `pwd`.chomp,
+          current_path: File.expand_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:     `pwd`.chomp,
+          path:     File.expand_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: `pwd`.chomp,
+          project_path: File.expand_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:  `pwd`.chomp,
+          current_path:  File.expand_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: `pwd`.chomp
+          project_path: File.expand_path(`pwd`.chomp)
         )
       end
     end
@@ -162,7 +162,7 @@ class RdmCliRunner
 
         Rdm::CLI::Config.run(
           config_name:  config_name,
-          current_path: `pwd`.chomp,
+          current_path: File.expand_path(`pwd`.chomp),
           config_data:  options_hash
         )
       end
@@ -193,11 +193,11 @@ class RdmCliRunner
         options_hash = options.__hash__
         options_hash.delete(:trace)
 
-        Rdm.root(`pwd`.chomp)
+        Rdm.root(File.expand_path(`pwd`.chomp))
         Rdm::SpecRunner.run(
           package:                package_name,
           spec_matcher:           spec_matcher,
-          path:                   `pwd`.chomp,
+          path:                   File.expand_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(`pwd`.chomp)
+        Rdm.root(File.expand_path(`pwd`.chomp))
 
         Rdm::CLI::DiffSpecRunner.run(
           revision: revision,
-          path:     `pwd`.chomp
+          path:     File.expand_path(`pwd`.chomp)
         )
       end
     end

data/example/.rdm/templates/configs/<%=config_path%>

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

data/example/.rdm/templates/configs/<%=role_config_path%>

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

data/example/Rdm.packages

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

data/example/configs/app/default.yml

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

data/example/configs/app/production.yml

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

data/example/configs/database/default.yml

@@ -0,0 +1,3 @@
+database:
+  username: "root"
+  password: "root"

data/example/env_files/development.env

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

data/example/env_files/production.env

@@ -0,0 +1,5 @@
+RUBY_ENV=production
+
+EXAMPLE_API_KEY=example_key_value
+
+APP_NAME=Application

data/example/env_files/test.env

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

data/example/infrastructure/repository/Package.rb

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

data/lib/rdm.rb

@@ -1,5 +1,3 @@
-require 'morf'
-
 module Rdm
   SOURCE_FILENAME = 'Rdm.packages'.freeze
   PACKAGE_FILENAME = 'Package.rb'.freeze
@@ -8,7 +6,6 @@ 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
@@ -18,9 +15,13 @@ 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'
@@ -32,6 +33,7 @@ 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
@@ -41,6 +43,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'
@@ -59,13 +62,6 @@ 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
@@ -74,9 +70,6 @@ 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
@@ -86,7 +79,7 @@ module Rdm
 
     # Rdm's managed configuration
     def config
-      @config ||= Rdm::ConfigManager
+      @config ||= Rdm::ConfigManager.new
     end
 
     # Setup Rdm's internal settings

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.rb

@@ -0,0 +1,11 @@
+class Rdm::Config
+  attr_accessor :name, :default_path, :role_path
+
+  def self.build(name:, default_path:, role_path:)
+    new.tap do |i|
+      i.name         = name
+      i.default_path = default_path
+      i.role_path    = role_path
+    end
+  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/config_manager.rb

@@ -0,0 +1,68 @@
+require 'yaml'
+require 'erb'
+
+class Rdm::ConfigManager
+  # Update configuration based on given config file
+  # @param config [Rdm::Config] Config entity
+  # @return root scope [Rdm::ConfigScope] Updated root scope
+  def load_config(config, source:)
+    if config.default_path
+      full_default_path = File.join(source.root_path, config.default_path)
+      update_using_file(full_default_path, raise_if_missing: true)
+    end
+    if config.role_path
+      full_role_path = File.join(source.root_path, config.role_path)
+      update_using_file(full_role_path, raise_if_missing: false)
+    end
+    root_scope
+  end
+
+  # Update configuration using given path to config file
+  # @param config [Hash<String: AnyValue>] Hash with configuration
+  # @return root scope [Rdm::ConfigScope] Updated root scope
+  def update_using_file(path, raise_if_missing: true)
+    if File.exist?(path)
+      compiled_file = ::ERB.new(File.read(path)).result
+      hash = YAML.load(compiled_file)
+      update_using_hash(hash)
+    elsif raise_if_missing
+      raise "Config file is not found at path #{path}"
+    end
+    root_scope
+  end
+
+  # Update configuration based on given hash
+  # @param config [Hash<String: AnyValue>] Hash with configuration
+  # @return root scope [Rdm::ConfigScope] Updated root scope
+  def update_using_hash(hash, scope: nil)
+    scope ||= root_scope
+
+    hash.each do |key, value|
+      if value.is_a?(Hash)
+        # Try using existing scope
+        child_scope = scope.read_attribute(key)
+        if !child_scope || !child_scope.is_a?(Rdm::ConfigScope)
+          child_scope = Rdm::ConfigScope.new
+        end
+        update_using_hash(value, scope: child_scope)
+        scope.write_attribute(key, child_scope)
+      else
+        scope.write_attribute(key, value)
+      end
+    end
+  end
+
+  def method_missing(method_name, *args)
+    root_scope.send(method_name, *args)
+  end
+
+  def to_h
+    root_scope.to_h
+  end
+
+  private
+
+  def root_scope
+    @root_scope ||= Rdm::ConfigScope.new
+  end
+end

data/lib/rdm/config_scope.rb

@@ -0,0 +1,23 @@
+class Rdm::ConfigScope
+  def initialize(attributes = {})
+    @attributes = attributes
+  end
+
+  def read_attribute(key)
+    @attributes[key.to_s]
+  end
+
+  def write_attribute(key, value)
+    @attributes[key.to_s] = value
+  end
+
+  def method_missing(method_name, *_args)
+    read_attribute(method_name)
+  end
+
+  def to_h
+    @attributes.each_with_object({}) do |(k, v), h|
+      h[k] = Rdm::ConfigScope === v ? v.to_h : v
+    end
+  end
+end

data/lib/rdm/errors.rb

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

data/lib/rdm/gen/config.rb

@@ -0,0 +1,59 @@
+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
+    @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::SourceModifier.add_config(@config_name, get_source.root_path)
+    
+    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