jimbodragon_acceptance_test 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80fdadd35ebee8e99e50d2c1369091f7af0122101539eb1a8fdbfb2ce0743624
-  data.tar.gz: 06caf57680cf80bc5744afa8920f1032fa2f4f894459abafc1b740d4ae781a08
+  metadata.gz: 57bf783d8528b4238096588ffb868b6f4dc2665d03995ebbbf9007e0e750ed4b
+  data.tar.gz: d50188ebac6a8ef1438fc9813069eaa4d9cf66013b242199555f870fda97a00f
 SHA512:
-  metadata.gz: ae872b8737f44ace2bf8ac8100dc145a30b2507b8c775ad2f3d9003042989fc91697300827d4b292d4bbbbdc07ee3c3d13e448c330919208cb2a4d3c36eebe59
-  data.tar.gz: 585469dcd9caa11b3bda6b904449622a1bb22a9b62c3b7b6838530d8890b9315e0450a58c24706a2ac8d6b3af4f7d83900f71a1a37f24dca4a9c212ceec2ac71
+  metadata.gz: c7cb78fc63d3506a58ec736f82d8f334c0573faacd70599680c4e9bcdd9c2bb7bc91ce7aa8d6000cb61e0c5605a8ae6b12658fcb509573f7c7dca17b84d42f41
+  data.tar.gz: 2f0bde12bf91593efffadfa7e42f68eb7442d0131fa26581d6db2a8e047bbaa31a6f63592a880565c8108017bd272520b3cdb864f18f71ed922bc312e3579b4a

data/bin/jimbodragon_acceptance_test

@@ -4,67 +4,9 @@
 # https://twitter.com/mitchellh/status/283014103189053442
 Signal.trap('INT') { exit 1 }
 
-require_relative ENV['ENVIRONMENT_FILE'] if !ENV['ENVIRONMENT_FILE'].nil? && ::File.exist?(ENV['ENVIRONMENT_FILE'])
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), %w(.. lib))
+require 'rubygems' unless defined?(Gem)
+require 'jimbodragon'
+require 'jimbodragon/main'
 
-module JimboDragon
-  module AcceptanceTests
-    module StartCucumber
-      def self.start_chef_client
-        extend JimboDragon::AcceptanceTests::StartCucumber
-        start_project
-      end
-
-      def install_chef
-        system('curl -L https://omnitruck.chef.io/install.sh | sudo bash -s -- -s once -P chef-client')
-      end
-
-      def run_project
-        # [
-        #   'circleci config process .circleci/config.yml > process.yml',
-        #   'circleci local execute -c process.yml --job jimbodragon_acceptance_test',
-        #   # 'chef exec hab plan render plan.sh/x86_64-linux/plan.sh',
-        #   'chef exec hab studio build',
-        #   'chef exec cucumber',
-        # ].each { |command| system command }
-        # end
-
-        [
-          'cucumber',
-          "chef-client -r #{ENV['NAMED_RUN_LIST']}",
-          'chef exec hab studio build',
-          "chef gem build #{ENV['GEM_PROJECT_NAME']}.gemspec",
-          "chef gem push #{ENV['GEM_PROJECT_NAME']}-#{ENV['GEM_PROJECT_VERSION']}.gem",
-          "chef exec knife cookbook upload #{[
-          ENV['NAMED_RUN_LIST'],
-          ENV['GEM_PROJECT_NAME'],
-          'chef-git-server',
-          'chefserver',
-          'chef_workstation_initialize',
-          'infra_chef',
-          'jimbodragon',
-          'jimbodragon_infra_chef',
-          'virtualbox',
-        ].flatten}",
-        # 'chef exec circleci config process .circleci/config.yml > process.yml',
-        # "chef exec circleci local execute -c process.yml --job #{ENV['GEM_PROJECT_NAME']}",
-        ].each { |command| system command }
-      end
-
-      def prepare_project
-        install_chef
-      end
-
-      def finalize_project
-        system('knife node show $(hostname) -z')
-      end
-
-      def start_project
-        prepare_project
-        run_project
-        finalize_project
-      end
-    end
-  end
-end
-
-JimboDragon::AcceptanceTests::StartCucumber.start_chef_client
+JimboDragon::Main.new(self).converge

