deploy_rubygem 0.60.21 → 0.60.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5a382592bfb10083db919cd98d351fedf46531b0f0316340dcd61440d78934a
-  data.tar.gz: ae39a1b035154186fd05ffb3a2a0ea3ce5d8d14a0bf13a3cab9d7270f54201d0
+  metadata.gz: 0025eb35e02d5cfc5cfcdba4ef9d1a2c3e1460f478cb48869e488ff9eb772460
+  data.tar.gz: 32ebfdd0c7f113c93dc8720fa172d2455428ca3438dec6f83c51f0edc2a4f0ff
 SHA512:
-  metadata.gz: 3316dfff7b0612fd01b95a28cec007e3a7a16a8c509117be35d2945c5e9fce846abbda0e6855cb68c9d44c92596e63eb258f528e087081e80d1cc2c24d7d5e55
-  data.tar.gz: 7b6b42ca9946bc38d148c0c74126f71b843951764b9aecca80223eb7128d126e0e0faef4f0152062283abffd5ae7d0e7d8cf172100f2436f1253e0c65e2e7755
+  metadata.gz: 60383e359731709cdf24b7e97935d777a7f69e6191759206a5e03ebee8462abb934d2b562e795df4a2c8141a8063e2e0b2ce9055ad2520ff4d66286ba0e673ee
+  data.tar.gz: 930c0a40af5f0235c637ec9800deea3f242e035796c573eb32cc0af879513f6efa36af2049e000c7bdb60eba1d620571a158033e2928669dd4712df20fac44c2

data/Rakefile

@@ -12,12 +12,12 @@ RuboCop::RakeTask.new
 
 task test_framework: %i[clean rubocop spec]
 task default: %i[test_framework build install:local]
-task cicd: %i[default release test_version]
+task cicd: %i[default test_version]
 task test_version: %i[install compliance]
 task :compliance do
-  # system('inspec exec git@github.com:JimboDragonGit/rubygem_baseline.git --input-file compliance.yml')
+  system('inspec exec compliance')
 end
-task developper: %i[push cicd]
+task developper: %i[rubocop push default release]
 task :push do
   system('git add .')
   system("git commit -m 'Rake pusing version #{DeployRubygem::VERSION}'")

data/lib/deploy_rubygem/chef_node.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+
+# DeployRubygem - deploy a gem using rake
+# Containing a class
+module DeployRubygem
+  # Using Project to deploy and manage Project
+  class ChefNode
+    attr_reader :chef_server_url, :nodename, :policyname, :policygroup, :knife_name, :chef_client_key
+
+    def initialize(options)
+      @chef_server_url = options['chef_server_url']
+      @nodename = options['node_name']
+      @policyname = options['policyname']
+      @policygrouop = options['policygrouop']
+      @knife_name = options['knife_name']
+      @chef_client_key = options['chef_client_key']
+    end
+
+    def clientrb
+      {
+        log_location: '/var/log/chef-client.log',
+        chef_server_url: chef_server_url,
+        chef_license: 'accept',
+        file_cache_path: '/var/chef/cache',
+        file_backup_path: '/var/chef/backup',
+        node_name: nodename,
+        policy_name: policyname,
+        policy_group: policygroup
+      }.map do |key, value|
+        key_pair = [key, "'#{value}'"]
+        key_pair.join(' ')
+      end.join("\n")
+    end
+
+    def read_file(file_path)
+      puts "REading file #{file_path}"
+      puts File.read(file_path)
+      puts "Had read #{File.read(file_path).split('\n').length} lines"
+    end
+
+    def boostrap
+      clientrb_file = '/etc/chef/client.rb'
+      clientpem_file = '/etc/chef/client.pem'
+
+      Dir.mkdir('/etc/chef') unless Dir.exist?('/etc/chef')
+
+      File.write(clientrb_file, clientrb)
+      File.write(clientpem_file, chef_client_key.split('\\n').join("\n"))
+
+      [clientrb_file, clientpem_file].each do |file_path|
+        FileUtils.chmod(0o600, file_path)
+        # read_file(file_path)
+      end
+
+      system('chef env --chef-license accept')
+    end
+  end
+end

