deploy_rubygem 0.51.1 → 0.53.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 118b1de3ff43e401460cbb361fb03afd099cf361056222dd2a693f44fbc3fc41
-  data.tar.gz: 29c8bc2cae322990c972a6377267f69defce5c4ad0055781e1576fa3d059d1bf
+  metadata.gz: 2feb4ae683f82b8c6f2d5ee3594339cb3c1991a7be19f24ac84094ea26909037
+  data.tar.gz: cebbccd37b7ce5f2922efd29968549c7d338972a37a975e4456150533e27d54f
 SHA512:
-  metadata.gz: 1a1b675bb515297858f28e675a2ab0af7d24e9e505a01dc1c5e6f89c591260ea9d12d76178cc92a207274be04e4aceeac8410d63050b1678ef27965193560a02
-  data.tar.gz: 73c0e3532a615513b22c8533792ffec0f00008c9cb6573ea74e29b9627c914f5f794b0d94302d69504b04ebbdd2ebdd08900ac28ae31ee96f7b67a5d52eacf0b
+  metadata.gz: 79d1eceff74c00612c250b31974b5be1e168f171ad3819cfb062dff14f2dd448174bbbd89ca1061a9f44214bc5de2056a83520cb2431655499bb891a6d942368
+  data.tar.gz: 5dcf4d69e1e1d5121c08d6e4279b4143beafe00b132f0a47cdd7fb6299f1f7c5a565d796e0ebb06dca1cac2243ad53f1216b83dfb385cc71383174de43591390

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-nG�8KC�0��p���n��W�����������pם-{�21W9,Ɣ��@h�j`����C����R��h扏���:���|Q���s��'WӈVPP���'������Yb�};ךּ
�L�kf#d���y̧�{A6/���o�$��nɥ5���K�:��R�7�
-Cנw�x�b�}��	ض�H~��T:�I�#|�qL�?? ��p������Q�h/�)2�����!�Ҫ�U��Q��nM���-Vb�1��Q_��n�(串g��Y	
+=�‹~�nBVէ�)�u*y+	�5���
+ޑ�������n��] ק��g,^Y�w�=?s�=O��� Xa�]��B:���^���9��P�O�q�q��W��4c\�s��Cv��>

data/.circleci/config.yml

@@ -9,7 +9,7 @@ jobs:
           password: $DOCKERHUB_PASSWORD  # context / project UI env-var reference
 
     environment: {}
-    working_directory: /tmp/jimbodragon
+    working_directory: /home/circleci/deploy_rubygem
     steps:
       - checkout
       - run: |
@@ -28,7 +28,7 @@ jobs:
           password: $DOCKERHUB_PASSWORD  # context / project UI env-var reference
 
     environment: {}
-    working_directory: /tmp/jimbodragon
+    working_directory: /home/circleci/deploy_rubygem
     steps:
       - checkout
       - run: |
@@ -40,7 +40,7 @@ jobs:
             ssh git@github.com || echo
             gem install deploy_rubygem
 
-            deploy_rubygem .
+            deploy_rubygem
   execute_local:
     docker:
       - image: cimg/ruby:3.1.2
@@ -49,11 +49,11 @@ jobs:
           password: $DOCKERHUB_PASSWORD  # context / project UI env-var reference
 
     environment: {}
-    working_directory: /tmp/jimbodragon
+    working_directory: /home/circleci/deploy_rubygem
     steps:
       - checkout
       - run: |
-            ruby bin/deploy_rubygem .
+            ruby bin/deploy_rubygem
 #...
 workflows:
   version: 2
@@ -67,7 +67,7 @@ workflows:
           filters:
             branches:
               only: master
-      - test_public:
+      - deploy_public:
           filters:
             branches:
               only: master

data/lib/deploy_rubygem/cookbook.rb

@@ -87,6 +87,10 @@ module DeployRubygem
     end
 
     def prepare_test_environment
+      cookbook_info[:profiles].each do |inspec_profile|
+        profile = DeployRubygem::Inspec.new(inspec_profile)
+        profile.update
+      end
       system("kitchen converge #{kitchen}")
     end
 
@@ -109,8 +113,9 @@ module DeployRubygem
       
       kitchen_verify
 
-      cookbook_info[:profiles].each do |inspec_profile|
+      cookbook_info[:execute_profiles].each do |inspec_profile|
         profile = DeployRubygem::Inspec.new(inspec_profile)
+        profile.update
         profile.apply
       end
     end

data/lib/deploy_rubygem/inspec.rb

@@ -8,11 +8,14 @@ module DeployRubygem
     end
 
     def apply
+      system("inspec check compliance/profiles/#{inspec_name}")
+      system("inspec exec compliance/profiles/#{inspec_name}")
+    end
+
+    def update
       system("rm -rf compliance/profiles/#{inspec_name}/vendor")
       system("rm compliance/profiles/#{inspec_name}/inspec.lock")
       system("inspec vendor compliance/profiles/#{inspec_name}")
-      system("inspec check compliance/profiles/#{inspec_name}")
-      system("inspec exec compliance/profiles/#{inspec_name}")
     end
   end
 end

data/lib/deploy_rubygem.rb

@@ -22,7 +22,20 @@ module DeployRubygem
           chef_repo: DeployRubygem.chefrepo_path,
           git: 'git@github.com:JimboDragonGit/jimbo_management_site.git',
           kitchens: %w(base),
-          profiles: %w(jimbodragon-accept),
+          profiles: %w(
+            jimbodragon-accept
+            jimbodragon-applications
+            jimbodragon-deploy-context
+            jimbodragon-environment
+            jimbodragon-git
+            jimbodragon-linux-baseline
+            jimbodragon-manual-push
+            jimbodragon-push
+            jimbodragon-services
+            jimbodragon-users
+            jimbodragon-workstation
+          ),
+          execute_profiles: %w(jimbodragon-accept),
           groups: %w(base)
         }
       }
@@ -41,20 +54,32 @@ module DeployRubygem
   
 
   def self.deploy_rubygem_path
-    if ARGV.empty? || ARGV.first.empty?
-      File.join(ENV['HOME'], 'deploy_rubygem')
-    else
-      ARGV.first
-    end
+    File.join(ENV['HOME'], 'deploy_rubygem')
+  end
+  
+
+  def self.jimbo_management_site_path
+    File.join(ENV['HOME'], 'jimbo_management_site')
   end
   
 
   def self.chefrepo_path
     '/usr/local/chef/repo/jimbodragon'
   end
+  
+
+  def self.change_to_directory(git_path, git_url)
+    if not Dir.exist?(chefrepo_path)
+      system("git clone #{git_url}")
+    end
+    Dir.chdir(git_path)
+  end
 
   def self.main
-    Dir.chdir(DeployRubygem.deploy_rubygem_path)
+    DeployRubygem.change_to_directory(DeployRubygem.chefrepo_path, 'git@github.com:JimboDragonGit/jimbodragon.git')
+    DeployRubygem.change_to_directory(DeployRubygem.jimbo_management_site_path, 'git@github.com:JimboDragonGit/jimbo_management_site.git')
+    DeployRubygem.change_to_directory(DeployRubygem.deploy_rubygem_path, 'git@github.com:JimboDragonGit/deploy_rubygem.git')
+
     DeployRubygem.self_deploy
     DeployRubygem.deploy_jimbo_management_site
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy_rubygem
 version: !ruby/object:Gem::Version
-  version: 0.51.1
+  version: 0.53.1
 platform: ruby
 authors:
 - Jimmy Provencher
@@ -33,7 +33,7 @@ cert_chain:
   n6Pwa3EckU/5n8N6gUJTAmGyu6Ncu1pbsZtH450+BJ2z82JNXomdFYlnG8+1XNlj
   3M1sBFUHvqrBg2hQkQcLHokmQYrYsRK5A7HrxwKcmwM=
   -----END CERTIFICATE-----
-date: 2024-05-22 00:00:00.000000000 Z
+date: 2024-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef