rdm 0.4.17 → 0.4.18

data/spec/rdm/gen/config_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Rdm::Gen::Config do
+  include ExampleProjectHelper
+
+  subject { described_class }
+
+  describe "::generate" do
+    before { initialize_example_project }
+    after  { reset_example_project }
+
+    context "sample config" do
+      before do
+        subject.generate(
+          config_name:  'mailing_system',
+          current_path: example_project_path
+        )
+      end
+
+      it "generates sample config" do
+        FileUtils.cd(example_project_path) do
+          ensure_exists("configs/mailing_system/default.yml")
+        end
+      end
+
+      it "add config line to Rdm.packages" do
+        ensure_content(rdm_source_file, 'config :mailing_system')
+      end
+    end
+  end
+end

data/spec/rdm/gen/init_spec.rb

@@ -18,6 +18,9 @@ describe Rdm::Gen::Init do
         ensure_exists("Gemfile")
         ensure_exists("Readme.md")
         ensure_exists("bin/console")
+        ensure_exists("env_files/test.env")
+        ensure_exists("env_files/development.env")
+        ensure_exists("env_files/production.env")
       end
     end
 
@@ -33,6 +36,15 @@ describe Rdm::Gen::Init do
         ensure_exists(".rdm/templates/package/bin/console")
       end
     end
+
+    it "has generated config templates" do
+      subject.generate(current_path: example_project_path, stdout: stdout)
+
+      FileUtils.cd(example_project_path) do
+        ensure_exists(".rdm/templates/configs/<%=config_path%>")
+        ensure_exists(".rdm/templates/configs/<%=role_config_path%>")
+      end
+    end
   end
 
   context "prevents double execution" do

data/spec/rdm/gen/package_spec.rb

@@ -82,7 +82,6 @@ describe Rdm::Gen::Package do
         package_name: "some",
         local_path:   "domain/some",
       )
-      
       expect {
         subject.generate(
           current_path: example_project_path,

data/spec/rdm/package_importer_spec.rb

@@ -8,28 +8,17 @@ describe Rdm::PackageImporter do
     dependencies.each do |dependency|
       package.import(dependency)
     end
-    package.set_environments do
-      array 'some_key', each: :string do
-        length({ min: 3 })
-      end
-    end
-
     package
   end
 
   def build_source(packages:)
     source = Rdm::Source.new(root_path: nil)
-    source.init_with(packages: packages)
+    source.init_with(packages: packages, configs: {})
     source
   end
 
-  before(:each) do
+  before do
     Rdm::PackageImporter.reset!
-    Rdm::ConfigManager.reset!
-
-    Rdm.setup do
-      config_path File.expand_path(File.join(__dir__, '../fixtures/app.yml'))
-    end
   end
 
   describe "#import_package" do
@@ -75,26 +64,5 @@ describe Rdm::PackageImporter do
         expect(imported).to_not include("factory")
       end
     end
-
-    context 'sets config variables' do
-      it 'only for imported packages' do
-        web_pack     = build_package("web", dependencies: ["core"])
-        core_pack    = build_package("core")
-        factory_pack = build_package("factory")
-        
-        source = build_source(packages: {"web" => web_pack, "core" => core_pack, "factory" => factory_pack})
-
-        imported = subject.import_package("web", source: source)
-
-        expect(Rdm::ConfigManager.web.some_key).to match(["value1", "value2", "value3"])
-        expect(Rdm::ConfigManager.core.some_key).to match(["value1", "value2", "value3"])
-
-        expect{
-          Rdm::ConfigManager.factory
-        }.to raise_error(
-          ArgumentError, ":factory configuration was not defined for current package. Add `import 'factory'` to your Package.rb file"
-        )
-      end
-    end
   end
 end

data/spec/rdm/rdm_spec.rb

@@ -29,7 +29,7 @@ describe Rdm do
 
   context "config" do
     it "returns config" do
-      expect(Rdm.config).to eq(Rdm::ConfigManager)
+      expect(Rdm.config).to be_a(Rdm::ConfigManager)
     end
   end
 

data/spec/rdm/source_parser_spec.rb

@@ -32,6 +32,12 @@ describe Rdm::SourceParser do
       expect(paths).to include("application/web")
       expect(paths).to include("domain/core")
     end
+
+    it "parses all config names" do
+      names = @source.config_names
+      expect(names.count).to be(1)
+      expect(names).to include("database")
+    end
   end
 
 
@@ -64,5 +70,58 @@ describe Rdm::SourceParser do
       expect(paths).to include("application/web")
       expect(paths).to include("domain/core")
     end
+
+    it "parses all config names" do
+      names = @source.config_names
+      expect(names.count).to be(2)
+      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')
+          expect(ENV['APP_NAME']).to eq('Application')
+        end
+      end
+
+      context "with undefined role" do
+        it "puts warning message" do
+          Rdm::Utils::FileUtils.change_file @rdm_source_file do |line|
+            line.include?("ENV['ENV_FILE'] || \"production\"") ? 'env_file_name "stading"' : line
+          end
+          subject.read_and_init_source(@rdm_source_file, stdout: stdout)
+
+          expect(stdout.output).to include("WARNING! Environment file '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')
+          expect(ENV['APP_NAME']).to eq('Application')
+        end
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -26,7 +26,6 @@ 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.17
+  version: 0.4.18
 platform: ruby
 authors:
 - Droid Labs
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,48 +108,6 @@ 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:
 executables:
@@ -172,6 +130,8 @@ 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
@@ -192,14 +152,18 @@ files:
 - example/application/web/package/web.rb
 - example/application/web/package/web/sample_controller.rb
 - example/bin/console
-- example/config/app.yml
+- 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/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
@@ -215,13 +179,19 @@ 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
@@ -248,11 +218,16 @@ 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
@@ -266,19 +241,12 @@ 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/app.yml
+- spec/fixtures/config.yml
 - spec/fixtures/sample_prj/Rdm.packages
 - spec/fixtures/sample_prj/infrastructure/web/Package.rb
 - spec/helpers/example_project_helper.rb
@@ -288,6 +256,8 @@ 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
@@ -309,10 +279,6 @@ 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:
 licenses: []
@@ -338,7 +304,7 @@ specification_version: 4
 summary: Ruby Dependency Manager
 test_files:
 - spec/fixtures/SampleSource.rb
-- spec/fixtures/app.yml
+- spec/fixtures/config.yml
 - spec/fixtures/sample_prj/Rdm.packages
 - spec/fixtures/sample_prj/infrastructure/web/Package.rb
 - spec/helpers/example_project_helper.rb
@@ -348,6 +314,8 @@ 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
@@ -369,8 +337,4 @@ 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/config/app.yml

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

data/example/infrastructure/repository/fixture.txt

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

data/lib/rdm/utils/ostruct_utils.rb

@@ -1,12 +0,0 @@
-require 'ostruct'
-
-class Rdm::Utils::Ostruct
-  class << self
-    def to_recursive_ostruct(hash)
-      OpenStruct.new(hash.each_with_object({}) do |(key, val), memo|
-        memo[key] = val.is_a?(Hash) ? to_recursive_ostruct(val) : val
-      end)
-    end
-  end
-end
-

data/lib/rdm/yml_config/config_caster.rb

@@ -1,32 +0,0 @@
-require 'morf'
-
-class Rdm::ConfigCaster
-  def initialize(envs)
-    @envs = envs
-  end
-
-  def cast(hash)
-    hash[@envs.name] ||= {}
-    caster.cast(hash, input_keys: :string, skip_unexpected_attributes: true)
-  end
-  
-
-  def to_hcast_string(env)
-    eval_string = "#{env.type} :#{env.name}, optional: #{env.optional}"
-    eval_string += env.is_array? ? ", each: :#{env.children.first.type}" : ""
-    eval_string += env.is_hash? ? %Q( do \n  #{env.children.map { |e| to_hcast_string(e) }.join("\n")} \nend) : ""
-
-    eval_string
-  end
-
-  private
-
-  def caster
-    @caster ||= Class.new
-    @caster.include(Morf::Caster)
-
-    @caster.class_eval "attributes do\n #{to_hcast_string(@envs)}\n end"
-
-    @caster
-  end
-end