mofa 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c040f77b572291d756fff5efda245dda9c8501c
-  data.tar.gz: 9e86ec9be601d46863449dd070142748b59cd8b2
+  metadata.gz: 03031f673e7c4110dd86dd3844d81907b8f9b0de
+  data.tar.gz: 1eae6a2a9bb2aebb0989db8e2f23af1f55953d8a
 SHA512:
-  metadata.gz: 2c8263d05d553f4673f9450df9755fde8890f34816f85dfd786d5275ae94ccff6c2c51d61993a7fa7a0777c01324febae7d1c64a9f722e8845ac596177cb860e
-  data.tar.gz: d01aa5c8214ddfe139197675099985b1c83935f9c863add10448f14bd3f29e81af7baf6c04df0fb1137c5061a33eaddaee53cf6023b548d4b6c7462aa9bebfc4
+  metadata.gz: c13f374e59288c9e37ab0586d4ab548a4ab46732edf23960cfcbf0ae10ce39ff29448b8693e2a5107b04a82db5467d051d127508f594c909aadfa481e94787a2
+  data.tar.gz: 386230d9f5903c7c82fdfc1c19e593be0ddaf4e91d01a1f020c972f5d3a486eb23ce6af515b604239a42eaf774f45cbf8a390544c31b60f49ded68869c21b507

data/.gitignore

@@ -5,4 +5,6 @@
 Gemfile.lock
 pkg/*
 
+example_hostlist.json
+
 

data/lib/mofa/attributes_map.rb

@@ -23,15 +23,53 @@ class AttributesMap
   def generate
     attr_all_roles = cookbook.mofa_yml.get_attr_for_role('all')
     attr_all_roles_local = cookbook.mofa_yml_local.get_attr_for_role('all')
-    attr_all_roles.merge!(attr_all_roles_local)
+    attr_all_roles = deep_merge(attr_all_roles, attr_all_roles_local)
+
     hostlist.list.each do |hostname|
       # Again: the underlying rule here is -> shortname = role
       attr_host_role = cookbook.mofa_yml.get_attr_for_role(Hostlist::get_role(hostname))
       attr_host_role_local = cookbook.mofa_yml_local.get_attr_for_role(Hostlist::get_role(hostname))
-      attr_host_role.merge!(attr_host_role_local)
-      attr_per_host = attr_all_roles.merge(attr_host_role)
+
+      attr_host_role = deep_merge(attr_host_role, attr_host_role_local)
+      attr_per_host = deep_merge(attr_all_roles, attr_host_role)
+
+      attr_per_host = deep_parse(attr_per_host, '__SHORTNAME__', Hostlist::get_shortname(hostname))
+
       @mp.store(hostname, attr_per_host)
     end
   end
 
+  def deep_parse(attr_hash, placeholder, content)
+    new_attr_hash = Marshal.load(Marshal.dump(attr_hash))
+    attr_hash.each do |key, value|
+      if value.is_a?(Hash)
+        new_attr_hash[key] = deep_parse(value, placeholder, content)
+      else
+        new_attr_hash[key] = value.gsub(Regexp.new(Regexp.escape(placeholder)), content)
+      end
+    end
+    new_attr_hash
+  end
+
+  def deep_merge(attr_hash, attr_hash_local)
+    new_attr_hash = Marshal.load(Marshal.dump(attr_hash))
+    attr_hash.each do |key, value|
+      if attr_hash_local.key?(key)
+        if value.is_a?(Hash) && attr_hash_local[key].is_a?(Hash)
+          new_attr_hash[key] = deep_merge(value, attr_hash_local[key])
+        else
+          new_attr_hash[key] = attr_hash_local[key]
+        end
+      end
+    end
+    # and now add all attributes that are in attr_hash_local but not in attr_hash
+    attr_hash_local.each do |key, value|
+      unless attr_hash.key?(key)
+        new_attr_hash.store(key, value)
+      end
+    end
+
+    new_attr_hash
+  end
+
 end

data/lib/mofa/hostlist.rb

@@ -40,7 +40,10 @@ class Hostlist
         if File.exist?(json_file)
           hosts_list_json = JSON.parse(File.read(json_file))
           @list = hosts_list_json['data'].collect { |i| i['cname'] }
+        else
+          fail "Hostlist JSON-File not found: #{json_file}"
         end
+
       else
         fail "Hostlist Service Url either has to be a http(s):// or a file:/// Url!"
     end
@@ -61,8 +64,6 @@ class Hostlist
     regex = Regexp.escape(regex).gsub(/__ASTERISK__/, '.*')
     regex = '^' + regex + '$'
 
-    puts "regex=#{regex}"
-
     @list.select! { |hostname| hostname.match(regex) }
   end
 

data/lib/mofa/mofa_cmd.rb

@@ -55,6 +55,7 @@ class MofaCmd
 
   def run_chef_solo_on_hosts
     time = Time.new
+    puts
     puts 'Chef-Solo Run started at ' + time.strftime('%Y-%m-%d %H:%M:%S')
     puts "Will use ssh_user #{Mofa::Config.config['ssh_user']} and ssh_key_file #{Mofa::Config.config['ssh_keyfile']}"
     at_least_one_chef_solo_run_failed = false

data/lib/mofa/mofa_yml.rb

@@ -33,8 +33,6 @@ class MofaYml
     # for now only __ENV_COOKBOOK__ for cookbook name is supported
     file_contents = File.read(path_to_mofayml)
     file_contents.gsub!(/__ENV_COOKBOOK__/, @cookbook.name)
-    puts "FileContents: #{file_contents}"
     @yml = YAML.load(file_contents)
-    puts "Parsed: #{@yml}"
   end
 end

data/lib/mofa/source_cookbook.rb

@@ -31,7 +31,7 @@ class SourceCookbook < Cookbook
   end
 
   def cleanup
-    say "Removing folder #{pkg_dir}...#{nl}"
+    say "Removing folder #{pkg_dir}... "
     run "rm -r #{pkg_dir}"
     ok
   end
@@ -100,7 +100,7 @@ class SourceCookbook < Cookbook
   end
 
   def berks_install_package
-    say "Running \"berks install\" and \”berks package\" on Cookbook in #{source_dir}...#{nl}"
+    say "Running \"berks install\" and \"berks package\" on Cookbook in #{source_dir}...#{nl}"
 
     redirect_stdout = (Mofa::CLI::option_verbose) ? '' : '> /dev/null'
     Bundler.with_clean_env do
@@ -115,7 +115,7 @@ class SourceCookbook < Cookbook
   end
 
   def cleanup_and_repackage
-    say "Shrinking Cookbook Snapshot #{pkg_name}...#{nl}"
+    say "Shrinking Cookbook Snapshot #{pkg_name}... "
 
     tar_verbose = (Mofa::CLI::option_debug) ? 'v' : ''
 

data/lib/mofa/version.rb

@@ -1,3 +1,3 @@
 module Mofa
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

metadata

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