data/lib/deploy_rubygem/inspectestor.rb

@@ -34,7 +34,7 @@ module DeployRubygem
     def update
       system("rm -rf #{inspec_path}/vendor")
       system("rm #{inspec_path}/inspec.lock")
-      system("inspec vendor #{inspec_path}")
+      system("inspec vendor #{inspec_path} ")
     end
 
     def save_as_html(html_file)
@@ -48,8 +48,12 @@ module DeployRubygem
 
     private
 
+    def chef_license
+      '--chef-licens accept'
+    end
+
     def inspec_options
-      cmd_opt = []
+      cmd_opt = [chef_license]
 
       unless input_file.nil?
         cmd_opt << '--input-file'
@@ -60,6 +64,7 @@ module DeployRubygem
         cmd_opt << '--waiver-file'
         cmd_opt << waiver_file
       end
+      puts "Using inspec options #{cmd_opt}"
       cmd_opt
     end
 

data/lib/deploy_rubygem/project.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'testing'
+require_relative 'workstation'
 
 # DeployRubygem - deploy a gem using rake
 # Containing a class

data/lib/deploy_rubygem/version.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'git-version-bump'
-
 require_relative 'rubygem'
 require_relative 'deploy_rubygem_options'
 
@@ -17,5 +15,5 @@ module DeployRubygem
   end
 
   # VERSION = new_deploy_rubygem.gvb_version.short_version
-  VERSION = '0.60.21'
+  VERSION = '0.60.22'
 end

data/lib/deploy_rubygem/workstation.rb

@@ -1,54 +1,75 @@
 # frozen_string_literal: true
 
-require_relative 'rspec'
+require 'fileutils'
+require_relative 'chef_node'
 
 # DeployRubygem - deploy a gem using rake
 # Containing a class
 module DeployRubygem
   # Using Project to deploy and manage Project
   class Workstation
+    attr_reader :chef_server_url, :nodename, :policyname, :policygroup, :knife_name, :chef_client_key, :chef_knife_key, :user_folder
+
+    def initialize(options)
+      @chef_server_url = options['chef_server_url']
+      @nodename = options['node_name']
+      @policyname = options['policyname']
+      @policygroup = options['policygroup']
+      @knife_name = options['knife_name']
+      @chef_knife_key = options['chef_knife_key']
+      @user_folder = options['user_folder']
+    end
+
     def clientrb
       {
-        log_location: '/var/log/chef-client.log',
-        chef_server_url: ENV['CHEF_SERVER_URL'],
+        log_location: File.join(ENV['HOME'], '.chef', 'chef-client.log'),
+        chef_server_url: chef_server_url,
         chef_license: 'accept',
-        file_cache_path: '/var/chef/cache',
-        file_backup_path: '/var/chef/backup',
-        node_name: ENV['NODENAME'],
-        policy_name: ENV['POLICYNAME'],
-        policy_group: ENV['POLICYGROUP']
+        file_cache_path: File.join(ENV['HOME'], '.chef', 'cache'),
+        file_backup_path: File.join(ENV['HOME'], '.chef', 'backup'),
+        node_name: nodename,
+        policy_name: policyname,
+        policy_group: policygroup
       }.map do |key, value|
-        [key, "'#{value}'"].join(' ')
+        key_pair = [key, "'#{value}'"]
+        key_pair.join(' ')
       end.join("\n")
     end
 
     def credential
       (['[default]'] + {
-        client_name: ENV['KNIFE_NAME'],
-        client_key: File.join(ENV['HOME'], '.chef', 'cicd.pem'),
-        chef_server_url: ENV['CHEF_SERVER_URL']
-        # secret_file: File.join(ENV['HOME'], '.chef', 'cicd.secret')
+        client_name: knife_name,
+        client_key: File.join(user_folder, '.chef', 'cicd.pem'),
+        chef_server_url: chef_server_url
+        # secret_file: File.join(user_folder, '.chef', 'cicd.secret')
       }.map do |key, value|
-        [key, "'#{value}'"].join(' ')
+        [key, '=', "'#{value}'"].join(' ')
       end).join("\n")
     end
 
+    def read_file(file_path)
+      puts "REading file #{file_path}"
+      puts File.read(file_path)
+      puts "Had read #{File.read(file_path).split('\n').length} lines"
+    end
+
     def boostrap_workstation
-      clientrb_file = '/etc/chef/client.rb'
-      clientpem_file = '/etc/chef/client.pem'
-      cicdpem_file = File.join(ENV['HOME'], '.chef', 'cicd.pem')
-      cicdcredential_file = File.join(ENV['HOME'], '.chef', 'credentials')
-      File.write(clientrb_file, clientrb)
-      File.write(clientpem_file, ENV['CHEF_CLIENT_KEY'])
-      File.write(cicdpem_file, ENV['CHEF_KNIFE_KEY'])
+      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')
+
+      Dir.mkdir(File.join(user_folder, '.chef'))
+
+      File.write(knife_file, clientrb)
+      File.write(cicdpem_file, chef_knife_key.split('\\n').join("\n"))
       File.write(cicdcredential_file, credential)
 
-      FileUtils.chmod(0o600, clientrb_file)
-      FileUtils.chmod(0o600, clientpem_file)
-      FileUtils.chmod(0o600, cicdpem_file)
-      FileUtils.chmod(0o600, cicdcredential_file)
+      [knife_file, cicdpem_file, cicdcredential_file].each do |file_path|
+        FileUtils.chmod(0o600, file_path)
+        # read_file(file_path)
+      end
 
-      system('chef-client')
+      system('chef env --chef-license accept')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy_rubygem
 version: !ruby/object:Gem::Version
-  version: 0.60.21
+  version: 0.60.22
 platform: ruby
 authors:
 - Jimmy Provencher
@@ -33,7 +33,7 @@ cert_chain:
   n6Pwa3EckU/5n8N6gUJTAmGyu6Ncu1pbsZtH450+BJ2z82JNXomdFYlnG8+1XNlj
   3M1sBFUHvqrBg2hQkQcLHokmQYrYsRK5A7HrxwKcmwM=
   -----END CERTIFICATE-----
-date: 2024-06-09 00:00:00.000000000 Z
+date: 2024-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -109,12 +109,7 @@ description: Using Chef cookbook style and force any script using it to switch t
   chef even if it is not install. It will install it tho ;)
 email:
 - jimbo_dragon@hotmail.com
-executables:
-- deploy_rubygem
-- prepare_workstation
-- test_deploy_rubygem
-- deploy_rubygem_manually
-- deploy_jimbodragon
+executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -129,13 +124,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/deploy_jimbodragon
-- bin/deploy_rubygem
-- bin/deploy_rubygem_manually
-- bin/prepare_workstation
-- bin/test_deploy_rubygem
 - exe/deploy_rubygem
 - lib/deploy_rubygem.rb
+- lib/deploy_rubygem/chef_node.rb
 - lib/deploy_rubygem/cookbook.rb
 - lib/deploy_rubygem/deploy_rubygem_options.rb
 - lib/deploy_rubygem/inspec_result.rb

data/bin/deploy_jimbodragon

@@ -1,8 +0,0 @@
-#!/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'
-
-DeployRubygem.deploy_jimbodragon

data/bin/deploy_rubygem

@@ -1,8 +0,0 @@
-#!/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'
-
-DeployRubygem.new_deploy_rubygem.deploy

data/bin/deploy_rubygem_manually

@@ -1,4 +0,0 @@
-#!/opt/chef-workstation/embedded/bin/ruby
-
-Dir.chdir(::File.join(ENV['HOME'], 'jimbo_management_site'))
-system('chef exec inspec exec compliance/profiles/jimbodragon-manual-push')

data/bin/prepare_workstation

@@ -1,3 +0,0 @@
-#!/opt/chef-workstation/embedded/bin/ruby
-
-system('chef-client')

data/bin/test_deploy_rubygem

@@ -1,7 +0,0 @@
-#!/opt/chef-workstation/embedded/bin/ruby
-Signal.trap('INT') { exit 1 }
-
-require 'rubygems' unless defined?(Gem)
-require 'deploy_rubygem'
-
-DeployRubygem.new_deploy_rubygem.release