mofa 0.2.17 → 0.3.0

data/lib/mofa/attributes_map.rb

@@ -44,6 +44,11 @@ class AttributesMap
     attr_hash.each do |key, value|
       if value.is_a?(Hash)
         new_attr_hash[key] = deep_parse(value, placeholder, content)
+      elsif value.is_a?(Array)
+        new_attr_hash[key] = []
+        value.each do |value_item|
+          new_attr_hash[key].push(value_item.gsub(Regexp.new(Regexp.escape(placeholder)), content))
+        end
       else
         new_attr_hash[key] = value.gsub(Regexp.new(Regexp.escape(placeholder)), content)
       end
@@ -72,4 +77,4 @@ class AttributesMap
     new_attr_hash
   end
 
-end
+end

data/lib/mofa/cookbook.rb

@@ -25,7 +25,6 @@ class Cookbook
       case
         when cookbook_name_or_path.match(/@/)
           fail "Did not find released Cookbook #{cookbook_name_or_path}!" unless ReleasedCookbook.exists?(cookbook_name_or_path)
-          fail "Did not find Version #{cookbook_version} of released Cookbook #{cookbook_name_or_path}!" unless ReleasedCookbook.exists?(cookbook_name_or_path, cookbook_version)
 
           cookbook = ReleasedCookbook.new(cookbook_name_or_path)
 
@@ -33,7 +32,7 @@ class Cookbook
           cookbook = SourceCookbook.new(cookbook_name_or_path)
       end
     rescue RuntimeError => e
-      error e.message
+      say e.message
       raise "Cookbook not found/detected!"
     end
     cookbook.token = token

data/lib/mofa/provision_cmd.rb

@@ -42,8 +42,93 @@ class ProvisionCmd < MofaCmd
   # This Code is Copy'n'Pasted from the old mofa tooling. Only to make the MVP work in time!!
   # This needs to be refactored ASAP.
 
