mofa 0.5.6 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5efe371265582362dd1c4fe8dd07eda8edb0f30d
-  data.tar.gz: 54b293d5773089c5af94a3fb583f834dabf76882
+SHA256:
+  metadata.gz: 22340c00ac56402d53cb1ed841920ace967951402a866f9ca880c33d25616c73
+  data.tar.gz: 228bdcb23b75e5da076e1f6f5ec80be8e63f2df02eeb828f564666ae566d0502
 SHA512:
-  metadata.gz: c23a3c1066f0e4265ed3150bf57b556c8876dfe3d53aab4391c5bcd6c37a51437ec48530c6e3ba808725d61ba179a290c1b851d3888c65c3527777ce6eec8a3f
-  data.tar.gz: 22481687e449b1c8d25c4f2180c7dd7c91bcda22a147f80fe3626b497dd6198525ed830d86528319f2b8e97773e07a1f8c9e688fcd92d8ca7214e60e0d7a4df2
+  metadata.gz: f31f027919a1a26cc1bb5eaf973631cc37762d39592dc688948d2ea4f29b5d94909d320ea43a595eb15fa67f262178f6e9024b8e2c91a8745fd5f163d95ef51b
+  data.tar.gz: 92c20936e7dd2b917d6be30d548bf6c6efef8249a51e002788500088cdfeaf0ce4e179c1688d1731b001dc90eb34db1561e88179ca2957ef042f905edd163c07

data/.gitignore

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

data/.rubocop.yml

@@ -1,9 +1,15 @@
+Metrics/ParameterLists:
+  Enabled: false
+
 Metrics/LineLength:
   Enabled: false
 
 Metrics/MethodLength:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/ClassLength:
   Enabled: false
 

data/.ruby-version

@@ -0,0 +1 @@
+2.6.5

data/Dockerfile

@@ -0,0 +1,12 @@
+FROM docker.io/chef/chefdk:1.6.11
+
+RUN apt update && apt upgrade --yes && \
+  apt install build-essential rsync --yes && \
+  gem install mofa
+
+RUN mkdir /root/.mofa
+
+COPY config.docker.yml /root/.mofa/config.yml
+
+ENV PATH="/root/.chefdk/gem/ruby/2.3.0/bin:${PATH}"
+

data/README.md

@@ -52,7 +52,7 @@ Before you can start using mofa please create a config file:
 
 # local Development
 
-    $ git clone https://github.com/hybris/mofa.git
+    $ git clone https://github.com/pingworks/mofa.git
     $ cd mofa
     $ bundle install
     $ cd ../somewhere_chef-env_some_cookbook

data/config.docker.yml

@@ -0,0 +1,39 @@
+# global mofa settings
+
+# Admin User Account that should be used for all mofa tasks.
+# The user has to be able to login passwordless
+# and has tohave passwordless sudo permissions.
+ssh_user: sccchef
+ssh_keyfile: ~/.ssh/id_rsa_sccchef
+
+# where to build tmporary cookbook packages and so on
+tmp_dir: /var/tmp
+
+# A REST-Webservice that returns a list of hosts that are potentially
+# manageable with this mofa.
+service_hostlist_url: file:///opt/workshopbox/etc/hostlist.json
+service_hostlist_default_filter: "localhost"
+#service_hostlist_api_key: xyz
+
+# The cookbook architectural pattern should becodified by following
+# a coonaming schema:
+# * Cookbooks beginning with "env_*" are Envrionment Cookbooks
+# * Cookbooks haven a prefix like "<organisation_name>_*" are
+#   so-called Wrapper Cookbooks
+# * Cookbooks having a "base_" Prefix are Base Cookbooks
+
+cookbook_type_indicator:
+  env: "^env_.*"
+  wrapper: "^(scc_|fos_|allcop_).*"
+  base: ".*_base$"
+
+# Binrepo for released cookbooks
+binrepo_base_url: 'https://berks-api/cookbooks'
+
+# Releasing into binrepo
+binrepo_host: berks-api
+binrepo_ssh_user: berks
+binrepo_ssh_port: 22
+binrepo_ssh_keyfile: /id_rsa
+binrepo_import_dir: /data/cookbooks/import
+

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

