deploy_rubygem 0.60.29 → 0.60.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec76c875f88949500709195f51e3deadc201423d45165a07d7091eea4ac83af7
-  data.tar.gz: f9ae71f8b5f2165373adae80916ef66afcfb9fd55cbaaff6a4e31ff840f0f9e7
+  metadata.gz: 272f1912c9321b5c99d8f3c69bee52c20ffdf8591e6e49ef82fe39f9d6e63197
+  data.tar.gz: c3e46c51ea5046e6a86b9b60d3a99d2c34ed577fa8e67349a8a9433f75b4569c
 SHA512:
-  metadata.gz: 676f0eb83748ac8da940f8a6fb3183f26204bf7c639725ac79f39764c64c63b8dc82926471afe21e39d6533bd5943e02bb7f552a860a3999bd5d187339d6da72
-  data.tar.gz: 3b0db7dc3ceb3e5ffdedf12ea975fc534748cba32fc89de9ed19b93bab97da1c25d938dbe8a57735ebd24d0441df7ceb63832794b69c7490dafb8594b739215c
+  metadata.gz: 02db2e27ef0d8a059d14a3faa127cf3572c768675d418e65b288887df40c35ac38a0147a26ef7d64c44220b86e63cbb3a7bd83bc43556c6955fabaff9b562bcf
+  data.tar.gz: 13b46eeabcf1a2d1dc7c9af1f475803ec5a3fd4021e789392b3c59f7f17ce42ca09cb979e496b2a3b67c8c43fa6059cf13590ab64d277209ac818257199df00f

data/.rubocop.yml

@@ -25,3 +25,215 @@ Layout/CommentIndentation:
 Metrics/MethodLength:
   Enabled: true
   Max: 20