+  def prepare_host(hostname, host_index, solo_dir)
+    prerequesits_met = false
+    puts
+    puts "----------------------------------------------------------------------"
+    puts "Chef-Solo on Host #{hostname} (#{host_index}/#{hostlist.list.length.to_s})"
+    puts "----------------------------------------------------------------------"
+
+    puts "Pinging host #{hostname}..."
+    exit_status = system("ping -q -c 1 #{hostname} >/dev/null 2>&1")
+    unless exit_status then
+      puts "  --> Host #{hostname} is unavailable!"
+      chef_solo_runs[hostname].store('status', 'UNAVAIL')
+      chef_solo_runs[hostname].store('status_msg', "Host #{hostname} unreachable.")
+    else
+      puts "  --> Host #{hostname} is available."
+      prerequesits_met = true
+      Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], :keys => [Mofa::Config.config['ssh_keyfile']], :port => Mofa::Config.config['ssh_port'], :verbose => :error) do |ssh|
+        puts "Remotely creating solo_dir \"#{solo_dir}\" on host #{hostname}"
+        # remotely create the temp folder
+        out = ssh_exec!(ssh, "[ -d #{solo_dir} ] || mkdir #{solo_dir}")
+        puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
+
+        # remotely create a data_bags folder structure on the target host
+        if cookbook.instance_of?(SourceCookbook) and File.directory?("#{cookbook.source_dir}/data_bags")
+          Dir.entries("#{cookbook.source_dir}/data_bags").select { |f| !f.match(/^\.\.?$/) }.each do |data_bag|
+            puts "Remotely creating data_bags dir \"#{solo_dir}/data_bags/#{data_bag}\""
+            out = ssh_exec!(ssh, "[ -d #{solo_dir}/data_bags/#{data_bag} ] || mkdir -p #{solo_dir}/data_bags/#{data_bag}")
+            puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
+          end
+        end
+      end
+    end
+    prerequesits_met
+  end
+
+  def create_solo_rb(sftp, hostname, solo_dir)
+    puts "Remotely creating \"#{solo_dir}/solo.rb\""
+    sftp.file.open("#{solo_dir}/solo.rb", "w") do |file|
+      if cookbook.instance_of?(SourceCookbook)
+        solo_rb = <<-"EOF"
+    cookbook_path [ "#{solo_dir}/cookbooks" ]
+        EOF
+      else
+        solo_rb = <<-"EOF"
+    recipe_url "#{cookbook.cookbooks_url}"
+        EOF
+      end
+      solo_rb += <<-"EOF"
+    data_bag_path "#{solo_dir}/data_bags"
+    log_level :info
+    log_location "#{solo_dir}/log"
+    verify_api_cert true
+      EOF
+
+      file.write(solo_rb)
+    end
+  end
+
+  def create_node_json(sftp, hostname, solo_dir, attributes_map)
+    puts "Remotely creating \"#{solo_dir}/node.json\""
+    node_json = {}
+    node_json.store('run_list', runlist_map.mp[hostname])
+    attributes_map.mp[hostname].each do |key, value|
+      node_json.store(key, value)
+    end
+
+    sftp.file.open("#{solo_dir}/node.json", "w") do |file|
+      file.write(JSON.pretty_generate(node_json))
+    end
+  end
+
+  def create_data_bags(sftp, hostname, solo_dir)
+    if cookbook.instance_of?(SourceCookbook) and File.directory?("#{cookbook.source_dir}/data_bags")
+      Dir.entries("#{cookbook.source_dir}/data_bags").select { |f| File.directory?(f) && !f.match(/^\.\.?$/) }.each do |data_bag|
+        Dir.entries("#{cookbook.source_dir}/data_bags/#{data_bag}").select { |f| f.match(/\.json$/) }.each do |data_bag_item|
+          puts "Uploading data_bag_item #{data_bag_item}... "
+          sftp.upload!("#{cookbook.source_dir}/data_bags/#{data_bag}/#{data_bag_item}", "#{solo_dir}/data_bags/#{data_bag}/#{data_bag_item}")
+          puts "OK."
+        end
+      end
+    end
+  end
+
   def run_chef_solo_on_hosts
     time = Time.new
+    # Create a temp working dir on the target host
+    solo_dir = '/var/tmp/' + time.strftime('%Y-%m-%d_%H%M%S')
     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']}, ssh_port #{Mofa::Config.config['ssh_port']} and ssh_key_file #{Mofa::Config.config['ssh_keyfile']}"
@@ -52,82 +137,19 @@ class ProvisionCmd < MofaCmd
     host_index = 0
     hostlist.list.each do |hostname|
       host_index = host_index + 1
-      puts
-      puts "----------------------------------------------------------------------"
-      puts "Chef-Solo on Host #{hostname} (#{host_index}/#{hostlist.list.length.to_s})"
-      puts "----------------------------------------------------------------------"
+      next unless prepare_host(hostname, host_index, solo_dir)
       chef_solo_runs.store(hostname, {})
 
-      puts "Pinging host #{hostname}..."
-      exit_status = system("ping -q -c 1 #{hostname} >/dev/null 2>&1")
-      unless exit_status then
-        puts "  --> Host #{hostname} is unavailable!"
-        chef_solo_runs[hostname].store('status', 'UNAVAIL')
-        chef_solo_runs[hostname].store('status_msg', "Host #{hostname} unreachable.")
-      else
-        puts "  --> Host #{hostname} is available."
-        prerequesits_met = true
-        # Create a temp working dir on the target host
-        solo_dir = '/var/tmp/' + time.strftime('%Y-%m-%d_%H%M%S')
-        Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], :keys => [Mofa::Config.config['ssh_keyfile']], :port => Mofa::Config.config['ssh_port'], :verbose => :error) do |ssh|
-          puts "Remotely creating solo_dir \"#{solo_dir}\" on host #{hostname}"
-          # remotely create the temp folder
-          out = ssh_exec!(ssh, "[ -d #{solo_dir} ] || mkdir #{solo_dir}")
-          puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
-
-          # remotely create a data_bags folder structure on the target host
-          if File.directory?("#{cookbook.source_dir}/data_bags")
-            Dir.entries("#{cookbook.source_dir}/data_bags").select { |f| !f.match(/^\.\.?$/) }.each do |data_bag|
-              puts "Remotely creating data_bags dir \"#{solo_dir}/data_bags/#{data_bag}\""
-              out = ssh_exec!(ssh, "[ -d #{solo_dir}/data_bags/#{data_bag} ] || mkdir -p #{solo_dir}/data_bags/#{data_bag}")
-              puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
-            end
-          end
-        end
-      end
-
-      # skip the rest if prerequesits are not met
-      next unless prerequesits_met
-
-
       Net::SFTP.start(hostname, Mofa::Config.config['ssh_user'], :keys => [Mofa::Config.config['ssh_keyfile']], :port =>  Mofa::Config.config['ssh_port'], :verbose => :error) do |sftp|
 
         # remotely creating solo.rb
