mofa 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0342f6975d3e968085fa8a6d0a8125a763841f1
-  data.tar.gz: 0d7a2c65a27761438ec84bc8a9fe45d4879c8660
+  metadata.gz: 9171669c7a5d19245a1592661d4149bb093495f8
+  data.tar.gz: 92084ca9bfc698cd4298d518e9487bebe3b0049c
 SHA512:
-  metadata.gz: d37a0c2d9feee6d3980e79dee2aa2e81b31c162e2f26550fadb1698094aff08dcf0b91f698ccf3af9b49e99802e430bd62d06bf51a434c55a0b5158592fd609a
-  data.tar.gz: d2e0e3f15c320c338d4176723b3b280ecb34a87e498d30926411d90eec6b230cfa633e6ec0682f864d9ced5373494e945fb66ddeb63a023a7bda99e46b00d10e
+  metadata.gz: 4fce8d6cb6b4b0df9cc818a94462668b958e0812faa3d0560f615f3b47d0ca2472ea3a004ba474a7e201b7125505981584d9707c010211947e91d0cd49bdd137
+  data.tar.gz: cae3f43f52b999da051d7a17aa52388bbd1d2577a467c33bef86eed1b8bae1ba86a5a1cd962bd39dd7d2e1ac6f2ff555ae6a7c7f4cc049046dbe0048deb2f89b

data/lib/mofa/cookbook.rb

@@ -19,7 +19,7 @@ class Cookbook
   attr_accessor :mofa_yml_local
   attr_accessor :token
   attr_accessor :override_mofa_secrets
-  
+
   def self.create(cookbook_name_or_path, token, override_mofa_secrets = nil)
     cookbook = nil
     begin
@@ -30,7 +30,7 @@ class Cookbook
           cookbook = ReleasedCookbook.new(cookbook_name_or_path, override_mofa_secrets)
 
         else
-          cookbook = SourceCookbook.new(cookbook_name_or_path)
+          cookbook = SourceCookbook.new(cookbook_name_or_path, override_mofa_secrets)
       end
     rescue RuntimeError => e
       raise "Cookbook not found/detected: " + e.message

data/lib/mofa/source_cookbook.rb

@@ -1,7 +1,7 @@
 class SourceCookbook < Cookbook
   COOKBOOK_IGNORE = %w(.mofa .idea .kitchen .vagrant .bundle test .git)
 
-  def initialize(cookbook_name_or_path)
+  def initialize(cookbook_name_or_path, override_mofa_secrets = nil)
     super()
     path = Pathname.new(cookbook_name_or_path)
 
@@ -10,6 +10,8 @@ class SourceCookbook < Cookbook
 
     say "source_dir=#{source_dir}"
 
+    @override_mofa_secrets = override_mofa_secrets
+
     autodetect_name
     autodetect_version
   end
@@ -130,6 +132,22 @@ class SourceCookbook < Cookbook
         end
       end
     end
+    inside "#{pkg_dir}/tmp" do
+      # Sync in mofa_secrets
+      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
     inside "#{pkg_dir}/tmp" do
       run "tar c#{tar_verbose}fz ../#{pkg_name}.new ."
     end

data/lib/mofa/version.rb

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

metadata

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