+
+Metrics/ClassLength:
+  Enabled: true
+  Max: 102
+
+Gemspec/DeprecatedAttributeAssignment: # new in 1.30
+  Enabled: true
+Gemspec/DevelopmentDependencies: # new in 1.44
+  Enabled: true
+Gemspec/RequireMFA: # new in 1.23
+  Enabled: false
+Layout/LineContinuationLeadingSpace: # new in 1.31
+  Enabled: true
+Layout/LineContinuationSpacing: # new in 1.31
+  Enabled: true
+Layout/LineEndStringConcatenationIndentation: # new in 1.18
+  Enabled: true
+Layout/SpaceBeforeBrackets: # new in 1.7
+  Enabled: true
+Lint/AmbiguousAssignment: # new in 1.7
+  Enabled: true
+Lint/AmbiguousOperatorPrecedence: # new in 1.21
+  Enabled: true
+Lint/AmbiguousRange: # new in 1.19
+  Enabled: true
+Lint/ConstantOverwrittenInRescue: # new in 1.31
+  Enabled: true
+Lint/DeprecatedConstants: # new in 1.8
+  Enabled: true
+Lint/DuplicateBranch: # new in 1.3
+  Enabled: true
+Lint/DuplicateMagicComment: # new in 1.37
+  Enabled: true
+Lint/DuplicateMatchPattern: # new in 1.50
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement: # new in 1.1
+  Enabled: true
+Lint/EmptyBlock: # new in 1.1
+  Enabled: true
+Lint/EmptyClass: # new in 1.3
+  Enabled: true
+Lint/EmptyInPattern: # new in 1.16
+  Enabled: true
+Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
+  Enabled: true
+Lint/ItWithoutArgumentsInBlock: # new in 1.59
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock: # new in 1.8
+  Enabled: true
+Lint/LiteralAssignmentInCondition: # new in 1.58
+  Enabled: true
+Lint/MixedCaseRange: # new in 1.53
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks: # new in 1.2
+  Enabled: true
+Lint/NonAtomicFileOperation: # new in 1.31
+  Enabled: true
+Lint/NumberedParameterAssignment: # new in 1.9
+  Enabled: true
+Lint/OrAssignmentToConstant: # new in 1.9
+  Enabled: true
+Lint/RedundantDirGlobSort: # new in 1.8
+  Enabled: true
+Lint/RedundantRegexpQuantifiers: # new in 1.53
+  Enabled: true
+Lint/RefinementImportMethods: # new in 1.27
+  Enabled: true
+Lint/RequireRangeParentheses: # new in 1.32
+  Enabled: true
+Lint/RequireRelativeSelfPath: # new in 1.22
+  Enabled: true
+Lint/SymbolConversion: # new in 1.9
+  Enabled: true
+Lint/ToEnumArguments: # new in 1.1
+  Enabled: true
+Lint/TripleQuotes: # new in 1.9
+  Enabled: true
+Lint/UnexpectedBlockArity: # new in 1.5
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator: # new in 1.1
+  Enabled: true
+Lint/UselessRescue: # new in 1.43
+  Enabled: true
+Lint/UselessRuby2Keywords: # new in 1.23
+  Enabled: true
+Metrics/CollectionLiteralLength: # new in 1.47
+  Enabled: true
+Naming/BlockForwarding: # new in 1.24
+  Enabled: true
+Security/CompoundHash: # new in 1.28
+  Enabled: true
+Security/IoMethods: # new in 1.22
+  Enabled: true
+Style/ArgumentsForwarding: # new in 1.1
+  Enabled: true
+Style/ArrayIntersect: # new in 1.40
+  Enabled: true
+Style/CollectionCompact: # new in 1.2
+  Enabled: true
+Style/ComparableClamp: # new in 1.44
+  Enabled: true
+Style/ConcatArrayLiterals: # new in 1.41
+  Enabled: true
+Style/DataInheritance: # new in 1.49
+  Enabled: true
+Style/DirEmpty: # new in 1.48
+  Enabled: true
+Style/DocumentDynamicEvalDefinition: # new in 1.1
+  Enabled: true
+Style/EmptyHeredoc: # new in 1.32
+  Enabled: true
+Style/EndlessMethod: # new in 1.8
+  Enabled: true
+Style/EnvHome: # new in 1.29
+  Enabled: true
+Style/ExactRegexpMatch: # new in 1.51
+  Enabled: true
+Style/FetchEnvVar: # new in 1.28
+  Enabled: true
+Style/FileEmpty: # new in 1.48
+  Enabled: true
+Style/FileRead: # new in 1.24
+  Enabled: true
+Style/FileWrite: # new in 1.24
+  Enabled: true
+Style/HashConversion: # new in 1.10
+  Enabled: true
+Style/HashExcept: # new in 1.7
+  Enabled: true
+Style/IfWithBooleanLiteralBranches: # new in 1.9
+  Enabled: true
+Style/InPatternThen: # new in 1.16
+  Enabled: true
+Style/MagicCommentFormat: # new in 1.35
+  Enabled: true
+Style/MapCompactWithConditionalBlock: # new in 1.30
+  Enabled: true
+Style/MapIntoArray: # new in 1.63
+  Enabled: true
+Style/MapToHash: # new in 1.24
+  Enabled: true
+Style/MapToSet: # new in 1.42
+  Enabled: true
+Style/MinMaxComparison: # new in 1.42
+  Enabled: true
+Style/MultilineInPatternThen: # new in 1.16
+  Enabled: true
+Style/NegatedIfElseCondition: # new in 1.2
+  Enabled: true
+Style/NestedFileDirname: # new in 1.26
+  Enabled: true
+Style/NilLambda: # new in 1.3
+  Enabled: true
+Style/NumberedParameters: # new in 1.22
+  Enabled: true
+Style/NumberedParametersLimit: # new in 1.22
+  Enabled: true
+Style/ObjectThen: # new in 1.28
+  Enabled: true
+Style/OpenStructUse: # new in 1.23
+  Enabled: true
+Style/OperatorMethodCall: # new in 1.37
+  Enabled: true
+Style/QuotedSymbols: # new in 1.16
+  Enabled: true
+Style/RedundantArgument: # new in 1.4
+  Enabled: true
+Style/RedundantArrayConstructor: # new in 1.52
+  Enabled: true
+Style/RedundantConstantBase: # new in 1.40
+  Enabled: true
+Style/RedundantCurrentDirectoryInPath: # new in 1.53
+  Enabled: true
+Style/RedundantDoubleSplatHashBraces: # new in 1.41
+  Enabled: true
+Style/RedundantEach: # new in 1.38
+  Enabled: true
+Style/RedundantFilterChain: # new in 1.52
+  Enabled: true
+Style/RedundantHeredocDelimiterQuotes: # new in 1.45
+  Enabled: true
+Style/RedundantInitialize: # new in 1.27
+  Enabled: true
+Style/RedundantLineContinuation: # new in 1.49
+  Enabled: true
+Style/RedundantRegexpArgument: # new in 1.53
+  Enabled: true
+Style/RedundantRegexpConstructor: # new in 1.52
+  Enabled: true
+Style/RedundantSelfAssignmentBranch: # new in 1.19
+  Enabled: true
+Style/RedundantStringEscape: # new in 1.37
+  Enabled: true
+Style/ReturnNilInPredicateMethodDefinition: # new in 1.53
+  Enabled: true
+Style/SelectByRegexp: # new in 1.22
+  Enabled: true
+Style/SendWithLiteralMethodName: # new in 1.64
+  Enabled: true
+Style/SingleLineDoEndBlock: # new in 1.57
+  Enabled: true
+Style/StringChars: # new in 1.12
+  Enabled: true
+Style/SuperArguments: # new in 1.64
+  Enabled: true
+Style/SuperWithArgsParentheses: # new in 1.58
+  Enabled: true
+Style/SwapValues: # new in 1.1
+  Enabled: true
+Style/YAMLFileRead: # new in 1.53
+  Enabled: true
+  

