mofa 0.5.3 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9c5d34e296fd7a81d1660c7ca2373f9b0ae40c21
-  data.tar.gz: 31f698fe349d88488a296d457ca386129f9d9637
+SHA256:
+  metadata.gz: 251a634b14b510bd82968c48565ae7a8141b24493420a179ca3f9c77286dd580
+  data.tar.gz: c7cb15e3e79de88d14e63cd96532a690e2238682354473cb95537af0e2d29b57
 SHA512:
-  metadata.gz: cb122e05cda26a3923f30aa68dc4fe59f873bd858e33bff7fd92fd9cc6b22a52127fe9cec8fe4ee195e751306305f2f73e318fcd42b06c0d37275eb27c40e787
-  data.tar.gz: 7333ae0549d1604f26eac29084a2f08b31659b89eec8ed07421b3844bfc02366a523a575b8d460b497cb663d51f0d9e5031645a8544ab4015389ed9a68e220a3
+  metadata.gz: ead33bbc0b4347cf748b841c0882cdc3ff232bb9149cb49567105e33b177ea2bc3505c4ecca2c22da890452809926f1ade2ff56c4b07e59ae493241b3c10919a
+  data.tar.gz: 894920014cf4622571fd32b5a56edb21f7b64776f00d3e88c7864b71e7d7309918bb2be7e1a6ec8159884e5b531b5a2f7e8ca9c0a9362c5a8ce92f8768f95210

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/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/source_cookbook.rb

@@ -142,8 +142,9 @@ class SourceCookbook < Cookbook
     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/"
+        path_translated = @override_mofa_secrets.sub(/^([a-zA-Z]):/,"/\1/")
+        if File.directory?("#{path_translated}/#{name}/cookbooks")
+          run "rsync -vr #{path_translated}/#{name}/cookbooks/ cookbooks/"
         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.3'
+  VERSION = '0.5.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mofa
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.10
 platform: ruby
 authors:
 - Alexander Birk
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2020-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -230,7 +230,7 @@ files:
 homepage: https://github.com/pingworks/mofa
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -245,9 +245,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: []