mofa 0.5.2 → 0.5.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9171669c7a5d19245a1592661d4149bb093495f8
4
- data.tar.gz: 92084ca9bfc698cd4298d518e9487bebe3b0049c
3
+ metadata.gz: 9c5d34e296fd7a81d1660c7ca2373f9b0ae40c21
4
+ data.tar.gz: 31f698fe349d88488a296d457ca386129f9d9637
5
5
  SHA512:
6
- metadata.gz: 4fce8d6cb6b4b0df9cc818a94462668b958e0812faa3d0560f615f3b47d0ca2472ea3a004ba474a7e201b7125505981584d9707c010211947e91d0cd49bdd137
7
- data.tar.gz: cae3f43f52b999da051d7a17aa52388bbd1d2577a467c33bef86eed1b8bae1ba86a5a1cd962bd39dd7d2e1ac6f2ff555ae6a7c7f4cc049046dbe0048deb2f89b
6
+ metadata.gz: cb122e05cda26a3923f30aa68dc4fe59f873bd858e33bff7fd92fd9cc6b22a52127fe9cec8fe4ee195e751306305f2f73e318fcd42b06c0d37275eb27c40e787
7
+ data.tar.gz: 7333ae0549d1604f26eac29084a2f08b31659b89eec8ed07421b3844bfc02366a523a575b8d460b497cb663d51f0d9e5031645a8544ab4015389ed9a68e220a3
@@ -49,6 +49,13 @@ class SourceCookbook < Cookbook
49
49
  end
50
50
 
51
51
  def load_mofa_yml_local
52
+ if override_mofa_secrets
53
+ say "-S Switch found - checking for .mofa.local.yml..."
54
+ if File.file?("#{override_mofa_secrets}/#{name}/.mofa.local.yml")
55
+ say ".mofa.local.yml found at #{override_mofa_secrets}/#{name}/.mofa.local.yml - copying it into source dir..."
56
+ FileUtils.cp "#{override_mofa_secrets}/#{name}/.mofa.local.yml", "#{source_dir}/.mofa.local.yml"
57
+ end
58
+ end
52
59
  @mofa_yml_local = MofaYml.load_from_file("#{source_dir}/.mofa.local.yml", self)
53
60
  end
54
61
 
@@ -137,14 +144,6 @@ class SourceCookbook < Cookbook
137
144
  if override_mofa_secrets
138
145
  if File.directory?("#{override_mofa_secrets}/#{name}/cookbooks")
139
146
  run "rsync -vr #{override_mofa_secrets}/#{name}/cookbooks/ cookbooks/"
140
- if File.file?("#{override_mofa_secrets}/#{name}/.mofa.local.yml")
141
- FileUtils.cp "#{override_mofa_secrets}/#{name}/.mofa.local.yml", "cookbooks/#{name}/"
142
- end
143
- if File.file?("#{override_mofa_secrets}/#{name}/.mofa.yml")
144
- FileUtils.cp "#{override_mofa_secrets}/#{name}/.mofa.yml", "cookbooks/#{name}/"
145
- end
146
- else
147
- run "rsync -vr #{override_mofa_secrets}/#{name}/ cookbooks/#{name}/"
148
147
  end
149
148
  end
150
149
  end
@@ -1,3 +1,3 @@
1
1
  module Mofa
2
- VERSION = '0.5.2'
2
+ VERSION = '0.5.3'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mofa
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.2
4
+ version: 0.5.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alexander Birk