data/Rakefile

@@ -1,25 +1,5 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-require 'rubocop/rake_task'
-
 require_relative 'lib/deploy_rubygem'
 
-RSpec::Core::RakeTask.new(:spec)
-RuboCop::RakeTask.new
-
-task test_framework: %i[clean rubocop spec]
-task default: %i[test_framework build install:local]
-task cicd: %i[default test_version]
-task test_version: %i[install compliance]
-task :compliance do
-  system('inspec exec compliance')
-end
-task developper: %i[rubocop push default]
-task :push do
-  system('git add .')
-  system("git commit -m 'Rake pusing version #{DeployRubygem::VERSION}'")
-  system('git push')
-end
+DeployRubygem::RakeTask.new

data/{bin → exe}/bootstrap_chef_workstation

@@ -1,7 +1,6 @@
 #!/opt/chef-workstation/embedded/bin/ruby
 # Signal.trap('INT') { exit 1 }
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), %w[.. lib])
 require 'rubygems' unless defined?(Gem)
 require 'deploy_rubygem'
 

data/exe/init_deploy

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+install_local
+install_chef_and_bundle
+
+install_chef_workstation
+# Do any other automated setup that you need to do here

data/exe/install_chef_and_bundle

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bash install.sh -P chef-workstation
+bundle install
+rake install:local
+# Do any other automated setup that you need to do here

data/exe/install_chef_workstation

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+require 'json'
+
+workstation_options = {
+  user_folder: '/root',
+  node_name: ENV.fetch('NODENAME'),
+  knife_name: ENV.fetch('KNIFE_NAME'),
+  policyname: ENV.fetch('POLICYNAME'),
+  policygroup: ENV.fetch('POLICYGROUP'),
+  chef_server_url: ENV.fetch('CHEF_SERVER_URL'),
+  chef_client_key: ENV.fetch('CHEF_CLIENT_KEY'),
+  chef_knife_key: ENV.fetch('CHEF_KNIFE_KEY')
+}
+
+File.write('node_options', JSON.generate(workstation_options))
+system('sudo bootstrap_chef_workstation node_options')
+
+workstation_options[:user_folder] = Dir.home
+File.write('workstation_options', JSON.generate(workstation_options))
+system('bootstrap_chef_workstation workstation_options')

data/exe/install_local

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+rake build
+rake install:local
+curl -L https://omnitruck.chef.io/install.sh > install.sh

data/lib/deploy_rubygem/chef_node.rb

@@ -42,10 +42,12 @@ module DeployRubygem
     end
 
     def boostrap
+      extend DeployRubygem
+
       clientrb_file = '/etc/chef/client.rb'
       clientpem_file = '/etc/chef/client.pem'
 
-      Dir.mkdir('/etc/chef') unless Dir.exist?('/etc/chef')
+      FileUtils.mkdir_p('/etc/chef')
 
       File.write(clientrb_file, clientrb)
       File.write(clientpem_file, chef_client_key.split('\\n').join("\n"))
@@ -55,7 +57,7 @@ module DeployRubygem
         # read_file(file_path)
       end
 
-      system('chef env --chef-license accept')
+      system(chef_accept_cmd)
     end
   end
 end

data/lib/deploy_rubygem/cookbook.rb

@@ -4,6 +4,7 @@ require_relative 'project'
 require_relative 'kitchen'
 require_relative 'inspectestor'
 require_relative 'rubygem'
+require_relative 'rake'
 
 # DeployRubygem - deploy a gem using rake
 # Containing a class
@@ -13,7 +14,7 @@ module DeployRubygem
     attr_reader :profiles, :kitchens, :execute_profiles
 
     def initialize(new_cookbook_info)
-      super(new_cookbook_info)
+      super
       @profiles = cookbook_info[:compliance_profiles].map do |profile_name|
         input_file = File.join(%w[compliance inputs] + ["#{cookbook_name}.yml"])
         waiver_file = File.join(%w[compliance waivers] + ["#{cookbook_name}.yml"])
@@ -116,7 +117,7 @@ module DeployRubygem
 
     def save_progress
       system('git add .')
-      system("git commit -m \"Saving: hostname=#{ENV['HOSTNAME']}, cookbook_name=#{cookbook_name}\"")
+      system("git commit -m \"Saving: hostname=#{ENV.fetch('HOSTNAME')}, cookbook_name=#{cookbook_name}\"")
       system('git push')
     end
 

data/lib/deploy_rubygem/inspec_result.rb

@@ -5,7 +5,7 @@
 module DeployRubygem
   # Using Inspec to deploy and manage Inspec
   class InspecTestorResult
-    attr_reader :success_control, :success_result, :failed_control, :failed_result, :pending_control, :pending_result
+    attr_reader :success_control, :success_result, :failed_control, :failed_result, :pending_control, :pending_result, :success_profiles, :failed_profiles
 
     def initialize(as_json)
       @as_json = as_json
@@ -15,6 +15,8 @@ module DeployRubygem
       @failed_result = 0
       @pending_control = 0
       @pending_result = 0
+      @success_profiles = []
+      @failed_profiles = []
       results
     end
 
@@ -43,24 +45,36 @@ module DeployRubygem
 
     private
 
+    def check_steps(item_result)
+      failed_steps = false
+      case item_result['status']
+      when 'passed'
+        @success_result += 1
+        @success_profiles << item_result['code_desc']
+      when 'failed'
+        @failed_result += 1
+        @failed_profiles << item_result['code_desc']
+        failed_steps = true
+      else
+        @pending_result += 1
+        @pending_control += 1
+        failed_steps = true
+      end
+      failed_steps
+    end
+
     def results
       controls.each do |control_result|
         control_as_fail = false
         control_result['results'].each do |item_result|
-          case item_result['status']
-          when 'passed'
-            @success_result += 1
-          when 'failed'
-            @failed_result += 1
-            @failed_control += 1
-            control_as_fail = true
-          else
-            @pending_result += 1
-            @pending_control += 1
-            control_as_fail = true
-          end
+          step_result = check_steps(item_result)
+          control_as_fail = step_result if step_result
+        end
+        if control_as_fail
+          @failed_control += 1
+        else
+          @success_control += 1
         end
-        @success_control += 1 unless control_as_fail
       end
     end
   end

data/lib/deploy_rubygem/inspectestor.rb

@@ -28,17 +28,17 @@ module DeployRubygem
       puts "waiver_file = #{waiver_file}"
 
       check
-      system("chef inspec exec #{inspec_path} #{inspec_options.join(' ')}")
+      system("chef exec inspec exec #{inspec_path} #{inspec_options.join(' ')}")
     end
 
     def update
       clean
-      system("chef inspec vendor #{inspec_path} ")
+      system("chef exec inspec vendor #{inspec_path} ")
     end
 
     def save_as_html(html_file)
       check
-      system("chef inspec exec #{inspec_path} #{inspec_options.join(' ')} --reporter html:#{html_file}")
+      system("chef exec inspec exec #{inspec_path} #{inspec_options.join(' ')} --reporter html:#{html_file}")
     end
 
     def test_json
@@ -46,8 +46,8 @@ module DeployRubygem
     end
 
     def clean
-      FileUtils.rm_rf(vendor_folder) if Dir.exist?(vendor_folder)
-      File.delete(lock_file) if File.exist?(lock_file)
+      FileUtils.rm_rf(vendor_folder)
+      FileUtils.rm_f(lock_file)
     end
 
     private

data/lib/deploy_rubygem/rake/cookbook.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+require 'rake/dsl_definition'
+
+require_relative 'default'
+
+# DeployRubygem module helper for rubygem
+module DeployRubygem
+  # RakeTask to use with DeployRubygem projects
+  class RakeCookbookTask < RakeDefaultTask
+    def initialize(task_name = 'cookbook', desc = 'Run DeployRubygem task')
+      super
+    end
+
+    def define_tasks # :nodoc:
+      super
+      test_cookbook
+      release_cookbook
+      cookstyle
+      build_cookbook
+      install_policy
+      release_policy
+      install_cookbook
+      report
+      clean_cookbook
+    end
+
+    def test_framework # :nodoc:
+      desc "@desc with #{__method__}"
+      task test_framework: %i[build_cookbook spec clean_cookbook]
+    end
+
+    def default # :nodoc:
+      desc "@desc with #{__method__}"
+      task default: %i[test_framework build install:local]
+    end
+
+    def cycle # :nodoc:
+      desc "@desc with #{__method__}"
+      task cycle: %i[test_framework release_policy test_version]
+    end
+
+    def develop # :nodoc:
+      desc "@desc with #{__method__}"
+      task develop: %i[build_cookbook spec push install release_policy report]
+    end
+
+    def test_cookbook # :nodoc:
+      desc "@desc with #{__method__}"
+      task test_cookbook: %i[build_cookbook spec push install release_policy report]
+    end
+
+    def release_cookbook # :nodoc:
+      desc "@desc with #{__method__}"
+      task release_cookbook: %i[clean_cookbook release_policy release]
+    end
+
+    def cookstyle # :nodoc:
+      desc "@desc with #{__method__}"
+      task cookstyle: %i[rubocop] do
+        system('cookstyle')
+      end
+    end
+
+    def build_cookbook # :nodoc:
+      desc "@desc with #{__method__}"
+      task build_cookbook: %i[clean_cookbook cookstyle] do
+        system('knife cookbook upload jimbo_management_site')
+      end
+    end
+
+    def install_policy # :nodoc:
+      desc "@desc with #{__method__}"
+      task install_policy: %i[build_cookbook] do
+        system('chef install Policyfile.rb')
+      end
+    end
+
+    def release_policy # :nodoc:
+      desc "@desc with #{__method__}"
+      task release_policy: %i[clean_cookbook install_policy] do
+        system('chef push prod Policyfile.lock.json')
+      end
+    end
+
+    def install_cookbook # :nodoc:
+      desc "@desc with #{__method__}"
+      task :install_cookbook do
+        system("sudo chef-client -o #{@task_name}")
+      end
+    end
+
+    def compliance # :nodoc:
+      desc "@desc with #{__method__}"
+      task :compliance do
+        inspect_opts = [
+          '--input-file', File.join('compliance', 'inputs', "#{@task_name}.yml"),
+          '--waiver-file', File.join('compliance', 'waivers', "#{@task_name}.yml"),
+          '--reporter', "html:/tmp/html/#{@task_name}_rake_report.html"
+        ]
+        system("inspec exec compliance/profiles/#{@task_name}-accept #{inspect_opts.join(' ')}")
+      end
+    end
+
+    def report # :nodoc:
+      desc "@desc with #{__method__}"
+      task :report do
+        system("sudo chef-client -o #{@task_name}::compile_report")
+      end
+    end
+
+    def clean_cookbook # :nodoc:
+      desc "@desc with #{__method__}"
+      task clean_cookbook: %i[clean] do
+        system('kitchen destroy base')
+        FileUtils.rm_f('Policyfile.lock.json')
+        FileUtils.rm_f('Gemfile.lock')
+        FileUtils.rm_f('.rspec_status')
+        profiles_folder = File.join(%w[compliance profiles])
+        Dir.children(profiles_folder).each do |sub_folder|
+          vendor_folder = File.join(profiles_folder, sub_folder, 'vendor')
+          inspec_file = File.join(profiles_folder, sub_folder, 'inspec.lock')
+          FileUtils.rm_rf(vendor_folder)
+          FileUtils.rm_f(inspec_file)
+        end
+      end
+    end
+  end
+end

data/lib/deploy_rubygem/rake/default.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rake/dsl_definition'
+
+# DeployRubygem module helper for rubygem
+module DeployRubygem
+  # RakeTask to use with DeployRubygem projects
+  class RakeDefaultTask
+    include ::Rake::DSL if defined?(::Rake::DSL)
+
+    # Define DeployRubygem Rake task
+    def initialize(task_name, desc)
+      @task_name = task_name
+      @desc = desc
+      yield self if block_given?
+      define_tasks
+    end
+
+    def rspec_and_rubocop
+      require 'rspec/core/rake_task'
+      require 'rubocop/rake_task'
+
+      RSpec::Core::RakeTask.new(:spec)
+      RuboCop::RakeTask.new
+    end
+
+    def define_tasks # :nodoc:
+      rspec_and_rubocop
+      test_framework
+      default
+      cycle
+      test_version
+      test_check_local
+      compliance
+      develop
+      push
+    end
+
+    def test_framework # :nodoc:
+      desc "@desc with #{__method__}"
+      task test_framework: %i[clean check_local]
+    end
+
+    def default # :nodoc:
+      desc "@desc with #{__method__}"
+      task default: %i[test_framework build install:local]
+    end
+
+    def cycle # :nodoc:
+      desc "@desc with #{__method__}"
+      task cycle: %i[default test_version]
+    end
+
+    def test_version # :nodoc:
+      desc "@desc with #{__method__}"
+      task test_version: %i[install compliance]
+    end
+
+    def test_check_local # :nodoc:
+      desc "@desc with #{__method__}"
+      task check_local: %i[rubocop spec]
+    end
+
+    def compliance # :nodoc:
+      desc "@desc with #{__method__}"
+      task :compliance do
+        system('inspec exec compliance')
+      end
+    end
+
+    def develop # :nodoc:
+      desc "@desc with #{__method__}"
+      task develop: %i[check_local clean push default]
+    end
+
+    def push # :nodoc:
+      desc "@desc with #{__method__}"
+      task :push do
+        system('git add .')
+        system("git commit -m 'Rake pusing version #{DeployRubygem::VERSION}'")
+        system('git push')
+      end
+    end
+  end
+end

data/lib/deploy_rubygem/rake.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'rake/dsl_definition'
+
+require_relative 'rake/cookbook'
+
+# DeployRubygem module helper for rubygem
+module DeployRubygem
+  # RakeTask to use with DeployRubygem projects
+  class RakeTask < RakeDefaultTask
+    def initialize(task_name = 'deploy_rubygem', desc = 'Run DeployRubygem task')
+      super
+    end
+  end
+end

data/lib/deploy_rubygem/rspec/chef.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+# DeployRubygem - deploy a gem using rake
+# Containing a class
+module DeployRubygem
+  def chef_env_cmd
+    'chef --chef-license accept env'
+  end
+
+  def chef_accept_cmd
+    'chef show-policy jimbo_management_site base --chef-license accept'
+  end
+
+  # Using Project to deploy and manage Project
+  module RSpecTesting
+    def testing_chef(chefrepo)
+      RSpec.describe "Accept Chef License #{chefrepo.project_name}" do
+        it 'Accept the Chef License' do
+          extend DeployRubygem
+          expect(`#{chef_accept_cmd}`).not_to be nil
+        end
+      end
+    end
+
+    def testing_workstation(chefrepo)
+      RSpec.describe "Install #{chefrepo.project_name}" do
+        it "Change to #{chefrepo} folder" do
+          change_repo = chefrepo.change_to_project_folder
+          expect(change_repo).not_to be nil
+          expect(Dir.pwd).to eq(chefrepo.path)
+        end
+
+        it 'Change to Chef repo folder' do
+          change_repo = chefrepo.change_to_chefrepo
+          expect(change_repo).not_to be nil
+          expect(change_repo).to eq(chefrepo.chefrepo_path)
+          expect(Dir.pwd).to eq(chefrepo.chefrepo_path)
+        end
+
+        unless chefrepo.cookbooks.nil?
+          it 'Should list his cookbooks dependencies' do
+            cookbooks = chefrepo.cookbooks
+            expect(cookbooks).not_to be nil
+            expect(cookbooks).to be_kind_of(Array)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/deploy_rubygem/rspec/inspec.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+# DeployRubygem - deploy a gem using rake
+# Containing a class
+module DeployRubygem
+  # Using Project to deploy and manage Project
+  module RSpecTesting
+    def testing_inspec(inspector)
+      inspect_test = InspecTestor.new(inspector[:inspec_path], inspector[:input_file], inspector[:waiver_file])
+      RSpec.describe "Testing #{inspect_test} at #{Dir.pwd}" do
+        it 'Should be a kind of Html' do
+          test_html = inspect_test.save_as_html('/tmp/html/deploy_rubygem_kind_of_html.html')
+          expect(test_html).to be true
+        end
+        it 'Should be a kind of Json' do
+          expect(inspect_test.test_json).to be_kind_of(InspecTestorResult)
+          expect(inspect_test.test_json.status).to eq 'loaded'
+        end
+        it 'Should be successfull' do
+          expect(inspect_test.test_json.success_result).to eq inspector[:success_result]
+          expect(inspect_test.test_json.success_control).to eq inspector[:success_control]
+          expect(inspect_test.test_json.failed_result).to eq inspector[:failed_result]
+          expect(inspect_test.test_json.failed_control).to eq inspector[:failed_control]
+          expect(inspect_test.test_json.pending_result).to eq inspector[:pending_result]
+          expect(inspect_test.test_json.pending_control).to eq inspector[:pending_control]
+        end
+      end
+    end
+  end
+end

data/lib/deploy_rubygem/rspec/ruby.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# DeployRubygem - deploy a gem using rake
+# Containing a class
+module DeployRubygem
+  # Using Project to deploy and manage Project
+  module RSpecTesting
+    def testing_gem(gem_obj)
+      RSpec.describe "Testing #{gem_obj}" do
+        it 'has a Project Name' do
+          expect(gem_obj.project_name).not_to be nil
+        end
+        it 'has Project Options' do
+          expect(gem_obj.project_options).not_to be nil
+        end
+      end
+    end
+
+    def install_gem_via_git(gem_obj)
+      RSpec.describe "Install #{gem_obj.project_name}" do
+        it "Change to #{gem_obj} folder" do
+          change_repo = gem_obj.change_to_project_folder
+          expect(change_repo).not_to be nil
+          expect(Dir.pwd).to eq(gem_obj.path)
+        end
+      end
+    end
+
+    def check_current_version(gem_name, version)
+      RSpec.describe [gem_name, version].join(', ') do
+        it 'has a version number' do
+          expect(version).not_to be nil
+        end
+
+        it "has not the actual version #{version} publish" do
+          gem_version = Gem::Version.new(version)
+          version_to_check = "#{gem_name} (#{gem_version})"
+          expect(`gem list -r #{gem_name}`).not_to include(version_to_check)
+        end
+      end
+    end
+  end
+end

data/lib/deploy_rubygem/rspec.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require_relative 'rspec/chef'
+require_relative 'rspec/inspec'
+require_relative 'rspec/ruby'
+
 # DeployRubygem - deploy a gem using rake
 # Containing a class
 module DeployRubygem
@@ -22,31 +26,6 @@ module DeployRubygem
       end
     end
 
-    def check_current_version(gem_name, version)
-      RSpec.describe gem_name do
-        it 'has a version number' do
-          expect(version).not_to be nil
-        end
-
-        it 'has not the actual version publish' do
-          gem_version = Gem::Version.new(version)
-          version_to_check = "#{gem_name} (#{gem_version})"
-          expect(`gem list -r #{gem_name}`).not_to include(version_to_check)
-        end
-      end
-    end
-
-    def testing_gem(gem_obj)
-      RSpec.describe "Testing #{gem_obj}" do
-        it 'has a Project Name' do
-          expect(gem_obj.project_name).not_to be nil
-        end
-        it 'has Project Options' do
-          expect(gem_obj.project_options).not_to be nil
-        end
-      end
-    end
-
     def testing_project(gem_obj)
       RSpec.describe "Testing gem #{gem_obj.project_name}" do
         it 'should not be null' do
@@ -60,62 +39,5 @@ module DeployRubygem
         end
       end
     end
-
-    def testing_workstation(gem_obj)
-      RSpec.describe "Install #{gem_obj.project_name}" do
-        it "Change to #{gem_obj} folder" do
-          change_repo = gem_obj.change_to_project_folder
-          expect(change_repo).not_to be nil
-          expect(Dir.pwd).to eq(gem_obj.path)
-        end
-
-        it 'Change to Chef repo folder' do
-          change_repo = gem_obj.change_to_chefrepo
-          expect(change_repo).not_to be nil
-          expect(change_repo).to eq(gem_obj.chefrepo_path)
-          expect(Dir.pwd).to eq(gem_obj.chefrepo_path)
-        end
-
-        unless gem_obj.cookbooks.nil?
-          it 'Should list his cookbooks dependencies' do
-            cookbooks = gem_obj.cookbooks
-            expect(cookbooks).not_to be nil
-            expect(cookbooks).to be_kind_of(Array)
-          end
-        end
-      end
-    end
-
-    def install_gem_via_git(gem_obj)
-      RSpec.describe "Install #{gem_obj.project_name}" do
-        it "Change to #{gem_obj} folder" do
-          change_repo = gem_obj.change_to_project_folder
-          expect(change_repo).not_to be nil
-          expect(Dir.pwd).to eq(gem_obj.path)
-        end
-      end
-    end
-
-    def testing_inspec(inspector)
-      inspect_test = InspecTestor.new(inspector[:inspec_path], inspector[:input_file], inspector[:waiver_file])
-      RSpec.describe "Testing #{inspect_test} at #{Dir.pwd}" do
-        it 'Should be a kind of Html' do
-          test_html = inspect_test.save_as_html('/tmp/html/deploy_rubygem_kind_of_html.html')
-          expect(test_html).to be true
-        end
-        it 'Should be a kind of Json' do
-          expect(inspect_test.test_json).to be_kind_of(InspecTestorResult)
-          expect(inspect_test.test_json.status).to eq 'loaded'
-        end
-        it 'Should be successfull' do
-          expect(inspect_test.test_json.success_result).to eq inspector[:success_result]
-          expect(inspect_test.test_json.success_control).to eq inspector[:success_control]
-          expect(inspect_test.test_json.failed_result).to eq inspector[:failed_result]
-          expect(inspect_test.test_json.failed_control).to eq inspector[:failed_control]
-          expect(inspect_test.test_json.pending_result).to eq inspector[:pending_result]
-          expect(inspect_test.test_json.pending_control).to eq inspector[:pending_control]
-        end
-      end
-    end
   end
 end

data/lib/deploy_rubygem/rubygem.rb

@@ -10,7 +10,7 @@ module DeployRubygem
   class Rubygem < Project
     def deploy_dependencies
       dependencies.each do |git_depends|
-        Dir.chdir(::File.join(ENV['HOME'], git_depends))
+        Dir.chdir(::File.join(Dir.home, git_depends))
         system('git pull')
 
         system('git add .')
@@ -54,7 +54,7 @@ module DeployRubygem
     end
 
     def rake_test
-      File.delete('Gemfile.lock') if File.exist?('Gemfile.lock')
+      FileUtils.rm_f('Gemfile.lock')
       system('bundle') || return
       system('bundle install') || return
       system('rake') || return

data/lib/deploy_rubygem/version.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'rubygem'
-
 # Set version for DeployRubygem
 module DeployRubygem
   # VERSION = new_deploy_rubygem.gvb_version.short_version
-  VERSION = '0.60.29'
+  VERSION = '0.60.35'
 end

data/lib/deploy_rubygem/workstation.rb