data/client.rb

@@ -1,3 +1,4 @@
-require_relative 'lib/knife'
+require_relative 'env' if ::File.exist?('env.rb')
+require_relative 'lib/jimbodragon'
 
-JimboDragon.loading_chef(self)
+JimboDragon.converge(self)

data/knife.rb

@@ -1,3 +1,4 @@
-require_relative 'lib/knife'
+require_relative 'env' if ::File.exist?('env.rb')
+require_relative 'lib/jimbodragon'
 
-JimboDragon.loading_chef(self)
+JimboDragon.converge(self)

data/lib/jimbodragon.rb

@@ -0,0 +1,55 @@
+require_relative 'jimbodragon/main'
+
+require_relative 'jimbodragon/convergence'
+require_relative 'jimbodragon/deploy'
+require_relative 'jimbodragon/knife'
+
+module JimboDragon
+  def self.converge(knife_or_chefclient)
+    extend JimboDragon::JimboEnv
+    extend JimboDragon::Convergence
+
+    deploy = JimboDragon::Deploy.new
+
+    case knife_or_chefclient
+    when JimboDragon::Main
+      install_chef
+      [
+        "chef exec knife cookbook upload #{[
+          JimboDragon::JimboEnv::NAMED_RUN_LIST,
+          JimboDragon::JimboEnv::GEM_PROJECT_NAME,
+        ].flatten.join(' ')}",
+        "chef-client -r #{JimboDragon::JimboEnv::NAMED_RUN_LIST}",
+        "chef gem build #{JimboDragon::JimboEnv::GEM_PROJECT_NAME}.gemspec",
+        "chef gem push #{JimboDragon::JimboEnv::GEM_PROJECT_NAME}-#{JimboDragon::JimboEnv::GEM_PROJECT_VERSION}.gem",
+      ].each do |command|
+        puts "Executing command #{command}"
+        deploy.deploy_commands.push command
+      end
+    else
+      case knife_or_chefclient.to_s
+      when 'ChefConfig::Config'
+        Chef::Log.warn('Haha Chef is now in use')
+        JimboDragon::Knife.new(knife_or_chefclient).load_knife
+      else
+        if respond_to? :logger
+          logger.warn "knife_or_chefclient = #{logger.class}"
+          case logger
+          when nil
+            logger.warn "knife_or_chefclient = #{logger.class}"
+          else
+            logger.warn "knife_or_chefclient = #{knife_or_chefclient.class}"
+          end
+        elsif respond_to? :Chef
+          Chef::Log.warn "knife_or_chefclient = #{knife_or_chefclient.to_s}"
+        else
+          puts "knife_or_chefclient = #{knife_or_chefclient.to_s}"
+        end
+      end
+    end
+
+    prepare_project
+    deploy.execute_deploy_command
+    finalize_project
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jimbodragon_acceptance_test
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Jimmy Provencher
@@ -35,7 +35,7 @@ cert_chain:
   +V3ectLBpuoKM8f/ZFMnUPA0mAv5e7J6u9IBwyNj/cy+wLOAbpPdmhoKZXCpQcno
   ysBBJbi//0tgFWwC4vOaDMch
   -----END CERTIFICATE-----
-date: 2022-12-16 00:00:00.000000000 Z
+date: 2022-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -95,7 +95,7 @@ files:
 - bin/jimbodragon_acceptance_test
 - client.rb
 - knife.rb
-- lib/knife.rb
+- lib/jimbodragon.rb
 homepage: https://github.com/JimboDragonGit/jimbodragon_acceptance_test
 licenses:
 - MIT

data/lib/knife.rb