@@ -16,26 +16,25 @@ module Mofa
     class_option :debug, :type => :boolean, :aliases => '-vv', :desc => 'be very vebose'
 
     desc 'provision <cookbook>', 'provisions Targethost(s) using a given cookbook.'
-    method_option :ignore_ping, :type => :boolean, :aliases => '-p'
-    method_option :target, :type => :string, :aliases => '-t'
+    method_option :ignore_ping, :type => :boolean, :aliases => '-P'
     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
     method_option :override_mofa_secrets, :type => :string, :aliases => '-S'
-
+    method_option :ssh_port, :type => :string, :aliases => '-p', :default => '22'
+    method_option :ssh_user, :type => :string, :aliases => '-u', :default => 'sccchef'
+    method_option :ssh_keyfile, :type => :string, :aliases => '-i',  :default => '~/.ssh/id_rsa_sccchef'
+    method_option :tmp_dir, :type => :string, :aliases => '-w', :default => '~/tmp/mofa'
+    method_option :binrepo_base_url, :type => :string, :aliases => '-r'
+    
     def provision(cookbook_name_or_path)
       set_verbosity
-
       cookbook_name_or_path ||= '.'
 
-      target_filter = options[:target]
-      #target_filter ||= Mofa::Config.config['profiles']['default']['target']
-
       token = MofaCmd.generate_token
 
-      hostlist = Hostlist.create(target_filter, options[:service_hostlist_url], options[:concrete_target])
+      hostlist = Hostlist.create(options[:concrete_target])
       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])
@@ -48,12 +47,13 @@ module Mofa
       cmd.options = options
 
       cmd.prepare
-      cmd.execute(options[:sshport])
+      cmd.execute(options[:ssh_port], options[:ssh_user], options[:ssh_keyfile])
       cmd.cleanup
     end
 
     desc 'upload <cookbook>', 'package & upload cookbook into binrepo'
     method_option :binrepo_host, :type => :string
+    method_option :binrepo_ssh_port, :type => :string
     method_option :binrepo_ssh_user, :type => :string
     method_option :binrepo_ssh_keyfile, :type => :string
 
@@ -68,7 +68,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
 
@@ -78,29 +79,6 @@ module Mofa
       puts VERSION
     end
 
-    desc 'config', 'prints out mofa config.'
-
-    def config
-      config_print
-    end
-
-    desc 'setup', 'setup initial configuration'
-
-    def setup
-      set_verbosity
-
-      case
-        when !File.exists?("#{ENV['HOME']}/.mofa/config.yml")
-          begin
-            config_create
-          end until config_valid?
-        else
-          begin
-            config_edit
-          end until config_valid?
-      end
-    end
-
     def self.option_verbose
       @@option_verbose
     end
@@ -129,33 +107,6 @@ module Mofa
       say detail, :red
     end
 
-    def config_create
-      say 'Creating a new mofa config (~/.mofa/config.yml)...'
-
-      say '- not implemented yet -'
-
-    end
-
-    def config_edit
-      say 'Editing mofa config (~/.mofa/config.yml)...'
-
-      say '- not implemented yet -'
-
-    end
-
-    def config_print
-      say 'Mofa Config (~/.mofa/config.yml):'
-
-      say '- not implemented yet -'
-
-    end
-
-    def config_valid?
-      say 'Validating Mofa config (~/.mofa/config.yml)...'
-      say '- not implemented yet -'
-      true
-    end
-
     def self.exit_on_failure?
       true
     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/cookbook.rb

@@ -24,16 +24,16 @@ class Cookbook
     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)
+      when cookbook_name_or_path.match(/@/)
+        raise "Did not find released Cookbook #{cookbook_name_or_path}!" unless ReleasedCookbook.exists?(cookbook_name_or_path)
 
-          cookbook = ReleasedCookbook.new(cookbook_name_or_path, override_mofa_secrets)
+        cookbook = ReleasedCookbook.new(cookbook_name_or_path, override_mofa_secrets)
 
-        else
-          cookbook = SourceCookbook.new(cookbook_name_or_path, override_mofa_secrets)
+      else
+        cookbook = SourceCookbook.new(cookbook_name_or_path, override_mofa_secrets)
       end
     rescue RuntimeError => e
-      raise "Cookbook not found/detected: " + e.message
+      raise 'Cookbook not found/detected: ' + e.message
     end
     cookbook.token = token
     cookbook.autodetect_type
@@ -43,32 +43,29 @@ class Cookbook
   end
 
   def autodetect_type
-    env_indicator = Mofa::Config.config['cookbook_type_indicator']['env']
-    wrapper_indicator = Mofa::Config.config['cookbook_type_indicator']['wrapper']
-    base_indicator = Mofa::Config.config['cookbook_type_indicator']['base']
+    env_indicator = '^env_.*'
+    base_indicator = '.*_base$'
 
-    say "Autodetecting Cookbook Architectural Type... "
+    say 'Autodetecting Cookbook Architectural Type...'
 
     case
-      when @name.match(env_indicator)
-        @type = 'env'
-      when @name.match(base_indicator)
-        @type = 'base'
-      when @name.match(wrapper_indicator)
-        @type = 'wrapper'
-      else
-        @type = 'application'
+    when @name.match(env_indicator)
+      @type = 'env'
+    when @name.match(base_indicator)
+      @type = 'base'
+    else
+      @type = 'application'
     end
     say "#{type.capitalize} Cookbook"
   end
 
-  def say(message = "", color = nil, force_new_line = (message.to_s !~ /( |\t)$/))
+  def say(message = '', color = nil, force_new_line = (message.to_s !~ /( |\t)$/))
     color ||= :green
     super
   end
 
   def ok(detail=nil)
-    text = detail ? "OK, #{detail}." : "OK."
+    text = detail ? "OK, #{detail}." : 'OK.'
     say text, :green
   end
 
@@ -86,6 +83,4 @@ class Cookbook
     exit_code = super(cmd, args.merge(:verbose => verbose))
     fail "Failed to run #{cmd.inspect}!" unless exit_code == true
   end
-
-
 end

data/lib/mofa/hostlist.rb

@@ -4,20 +4,10 @@ require 'json'
 
 class Hostlist
   attr_accessor :list
-  attr_accessor :filter
-  attr_accessor :service_host
-  attr_accessor :service_url
-  attr_accessor :api_key
   attr_accessor :concrete_target
 
-  def self.create(filter = nil, service_hostlist_url = nil, concrete_target = nil)
+  def self.create(concrete_target)
     hl = Hostlist.new
-    filter = Mofa::Config.config['service_hostlist_default_filter'] if concrete_target.nil? && filter.nil?
-    service_hostlist_url ||= Mofa::Config.config['service_hostlist_url']
-    hl.filter = filter
-    hl.service_host = Mofa::Config.config['service_hostlist_url'].gsub(/^http:\/\//, '').gsub(/\/.*$/, '').gsub(/:.*$/, '')
-    hl.service_url = service_hostlist_url
-    hl.api_key = Mofa::Config.config['service_hostlist_api_key']
     hl.concrete_target = concrete_target
     hl
   end
@@ -30,65 +20,16 @@ class Hostlist
     Hostlist::get_shortname(hostname).gsub(/\d+$/, '')
   end
 
-  def has_concrete_target
-    return (@concrete_target.nil?) ? false : true
-  end
-
   def retrieve
-    case
-      when has_concrete_target
-        @list = [@concrete_target]
-      when @service_url.match(/^http/)
-        fail "Hostlist Service not reachable! (cannot ping #{service_host})" unless up?
-        response = RestClient.get(@service_url, {:params => {:key => api_key}})
-        hosts_list_json = JSON.parse response.body
-        @list = hosts_list_json['data'].collect { |i| i['cname'] }
-      when @service_url.match(/^file:/)
-        json_file = @service_url.gsub(/^file:\/\//, '')
-        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
-    apply_filter
-    sort_by_domainname
+    @list = [@concrete_target]
   end
 
-
   def up?
     p = Net::Ping::TCP.new(@service_host, 'http')
     p.ping?
   end
 
-  def apply_filter
-    unless @filter.nil?
-      if @filter[0] == '/' && @filter[-1] == '/' && @filter.length > 2
-        regex = @filter[1..-2]
-      else
-        # building matcher
-        regex = @filter.gsub(/\*/, '__ASTERISK__')
-        regex = Regexp.escape(regex).gsub(/__ASTERISK__/, '.*')
-        regex = '^' + regex + '$'
-      end
-      @list.select! { |hostname| hostname.match(regex) }
-    end
-  end
-
-  def sort_by_domainname
-    sortable = {}
-    @list.each do |hostname|
-      sortable.store(hostname.split(/\./).reverse.join('.'), hostname)
-    end
-    @list = sortable.keys.sort.collect { |s| sortable[s] }
-  end
-
   def filter_by_runlist_map(runlist_map)
     @list.select! { |hostname| runlist_map.mp.key?(hostname) }
   end
-
 end

data/lib/mofa/mofa_cmd.rb

@@ -17,42 +17,42 @@ class MofaCmd
 
   # @abstract
   def prepare
-    raise RuntimeError, "must be implemented"
+    raise RuntimeError, 'must be implemented'
   end
 
   # @abstract
-  def execute(_sshport)
-    raise RuntimeError, "must be implemented"
+  def execute(_ssh_port)
+    raise RuntimeError, 'must be implemented'
   end
 
   # @abstract
   def cleanup
-    raise RuntimeError, "must be implemented"
+    raise RuntimeError, 'must be implemented'
   end
 
   def ssh_exec!(ssh, command)
-    stdout_data = ""
-    stderr_data = ""
+    stdout_data = ''
+    stderr_data = ''
     exit_code = nil
     exit_signal = nil
     ssh.open_channel do |channel|
-      channel.exec(command) do |ch, success|
+      channel.exec(command) do |_ch, success|
         unless success
           abort "FAILED: couldn't execute command (ssh.channel.exec)"
         end
-        channel.on_data do |ch, data|
-          stdout_data+=data
+        channel.on_data do |_ch, data|
+          stdout_data += data
         end
 
-        channel.on_extended_data do |ch, type, data|
-          stderr_data+=data
+        channel.on_extended_data do |_ch, _type, data|
+          stderr_data += data
         end
 
-        channel.on_request("exit-status") do |ch, data|
+        channel.on_request('exit-status') do |_ch, data|
           exit_code = data.read_long
         end
 
-        channel.on_request("exit-signal") do |ch, data|
+        channel.on_request('exit-signal') do |_ch, data|
           exit_signal = data.read_long
         end
       end

data/lib/mofa/provision_cmd.rb

@@ -14,7 +14,7 @@ class ProvisionCmd < MofaCmd
     cookbook.prepare
   end
 
-  def execute(sshport = 22)
+  def execute(ssh_port, ssh_user, ssh_keyfile)
     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(sshport)
+    exit_code = run_chef_solo_on_hosts(ssh_port, ssh_user, ssh_keyfile)
 
     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, ssh_user, ssh_keyfile)
     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, ssh_user, keys: [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}")
@@ -90,8 +90,6 @@ class ProvisionCmd < MofaCmd
       file.write(solo_rb)
     end
   end
-# log_level :info
-# log_location "#{solo_dir}/log"
 
   def create_node_json(sftp, hostname, solo_dir, attributes_map)
     puts "Remotely creating \"#{solo_dir}/node.json\" on #{hostname}..."
@@ -121,13 +119,13 @@ class ProvisionCmd < MofaCmd
     end
   end
 
-  def run_chef_solo_on_hosts(sshport = Mofa::Config.config['ssh_port'])
+  def run_chef_solo_on_hosts(ssh_port, ssh_user, ssh_keyfile)
     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 #{sshport} and ssh_key_file #{Mofa::Config.config['ssh_keyfile']}"
+    puts "Will use ssh_user '#{ssh_user}', ssh_port '#{ssh_port}' and ssh_keyfile '#{ssh_keyfile}'"
     at_least_one_chef_solo_run_failed = false
     chef_solo_runs = {}
     host_index = 0
@@ -144,9 +142,9 @@ class ProvisionCmd < MofaCmd
         end
       end
 
-      prepare_host(hostname, host_index, solo_dir)
+      prepare_host(hostname, host_index, solo_dir, ssh_port, ssh_user, ssh_keyfile)
 
-      Net::SFTP.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: sshport, use_agent: false, verbose: :error) do |sftp|
+      Net::SFTP.start(hostname, ssh_user, keys: [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 +162,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: sshport, use_agent: false, verbose: :error) do |ssh|
+              Net::SSH.start(hostname, ssh_user, keys: [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 +179,13 @@ class ProvisionCmd < MofaCmd
               raise e
             end
             begin
-              Net::SSH.start(hostname, Mofa::Config.config['ssh_user'], keys: [Mofa::Config.config['ssh_keyfile']], port: sshport, use_agent: false, verbose: :error) do |ssh|
+              Net::SSH.start(hostname, ssh_user, keys: [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,9 +205,9 @@ 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: sshport, use_agent: false, verbose: :error) do |ssh|
+          Net::SSH.start(hostname, ssh_user, keys: [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}")
+            out = ssh_exec!(ssh, "sudo chown -R #{ssh_user}.#{ssh_user} #{solo_dir}")
             puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0
             out = ssh_exec!(ssh, '[ -d /var/lib/mofa ] || sudo mkdir /var/lib/mofa')
             puts "ERROR (#{out[0]}): #{out[2]}" if out[0] != 0

data/lib/mofa/released_cookbook.rb

@@ -9,7 +9,7 @@ class ReleasedCookbook < Cookbook
 
   def self.exists?(cookbook_name_or_path)
     nv = get_name_and_version(cookbook_name_or_path)
-    url = "#{Mofa::Config.config['binrepo_base_url']}/#{nv['name']}/#{nv['version']}/#{nv['name']}_#{nv['version']}-full.tar.gz"
+    url = "#{Mofa::CLI::binrepo_base_url}/#{nv['name']}/#{nv['version']}/#{nv['name']}_#{nv['version']}-full.tar.gz"
     puts "Checking if cookbook exists: #{url}"
     RestClient.head(url)
   end
@@ -26,7 +26,7 @@ class ReleasedCookbook < Cookbook
 
   def prepare
     @pkg_name ||= "#{name}_#{version}-full.tar.gz"
-    @pkg_dir = "#{Mofa::Config.config['tmp_dir']}/.mofa/#{token}"
+    @pkg_dir = "#{Mofa::CLI::option_tmp_dir}/.mofa/#{token}"
     set_cookbooks_url
   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
 
@@ -110,17 +114,17 @@ class ReleasedCookbook < Cookbook
   end
 
   def cleanup!
-    unless (Dir.entries("#{Mofa::Config.config['tmp_dir']}/.mofa") - %w{ . .. }).empty?
-      say "Removing content of folder #{Mofa::Config.config['tmp_dir']}/.mofa"
-      run "rm -r #{Mofa::Config.config['tmp_dir']}/.mofa/*"
+    unless (Dir.entries("#{Mofa::CLI::option_tmp_dir}/.mofa") - %w{ . .. }).empty?
+      say "Removing content of folder #{Mofa::CLI::option_tmp_dir}/.mofa"
+      run "rm -r #{Mofa::CLI::option_tmp_dir}/.mofa/*"
     else
-      say "Folder #{Mofa::Config.config['tmp_dir']}/.mofa is (already) clean."
+      say "Folder #{Mofa::CLI::option_tmp_dir}/.mofa is (already) clean."
     end
   end
 
   def set_cookbooks_url
     say 'Using remote URI as cookbooks_url: '
-    @cookbooks_url = "#{Mofa::Config.config['binrepo_base_url']}/#{@name}/#{@version}/#{@name}_#{@version}-full.tar.gz"
+    @cookbooks_url = "#{Mofa::CLI::binrepo_base_url}/#{@name}/#{@version}/#{@name}_#{@version}-full.tar.gz"
     say "#{@cookbooks_url}"
   end
 

data/lib/mofa/runlist_map.rb

@@ -33,7 +33,7 @@ class RunlistMap
       end
     else
       hostlist.list.each do |hostname|
-        @mp.store(hostname,  option_runlist)
+        @mp.store(hostname, option_runlist)
       end
     end
   end
@@ -51,7 +51,6 @@ class RunlistMap
         end
       end
     end
-
   end
 
   def set_default_runlist_for_every_host
@@ -62,5 +61,4 @@ class RunlistMap
       end
     end
   end
-
 end

data/lib/mofa/source_cookbook.rb

@@ -77,11 +77,11 @@ class SourceCookbook < Cookbook
   end
 
   def cleanup!
-    unless (Dir.entries("#{Mofa::Config.config['tmp_dir']}/.mofa") - %w{ . .. }).empty?
-      say "Removing content of folder #{Mofa::Config.config['tmp_dir']}/.mofa"
-      run "rm -r #{Mofa::Config.config['tmp_dir']}/.mofa/*"
+    unless (Dir.entries("#{Mofa::CLI::option_tmp_dir}/.mofa") - %w{ . .. }).empty?
+      say "Removing content of folder #{Mofa::CLI::option_tmp_dir}/.mofa"
+      run "rm -r #{Mofa::CLI::option_tmp_dir}/.mofa/*"
     else
-      say "Folder #{Mofa::Config.config['tmp_dir']}/.mofa is (already) clean."
+      say "Folder #{Mofa::CLI::option_tmp_dir}/.mofa is (already) clean."
     end
   end
 

data/lib/mofa/upload_cmd.rb

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

data/lib/mofa/version.rb

@@ -1,3 +1,3 @@
 module Mofa
-  VERSION = '0.5.6'
+  VERSION = '0.5.13'
 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.6
+  version: 0.5.13
 platform: ruby
 authors:
 - Alexander Birk
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-09 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -202,17 +202,21 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/mofa
+- config.docker.yml
 - config.yml.erb
 - 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
@@ -225,12 +229,10 @@ files:
 - lib/mofa/upload_cmd.rb
 - lib/mofa/version.rb
 - mofa.gemspec
-- rspec/mofa/hostfile_spec.rb
-- rspec/mofa/test_hostlist.json
 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.11
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: a lightweight remote chef-solo runner
 test_files: []

data/rspec/mofa/hostfile_spec.rb

@@ -1,18 +0,0 @@
-require 'mofa/hostlist'
-require 'mofa/config'
-
-describe Hostlist do
-  before do
-    Mofa::Config.load
-
-  end
-  it "should initialize" do
-    hostlist = Hostlist.create("/.*/", "file://rspec/mofa/test_hostlist.json")
-    hostlist != nil
-  end
-  it "should retrieve" do
-    hostlist = Hostlist.create("/.*/", "file://rspec/mofa/test_hostlist.json")
-    puts     hostlist.retrieve.count
-  end
-
-end

data/rspec/mofa/test_hostlist.json

@@ -1,7 +0,0 @@
-{
-	"data": [
-		{
-			"cname": "some-machine.somedomain.somecompany.com"
-		}
-	]
-}