capistrano-multiconfig 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2444c019b2164fb48b8c2b07ad2b92f43852cfb7
-  data.tar.gz: 22c2d78e1dfeaf94989f2f4a0f0d6f7478db8852
+  metadata.gz: 7a4a01eddf6db929483491f1ab6e8f1bee0c1de0
+  data.tar.gz: 37b27ad85cb0cdfb72562e666e3886c90a09256d
 SHA512:
-  metadata.gz: cd67f960281c7c3e633c1c9cdd9562ebf4c9b4f9ee848a93b8d1229b6e53c446f0ef01dfa2facbd2ff7c8bb5348e99da003b19c0314c9f4af307dafee4124302
-  data.tar.gz: 2e2f10fc4c5f9e4ad3257d1feac61495a50bdd0d3a68c92537e3f204d7ed4b3027771a1b4ec14208b24e2702c745afc0bedae1b5731b15586ec221f2aeb6f955
+  metadata.gz: 4125540d382803fa4f317d7452eeb83229bae15457aaefab91de85b1f5d2c3331d492b6e3dc9441c48c23d63ecd5e3818875f1141aaacc2f71c5811c7442d7a6
+  data.tar.gz: a1e9b7b9dbad421babef44a1704180a9a8d90156a87ca8e0b76d8f8048ead068cad6b234f80d08df0b335cc1d216d74142f76fbaff4d4256e2d1cc4e71f4be18

data/capistrano-multiconfig.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "capistrano-multiconfig"
-  s.version     = "3.0.0"
+  s.version     = "3.0.1"
   s.authors     = ["Andriy Yanko"]
   s.email       = ["andriy.yanko@gmail.com"]
   s.homepage    = "https://github.com/railsware/multiconfig"

data/fixtures/config/root_with_nested.rb

@@ -0,0 +1 @@
+set :message, "hello from root"

data/fixtures/config/root_with_nested/app/config.rb

@@ -0,0 +1 @@
+set :message, "#{fetch(:message)} world"

data/lib/capistrano/multiconfig.rb

@@ -9,11 +9,20 @@ config_names = Capistrano::Multiconfig::Configurations.find_names(config_root_pa
 config_names.each do |config_name|
   Rake::Task.define_task(config_name) do
     set(:config_name, config_name)
-    segments = config_name.split(":")
-    segments.size.times do |i|
-      path = File.join([config_root_path] + segments[0..i]) + '.rb'
-      load(path) if File.exists?(path)
+
+    load "capistrano/defaults.rb"
+
+    paths = [ config_root_path + '.rb' ]
+
+    (segments = config_name.split(":")).size.times do |i|
+      paths << File.join([config_root_path] + segments[0..i]) + '.rb'
     end
+
+    paths.each { |path| load(path) if File.exists?(path) }
+
+    load "capistrano/#{fetch(:scm)}.rb"
+    I18n.locale = fetch(:locale, :en)
+    configure_backend
   end.add_description("Load #{config_name} configuration")
 end
 

data/spec/integration_spec.rb

@@ -87,6 +87,14 @@ TEXT
           subject.should == "hello from level0 level1 world\n"
       end
     end
+
+    context "configuration with root and nested" do
+      let(:config_root) { 'config/root_with_nested' }
+      subject { run_cap("app:config hello_world") }
+      it "should display nested message from root" do
+        subject.should == "hello from root world\n"
+      end
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-multiconfig
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Andriy Yanko
@@ -58,6 +58,8 @@ files:
 - fixtures/config/nested_with_shared_file/app.rb
 - fixtures/config/nested_with_shared_file/app/production.rb
 - fixtures/config/nested_with_shared_file/app/staging.rb
+- fixtures/config/root_with_nested.rb
+- fixtures/config/root_with_nested/app/config.rb
 - fixtures/config/sample/apps/world1.rb
 - fixtures/config/sample/apps/world2.rb
 - fixtures/config/third_level_nested/app/blog/production.rb