@@ -1,68 +0,0 @@
-
-module JimboDragon
-  def self.loading_chef(knife_or_chefclient)
-    JimboDragon.Knife.new(knife_or_chefclient)
-  end
-
-  class Knife
-    attr_accessor :knife_or_chefclient
-
-    def send_to_chef(method, parameter)
-      knife_or_chefclient.send(method, parameter)
-    end
-
-    def initialize(knife_or_chefclient)
-      @knife_or_chefclient = knife_or_chefclient
-      send_to_chef(:chef_license, 'accept')
-      send_to_chef(:log_level, :info)
-      send_to_chef(:node_name, ENV['KNIFE_USER'])
-
-      send_to_chef(:client_key, "#{chef_repo_path}/profiles.d/#{ENV['KNIFE_USER']}/chef/#{ENV['KNIFE_USER']}.pem")
-      send_to_chef(:chef_server_url, 'https://api.chef.io/organizations/jimbodragon')
-
-      send_to_chef(:chef_repo_path, chef_repo_path)
-      send_to_chef(:cookbook_path, [
-          "#{chef_repo_path}/cookbooks/",
-          "#{chef_repo_path}/libraries/",
-          "#{chef_repo_path}/resources/",
-          "#{chef_repo_path}/berks-cookbooks/",
-        ]
-      )
-      send_to_chef(:data_bags_path, "#{chef_repo_path}/data_bags")
-      send_to_chef(:environment_path, "#{chef_repo_path}/environments")
-      send_to_chef(:node_path, "#{chef_repo_path}/nodes")
-      send_to_chef(:policy_group_path, "#{chef_repo_path}/policy_group")
-      send_to_chef(:policy_path, "#{chef_repo_path}/policies")
-      send_to_chef(:role_path, "#{chef_repo_path}/roles")
-      send_to_chef(:log_location, "#{chef_repo_path}/logs/#{ENV['KNIFE_USER']}.log")
-      send_to_chef(:cache_path, "#{chef_repo_path}/.chef/local-mode-cache")
-      send_to_chef(:checksum_path, "#{chef_repo_path}/.chef/local-mode-cache/checksums")
-      send_to_chef(:acl_path, "#{chef_repo_path}/acls")
-      send_to_chef(:client_d_dir, "#{chef_repo_path}/.chef/client.d")
-      send_to_chef(:client_key_path, "#{chef_repo_path}/client_keys")
-      send_to_chef(:client_path, "#{chef_repo_path}/clients")
-      send_to_chef(:color, true)
-      send_to_chef(:config_d_dir, "#{chef_repo_path}/.chef/config.d")
-      send_to_chef(:config_dir, "#{chef_repo_path}/.chef")
-      send_to_chef(:container_path, "#{chef_repo_path}/containers")
-      send_to_chef(:cookbook_artifact_path, "#{chef_repo_path}/cookbook_artifacts")
-      send_to_chef(:enable_reporting, false)
-      send_to_chef(:file_backup_path, "#{chef_repo_path}/.chef/local-mode-cache/backup")
-      send_to_chef(:file_cache_path, "#{chef_repo_path}/.chef/local-mode-cache/cache")
-      send_to_chef(:group_path, "#{chef_repo_path}/groups")
-      send_to_chef(:lockfile, "#{chef_repo_path}/.chef/local-mode-cache/cache/chef-client-running.pid")
-      send_to_chef(:ohai_segment_plugin_path, "#{chef_repo_path}/.chef/ohai/cookbook_plugins")
-      send_to_chef(:solo_d_dir, "#{chef_repo_path}/.chef/solo.d")
-      send_to_chef(:user_path, "#{chef_repo_path}/users")
-      send_to_chef(:syntax_check_cache_path, "#{chef_repo_path}/.chef/syntaxcache")
-      send_to_chef(:trusted_certs_dir, "#{chef_repo_path}/.chef/trusted_certs")
-      send_to_chef(:validation_client_name, "#{ENV['HAB_ORIGIN']}-validator")
-      send_to_chef(:data_bag_encrypt_version, 3)
-      send_to_chef(:named_run_list, NAMED_RUN_LIST)
-    end
-
-    def chef_repo_path
-      
-    end
-  end
-end