@@ -22,11 +22,11 @@ module DeployRubygem
 
     def clientrb
       {
-        log_location: File.join(ENV['HOME'], '.chef', 'chef-client.log'),
+        log_location: File.join(Dir.home, '.chef', 'chef-client.log'),
         chef_server_url: chef_server_url,
         chef_license: 'accept',
-        file_cache_path: File.join(ENV['HOME'], '.chef', 'cache'),
-        file_backup_path: File.join(ENV['HOME'], '.chef', 'backup'),
+        file_cache_path: File.join(Dir.home, '.chef', 'cache'),
+        file_backup_path: File.join(Dir.home, '.chef', 'backup'),
         node_name: nodename,
         policy_name: policyname,
         policy_group: policygroup
@@ -55,6 +55,8 @@ module DeployRubygem
     end
 
     def boostrap_workstation
+      extend DeployRubygem
+
       knife_file = File.join(user_folder, '.chef', 'knife.rb')
       cicdpem_file = File.join(user_folder, '.chef', 'cicd.pem')
       cicdcredential_file = File.join(user_folder, '.chef', 'credentials')
@@ -70,7 +72,7 @@ module DeployRubygem
         # read_file(file_path)
       end
 
-      system('chef env --chef-license accept')
+      system(chef_accept_cmd)
     end
   end
 end

data/lib/deploy_rubygem.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'deploy_rubygem/version'
+require_relative 'deploy_rubygem/rubygem'
 
 # DeployRubygem module helper for rubygem
 module DeployRubygem
@@ -11,7 +12,7 @@ module DeployRubygem
   def self.exemple_cookbook
     {
       git: 'git@git.exemple.com:/Exemple/exemple_cookbook.git',
-      path: File.join(ENV['HOME'], 'jimbo_management_site'),
+      path: File.join(Dir.home, 'jimbo_management_site'),
       kitchens: %w[base],
       compliance_profiles: {
         input: 'compliance/inputs/user.yml',

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: deploy_rubygem
 version: !ruby/object:Gem::Version
-  version: 0.60.29
+  version: 0.60.35
 platform: ruby
 authors:
 - Jimmy Provencher
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
@@ -33,7 +33,7 @@ cert_chain:
   n6Pwa3EckU/5n8N6gUJTAmGyu6Ncu1pbsZtH450+BJ2z82JNXomdFYlnG8+1XNlj
   3M1sBFUHvqrBg2hQkQcLHokmQYrYsRK5A7HrxwKcmwM=
   -----END CERTIFICATE-----
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -112,6 +112,9 @@ email:
 executables:
 - install_chef_workstation
 - bootstrap_chef_workstation
+- install_local
+- install_chef_and_bundle
+- init_deploy
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -126,9 +129,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/bootstrap_chef_workstation
-- bin/install_chef_workstation
+- exe/bootstrap_chef_workstation
 - exe/deploy_rubygem
+- exe/init_deploy
+- exe/install_chef_and_bundle
+- exe/install_chef_workstation
+- exe/install_local
 - lib/deploy_rubygem.rb
 - lib/deploy_rubygem/chef_node.rb
 - lib/deploy_rubygem/cookbook.rb
@@ -136,7 +142,13 @@ files:
 - lib/deploy_rubygem/inspectestor.rb
 - lib/deploy_rubygem/kitchen.rb
 - lib/deploy_rubygem/project.rb
+- lib/deploy_rubygem/rake.rb
+- lib/deploy_rubygem/rake/cookbook.rb
+- lib/deploy_rubygem/rake/default.rb
 - lib/deploy_rubygem/rspec.rb
+- lib/deploy_rubygem/rspec/chef.rb
+- lib/deploy_rubygem/rspec/inspec.rb
+- lib/deploy_rubygem/rspec/ruby.rb
 - lib/deploy_rubygem/rubygem.rb
 - lib/deploy_rubygem/testing.rb
 - lib/deploy_rubygem/version.rb
@@ -149,6 +161,7 @@ metadata:
   bug_tracker_uri: https://github.com/JimboDragonGit/deploy_rubygem/issues
   changelog_uri: https://github.com/JimboDragonGit/deploy_rubygem/releases
   homepage_uri: https://github.com/JimboDragonGit/deploy_rubygem
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"

data/bin/install_chef_workstation

@@ -1,24 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'json'
-
-system('curl -L https://omnitruck.chef.io/install.sh > install.sh')
-system('sudo bash install.sh -P chef-workstation')
-
-workstation_options = {
-  user_folder: '/root',
-  node_name: ENV['NODENAME'],
-  knife_name: ENV['KNIFE_NAME'],
-  policyname: ENV['POLICYNAME'],
-  policygroup: ENV['POLICYGROUP'],
-  chef_server_url: ENV['CHEF_SERVER_URL'],
-  chef_client_key: ENV['CHEF_CLIENT_KEY'],
-  chef_knife_key: ENV['CHEF_KNIFE_KEY']
-}
-
-File.write('node_options', JSON.generate(workstation_options))
-system('sudo bootstrap_chef_workstation node_options')
-
-workstation_options[:user_folder] = ENV['HOME']
-File.write('workstation_options', JSON.generate(workstation_options))
-system('bootstrap_chef_workstation workstation_options')