-        puts "Remotely creating \"#{solo_dir}/solo.rb\""
-        sftp.file.open("#{solo_dir}/solo.rb", "w") do |file|
-          solo_rb = <<-"EOF"
-        cookbook_path [ "#{solo_dir}/cookbooks" ]
-        data_bag_path "#{solo_dir}/data_bags"
-        log_level :info
-        log_location "#{solo_dir}/log"
-        verify_api_cert true
-          EOF
-
-          file.write(solo_rb)
-        end
+        create_solo_rb(sftp, hostname, solo_dir)
 
         # remotely creating node.json
-        puts "Remotely creating \"#{solo_dir}/node.json\""
-        node_json = {}
-        node_json.store('run_list', runlist_map.mp[hostname])
-        attributes_map.mp[hostname].each do |key, value|
-          node_json.store(key, value)
-        end
-
-        sftp.file.open("#{solo_dir}/node.json", "w") do |file|
-          file.write(JSON.pretty_generate(node_json))
-        end
+        create_node_json(sftp, hostname, solo_dir, attributes_map)
 
         # remotely create data_bag items
-        if File.directory?("#{cookbook.source_dir}/data_bags")
-          Dir.entries("#{cookbook.source_dir}/data_bags").select { |f| File.directory?(f) && !f.match(/^\.\.?$/) }.each do |data_bag|
-            Dir.entries("#{cookbook.source_dir}/data_bags/#{data_bag}").select { |f| f.match(/\.json$/) }.each do |data_bag_item|
-              puts "Uploading data_bag_item #{data_bag_item}... "
-              sftp.upload!("#{cookbook.source_dir}/data_bags/#{data_bag}/#{data_bag_item}", "#{solo_dir}/data_bags/#{data_bag}/#{data_bag_item}")
-              puts "OK."
-            end
-          end
-        end
+        create_data_bags(sftp, hostname, solo_dir)
 
         if cookbook.instance_of?(SourceCookbook)
           puts "Cookbook is a SourceCookbook! Uploading Snapshot Package #{cookbook.pkg_name}... "

data/lib/mofa/released_cookbook.rb

@@ -1,10 +1,24 @@
 class ReleasedCookbook < Cookbook
 
+  def self.get_name_and_version(cookbook_name_or_path)
+    # TODO: this needs proper vaidation!
+    name = cookbook_name_or_path.split(/@/).first
+    version = cookbook_name_or_path.split(/@/).last
+    { 'name' => name, 'version' => version }
+  end
+
+  def self.exists?(cookbook_name_or_path)
+    nv = get_name_and_version(cookbook_name_or_path)
+    url = "#{Mofa::Config.config['bin_repo']}/#{nv['name']}/#{nv['version']}/#{nv['name']}_#{nv['version']}-full.tar.gz"
+    puts "Checking if cookbook exists: #{url}"
+    RestClient.head(url)
+  end
+
   def initialize(cookbook_name_or_path)
     super()
-    # TODO: this needs proper vaidation!
-    @name = cookbook_name_or_path.split(/@/).first
-    @version = cookbook_name_or_path.split(/@/).last
+    nv = ReleasedCookbook.get_name_and_version(cookbook_name_or_path)
+    @name = nv['name']
+    @version = nv['version']
   end
 
   # ------------- Interface Methods
@@ -12,19 +26,26 @@ class ReleasedCookbook < Cookbook
   def prepare
     @pkg_name ||= "#{name}_#{version}-full.tar.gz"
     @pkg_dir = "#{Mofa::Config.config['tmp_dir']}/.mofa/#{token}"
+    set_cookbooks_url
   end
 
   def execute
-    # TODO: Download & unpack released cookbook
-    # Important for guessing role runlists (when cookbook is an env-cookbook)
   end
 
   def cleanup
     say "Removing folder #{pkg_dir}...#{nl}"
-    run "rm -r #{pkg_dir}"
+    run "rm -rf #{pkg_dir}"
     ok
   end
 
+  def load_mofa_yml
+    @mofa_yml = MofaYml.load_from_file(".mofa.yml", self)
+  end
+
+  def load_mofa_yml_local
+    @mofa_yml_local = MofaYml.load_from_file(".mofa.local.yml", self)
+  end
+
   # ------------- /Interface Methods
 
   def cleanup!
@@ -36,6 +57,16 @@ class ReleasedCookbook < Cookbook
     end
   end
 
+  def set_cookbooks_url
+    say 'Using remote URI as cookbooks_url: '
+    @cookbooks_url = "#{Mofa::Config.config['bin_repo']}/#{@name}/#{@version}/#{@name}_#{@version}-full.tar.gz"
+    say "#{@cookbooks_url}"
+  end
+
+  def recipes
+    []
+  end
+
   private
 
   def nl

data/lib/mofa/runlist_map.rb

@@ -11,6 +11,7 @@ class RunlistMap
     rl.cookbook = cookbook
     rl.hostlist = hostlist
     rl.token = token
+    rl.option_runlist = option_runlist
     rl.default_runlist_recipes = (!option_runlist.nil?) ? option_runlist : nil
     rl
   end
@@ -23,11 +24,17 @@ class RunlistMap
     @default_runlist_recipes ||= [ "#{cookbook.name}::default" ]
     @default_runlist_recipes = [ "#{@default_runlist_recipes}" ] unless @default_runlist_recipes.kind_of?(Array)
 
-    case cookbook.type
-      when 'env'
-        guess_runlists_by_hostnames
-      else
-        set_default_runlist_for_every_host
+    if option_runlist.nil?
+      case cookbook.type
+        when 'env'
+          guess_runlists_by_hostnames
+        else
+          set_default_runlist_for_every_host
+      end
+    else
+      hostlist.list.each do |hostname|
+        @mp.store(hostname,  option_runlist)
+      end
     end
   end
 
@@ -50,9 +57,9 @@ class RunlistMap
     hostlist.list.each do |hostname|
       @default_runlist_recipes.each do |rl_entry|
         next unless rl_entry.split(/::/)[0] == cookbook.name
-        @mp.store(hostname,  rl_entry) if cookbook.recipes.include?(rl_entry.split(/::/)[1])
+        @mp.store(hostname,  rl_entry) if cookbook.recipes.kind_of?(Array) and cookbook.recipes.include?(rl_entry.split(/::/)[1])
       end
     end
   end
 
-end
+end

data/lib/mofa/source_cookbook.rb

@@ -22,11 +22,11 @@ class SourceCookbook < Cookbook
 
     @pkg_name ||= "#{name}_#{version}-SNAPSHOT.tar.gz"
     @pkg_dir = "#{source_dir}/.mofa/#{token}"
+    set_cookbooks_url
   end
 
   def execute
     package
-    set_cookbooks_url
   end
 
   def cleanup

data/lib/mofa/version.rb

@@ -1,3 +1,3 @@
 module Mofa
-  VERSION = "0.2.17"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mofa
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec