selfbootstrap 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ea35f81e20b7781e516391dbd15f3447fa756b7849ac6df470c7e9414402a55
-  data.tar.gz: 23c6e129f5ae6b6b43b5c37d4793213a96c67384b4480f0fabcc117772977eac
+  metadata.gz: 8739c46ccf96e927b7cc40f639e182255f07e7aea55b873f169e789f7f885985
+  data.tar.gz: 5bb61401af6856a5c800f9d8a19be52f1ebd6a5cc69734b3dbfd200c39b08a34
 SHA512:
-  metadata.gz: 405fe88c5d6dd78f4bf97de9bf0f642610e269ff4818fcd644e980244b7177df4b41100c5a8efacef42850d17210cb9ddaf788bdf6128c54a6976fc91b23942c
-  data.tar.gz: 0febafe5b16db0f2563ccf140e7dbd14c3f1ef381e1b3f22e3d614e12a2bc422270b892c72fa7cc42ca7eb61fecb14cc6557576afe158eeb4903c45816238fd0
+  metadata.gz: a8d1b86380929c3f71d0fc0deb3bab480712a418674183f173378c631e118b17031a172f3d791184e2b17420428a6f5b95ce520f0cc3f61492d439ea88485f84
+  data.tar.gz: d45e16169c93f4432ec3be3e18ee98e59da5ba9c3d29a4266417721a55f6e2d30ae49b052c706f535a2096025ce7924b9050e529faa831519ddf1b81718ee0c6

data/lib/selfbootstrap/nochef/chef.rb

@@ -26,6 +26,40 @@ module ChefWorkstationInitialize
       module ChefHelpers
         include ChefWorkstationInitialize::SelfBootstrap::NoChef::BerksHelpers
 
+        def is_chef_enabled?
+          is_chef_constant_enabled? :Chef
+        end
+
+        def is_chef_command?
+          ::File.basename($PROGRAM_NAME).eql?('chef')
+        end
+
+        def is_chef_cli_command?
+          ::File.basename($PROGRAM_NAME).eql?('chef-cli')
+        end
+
+        def is_chef_client_command?
+          ::File.basename($PROGRAM_NAME).eql?('chef-client')
+        end
+
+        def is_chef_installed?
+          ::Dir.exist?('/opt/chef-workstation')
+        end
+
+        def is_chef_profile_set?
+          is_chef_installed? ? (base_command('which ruby', [], as_system: true).include? '/opt/chef-workstation') : false
+        end
+
+        def is_chefworkstation_available?
+          if is_chef_profile_set?
+            $LOAD_PATH.select do |loaded_path|
+              loaded_path.include? '/opt/chef-workstation'
+            end.count > 0
+          else
+            false
+          end
+        end
+
         def chef(*args, **run_opts)
           base_command('chef', args, run_opts)
         end
@@ -37,6 +71,10 @@ module ChefWorkstationInitialize
         def is_knife_gem_install?
           chef('gem list -i knife') == 'true'
         end
+
+        def install_chef_workstation
+          base_command('curl -L https://omnitruck.chef.io/install.sh | bash -s -- -s once -P chef-workstation', [], as_system: true)
+        end
       end
     end
   end

data/lib/selfbootstrap/nochef/commandline.rb

@@ -9,18 +9,22 @@
 # camel-casing throughout the remainder of the name.
 #
 
-require_relative 'defaultvalues'
+require_relative 'defaultmethods'
 
 module ChefWorkstationInitialize
   module SelfBootstrap
     module NoChef
       module CommandlineHelpers
-        include ChefWorkstationInitialize::SelfBootstrap::NoChef::DefaultValuesHelpers
+        include ChefWorkstationInitialize::SelfBootstrap::NoChef::DefaultMethodsHelpers
+
+        def is_mixlib_disabled?
+          !is_chef_constant_enabled? :Mixlib
+        end
 
         def main_command(command, args = [], run_opts = {})
           command = 'sudo ' + command.to_s if run_opts[:sudo]
           main_command = [command, args].compact.join(' ')
-          worklog "running \"#{main_command}\" from a shell terminal" if run_opts[:debug]
+          worklog "running \"#{main_command}\" from a shell terminal" # if run_opts[:debug]
           [main_command, run_options(run_opts)]
         end
 
@@ -31,9 +35,22 @@ module ChefWorkstationInitialize
           if respond_to?('shell_out!')
             warning_worklog('Using shell_out! as executer')
             [shell_out!(final_command, final_run_options)]
-          elsif defined?(Mixlib).nil?
-            error_worklog('Cannot continue without at least a Chef workstation setup to run command ' + final_command)
-            exit 1
+          elsif is_mixlib_disabled?
+            if run_opts[:as_system]
+              warning_worklog "Using system to run command #{final_command}"
+              exit_status = system(final_command)
+              if exit_status.nil?
+                1
+              elsif exit_status.is_a?(Integer)
+                exit_status
+              else
+                2
+              end
+            else
+              error_worklog('Cannot continue without at least a Chef workstation setup to run command ' + final_command)
+              restart_bootstrap
+              exit 1
+            end
           else
             # warning_worklog('Using Mixlib::ShellOut as executer')
             shell_command = Mixlib::ShellOut.new(final_command, final_run_options)
@@ -47,22 +64,7 @@ module ChefWorkstationInitialize
 
         def run_options(run_opts = {})
           # debug_worklog run_opts.inspect
-          env = {}
-          if workstation_resource[:user]
-            run_opts[:user] = workstation_resource[:user]
-            # Certain versions of `git` misbehave if git configuration is
-            # inaccessible in $HOME. We need to ensure $HOME matches the
-            # user who is executing `git` not the user running Chef.
-            env['HOME'] = get_homedir(workstation_resource[:user])
-          end
-          livestream = run_opts[:live].nil? || run_opts[:live]
-          run_opts[:group] = workstation_resource[:group] if workstation_resource[:group]
-          env['GIT_SSH'] = workstation_resource[:ssh_wrapper] if workstation_resource[:ssh_wrapper]
-          run_opts[:log_tag] = workstation_resource[:log_tag] if workstation_resource[:log_tag]
-          run_opts[:timeout] = workstation_resource[:timeout] if workstation_resource[:timeout]
-          env.merge!(workstation_resource[:environment_variables]) if workstation_resource[:environment_variables]
-          run_opts[:environment] = env unless env.empty?
-          run_opts[:live_stream] = $stdout if livestream
+          run_opts[:live_stream] = $stdout if run_opts[:live]
           run_opts.delete :sudo if run_opts.key? :sudo
           run_opts.delete :live if run_opts.key? :live
           run_opts.delete :debug if run_opts.key? :debug

data/lib/selfbootstrap/nochef/{defaultvalues.rb → defaultmethods.rb}

@@ -27,10 +27,20 @@ require 'socket'
 module ChefWorkstationInitialize
   module SelfBootstrap
     module NoChef
-      module DefaultValuesHelpers
+      module DefaultMethodsHelpers
         def define_resource_requirements
         end
 
+        def is_chef_constant_enabled?(constant)
+          # if is_chefworkstation_available?
+            constant_defined = const_defined?(constant)
+            worklog "constant_defined = #{constant_defined.class} for #{constant}"
+            constant_defined
+          # else
+          #   false
+          # end
+        end
+
         def worklog_counter
           @worklog_counter ||= 0
           @worklog_counter += 1

data/lib/selfbootstrap/nochef/defaultworkstationresource.rb

@@ -8,62 +8,86 @@
 # single word that starts with a capital letter and then continues to use
 # camel-casing throughout the remainder of the name.
 #
+
 module ChefWorkstationInitialize
   module SelfBootstrap
     module NoChef
       module WorkstationResourceHelpers
-        class DefaultWorkstationResource
-          include ChefWorkstationInitialize::SelfBootstrap::NoChef
+        def workstation_resource_keys
+          default_workstation_data.keys
+        end
 
-          def workstation_resource_keys
-            @selfbootstrap_resource.keys
-          end
+        def default_workstation_data
+          {
+            install_dir: ::Dir.getwd,
+            project_name: ::File.basename(::Dir.getwd),
+            cookbook_source: 'infra_chef',
+            project_description: nil,
+            environments: nil,
+            initial_command: nil,
+            cron_chef_solo_command: nil,
+            chef_boostrapped: nil,
+            environment: nil,
+            user: ENV['USER'],
+            group: ENV['GROUP'].nil? ? ENV['USER'] : ENV['GROUP'],
+            home: ENV['HOME'],
+            run_for_type: nil,
+            gitinfo: nil,
+            cron: nil,
+            provisioners: nil,
+            verifiers: nil,
+            platforms: nil,
+            suites: nil,
+            default_attributes: nil,
+            override_attributes: nil,
+            solo: true,
+            data_bag_encrypt_version: 3,
+            file_cache_path: '',
+            debug: false,
+          }
+        end
 
-          def [](key)
-            @selfbootstrap_resource ||= {
-              install_dir: ::Dir.getwd,
-              project_name: ::File.basename(::Dir.getwd),
-              cookbook_source: 'infra_chef',
-              project_description: nil,
-              environments: nil,
-              initial_command: nil,
-              cron_chef_solo_command: nil,
-              chef_boostrapped: nil,
-              environment: nil,
-              user: ENV['USER'],
-              group: ENV['GROUP'].nil? ? ENV['USER'] : ENV['GROUP'],
-              home: ENV['HOME'],
-              run_for_type: nil,
-              gitinfo: nil,
-              cron: nil,
-              provisioners: nil,
-              verifiers: nil,
-              platforms: nil,
-              suites: nil,
-              default_attributes: nil,
-              override_attributes: nil,
-              solo: true,
-              data_bag_encrypt_version: 3,
-              file_cache_path: '',
-              debug: false,
-            }
-            if @selfbootstrap_resource.key?(key.to_sym)
-              @selfbootstrap_resource[key.to_sym]
-            elsif @selfbootstrap_resource.key?(key.to_s)
-              @selfbootstrap_resource[key.to_s]
-            end
-          end
+        # class DefaultWorkstationResource
+        #   include ChefWorkstationInitialize::SelfBootstrap::NoChef
+        #   prepend ChefWorkstationInitialize::SelfBootstrap::NoChef
 
-          def get_workstation_property(property_name)
-            debug_worklog("Get property #{property_name}") # if property_name == 'group'
-            self[property_name]
-          end
+        #   def initialize
+        #     config_loader = ChefConfig::WorkstationConfigLoader.new(nil)
+        #     Chef::Config.from_file(config_loader.config_location)
+        #   end
 
-          def set_workstation_property(property_name, value)
-            debug_worklog("Assign property #{property_name} is value #{value.is_a?(::Dir) ? get_path(value) : value}")
-            self[property_name] = value
-          end
-        end
+        #   def workstation_resource_keys
+        #     @selfbootstrap_resource.keys
+        #   end
+
+        #   def [](key)
+        #     @selfbootstrap_resource ||= default_workstation_data
+        #     if @selfbootstrap_resource.key?(key.to_sym)
+        #       @selfbootstrap_resource[key.to_sym]
+        #     elsif @selfbootstrap_resource.key?(key.to_s)
+        #       @selfbootstrap_resource[key.to_s]
+        #     end
+        #   end
+
+        #   def get_workstation_property(property_name)
+        #     debug_worklog("Get property #{property_name}") # if property_name == 'group'
+        #     self[property_name]
+        #   end
+
+        #   def set_workstation_property(property_name, value)
+        #     debug_worklog("Assign property #{property_name} is value #{value.is_a?(::Dir) ? get_path(value) : value}")
+        #     self[property_name] = value
+        #   end
+
+        #   def render_template(generated_path, source, **variables)
+        #     if ::File.basename(generated_path).eq?('kitchen.yml')
+        #       worklog('Generating a new kitchen file')
+        #       kitchen 'init'
+        #     else
+        #       super(generated_path, source, variables)
+        #     end
+        #   end
+        # end
       end
     end
     #

data/lib/selfbootstrap/nochef/kitchen.rb

@@ -28,7 +28,12 @@ module ChefWorkstationInitialize
         include ChefWorkstationInitialize::SelfBootstrap::NoChef::ChefHelpers
         include ChefWorkstationInitialize::SelfBootstrap::NoChef::ProvisionersHelpers
 
+        def is_kitchen_command?
+          ::File.basename($PROGRAM_NAME).eql?('kitchen')
+        end
+
         def kitchen(*args, **run_opts)
+          write_kitchen_file unless args.eql? ['init']
           base_command('kitchen', args, run_opts)
         end
 

data/lib/selfbootstrap/nochef/knife.rb

@@ -26,6 +26,10 @@ module ChefWorkstationInitialize
       module KnifeHelpers
         include ChefWorkstationInitialize::SelfBootstrap::NoChef::ChefRepoHelpers
 
+        def is_knife?
+          ::File.basename($PROGRAM_NAME).eql?('knife')
+        end
+
         def knife(*args, **run_opts)
           base_command('knife', *args, **run_opts)
         end
@@ -53,21 +57,9 @@ module ChefWorkstationInitialize
         end
 
         def knife_self_bootstrap_cmd
+          debug_worklog 'boostrapped with chef-server and knife'
           knife "bootstrap #{self_bootstrap_options} --policy-group #{project_name} --policy-name #{project_name} #{default_hostname}"
         end
-
-        def chef_client_self_bootstrap_cmd
-          chef_client_options = [self_bootstrap_options]
-          chef_client_options << "--runlist #{project_name}"
-          if ::File.exist?('solo.rb')
-            chef_client_options << '-c solo.rb'
-          else
-            chef_client_options << chef_solo_options_command
-            chef_client_options << "--chef-zero-host #{default_hostname}"
-            chef_client_options << "--chef-zero-port #{default_chefzero_portrange}"
-          end
-          chef_client chef_client_options, debug: true
-        end
       end
     end
   end

data/lib/selfbootstrap/nochef/selfbootstrap.rb

@@ -19,35 +19,6 @@ module ChefWorkstationInitialize
 
         attr_accessor :force_solo
 
-        def self_bootstrap_with_kitchen
-          kitchen 'list bootstrap self', sudo: true
-        end
-
-        def set_chef_profile
-          bash_file = '/etc/bash.bashrc.copy'
-          chef_shell_cmd = 'eval "$(chef shell-init bash)"'
-          debug_worklog "Set chef profile tpo #{bash_file}"
-          open(bash_file, 'a') do |f|
-            f.puts chef_shell_cmd
-          end unless ::File.read(bash_file).include?(chef_shell_cmd)
-        end
-
-        def install_chef_client
-          base_command('curl -L https://omnitruck.chef.io/install.sh | sudo bash -s -- -s once -P chef-workstation')
-        end
-
-        def is_chef_installed?
-          ::Dir.exist?('/opt/chef-workstation')
-        end
-
-        def is_chef_profile_set?
-          base_command('which ruby') == '/usr/bin/chef-client'
-        end
-
-        def is_knife?
-          ::File.basename($PROGRAM_NAME).eql?('knife')
-        end
-
         def for_solo?
           is_knife? && ARGV.join(' ').include?('config show solo --format json')
         end
@@ -61,36 +32,23 @@ module ChefWorkstationInitialize
         end
 
         def is_boostrapping?
-          # debug_worklog "unauthorized_to_boostrap = #{bootstrapping_progress_file}"
-          ::File.exist?(bootstrapping_progress_file)
-        end
-
-        def is_chef_command?
-          ::File.basename($PROGRAM_NAME).eql?('chef')
-        end
-
-        def is_chef_cli_command?
-          ::File.basename($PROGRAM_NAME).eql?('chef-cli')
-        end
-
-        def is_chef_client_command?
-          ::File.basename($PROGRAM_NAME).eql?('chef-client')
-        end
-
-        def is_kitchen_command?
-          ::File.basename($PROGRAM_NAME).eql?('kitchen')
+          is_chef_enabled? ? ::File.exist?(bootstrapping_progress_file) : false
         end
 
         def unauthorized_to_boostrap?
           is_chef_command? || is_chef_client_command? || is_chef_cli_command?
         end
 
+        def run_as_root?
+          ENV['USER'] == 'root' # workstation_resource[:user] == 'root'
+        end
+
         def skip_boostrap?
           debug_worklog("for_solo = #{for_solo?}")
           debug_worklog("for_search_local_node = #{for_search_local_node?}")
-          debug_worklog("is_boostrapping = #{is_boostrapping?}")
           debug_worklog("unauthorized_to_boostrap = #{unauthorized_to_boostrap?}")
-          for_solo? || for_search_local_node? || is_boostrapping? || unauthorized_to_boostrap?
+          debug_worklog("is_boostrapping = #{is_boostrapping?}")
+          for_solo? || for_search_local_node? || unauthorized_to_boostrap? || is_boostrapping?
         end
 
         def chef_solo_options
@@ -121,6 +79,58 @@ module ChefWorkstationInitialize
           FileUtils.rm bootstrapping_progress_file if ::File.exist?(bootstrapping_progress_file)
         end
 
+        def install_this_gem
+          chef 'gem install selfbootstrap', { as_system: true }
+        end
+
+        def restart_bootstrap
+          rerun_opt = { sudo: true }
+          if run_as_root?
+            install_chef_workstation
+            set_chef_profile
+            install_this_gem
+            rerun_opt[:as_system] = true
+          end
+          worklog 'Self bootstrap with sudo command'
+          debug_worklog 'boostrapped with solo and kitchen and root'
+          remove_bootstrap_file
+          exit base_command('selfbootstrap', ARGV, rerun_opt)
+          # kitchen 'list bootstrap self', sudo: true
+        end
+
+        def set_chef_profile
+          bash_file = '/etc/bash.bashrc'
+          # chef_shell_cmd = "cd #{workstation_scripts_dir}; curl -L https://omnitruck.chef.io/install_desktop.sh | sudo bash -s -- #{project_name} #{environments.join(' ')}"
+          chef_shell_cmd = 'eval "$(chef shell-init bash)"'
+          debug_worklog "Set chef profile to #{bash_file}"
+          open(bash_file, 'a') do |f|
+            f.puts chef_shell_cmd
+          end unless ::File.read(bash_file).include?(chef_shell_cmd)
+        end
+
+        def bootstrap_self_command
+          if is_solo?
+            debug_worklog 'boostrapped with solo'
+            if chefworkstation_available?
+              if chef_enabled?
+                prepend ChefWorkstationInitialize::SelfBootstrap::WithChef
+                bootstrap_self_command
+              else
+                require 'kitchen'
+                require 'chef'
+                require 'chef/workstation_config_loader'
+              end
+            elsif run_as_root?
+              chef_client_self_bootstrap_cmd
+            else
+              restart_bootstrap
+            end
+          else
+            knife_self_bootstrap_cmd
+          end
+          debug_worklog 'bootstrap self command completed'
+        end
+
         def boostrapp_once
           create_chef_additionnal_dir
           berks_vendor_init unless is_self_bootsrapping?
@@ -134,24 +144,19 @@ module ChefWorkstationInitialize
           end
         end
 
-        def bootstrap_self_command
-          if is_solo?
-            debug_worklog 'boostrapped with solo'
-            if workstation_resource[:user] != 'root'
-              debug_worklog 'boostrapped with solo and kitchen and root'
-              remove_bootstrap_file
-              self_bootstrap_with_kitchen
-            else
-              debug_worklog 'boostrapped with solo and chef-client'
-              install_chef_client
-              set_chef_profile
-              chef_client_self_bootstrap_cmd
-            end
+        def chef_client_self_bootstrap_cmd
+          debug_worklog 'boostrapped with solo and chef-client'
+
+          chef_client_options = [self_bootstrap_options]
+          chef_client_options << "--runlist #{project_name}"
+          if ::File.exist?('solo.rb')
+            chef_client_options << '-c solo.rb'
           else
-            debug_worklog 'boostrapped with chef-server and knife'
-            knife_self_bootstrap_cmd
+            chef_client_options << chef_solo_options_command
+            chef_client_options << "--chef-zero-host #{default_hostname}"
+            chef_client_options << "--chef-zero-port #{default_chefzero_portrange}"
           end
-          debug_worklog 'bootstrap self command completed'
+          chef_client chef_client_options, debug: true
         end
 
         def bootstrap_self

data/lib/selfbootstrap/nochef/ssh.rb

@@ -22,7 +22,7 @@ module ChefWorkstationInitialize
         end
 
         def ssh_keygen(*args, **run_opts)
-          base_command('ssh', args, run_opts)
+          base_command('ssh-keygen', args, run_opts)
         end
 
         def ssh_command(ip_or_name, user, command)

data/lib/selfbootstrap/nochef/workstationresource.rb

@@ -10,7 +10,7 @@
 #
 
 require_relative 'workstation'
-require_relative 'defaultworkstationresource'
+# require_relative 'defaultworkstationresource'
 
 module ChefWorkstationInitialize
   module SelfBootstrap
@@ -18,8 +18,38 @@ module ChefWorkstationInitialize
       module WorkstationResourceHelpers
         include ChefWorkstationInitialize::SelfBootstrap::NoChef::WorkstationHelpers
 
-        def default_workstation_resource
-          @default_workstation_resource ||= DefaultWorkstationResource.new
+        def workstation_resource_keys
+          default_workstation_data.keys
+        end
+
+        def default_workstation_data
+          {
+            install_dir: ::Dir.getwd,
+            project_name: ::File.basename(::Dir.getwd),
+            cookbook_source: 'infra_chef',
+            project_description: nil,
+            environments: nil,
+            initial_command: nil,
+            cron_chef_solo_command: nil,
+            chef_boostrapped: nil,
+            environment: nil,
+            user: ENV['USER'],
+            group: ENV['GROUP'].nil? ? ENV['USER'] : ENV['GROUP'],
+            home: ENV['HOME'],
+            run_for_type: nil,
+            gitinfo: nil,
+            cron: nil,
+            provisioners: nil,
+            verifiers: nil,
+            platforms: nil,
+            suites: nil,
+            default_attributes: nil,
+            override_attributes: nil,
+            solo: true,
+            data_bag_encrypt_version: 3,
+            file_cache_path: '',
+            debug: false,
+          }
         end
 
         def set_workstation_resource(new_resource_set)
@@ -47,74 +77,20 @@ module ChefWorkstationInitialize
           @workstation
         end
 
-        def workstation_resource
-          get_workstation
-        end
-
-        def get_workstation_property(property_name)
-          require_implement_method('get_workstation_property', %w(property_name))
+        def set_workstation_data(workstation_data)
+          # ::File.join(get_path(workstation_chef_repo_path), __FILE__.gsub(/^.*cache/), '')
+          # @workstation_tool = new_workstation
+          # include new_workstation
+          # @workstation = default_workstation_resource if @workstation.nil?
+          # swap_workstation(ChefWorkstationInitialize::SelfBootstrap::WithChef) if respond_to? 'Chef'
+          # @workstation
 
-          # debug_worklog("Get property #{property_name}") # if property_name == 'group'
-          # property = nil
-          # viarail = nil
-          # if respond_to?('workstation_' + property_name)
-          #   viarail = 'self workstaion'
-          #   property = send('workstation_' + property_name)
-          # elsif property_name != 'project_name' && respond_to?(property_name + '=')
-          #   viarail = 'self'
-          #   property = send(property_name)
-          #   workstation_resource_property = workstation_resource[property_name.to_sym]
-          #   if (property.nil? && !workstation_resource_property.nil?) || (!property.nil? && !workstation_resource_property.nil?)
-          #     viarail += ' Using workstation_resource_property'
-          #     property = set_workstation_property(property_name, workstation_resource_property) if property != workstation_resource_property
-          #   elsif !property.nil? && workstation_resource_property.nil?
-          #     viarail += ' Using property'
-          #     property = set_workstation_property(property_name, property)
-          #   elsif property.nil? && workstation_resource_property.nil?
-          #     viarail += ' No property present'
-          #     worklog("Property #{property_name} is not present")
-          #   end
-          # elsif !respond_to?('new_resource') || new_resource.nil?
-          #   viarail = 'workstation_resource'
-          #   property = workstation_resource[property_name.to_sym]
-          # elsif new_resource.respond_to?(property_name)
-          #   viarail = 'new_resource'
-          #   property = new_resource.send(property_name)
-          # elsif new_resource.is_a?(Hash)
-          #   viarail = 'new_resource(Hash)'
-          #   property = new_resource[property_name.to_sym]
-          # else
-          #   viarail = 'UNKNOWN'
-          #   worklog("new_resource doesn't respond to #{property_name} :: #{new_resource.class} :: #{new_resource.methods}")
-          #   property = nil
-          # end
-          # debug_worklog("property #{property_name} is #{property.is_a?(::Dir) ? get_path(property) : property} via #{viarail}") # if property_name == 'group'
-          # property
+          workstation_data.send(:extend, ChefWorkstationInitialize::SelfBootstrap)
+          workstation_data
         end
 
-        def set_workstation_property(property_name, value)
-          require_implement_method('set_workstation_property', %w(property_name value))
-
-          # debug_worklog("Assign property #{property_name} is value #{value.is_a?(::Dir) ? get_path(value) : value}")
-          # assign = false
-          # if property_name != 'project_name' && respond_to?(property_name + '=')
-          #   assign = true
-          #   send(property_name + '=', value)
-          # end
-          # if !respond_to?('new_resource') || new_resource.nil?
-          #   assign = true
-          #   workstation_resource[property_name.to_sym] = value
-          # end
-          # if respond_to?('new_resource') && new_resource.respond_to?(property_name)
-          #   assign = true
-          #   new_resource.send(property_name, value)
-          # end
-          # if respond_to?('new_resource') && new_resource.is_a?(Hash)
-          #   assign = true
-          #   new_resource[property_name] = value
-          # end
-          # worklog("new_resource could not assign value '#{value}' not respond to #{property_name} :: #{new_resource.class} :: #{new_resource.methods}") unless assign
-          # get_workstation_property(property_name)
+        def workstation_resource
+          default_workstation_data
         end
       end
     end

data/lib/selfbootstrap/nochef.rb

@@ -9,17 +9,10 @@
 # camel-casing throughout the remainder of the name.
 #
 
-require 'withchef'
 require_relative 'nochef/selfbootstrap'
 
 module ChefWorkstationInitialize
   module SelfBootstrap
-    if respond_to? 'Chef'
-      include ChefWorkstationInitialize::SelfBootstrap::WithChef
-    else
-      include ChefWorkstationInitialize::SelfBootstrap::NoChef
-    end
-
     module NoChef
       include ChefWorkstationInitialize::SelfBootstrap::NoChef::SelfBootstrapHelpers
       #

data/lib/selfbootstrap/withchef/chefrepo.rb

@@ -43,19 +43,25 @@ module ChefWorkstationInitialize
         end
 
         def render_template(generated_path, source, **variables)
-          template generated_path do
-            extend ChefWorkstationInitialize::SelfBootstrap
-            cookbook workstation_resource[:cookbook_source]
-            source source
-            variables variables
-          end
-          template ::File.join(get_path(workstation_chef_repo_path), 'chefignore') do
-            extend ChefWorkstationInitialize::SelfBootstrap
-            cookbook workstation_resource[:cookbook_source]
-            source 'chefignore.erb'
-            variables(workstation: self)
-            action :create_if_missing
+          if respond_to? :template
+            template generated_path do
+              extend ChefWorkstationInitialize::SelfBootstrap
+              cookbook workstation_resource[:cookbook_source]
+              source source
+              variables variables
+            end
+          elsif ::File.basename(generated_path).include?('kitchen.yml')
+            kitchen 'init'
+          else
+            error_worklog "Need to be inside a Chef recipe or Chef resource to run this rendering for #{generated_path}"
           end
+          # template ::File.join(get_path(workstation_chef_repo_path), 'chefignore') do
+          #   extend ChefWorkstationInitialize::SelfBootstrap
+          #   cookbook workstation_resource[:cookbook_source]
+          #   source 'chefignore.erb'
+          #   variables(workstation: self)
+          #   action :create_if_missing
+          # end
         end
       end
     end
@@ -81,4 +87,3 @@ end
 #
 
 # require_relative "../providers/git_resource"
-  

data/lib/selfbootstrap/withchef/commandline.rb

@@ -9,13 +9,32 @@
 # camel-casing throughout the remainder of the name.
 #
 
-require_relative 'defaultvalues'
+require_relative 'defaultmethods'
 
 module ChefWorkstationInitialize
   module SelfBootstrap
     module WithChef
       module CommandlineHelpers
-        include ChefWorkstationInitialize::SelfBootstrap::WithChef::DefaultValuesHelpers
+        include ChefWorkstationInitialize::SelfBootstrap::WithChef::DefaultMethodsHelpers
+
+        def run_options(run_opts = {})
+          # debug_worklog run_opts.inspect
+          env = {}
+          if workstation_resource[:user]
+            run_opts[:user] = workstation_resource[:user]
+            # Certain versions of `git` misbehave if git configuration is
+            # inaccessible in $HOME. We need to ensure $HOME matches the
+            # user who is executing `git` not the user running Chef.
+            env['HOME'] = get_homedir(workstation_resource[:user])
+          end
+          run_opts[:group] = workstation_resource[:group] if workstation_resource[:group]
+          env['GIT_SSH'] = workstation_resource[:ssh_wrapper] if workstation_resource[:ssh_wrapper]
+          run_opts[:log_tag] = workstation_resource[:log_tag] if workstation_resource[:log_tag]
+          run_opts[:timeout] = workstation_resource[:timeout] if workstation_resource[:timeout]
+          env.merge!(workstation_resource[:environment_variables]) if workstation_resource[:environment_variables]
+          run_opts[:environment] = env unless env.empty?
+          super(run_opts)
+        end
       end
     end
   end

data/lib/selfbootstrap/withchef/{defaultvalues.rb → defaultmethods.rb}

@@ -21,17 +21,23 @@
 module ChefWorkstationInitialize
   module SelfBootstrap
     module WithChef
-      module DefaultValuesHelpers
+      module DefaultMethodsHelpers
+        include ChefWorkstationInitialize::SelfBootstrap::NoChef::SelfBootstrapHelpers
+
         def generate_directory(dir_path)
-          directory get_path(dir_path) do
-            group workstation_resource[:group]
-            mode '0775'
-            recursive true
+          if respond_to? :directory
+            directory get_path(dir_path) do
+              group workstation_resource[:group]
+              mode '0775'
+              recursive true
+            end
+          else
+            super(dir_path)
           end
         end
 
         def worklog(logstr)
-          Chef::Log.warn("\n\n(#{worklog_counter})WORKLOG:: #{logstr}\n\n")
+          ::Chef::Log.warn("(#{worklog_counter}):: #{logstr}")
         end
       end
     end

data/lib/selfbootstrap/withchef/workstationresource.rb

@@ -17,24 +17,35 @@ module ChefWorkstationInitialize
       module WorkstationResourceHelpers
         include ChefWorkstationInitialize::SelfBootstrap::WithChef::WorkstationHelpers
 
-        class ChefConfigResource < ChefWorkstationInitialize::SelfBootstrap::NoChef::WorkstationResourceHelpers::DefaultWorkstationResource
-          include ChefWorkstationInitialize::SelfBootstrap::WithChef
-
-          def [](key)
-            debug_worklog('Searching config key" ' + key.to_s + '"') unless key.to_s == 'debug'
-            if default_workstation_resource.key?(key)
-              default_workstation_resource[key]
-            elsif default_workstation_resource.key?(key.to_s)
-              default_workstation_resource[key.to_s]
-            end
-          end
-        end
+        # class ChefConfigResource < ChefWorkstationInitialize::SelfBootstrap::NoChef::WorkstationResourceHelpers::DefaultWorkstationResource
+        #   include ChefWorkstationInitialize::SelfBootstrap::WithChef
+
+        #   def [](key)
+        #     debug_worklog('Searching config key" ' + key.to_s + '"') unless key.to_s == 'debug'
+        #     if default_workstation_resource.key?(key)
+        #       default_workstation_resource[key]
+        #     elsif default_workstation_resource.key?(key.to_s)
+        #       default_workstation_resource[key.to_s]
+        #     end
+        #   end
+        # end
 
-        def get_workstation
-          debug_worklog "Get workstation from #{self.class}"
-          @workstation = ChefConfigResource.new if @workstation.nil?
-          swap_workstation(ChefWorkstationInitialize::SelfBootstrap::WithLogger) if respond_to? 'logger'
-          @workstation
+        # def get_workstation
+        #   debug_worklog "Get workstation from #{self.class}"
+        #   @workstation = ChefConfigResource.new if @workstation.nil?
+        #   swap_workstation(ChefWorkstationInitialize::SelfBootstrap::WithLogger) if respond_to? 'logger'
+        #   @workstation
+        # end
+
+        def workstation_resource
+          @workstation_data ||= (
+            if Chef::Config[:selfbootstrap].nil?
+              config_loader = ChefConfig::WorkstationConfigLoader.new(nil)
+              Chef::Config.from_file(config_loader.config_location) unless config_loader.config_location.nil?
+              default_workstation_data.deep_merge Chef::Config[:selfbootstrap]
+            end
+          )
+          @workstation_data
         end
       end
     end

data/lib/selfbootstrap/withchef.rb

@@ -9,20 +9,11 @@
 # camel-casing throughout the remainder of the name.
 #
 
-require 'withlogger'
+require_relative 'nochef'
 require_relative 'withchef/selfbootstrap'
-require 'nochef'
 
 module ChefWorkstationInitialize
   module SelfBootstrap
-    if respond_to? 'logger'
-      include ChefWorkstationInitialize::SelfBootstrap::WithLogger
-    elsif respond_to? 'Chef'
-      include ChefWorkstationInitialize::SelfBootstrap::WithChef
-    else
-      include ChefWorkstationInitialize::SelfBootstrap::NoChef
-    end
-
     module WithChef
       include ChefWorkstationInitialize::SelfBootstrap::WithChef::SelfBootstrapHelpers
       #

data/lib/selfbootstrap/withlogger/{defaultvalues.rb → defaultmethods.rb}

@@ -18,12 +18,14 @@
 # camel-casing throughout the remainder of the name.
 #
 
-require_relative 'nochef'
+require_relative '../withchef'
 
 module ChefWorkstationInitialize
   module SelfBootstrap
     module WithLogger
-      module DefaultValuesHelpers
+      module DefaultMethodsHelpers
+        include ChefWorkstationInitialize::SelfBootstrap::NoChef::SelfBootstrapHelpers
+
         def worklog(logstr)
           logger.warn("\n\n(#{worklog_counter})WORKLOG:: #{logstr}\n\n")
         end

data/lib/selfbootstrap/withlogger/workstationresource.rb

@@ -9,32 +9,32 @@
 # camel-casing throughout the remainder of the name.
 #
 
-require_relative 'defaultvalues'
+require_relative 'defaultmethods'
 
 module ChefWorkstationInitialize
   module SelfBootstrap
     module WithLogger
       module WorkstationResourceHelpers
-        include ChefWorkstationInitialize::SelfBootstrap::WithLogger::DefaultValuesHelpers
+        include ChefWorkstationInitialize::SelfBootstrap::WithLogger::DefaultMethodsHelpers
 
-        class ChefLoggerResource < ChefWorkstationInitialize::SelfBootstrap::WithChef::WorkstationResourceHelpers::ChefConfigResource
-          include ChefWorkstationInitialize::SelfBootstrap::WithLogger
+        # class ChefLoggerResource < ChefWorkstationInitialize::SelfBootstrap::WithChef::WorkstationResourceHelpers::ChefConfigResource
+        #   include ChefWorkstationInitialize::SelfBootstrap::WithLogger
 
-          def [](key)
-            debug_worklog('Searching config key" ' + key.to_s + '"') unless key.to_s == 'debug'
-            if default_workstation_resource.key?(key)
-              default_workstation_resource[key]
-            elsif default_workstation_resource.key?(key.to_s)
-              default_workstation_resource[key.to_s]
-            end
-          end
-        end
+        #   def [](key)
+        #     debug_worklog('Searching config key" ' + key.to_s + '"') unless key.to_s == 'debug'
+        #     if default_workstation_resource.key?(key)
+        #       default_workstation_resource[key]
+        #     elsif default_workstation_resource.key?(key.to_s)
+        #       default_workstation_resource[key.to_s]
+        #     end
+        #   end
+        # end
 
-        def get_workstation
-          debug_worklog "Get workstation from #{self.class}"
-          @workstation = ChefLoggerResource.new if @workstation.nil?
-          @workstation
-        end
+        # def get_workstation
+        #   debug_worklog "Get workstation from #{self.class}"
+        #   @workstation = ChefLoggerResource.new if @workstation.nil?
+        #   @workstation
+        # end
       end
     end
   end

data/lib/selfbootstrap/withlogger.rb

@@ -9,17 +9,11 @@
 # camel-casing throughout the remainder of the name.
 #
 
-require 'withchef'
+require_relative 'withchef'
 require_relative 'withlogger/selfbootstrap'
 
 module ChefWorkstationInitialize
   module SelfBootstrap
-    if respond_to? 'logger'
-      include ChefWorkstationInitialize::SelfBootstrap::WithLogger
-    else
-      include ChefWorkstationInitialize::SelfBootstrap::WithChef
-    end
-
     module WithLogger
       include ChefWorkstationInitialize::SelfBootstrap::WithLogger::SelfBootstrapHelpers
       #

data/lib/selfbootstrap.rb

@@ -13,9 +13,11 @@ require_relative 'selfbootstrap/withlogger'
 
 module ChefWorkstationInitialize
   module SelfBootstrap
+    include ChefWorkstationInitialize::SelfBootstrap::NoChef
+
     def self.bootstrap
-      extend ChefWorkstationInitialize::SelfBootstrap::NoChef
-      get_workstation.selfbootstrap
+      extend ChefWorkstationInitialize::SelfBootstrap
+      bootstrap_self
     end
 
     class ::Array
@@ -41,7 +43,11 @@ module ChefWorkstationInitialize
             v2
           end
         end
-        merge(second, &merger)
+        if second.nil?
+          self
+        else
+          merge(second, &merger)
+        end
       end
 
       def stringify_keys!

data/test/exemple/bootstrap.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+puts $LOAD_PATH.unshift File.join(File.dirname(File.dirname(__dir__)), %w(lib))
+
+::Dir.chdir __dir__
+
+require 'selfbootstrap'
+ChefWorkstationInitialize::SelfBootstrap.bootstrap

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selfbootstrap
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Jimmy Provencher
@@ -35,12 +35,40 @@ cert_chain:
   +V3ectLBpuoKM8f/ZFMnUPA0mAv5e7J6u9IBwyNj/cy+wLOAbpPdmhoKZXCpQcno
   ysBBJbi//0tgFWwC4vOaDMch
   -----END CERTIFICATE-----
-date: 2022-10-18 00:00:00.000000000 Z
-dependencies: []
+date: 2022-10-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '17.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '17.10'
+- !ruby/object:Gem::Dependency
+  name: test-kitchen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: Using Chef cookbook style and force any script using it to switch to
   chef even if it is not install. It will install it tho ;)
 email:
-- maintainers@localhost.local
+- jimbo_dragon@hotmail.com
 executables:
 - selfbootstrap
 extensions: []
@@ -58,7 +86,7 @@ files:
 - lib/selfbootstrap/nochef/chef.rb
 - lib/selfbootstrap/nochef/chefrepo.rb
 - lib/selfbootstrap/nochef/commandline.rb
-- lib/selfbootstrap/nochef/defaultvalues.rb
+- lib/selfbootstrap/nochef/defaultmethods.rb
 - lib/selfbootstrap/nochef/defaultworkstationresource.rb
 - lib/selfbootstrap/nochef/git.rb
 - lib/selfbootstrap/nochef/kitchen.rb
@@ -77,23 +105,24 @@ files:
 - lib/selfbootstrap/withchef/chef.rb
 - lib/selfbootstrap/withchef/chefrepo.rb
 - lib/selfbootstrap/withchef/commandline.rb
-- lib/selfbootstrap/withchef/defaultvalues.rb
+- lib/selfbootstrap/withchef/defaultmethods.rb
 - lib/selfbootstrap/withchef/git.rb
 - lib/selfbootstrap/withchef/selfbootstrap.rb
 - lib/selfbootstrap/withchef/users.rb
 - lib/selfbootstrap/withchef/workstation.rb
 - lib/selfbootstrap/withchef/workstationresource.rb
 - lib/selfbootstrap/withlogger.rb
-- lib/selfbootstrap/withlogger/defaultvalues.rb
+- lib/selfbootstrap/withlogger/defaultmethods.rb
 - lib/selfbootstrap/withlogger/selfbootstrap.rb
 - lib/selfbootstrap/withlogger/workstationresource.rb
-homepage: https://localhost.local/selfbootstrap
+- test/exemple/bootstrap.rb
+homepage: https://github.com/JimboDragonGit/chef_selfbootstrap
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: https://localhost.local/selfbootstrap/issues
-  changelog_uri: https://localhost.local/selfbootstrap/releases
-  homepage_uri: https://localhost.local/selfbootstrap
+  bug_tracker_uri: https://github.com/JimboDragonGit/chef_selfbootstrap/issues
+  changelog_uri: https://github.com/JimboDragonGit/chef_selfbootstrap/releases
+  homepage_uri: https://github.com/JimboDragonGit/chef_selfbootstrap
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"