mofa 0.3.30 → 0.3.31

data/lib/mofa/cli.rb

@@ -22,6 +22,7 @@ module Mofa
     method_option :runlist, :type => :string, :aliases => '-o'
     method_option :attributes, :type => :string, :aliases => '-j'
     method_option :service_hostlist_url, :type => :string
+    method_option :override_mofa_secrets, :type => :string, :aliases => '-S'
 
     def provision(cookbook_name_or_path)
       set_verbosity
@@ -34,7 +35,7 @@ module Mofa
       token = MofaCmd.generate_token
 
       hostlist = Hostlist.create(target_filter, options[:service_hostlist_url], options[:concrete_target])
-      cookbook = Cookbook.create(cookbook_name_or_path, token)
+      cookbook = Cookbook.create(cookbook_name_or_path, token, options[:override_mofa_secrets])
       runlist_map = RunlistMap.create(cookbook, hostlist, token, options[:runlist])
       attributes_map = AttributesMap.create(cookbook, hostlist, token, options[:runlist], options[:attributes])
 

data/lib/mofa/cookbook.rb

@@ -18,15 +18,16 @@ class Cookbook
   attr_accessor :mofa_yml
   attr_accessor :mofa_yml_local
   attr_accessor :token
-
-  def self.create(cookbook_name_or_path, token)
+  attr_accessor :override_mofa_secrets
+  
+  def self.create(cookbook_name_or_path, token, override_mofa_secrets = nil)
     cookbook = nil
     begin
       case
         when cookbook_name_or_path.match(/@/)
           fail "Did not find released Cookbook #{cookbook_name_or_path}!" unless ReleasedCookbook.exists?(cookbook_name_or_path)
 
-          cookbook = ReleasedCookbook.new(cookbook_name_or_path)
+          cookbook = ReleasedCookbook.new(cookbook_name_or_path, override_mofa_secrets)
 
         else
           cookbook = SourceCookbook.new(cookbook_name_or_path)

data/lib/mofa/released_cookbook.rb

@@ -14,11 +14,12 @@ class ReleasedCookbook < Cookbook
     RestClient.head(url)
   end
 
-  def initialize(cookbook_name_or_path)
+  def initialize(cookbook_name_or_path, override_mofa_secrets = nil)
     super()
     nv = ReleasedCookbook.get_name_and_version(cookbook_name_or_path)
     @name = nv['name']
     @version = nv['version']
+    @override_mofa_secrets = override_mofa_secrets
   end
 
   # ------------- Interface Methods
@@ -62,6 +63,19 @@ class ReleasedCookbook < Cookbook
       FileUtils.cp_r "#{pkg_dir}/tmp/cookbooks/#{name}/recipes", pkg_dir
     end
 
+    # Sync in mofa_secrets
+    if override_mofa_secrets
+      run "rsync -avx #{override_mofa_secrets}/ #{pkg_dir}/tmp/cookbooks/#{name}/"
+    end
+
+    if File.exist?("#{pkg_dir}/tmp/cookbooks/#{name}/.mofa.yml")
+      FileUtils.cp "#{pkg_dir}/tmp/cookbooks/#{name}/.mofa.yml", pkg_dir
+    end
+
+    if File.exist?("#{pkg_dir}/tmp/cookbooks/#{name}/.mofa.local.yml")
+      FileUtils.cp "#{pkg_dir}/tmp/cookbooks/#{name}/.mofa.local.yml", pkg_dir
+    end
+
     run "cd #{pkg_dir}/tmp/;tar c#{tar_verbose}fz #{pkg_dir}/#{pkg_name}.new ."
     run "rm #{pkg_dir}/#{pkg_name}"
     run "mv #{pkg_dir}/#{pkg_name}.new #{pkg_dir}/#{pkg_name}"
@@ -69,11 +83,11 @@ class ReleasedCookbook < Cookbook
   end
 
   def load_mofa_yml
-    @mofa_yml = MofaYml.load_from_file(".mofa.yml", self)
+    @mofa_yml = MofaYml.load_from_file("#{pkg_dir}/.mofa.yml", self)
   end
 
   def load_mofa_yml_local
-    @mofa_yml_local = MofaYml.load_from_file(".mofa.local.yml", self)
+    @mofa_yml_local = MofaYml.load_from_file("#{pkg_dir}/.mofa.local.yml", self)
   end
 
   # ------------- /Interface Methods

data/lib/mofa/version.rb

@@ -1,3 +1,3 @@
 module Mofa
-  VERSION = "0.3.30"
+  VERSION = "0.3.31"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mofa
 version: !ruby/object:Gem::Version
-  version: 0.3.30
+  version: 0.3.31
   prerelease: 
 platform: ruby
 authors: