jimbo_management_site 0.60.14 → 0.60.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ba041abb18207fe431a7f2ec3f85d10145f4755b54c73ebf3e9776bcd48427f
-  data.tar.gz: c5f368827436ff158a7ad2480d11e11ee4b6de5d802990355955f4f8f306e5da
+  metadata.gz: 8f3f7add5132ced5791e904e39eedf48491e36992183df12721a318248108569
+  data.tar.gz: 877a9b96cbb4048e1c99df5f3c79d82e4a7c595c88561a77572be21c63c0366c
 SHA512:
-  metadata.gz: c3817776dec91fc98856bbb9de8148ba4df0d26b63921a60ed594534a5605049e3b8d0fecc15e1a18d3487ffaec6c9ea06c089ccdc287421ab17a8e61d2352a8
-  data.tar.gz: a487401e56c41086dfb70f122a53be2b58b9853d1e07fee6c71014d7188af3acec326c38a4fc7adfdea6575d8e780040e86d7385add74bda229684c9c44da86b
+  metadata.gz: b2f9d5d5afc5e27360488f0285a1159a828b2d7d5101ddb63e8548e10dc0047ef339ead50e92ea544d2da5b844cbed2f79d59e2de98bf5304dc562b9024ce20a
+  data.tar.gz: 1464be1f6e7b0acef80249a72d3585041291ca2d3b70f404355f7054242f785ce6e490fccc5111c5a558381ff35f7280163f2dcac7427e9558e96ddbb70a0f96

data/Policyfile.rb

@@ -20,6 +20,7 @@ end
 
 # run_list: chef-client will run these recipes in the order specified.
 run_list 'jimbo_management_site::default'
+run_list 'jimbo_management_site::compile_deploy_rubygem'
 
 # Specify a custom source for a single cookbook:
 cookbook 'jimbo_management_site', path: '.'
@@ -29,3 +30,4 @@ cookbook 'deploy-context'
 
 named_run_list :jimbo_management_site, ['recipe[jimbo_management_site::default]']
 named_run_list :website, ['recipe[jimbo_management_site::website]']
+named_run_list :compile_deploy_rubygem, ['recipe[jimbo_management_site::compile_deploy_rubygem]']

data/Rakefile

@@ -13,20 +13,20 @@ require 'deploy_rubygem'
 
 task wip: %i[clean_cookbook release_policy install_jimbo_management_site]
 
-task test_framework: %i[clean_cookbook rubocop install:local spec clean_cookbook]
-task default: %i[test_framework build install:local]
+task test_framework: %i[clean_cookbook cookstyle build_cookbook spec clean_cookbook]
+task default: %i[test_framework build_cookbook install:local]
 task cicd: %i[test_framework release_cookbook test_version release_framework]
 task test_version: %i[install compliance]
 task release_framework: %i[clean_cookbook release test_version]
 task release_cookbook: %i[release release_policy]
-task developper: %i[push cicd report]
+task developper: %i[clean_cookbook cookstyle build_cookbook spec push install release_policy report]
 task :push do
   system('git add .')
   system("git commit -m 'Rake pusing version #{DeployRubygem::VERSION}'")
   system('git push')
 end
 
-task :cookstyle do
+task cookstyle: %i[rubocop] do
   system('cookstyle')
 end
 
@@ -38,28 +38,35 @@ task install_policy: %i[build_cookbook] do
   system('chef install Policyfile.rb')
 end
 
-task release_policy: %i[install_policy] do
+task release_policy: %i[clean_cookbook install_policy] do
   system('chef push prod Policyfile.lock.json')
 end
 
-task install_jimbo_management_site: %i[clean_cookbook release_policy] do
+task :install_jimbo_management_site do
   system('sudo chef-client -o jimbo_management_site')
 end
 
 task :compliance do
   inspect_opts = [
     '--input-file',
-    File.join('compliance', 'inputs', 'user.yml'),
+    File.join('compliance', 'inputs', 'jimbo_management_site.yml'),
     '--waiver-file',
-    File.join('compliance', 'waivers', 'jimbo_management_site.yml')
+    File.join('compliance', 'waivers', 'jimbo_management_site.yml'),
+    '--reporter', 'html:/tmp/html/jimbo_management_site_rake_report.html'
   ]
-  system("inspec exec git@github.com:JimboDragonGit/rubygem_baseline.git #{inspect_opts.join(' ')}")
+  system("inspec exec compliance/profiles/jimbodragon-accept #{inspect_opts.join(' ')}")
 end
 
 task :report do
   system('sudo chef-client -o jimbo_management_site::compile_deploy_rubygem')
 end
 
+task :update_report do
+  Dir.chdir(File.join('..', 'deploy_rubygem')) do
+    system('rake developper')
+  end
+end
+
 task clean_cookbook: %i[clean] do
   # system('kitchen destroy base')
   # File.delete('Policyfile.lock.json') if File.exist?('Policyfile.lock.json')

data/chefignore

@@ -121,3 +121,4 @@ pkg
 # JimboDragon #
 ###########
 pkg
+base_check.log

data/lib/jimbo_management_site/version.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'deploy_rubygem'
-require 'deploy_rubygem/project'
-require 'deploy_rubygem/version'
-
-module JimboManagementSiteTest
-  VERSION = '0.60.14'
+module JimboManagementSite
+  VERSION = '0.60.18'
 end

data/lib/jimbo_management_site.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
 require_relative 'jimbo_management_site/version'
-require_relative 'jimbo_management_site/jimbo_management_site_options'
-
 require 'deploy_rubygem'
 
-# DeployRubygemAcceptanceTest - Acceptance test for deploy_rubygem
-module DeployRubygemAcceptanceTest
+# JimboManagementSite - Acceptance test for deploy_rubygem
+module JimboManagementSite
   class Error < StandardError; end
   # Your code goes here...
 end

data/metadata.rb

@@ -8,7 +8,7 @@ maintainer 'Jimmy Provencher'
 maintainer_email 'jimmy.provencher@hotmail.ca'
 license 'All Rights Reserved'
 description 'Installs/Configures jimbo_management_site'
-version JimboManagementSiteTest::VERSION
+version JimboManagementSite::VERSION
 chef_version '>= 16.0'
 
 # The `issues_url` points to the location where issues for this cookbook are
@@ -23,7 +23,7 @@ chef_version '>= 16.0'
 #
 # source_url 'https://github.com/<insert_org_here>/jimbo_management_site'
 
-gem 'deploy_rubygem'
+# gem 'deploy_rubygem'
 
 depends 'apache2'
 depends 'php'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jimbo_management_site
 version: !ruby/object:Gem::Version
-  version: 0.60.14
+  version: 0.60.18
 platform: ruby
 authors:
 - Jimmy Provencher
@@ -33,7 +33,7 @@ cert_chain:
   n6Pwa3EckU/5n8N6gUJTAmGyu6Ncu1pbsZtH450+BJ2z82JNXomdFYlnG8+1XNlj
   3M1sBFUHvqrBg2hQkQcLHokmQYrYsRK5A7HrxwKcmwM=
   -----END CERTIFICATE-----
-date: 2024-06-08 00:00:00.000000000 Z
+date: 2024-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deploy_rubygem
@@ -82,7 +82,6 @@ files:
 - files/html/report.php
 - kitchen.yml
 - lib/jimbo_management_site.rb
-- lib/jimbo_management_site/jimbo_management_site_options.rb
 - lib/jimbo_management_site/version.rb
 - metadata.rb
 homepage: https://github.com/JimboDragonGit/jimbo_management_site

data/lib/jimbo_management_site/jimbo_management_site_options.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-# DeployRubygem - deploy a gem using rake
-# Containing a class
-module JimboManagementSiteTestOptions
-  # Using Inspec to deploy and manage Inspec
-  class JimboManagementSiteTestOptions
-    def project_name
-      'jimbo_management_site'
-    end
-
-    def git
-      'git@github.com:JimboDragonGit/jimbo_management_site.git'
-    end
-
-    def chefrepo_git
-      'git@github.com:JimboDragonGit/jimbodragon.git'
-    end
-
-    def chefrepo_path
-      '/usr/local/chef/repo/jimbodragon'
-    end
-
-    def dependencies
-      %w[
-        deploy_rubygem
-      ]
-    end
-
-    def path
-      File.join(ENV['HOME'], 'jimbo_management_site')
-    end
-
-    def compile
-      {
-        project_name: project_name,
-        git: git,
-        chefrepo_git: chefrepo_git,
-        chefrepo_path: chefrepo_path,
-        dependencies: dependencies,
-        path: path
-      }
-    end
-  end
-end