jimbodragon_acceptance_test 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2ea6e5ed5ed373bfc97363b0051de19cfa7247ddaf6a5226040f43a19ffce32
-  data.tar.gz: 7a0a72409933cfbcf6aeb87e6215d34169c1e85c5210fb208a254f6bdc77d4ac
+  metadata.gz: 57bf783d8528b4238096588ffb868b6f4dc2665d03995ebbbf9007e0e750ed4b
+  data.tar.gz: d50188ebac6a8ef1438fc9813069eaa4d9cf66013b242199555f870fda97a00f
 SHA512:
-  metadata.gz: f24402259bd6c326aba3afc10369f731230350d188647eff6ca6c43e57e4876954dd10dc9888993cc049ca166c0af4ac6b17d80bdabaa5a42a09f708f92729ac
-  data.tar.gz: b65185f6e11ae13102d4e4b3702b170266273e7373993e6a6155e23e89db84fac3c496d4a6c6c174a68510258cd9d1421f3b71c21a4de0d1aecb69af831d0544
+  metadata.gz: c7cb78fc63d3506a58ec736f82d8f334c0573faacd70599680c4e9bcdd9c2bb7bc91ce7aa8d6000cb61e0c5605a8ae6b12658fcb509573f7c7dca17b84d42f41
+  data.tar.gz: 2f0bde12bf91593efffadfa7e42f68eb7442d0131fa26581d6db2a8e047bbaa31a6f63592a880565c8108017bd272520b3cdb864f18f71ed922bc312e3579b4a

data/client.rb

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

data/knife.rb

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

data/lib/jimbodragon.rb

@@ -1,48 +1,13 @@
-
-require_relative ENV['ENVIRONMENT_FILE'] if !ENV['ENVIRONMENT_FILE'].nil? && ::File.exist?(ENV['ENVIRONMENT_FILE'])
+require_relative 'jimbodragon/main'
 
 require_relative 'jimbodragon/convergence'
 require_relative 'jimbodragon/deploy'
-require_relative 'jimbodragon/main'
-require_relative 'jimbodragon/test/acceptance/cucumber'
+require_relative 'jimbodragon/knife'
 
 module JimboDragon
-  CUCUMBER_PUBLISH_ENABLED = ENV['CUCUMBER_PUBLISH_ENABLED'].nil? ? true : ENV['CUCUMBER_PUBLISH_ENABLED']
-  CUCUMBER_PUBLISH_QUIET = ENV['CUCUMBER_PUBLISH_QUIET'].nil? ? false : ENV['CUCUMBER_PUBLISH_QUIET']
-  CUCUMBER_PUBLISH_TOKEN = ENV['CUCUMBER_PUBLISH_TOKEN'].nil? ? puts('Missing private CUCUMBER_PUBLISH_TOKEN') : ENV['CUCUMBER_PUBLISH_TOKEN']
-
-  CIRCLECI_TOKEN = ENV['CIRCLECI_TOKEN'].nil? ? puts('Missing private CIRCLECI_TOKEN') : ENV['CIRCLECI_TOKEN']
-  CIRCLECI_API_TOKEN = ENV['CIRCLECI_API_TOKEN'].nil? ? puts('Missing private CIRCLECI_TOKEN') : ENV['CIRCLECI_API_TOKEN']
-  CIRCLECI_ORG_OPTION = ENV['CIRCLECI_ORG_OPTION'].nil? ? true.to_s.freeze : ENV['CIRCLECI_ORG_OPTION']
-
-  HAB_AUTH_TOKEN = ENV['HAB_AUTH_TOKEN'].nil? ? puts('Missing private CIRCLECI_TOKEN') : ENV['HAB_AUTH_TOKEN']
-  HAB_ORIGIN = ENV['HAB_ORIGIN'].nil? ? puts('Missing private CIRCLECI_TOKEN') : ENV['HAB_ORIGIN']
-  HAB_LICENSE = ENV['HAB_LICENSE'].nil? ? 'accept'.freeze : ENV['HAB_LICENSE']
-
-  GITHUB_SSH_PRIVATE_KEY = ENV['GITHUB_SSH_PRIVATE_KEY'].nil? ? puts('Missing private CIRCLECI_TOKEN') : ENV['GITHUB_SSH_PRIVATE_KEY']
-  GITHUB_SSH_PUBLIC_KEY = ENV['GITHUB_SSH_PUBLIC_KEY'].nil? ? puts('Missing private CIRCLECI_TOKEN') : ENV['GITHUB_SSH_PUBLIC_KEY']
-
-  AWS_ACCESS_KEY_ID = ENV['AWS_ACCESS_KEY_ID'].nil? ? puts('Missing private CIRCLECI_TOKEN') : ENV['AWS_ACCESS_KEY_ID']
-  AWS_SECRET_ACCESS_KEY = ENV['AWS_SECRET_ACCESS_KEY'].nil? ? puts('Missing private CIRCLECI_TOKEN') : ENV['AWS_SECRET_ACCESS_KEY']
-
-  DOCKERHUB_USER = ENV['DOCKERHUB_USER'].nil? ? puts('Missing private CIRCLECI_TOKEN') : ENV['DOCKERHUB_USER']
-  DOCKERHUB_PASSWORD = ENV['DOCKERHUB_PASSWORD'].nil? ? puts('Missing private CIRCLECI_TOKEN') : ENV['DOCKERHUB_PASSWORD']
-  DOCKER_PASS = ENV['DOCKER_PASS'].nil? ? DOCKERHUB_USER : ENV['DOCKER_PASS']
-  DOCKER_USER = ENV['DOCKER_USER'].nil? ? DOCKERHUB_PASSWORD : ENV['DOCKER_USER']
-  DO_CHECK = ENV['DO_CHECK'].nil? ? true.to_s.freeze : ENV['DO_CHECK']
-
-  KNIFE_USER = ENV['KNIFE_USER'].nil? ? puts('Missing private CIRCLECI_TOKEN') : ENV['KNIFE_USER']
-  NAMED_RUN_LIST = ENV['NAMED_RUN_LIST'].nil? ? puts('Missing private CIRCLECI_TOKEN') : ENV['NAMED_RUN_LIST']
-  GEM_PROJECT_NAME = ENV['GEM_PROJECT_NAME'].nil? ? "#{NAMED_RUN_LIST}_acceptance_test".freeze : ENV['GEM_PROJECT_NAME']
-
-  ENVIRONMENT_FILE = ENV['ENVIRONMENT_FILE'].nil? ? __FILE__.freeze : ENV['ENVIRONMENT_FILE']
-
-  GEM_PROJECT_VERSION = ENV['GEM_PROJECT_VERSION'].nil? ? ::File.read('VERSION').freeze : ENV['GEM_PROJECT_VERSION']
-
   def self.converge(knife_or_chefclient)
+    extend JimboDragon::JimboEnv
     extend JimboDragon::Convergence
-    extend JimboDragon::Knife
-    extend JimboDragon::Test::Acceptance::Cucumber
 
     deploy = JimboDragon::Deploy.new
 
@@ -50,29 +15,37 @@ module JimboDragon
     when JimboDragon::Main
       install_chef
       [
-        "chef-client -r #{NAMED_RUN_LIST}",
-        'chef exec hab studio build',
-        "chef gem build #{GEM_PROJECT_NAME}.gemspec",
-        "chef gem push #{GEM_PROJECT_NAME}-#{GEM_PROJECT_VERSION}.gem",
         "chef exec knife cookbook upload #{[
-        NAMED_RUN_LIST,
-        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 #{GEM_PROJECT_NAME}",
-      ].each { |command| deploy.deploy_commands.push command }
-      # load_knife(knife_or_chefclient)
+          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
-      puts "knife_or_chefclient = #{knife_or_chefclient.class}"
-      # install_chef
-      # start_cucumber
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jimbodragon_acceptance_test
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  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