deploy_rubygem 0.60.35 → 0.60.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 272f1912c9321b5c99d8f3c69bee52c20ffdf8591e6e49ef82fe39f9d6e63197
-  data.tar.gz: c3e46c51ea5046e6a86b9b60d3a99d2c34ed577fa8e67349a8a9433f75b4569c
+  metadata.gz: 7d7b7ddd45122fc2dd5f7344990aaa13a123e469146f2d1612be29196742e83b
+  data.tar.gz: dde2749c7504646d51ba67978dbbe8bc4ea683698f775929fa67038403994f12
 SHA512:
-  metadata.gz: 02db2e27ef0d8a059d14a3faa127cf3572c768675d418e65b288887df40c35ac38a0147a26ef7d64c44220b86e63cbb3a7bd83bc43556c6955fabaff9b562bcf
-  data.tar.gz: 13b46eeabcf1a2d1dc7c9af1f475803ec5a3fd4021e789392b3c59f7f17ce42ca09cb979e496b2a3b67c8c43fa6059cf13590ab64d277209ac818257199df00f
+  metadata.gz: c94be7a2c5ee004317e5b508c32cf80d62e9f5b7699a69d3b6c27c89a978751bdb2624018011405f92f6185d00b7c7b446464f1318d63cbe7b1f50cd6ed2c08d
+  data.tar.gz: b09c8856baaedab3184c3ff95e6cb6a7a1d220d18c0310e9a18a1f9a3b029b05332f30e27b50d79a40fc3eaa2fdf12c56a9a683cb942dac3aec45c997bc127f9

checksums.yaml.gz.sig

@@ -1,4 +1,2 @@
-ڌ����{v&	���ŦK\_�j%��;��`��kÆ�ɵڙ��8��%#$
-=FiŴ��ވ�eN���v����w;>}�X��w���c@T:`Au��H~
-3/o ��͝����`�Z��H?�.m��u�9��6�>��K�qq��u39z�#"����$��d�I���U{��I��$y�;��=ڈ�.�bGS$�߰��V�!��2[��Q9V#b�;\C�1,u�2��5;���X
-�Џ��;Z��E�����Y[�ufW�b8y�2u��U3�nr�j�gҨT�Q17�Y
�xK@��Y-��;�VF�b�6��sY�����H�cB�/r���s�k\{��2擽�ψb׺
+"+�I�hup,3I���("���/�C
+��rX��r4����0���[ �Je���h�]��;�ȴ`/��;#�D�|/=)��Qa�(�J�ʙ?s��{�#&�o�[�]���o��q��U�/���[�߇4b��P�@*��;Z��

data/exe/deploy_rubygem

@@ -1,3 +1,12 @@
 #!/usr/bin/env ruby
 
 require 'deploy_rubygem'
+
+case ARGV[0]
+when 'install'
+  DeployRubygem.deployer.install_chef_workstation
+when 'bootstrap_chef_workstation'
+  DeployRubygem.deployer.bootstrap_chef_workstation(ARGV[0])
+else
+  puts DeployRubygem.deployer.no_option_txt
+end

data/lib/deploy_rubygem/{chef_node.rb → chef_admin.rb}

@@ -6,7 +6,7 @@ require 'fileutils'
 # Containing a class
 module DeployRubygem
   # Using Project to deploy and manage Project
-  class ChefNode
+  class ChefAdmin
     attr_reader :chef_server_url, :nodename, :policyname, :policygroup, :knife_name, :chef_client_key
 
     def initialize(options)

data/lib/deploy_rubygem/project.rb

@@ -8,6 +8,7 @@ require_relative 'workstation'
 module DeployRubygem
   # Using Project to deploy and manage Project
   class Project
+    include DeployRubygem
     include RSpecTesting
 
     attr_reader :project_options, :cookbooks, :compliance_profile

data/lib/deploy_rubygem/rake/default.rb

@@ -31,7 +31,7 @@ module DeployRubygem
       default
       cycle
       test_version
-      test_check_local
+      check_local
       compliance
       develop
       push
@@ -57,7 +57,7 @@ module DeployRubygem
       task test_version: %i[install compliance]
     end
 
-    def test_check_local # :nodoc:
+    def check_local # :nodoc:
       desc "@desc with #{__method__}"
       task check_local: %i[rubocop spec]
     end

data/lib/deploy_rubygem/version.rb

@@ -3,5 +3,5 @@
 # Set version for DeployRubygem
 module DeployRubygem
   # VERSION = new_deploy_rubygem.gvb_version.short_version
-  VERSION = '0.60.35'
+  VERSION = '0.60.37'
 end

data/lib/deploy_rubygem/workstation.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'fileutils'
-require_relative 'chef_node'
+require_relative 'chef_admin'
 
 # DeployRubygem - deploy a gem using rake
 # Containing a class

data/lib/deploy_rubygem.rb

@@ -1,10 +1,16 @@
 # frozen_string_literal: true
 
+require 'json'
+
 require_relative 'deploy_rubygem/version'
 require_relative 'deploy_rubygem/rubygem'
 
 # DeployRubygem module helper for rubygem
 module DeployRubygem
+  def no_option_txt
+    'Use "deploy_rubygem install" to install Chef dependencies'
+  end
+
   def rubygem_test
     DeployRubygem.deployer
   end
@@ -39,4 +45,34 @@ module DeployRubygem
     }
     @deployer ||= DeployRubygem::Project.new(project_options)
   end
+
+  def install_chef_workstation
+    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 deploy_rubygem bootstrap node_options')
+
+    workstation_options[:user_folder] = Dir.home
+    File.write('workstation_options', JSON.generate(workstation_options))
+    system('deploy_rubygem bootstrap workstation_options')
+  end
+
+  def bootstrap_chef_workstation(option_file)
+    workstation_options = JSON.parse(File.read(option_file))
+
+    if workstation_options['user_folder'] == '/root'
+      DeployRubygem::ChefAdmin.new(workstation_options).boostrap
+    else
+      DeployRubygem::Workstation.new(workstation_options).boostrap_workstation
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy_rubygem
 version: !ruby/object:Gem::Version
-  version: 0.60.35
+  version: 0.60.37
 platform: ruby
 authors:
 - Jimmy Provencher
@@ -33,50 +33,50 @@ cert_chain:
   n6Pwa3EckU/5n8N6gUJTAmGyu6Ncu1pbsZtH450+BJ2z82JNXomdFYlnG8+1XNlj
   3M1sBFUHvqrBg2hQkQcLHokmQYrYsRK5A7HrxwKcmwM=
   -----END CERTIFICATE-----
-date: 2024-06-16 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -110,11 +110,7 @@ description: Using Chef cookbook style and force any script using it to switch t
 email:
 - jimbo_dragon@hotmail.com
 executables:
-- install_chef_workstation
-- bootstrap_chef_workstation
-- install_local
-- install_chef_and_bundle
-- init_deploy
+- deploy_rubygem
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -129,14 +125,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- 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/chef_admin.rb
 - lib/deploy_rubygem/cookbook.rb
 - lib/deploy_rubygem/inspec_result.rb
 - lib/deploy_rubygem/inspectestor.rb

data/exe/bootstrap_chef_workstation

@@ -1,13 +0,0 @@
-#!/opt/chef-workstation/embedded/bin/ruby
-# Signal.trap('INT') { exit 1 }
-
-require 'rubygems' unless defined?(Gem)
-require 'deploy_rubygem'
-
-workstation_options = JSON.parse(File.read(ARGV[0]))
-
-if workstation_options['user_folder'] == '/root'
-  DeployRubygem::ChefNode.new(workstation_options).boostrap
-else
-  DeployRubygem::Workstation.new(workstation_options).boostrap_workstation
-end

data/exe/init_deploy

@@ -1,10 +0,0 @@
-#!/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

@@ -1,9 +0,0 @@
-#!/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

@@ -1,21 +0,0 @@
-#!/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

@@ -1,9 +0,0 @@
-#!/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