mofa 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9171669c7a5d19245a1592661d4149bb093495f8
-  data.tar.gz: 92084ca9bfc698cd4298d518e9487bebe3b0049c
+  metadata.gz: 9c5d34e296fd7a81d1660c7ca2373f9b0ae40c21
+  data.tar.gz: 31f698fe349d88488a296d457ca386129f9d9637
 SHA512:
-  metadata.gz: 4fce8d6cb6b4b0df9cc818a94462668b958e0812faa3d0560f615f3b47d0ca2472ea3a004ba474a7e201b7125505981584d9707c010211947e91d0cd49bdd137
-  data.tar.gz: cae3f43f52b999da051d7a17aa52388bbd1d2577a467c33bef86eed1b8bae1ba86a5a1cd962bd39dd7d2e1ac6f2ff555ae6a7c7f4cc049046dbe0048deb2f89b
+  metadata.gz: cb122e05cda26a3923f30aa68dc4fe59f873bd858e33bff7fd92fd9cc6b22a52127fe9cec8fe4ee195e751306305f2f73e318fcd42b06c0d37275eb27c40e787
+  data.tar.gz: 7333ae0549d1604f26eac29084a2f08b31659b89eec8ed07421b3844bfc02366a523a575b8d460b497cb663d51f0d9e5031645a8544ab4015389ed9a68e220a3

data/lib/mofa/source_cookbook.rb

@@ -49,6 +49,13 @@ class SourceCookbook < Cookbook
   end
 
   def load_mofa_yml_local
+    if override_mofa_secrets
+      say "-S Switch found - checking for .mofa.local.yml..."
+      if File.file?("#{override_mofa_secrets}/#{name}/.mofa.local.yml")
+        say ".mofa.local.yml found at #{override_mofa_secrets}/#{name}/.mofa.local.yml - copying it into source dir..."
+        FileUtils.cp "#{override_mofa_secrets}/#{name}/.mofa.local.yml", "#{source_dir}/.mofa.local.yml"
+      end
+    end
     @mofa_yml_local = MofaYml.load_from_file("#{source_dir}/.mofa.local.yml", self)
   end
 
@@ -137,14 +144,6 @@ class SourceCookbook < Cookbook
       if override_mofa_secrets
         if File.directory?("#{override_mofa_secrets}/#{name}/cookbooks")
           run "rsync -vr #{override_mofa_secrets}/#{name}/cookbooks/ cookbooks/"
-          if File.file?("#{override_mofa_secrets}/#{name}/.mofa.local.yml")
-            FileUtils.cp "#{override_mofa_secrets}/#{name}/.mofa.local.yml", "cookbooks/#{name}/"
-          end
-          if File.file?("#{override_mofa_secrets}/#{name}/.mofa.yml")
-            FileUtils.cp "#{override_mofa_secrets}/#{name}/.mofa.yml", "cookbooks/#{name}/"
-          end
-        else
-          run "rsync -vr #{override_mofa_secrets}/#{name}/ cookbooks/#{name}/"
         end
       end
     end

data/lib/mofa/version.rb

@@ -1,3 +1,3 @@
 module Mofa
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mofa
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Alexander Birk