rdm 0.4.14.2 → 0.4.17

data/spec/rdm/yml_config/env_config_dsl_spec.rb

@@ -0,0 +1,123 @@
+require 'spec_helper'
+
+describe Rdm::EnvConfigDSL do
+  subject { described_class.new }
+  let(:env_context) {
+    Proc.new do
+      string :url, optional: true do
+        length({ min: 4, max: 7, equal_to: 2 })
+      end
+
+      array :connections, each: :string, default: [4] do
+        size({ min: 0, max: 20})
+      end
+
+      hash :log_level do
+        symbol :output do
+          inclusion({ in: [:warn, :debug, :fatal, :error, :info] })
+        end
+
+        integer :level
+      end
+
+      array :some_array, each: :hash do
+        string :key do
+          length({ min: 4, max: 10 })
+        end
+
+        string :one_more_key, optional: true
+      end
+    end
+  }
+
+  it 'handle dsl' do
+    subject.instance_exec(&env_context)
+    
+    expect(subject.data.first).to be_a(Rdm::EnvConfig)
+    expect(subject.data.map(&:to_hash)).to match(
+      [
+        {
+          name:     :url,
+          type:     :string,
+          optional: true,
+          validates: {
+            length: {
+              min:   4,
+              max:   7,
+              equal_to: 2
+            }
+          }
+        },
+        {
+          name: :connections,
+          type: :array,
+          optional: false,
+          default: [4],
+          children: [
+            {
+              type: :string,
+              optional: false,
+              validates: {
+                size: {
+                  min: 0,
+                  max: 20
+                }
+              }
+            }
+          ]
+        },
+        {
+          name:     :log_level,
+          type:     :hash,
+          optional: false,
+          children: [
+            {
+              name: :output,
+              type: :symbol,
+              optional: false,
+              validates: {
+                inclusion: {
+                  in: [:warn, :debug, :fatal, :error, :info]
+                }
+              }
+            },
+            {
+              name: :level,
+              type: :integer,
+              optional: false
+            }
+          ]
+        },
+        {
+          name: :some_array,
+          type: :array,
+          optional: false,
+          children: [
+            {
+              type: :hash,
+              optional: false,
+              children: [
+                {
+                  name: :key,
+                  type: :string,
+                  optional: false,
+                  validates: {
+                    length: {
+                      min: 4,
+                      max: 10
+                    }
+                  }
+                },
+                {
+                  name: :one_more_key,
+                  type: :string,
+                  optional: true
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    )
+  end
+end

data/spec/spec_helper.rb

@@ -26,6 +26,7 @@ end
 
 Rdm.setup do
   silence_missing_package_file true
+  config_path                  File.join(__dir__, 'fixtures', 'app.yml')
 end
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdm
 version: !ruby/object:Gem::Version
-  version: 0.4.14.2
+  version: 0.4.17
 platform: ruby
 authors:
 - Droid Labs
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2020-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,8 +108,50 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.4'
+- !ruby/object:Gem::Dependency
+  name: morf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hcast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: attr_validator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby Dependency Manager
-email: 
+email:
 executables:
 - rdm
 - rubocop
@@ -130,8 +172,6 @@ files:
 - docs/index.md
 - docs/interface_brainstorming.md
 - example/.rdm/helpers/render_helper.rb
-- example/.rdm/templates/configs/<%=config_path%>
-- example/.rdm/templates/configs/<%=role_config_path%>
 - example/.rdm/templates/package/.gitignore
 - example/.rdm/templates/package/.rspec
 - example/.rdm/templates/package/<%=package_subdir_name%>/<%=package_name%>.rb
@@ -152,18 +192,14 @@ files:
 - 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/config/app.yml
 - example/domain/core/Package.rb
 - example/domain/core/package/core.rb
 - example/domain/core/package/core/sample_service.rb
 - example/domain/core/spec/core/one_more_spec.rb
 - example/domain/core/spec/core/sample_service_spec.rb
-- example/env_files/development.env
-- example/env_files/production.env
-- example/env_files/test.env
 - example/infrastructure/repository/Package.rb
+- example/infrastructure/repository/fixture.txt
 - example/infrastructure/repository/package/repository.rb
 - example/infrastructure/repository/package/repository/sample_repository.rb
 - example/infrastructure/repository/spec/example_spec.rb
@@ -179,19 +215,13 @@ 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/diff_spec_runner.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
@@ -218,16 +248,11 @@ files:
 - lib/rdm/spec_runner/runner.rb
 - lib/rdm/spec_runner/spec_filename_matcher.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/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/.runignore
 - lib/rdm/templates/init/tests/diff_run
 - lib/rdm/templates/init/tests/run
@@ -241,12 +266,19 @@ files:
 - lib/rdm/templates/template_detector.rb
 - lib/rdm/templates/template_renderer.rb
 - lib/rdm/utils/file_utils.rb
+- lib/rdm/utils/ostruct_utils.rb
 - lib/rdm/utils/render_util.rb
 - lib/rdm/utils/string_utils.rb
 - lib/rdm/version.rb
+- lib/rdm/yml_config/config_caster.rb
+- lib/rdm/yml_config/config_manager.rb
+- lib/rdm/yml_config/config_validator.rb
+- lib/rdm/yml_config/env_config.rb
+- lib/rdm/yml_config/env_config_dsl.rb
+- lib/rdm/yml_config/validate_config.rb
 - rdm.gemspec
 - spec/fixtures/SampleSource.rb
-- spec/fixtures/config.yml
+- spec/fixtures/app.yml
 - spec/fixtures/sample_prj/Rdm.packages
 - spec/fixtures/sample_prj/infrastructure/web/Package.rb
 - spec/helpers/example_project_helper.rb
@@ -256,8 +288,6 @@ files:
 - spec/rdm/cli/diff_spec_runner_spec.rb
 - 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
@@ -279,11 +309,15 @@ files:
 - spec/rdm/spec_runner_spec.rb
 - spec/rdm/templates/template_detector_spec.rb
 - spec/rdm/templates/template_renderer_spec.rb
+- spec/rdm/yml_config/config_caster_spec.rb
+- spec/rdm/yml_config/config_manager_spec.rb
+- spec/rdm/yml_config/config_validator_spec.rb
+- spec/rdm/yml_config/env_config_dsl_spec.rb
 - spec/spec_helper.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -298,14 +332,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Ruby Dependency Manager
 test_files:
 - spec/fixtures/SampleSource.rb
-- spec/fixtures/config.yml
+- spec/fixtures/app.yml
 - spec/fixtures/sample_prj/Rdm.packages
 - spec/fixtures/sample_prj/infrastructure/web/Package.rb
 - spec/helpers/example_project_helper.rb
@@ -315,8 +348,6 @@ test_files:
 - spec/rdm/cli/diff_spec_runner_spec.rb
 - 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
@@ -338,4 +369,8 @@ test_files:
 - spec/rdm/spec_runner_spec.rb
 - spec/rdm/templates/template_detector_spec.rb
 - spec/rdm/templates/template_renderer_spec.rb
+- spec/rdm/yml_config/config_caster_spec.rb
+- spec/rdm/yml_config/config_manager_spec.rb
+- spec/rdm/yml_config/config_validator_spec.rb
+- spec/rdm/yml_config/env_config_dsl_spec.rb
 - spec/spec_helper.rb

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

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

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

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

data/example/configs/app/default.yml

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

data/example/configs/app/production.yml

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

data/example/configs/database/default.yml

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

data/example/env_files/development.env

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

data/example/env_files/production.env

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

data/example/env_files/test.env

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

data/lib/rdm/cli/config.rb

@@ -1,31 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,68 +0,0 @@
-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