rdm 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccd255c90b9282d7099a6d56209702df3a6ae2ea
-  data.tar.gz: 45f8f4f7c203d6c9f24145df9f78ec150bad091f
+  metadata.gz: ec7392add4bff744020f08554065f66d2b1c2155
+  data.tar.gz: 39ac10317b4c8ae71816e6844ec922b06025a74c
 SHA512:
-  metadata.gz: 43e2df557a1921a6ee3edc8d998113fd97efa8632ddcd3d7bb60596fdb63ca9f75f261666d305a149bcb75f6d91a3f01b60980db609f8e4422d681f552358a77
-  data.tar.gz: 037effcac344e15c413e24cc4b676ef5840eecadd0c70b2ce2752243541d9967c9e75f07fd6955a43177d6198b2b6bb83bfd102081b11f1b8d5a89b117d09969
+  metadata.gz: 705e6d22a68e2c9e5c2499bc197885bcb624f02777ba0601647cee6e93a034afb6c3c91dbef73da21ff5381d5e4f4d103f423193eaf6490c0fc0113badca3c21
+  data.tar.gz: 1a00c19c72dcdc189d84f9e1ac11412963bc04b7e4df69d3a6f1393bce683d9ae269180f35db35917bab16e1f6708f3778fe8f3bccff80dcaae91970fd1da638

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rdm (0.4.0)
+    rdm (0.4.1)
       activesupport
       commander (~> 4.4)
 

data/example/Rdm.packages

@@ -1,14 +1,16 @@
 setup do
   role "production"
+  
+  env_file_name "production"
+  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"
 
-  env_files_dir "env_files"
-
   package_subdir_name "package"
 
+
   compile_path "/tmp/rdm/:package_name"
 end
 

data/example/env_files/development.env

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

data/example/env_files/production.env

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

data/example/env_files/test.env

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

data/lib/rdm.rb

@@ -88,6 +88,14 @@ module Rdm
       @root = value
     end
 
-    attr_reader :root
+    def root(path = nil)
+      return @root if @root
+
+      if path
+        @root = Rdm::SourceLocator.locate(path)
+      end
+        
+      @root
+    end
   end
 end

data/lib/rdm/settings.rb

@@ -2,7 +2,7 @@ class Rdm::Settings
   SETTING_KEYS = [
     :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, :env_files_dir
+    :compile_ignore_files, :compile_add_files, :env_files_dir, :env_file_name
   ].freeze
 
   SETTING_VARIABLES = [:role, :configs_dir, :config_path, :role_config_path].freeze
@@ -26,6 +26,7 @@ class Rdm::Settings
       'Gemfile',
       'Gemfile.lock',
     ])
+    compile_path('/tmp/rdm/:package_name')
   end
 
   SETTING_KEYS.each do |key|

data/lib/rdm/source_parser.rb

@@ -70,18 +70,18 @@ class Rdm::SourceParser
   end
 
   def init_and_set_env_variables(source)
-    role = settings.read_setting(:role)
-
-    unless File.exists?(env_file_path(role))
-      @stdout.puts "WARNING! Environment file for role '#{role}' was not found. Please, add #{env_file_path(role)} file..."
+    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(role)) do |line|
+    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 '#{role}' overwrites ENV['#{key}'] variable from '#{ENV.fetch(key, nil)}' to '#{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
@@ -102,8 +102,10 @@ class Rdm::SourceParser
     File.dirname(source_path)
   end
 
-  def env_file_path(role)
-    File.join(root_path, settings.read_setting(:env_files_dir), "#{role}.env")
+  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

data/lib/rdm/templates/init/Rdm.packages

@@ -3,6 +3,10 @@ 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'

data/lib/rdm/version.rb

@@ -1,3 +1,3 @@
 module Rdm
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/spec/rdm/source_parser_spec.rb

@@ -91,18 +91,19 @@ describe Rdm::SourceParser 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?('role "production"') ? 'role "stading"' : line
+            line.include?('env_file_name "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 for role 'stading' was not found. Please, add /tmp/example/env_files/stading.env file...")
+          expect(stdout.output).to include("WARNING! Environment file 'stading' was not found. Please, add /tmp/example/env_files/stading.env file...")
         end
       end
 
@@ -119,6 +120,7 @@ describe Rdm::SourceParser do
 
         it 'overwrites ENV variable' do
           expect(ENV['RUBY_ENV']).to eq('production')
+          expect(ENV['APP_NAME']).to eq('Application')
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdm
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Droid Labs