mofa 0.5.4 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9293928f429f3de0f72f511acde41163a2029d1f
-  data.tar.gz: f29ddaee5ba859408de4f182f746d8ddce4453ed
+SHA256:
+  metadata.gz: 53a589ffb32931662ca28a41fbd8081a4471db52287d6b792a1033b64221803e
+  data.tar.gz: 50920386da52fabe51ce55bf1dd4144ad49d9f7d26679d9d592da3ca1e9dca36
 SHA512:
-  metadata.gz: 3120abaa07e1f6264c53081bdbc2b56d2218e4b0c63355cd0c4b5064f77fbe91647d8460d68b896b8ce11819ae613c41b58e87c76b097f92a8287bfa940ae67d
-  data.tar.gz: e705ee204fe31f06b3c3162ef4c195bffbf9fcc70c94d776157e89d32816d30f62a23605c2f570532763bb238143bc4fb9380a705b2c5f6ebc52b4f470543105
+  metadata.gz: d0aea4b5658276cfdae1bd83f72bbc705ea80b43bc87a15168d08f553912d1629c2a533bfb99895ef6d917420b728c5dfefa6ce391a7882627c5d0c373f7cd3d
+  data.tar.gz: ed15e04c4eabebfc08c66e303bb112f8757543ea3c5ec8c3cd5f9184a9b5715d6a1607205a8a5b172462b967da9be51b0b4211f71a52709ce8ec5ff4c650f225

data/.gitignore

@@ -7,4 +7,6 @@ pkg/*
 
 example_hostlist.json
 
+vendor/bundle
+
 

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.6.6

data/lib/mofa/attributes_map.rb

@@ -47,10 +47,16 @@ class AttributesMap
       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))
+          if value_item.is_a?(Hash)
+            new_attr_hash[key] = deep_parse(value, placeholder, content)
+          else
+            new_attr_hash[key].push(value_item.gsub(Regexp.new(Regexp.escape(placeholder)), content))
+          end
         end
       else
-        new_attr_hash[key] = value.gsub(Regexp.new(Regexp.escape(placeholder)), content)
+        if value
+          new_attr_hash[key] = value.gsub(Regexp.new(Regexp.escape(placeholder)), content)
+        end
       end
     end
     new_attr_hash

data/lib/mofa/cli.rb

@@ -19,6 +19,7 @@ module Mofa
     method_option :ignore_ping, :type => :boolean, :aliases => '-p'
     method_option :target, :type => :string, :aliases => '-t'
     method_option :concrete_target, :type => :string, :aliases => '-T'
+    method_option :sshport, :type => :string, :aliases => '-P'
     method_option :runlist, :type => :string, :aliases => '-o'
     method_option :attributes, :type => :string, :aliases => '-j'
     method_option :service_hostlist_url, :type => :string
@@ -47,12 +48,13 @@ module Mofa
       cmd.options = options
 
       cmd.prepare
-      cmd.execute
+      cmd.execute(options[:sshport])
       cmd.cleanup
     end
 
     desc 'upload <cookbook>', 'package & upload cookbook into binrepo'
     method_option :binrepo_host, :type => :string
+    method_option :binrepo_sshport, :type => :string
     method_option :binrepo_ssh_user, :type => :string
     method_option :binrepo_ssh_keyfile, :type => :string
 
@@ -67,7 +69,8 @@ module Mofa
       cmd = UploadCmd.new(token, cookbook)
 
       cmd.prepare
-      cmd.execute
+      # FIXME: bring in the ssh-port in a different way
+      cmd.execute(22)
       cmd.cleanup
     end
 

data/lib/mofa/cmd_line_args.rb

@@ -0,0 +1,25 @@
+module Mofa
+  class CmdLineArgs
+    def self.instance
+      @__instance__ ||= new
+    end
+
+    def initialize
+      @cmd_line_args = {}
+    end
+
+    def register(cmd_line_args)
+      @cmd_line_args = cmd_line_args
+    end
+
+    def get(key)
+      raise "Cmd Line Arg with key #{key} does not exist!" unless @cmd_line_args.key?(key)
+      @cmd_line_args[key]
+    end
+
+    def list
+    puts 'Comman Line Args:'
+    @cmd_line_args.inspect
+    end
+  end
+end

data/lib/mofa/mofa_cmd.rb

@@ -21,7 +21,7 @@ class MofaCmd
   end
 
   # @abstract
-  def execute
+  def execute(_ssh_port)
     raise RuntimeError, "must be implemented"
   end
 

data/lib/mofa/provision_cmd.rb

@@ -14,7 +14,7 @@ class ProvisionCmd < MofaCmd
     cookbook.prepare
   end
 
-  def execute
+  def execute(ssh_port = 22)
     cookbook.execute
 
     hostlist.retrieve
@@ -30,7 +30,7 @@ class ProvisionCmd < MofaCmd
 
     puts "Hostlist after runlist filtering: #{hostlist.list.inspect}"
 
-    exit_code = run_chef_solo_on_hosts
+    exit_code = run_chef_solo_on_hosts(ssh_port)
 
     exit_code
   end
@@ -56,12 +56,12 @@ class ProvisionCmd < MofaCmd
     host_available
   end
 
-  def prepare_host(hostname, host_index, solo_dir)
+  def prepare_host(hostname, host_index, solo_dir, ssh_port = Mofa::Config.config['ssh_port'] )
     puts
     puts '----------------------------------------------------------------------'
     puts "Chef-Solo on Host #{hostname} (#{host_index}/#{hostlist.list.length})"
     puts '----------------------------------------------------------------------'
-    Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: Mofa::Config.config['ssh_port'], use_agent: false, verbose: :error) do |ssh|
+    Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: ssh_port, use_agent: false, 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}")
@@ -121,13 +121,13 @@ class ProvisionCmd < MofaCmd
     end
   end
 
-  def run_chef_solo_on_hosts
+  def run_chef_solo_on_hosts(ssh_port = Mofa::Config.config['ssh_port'])
     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']}"
+    puts "Will use ssh_user #{Mofa::Config.config['ssh_user']}, ssh_port #{ssh_port} and ssh_key_file #{Mofa::Config.config['ssh_keyfile']}"
     at_least_one_chef_solo_run_failed = false
     chef_solo_runs = {}
     host_index = 0
@@ -144,9 +144,9 @@ class ProvisionCmd < MofaCmd
         end
       end
 
-      prepare_host(hostname, host_index, solo_dir)
+      prepare_host(hostname, host_index, solo_dir, ssh_port)
 
-      Net::SFTP.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: Mofa::Config.config['ssh_port'], use_agent: false, verbose: :error) do |sftp|
+      Net::SFTP.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: ssh_port, use_agent: false, verbose: :error) do |sftp|
         # remotely creating solo.rb
         create_solo_rb(sftp, hostname, solo_dir)
 
@@ -164,7 +164,7 @@ class ProvisionCmd < MofaCmd
           # Do it -> Execute the chef-solo run!
           begin
             begin
-              Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: Mofa::Config.config['ssh_port'], use_agent: false, verbose: :error) do |ssh|
+              Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: ssh_port, use_agent: false, verbose: :error) do |ssh|
                 puts "Remotely unpacking Cookbook Package #{cookbook.pkg_name}... "
                 ssh.exec!("cd #{solo_dir}; tar xvfz #{cookbook.pkg_name}") do |_ch, _stream, line|
                   puts line if Mofa::CLI.option_debug
@@ -181,13 +181,13 @@ class ProvisionCmd < MofaCmd
               raise e
             end
             begin
-              Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: Mofa::Config.config['ssh_port'], use_agent: false, verbose: :error) do |ssh|
+              Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: ssh_port, use_agent: false, verbose: :error) do |ssh|
                 puts "Remotely running chef-solo -c #{solo_dir}/solo.rb -j #{solo_dir}/node.json"
                 chef_run_exit_code = 0
                 ssh.exec!("sudo chef-solo -c #{solo_dir}/solo.rb -j #{solo_dir}/node.json") do |_ch, _stream, line|
                   puts line if Mofa::CLI.option_verbose || Mofa::CLI.option_debug
                   log_file.write(line)
-                  chef_run_exit_code = 1 if line =~ /Chef run process exited unsuccessfully/
+                  chef_run_exit_code = 1 if line =~ /Chef run process exited unsuccessfully/ || line =~ /chef-solo: command not found/
                 end
                 raise 'Chef run process exited unsuccessfully' if chef_run_exit_code != 0
                 chef_solo_runs[hostname].store('status', 'SUCCESS')
@@ -207,7 +207,7 @@ class ProvisionCmd < MofaCmd
             log_file.write('chef-solo run: FAIL')
             puts "ERRORS detected while provisioning #{hostname} (#{e.message})."
           end
-          Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: Mofa::Config.config['ssh_port'], use_agent: false, verbose: :error) do |ssh|
+          Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: ssh_port, use_agent: false, verbose: :error) do |ssh|
             snapshot_or_release = cookbook.is_a?(SourceCookbook) ? 'snapshot' : 'release'
             out = ssh_exec!(ssh, "sudo chown -R #{Mofa::Config.config['ssh_user']}.#{Mofa::Config.config['ssh_user']} #{solo_dir}")
             puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0

data/lib/mofa/released_cookbook.rb

@@ -30,7 +30,7 @@ class ReleasedCookbook < Cookbook
     set_cookbooks_url
   end
 
-  def execute#
+  def execute
     package
   end
 
@@ -65,16 +65,20 @@ class ReleasedCookbook < Cookbook
 
     # Sync in mofa_secrets
     if override_mofa_secrets
-      if File.directory?("#{override_mofa_secrets}/#{name}/cookbooks")
-        run "rsync -vr #{override_mofa_secrets}/#{name}/cookbooks/ #{pkg_dir}/tmp/cookbooks/"
-        if File.file?("#{override_mofa_secrets}/#{name}/.mofa.local.yml")
-          FileUtils.cp "#{override_mofa_secrets}/#{name}/.mofa.local.yml", "#{pkg_dir}/tmp/cookbooks/#{name}/"
-        end
-        if File.file?("#{override_mofa_secrets}/#{name}/.mofa.yml")
-          FileUtils.cp "#{override_mofa_secrets}/#{name}/.mofa.yml", "#{pkg_dir}/tmp/cookbooks/#{name}/"
+      if File.directory?("#{override_mofa_secrets}/#{name}")
+        if File.directory?("#{override_mofa_secrets}/#{name}/cookbooks")
+          run "rsync -vr #{override_mofa_secrets}/#{name}/cookbooks/ #{pkg_dir}/tmp/cookbooks/"
+          if File.file?("#{override_mofa_secrets}/#{name}/.mofa.local.yml")
+            FileUtils.cp "#{override_mofa_secrets}/#{name}/.mofa.local.yml", "#{pkg_dir}/tmp/cookbooks/#{name}/"
+          end
+          if File.file?("#{override_mofa_secrets}/#{name}/.mofa.yml")
+            FileUtils.cp "#{override_mofa_secrets}/#{name}/.mofa.yml", "#{pkg_dir}/tmp/cookbooks/#{name}/"
+          end
+        else
+          run "rsync -vr #{override_mofa_secrets}/#{name}/ #{pkg_dir}/tmp/cookbooks/#{name}/"
         end
       else
-        run "rsync -vr #{override_mofa_secrets}/#{name}/ #{pkg_dir}/tmp/cookbooks/#{name}/"
+        say "Skipping non-existant mofa-secrets folder #{override_mofa_secrets}/#{name}"
       end
     end
 

data/lib/mofa/runlist_map.rb

@@ -44,9 +44,10 @@ class RunlistMap
     # and so on
     hostlist.list.each do |hostname|
       cookbook.recipes.each do |recipe|
-        recipe_regex = "^#{recipe}[0-9]*\."
+        recipe_regex = "^#{recipe}[0-9]*\\\."
         if hostname.match(recipe_regex)
           @mp.store(hostname, "recipe[#{cookbook.name}::#{recipe}]")
+          break
         end
       end
     end

data/lib/mofa/upload_cmd.rb

@@ -15,7 +15,7 @@ class UploadCmd < MofaCmd
     cookbook.prepare
   end
 
-  def execute
+  def execute(_ssh_port)
     cookbook.execute
     upload_cookbook_pkg
   end

data/lib/mofa/version.rb

@@ -1,3 +1,3 @@
 module Mofa
-  VERSION = '0.5.4'
+  VERSION = '0.5.11'
 end

data/mofa.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "guard-minitest"
   s.add_development_dependency "rake"
   s.add_runtime_dependency "thor"
+  # s.add_runtime_dependency "ed25519"
+  # s.add_runtime_dependency "bcrypt_pbkdf"
   s.add_runtime_dependency "json"
   s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "net-ssh"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mofa
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.11
 platform: ruby
 authors:
 - Alexander Birk
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2020-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -202,6 +202,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Guardfile
@@ -213,6 +214,7 @@ files:
 - lib/mofa.rb
 - lib/mofa/attributes_map.rb
 - lib/mofa/cli.rb
+- lib/mofa/cmd_line_args.rb
 - lib/mofa/config.rb
 - lib/mofa/cookbook.rb
 - lib/mofa/hostlist.rb
@@ -230,7 +232,7 @@ files:
 homepage: https://github.com/pingworks/mofa
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -245,9 +247,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: mofa
-rubygems_version: 2.6.3
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: a lightweight remote chef-solo runner
 test_files: []