deploy_rubygem 0.60.43 → 0.60.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a77bb19d345806d57bf2df2d23b9f9b312c5f8381c05f0eac00a245a0da3196
-  data.tar.gz: 9f0fe280087d5318ef663f23f73b5a3a8d529d680cc2bd6fa68ba337b852b76f
+  metadata.gz: 3c6f5176a71cf96fafed51ea805cc1c5175adaec0d41a49a58c97e04dcce28ae
+  data.tar.gz: fd9bdb45005a555765b05533569fbc58d62faa2a0b707660319ee436cdbd0467
 SHA512:
-  metadata.gz: 1e227e609c098802e3398187e28c8d026f676703f82b720371f6baddf0fb1996574c2bd1b02031a050568085e7d070cb2a8539eb88c1275112954047e5908f35
-  data.tar.gz: e1a9c01fa8ecea496d2005b773c3f7b3514612410a36b9f383a27fc27af321de9d5de4feb8357db160677e87d2d343c3a30e4a7c71cd3a53dd5a8a0c46ab98a0
+  metadata.gz: dd5d9669b7eb13eab69e8576bbd9b53130f64db7d3c27b57afc178795bb030ba2f6022a7ed353cd82bf71836b4b0eb0db91be25125fcfe60eb919d6758b86c11
+  data.tar.gz: f5e7c37f166c0d6d0e51d2dd9ad5529253ff8ef092cdfc7028f7a2ab783c1f2461a024afc11a60360687e9d56a077bbf766abd44cb39e66655fdf36fcd3b902a

data/.rubocop.yml

@@ -28,7 +28,7 @@ Metrics/MethodLength:
 
 Metrics/ClassLength:
   Enabled: true
-  Max: 102
+  Max: 104
 
 Gemspec/DeprecatedAttributeAssignment: # new in 1.30
   Enabled: true

data/lib/deploy_rubygem/rake/cookbook/chef.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+# DeployRubygem module helper for rubygem
+module DeployRubygem
+  # RakeTask to use with DeployRubygem projects
+  module ChefCookbookTask
+    def chef_client # :nodoc:
+      desc "@desc with #{__method__}"
+      task :chef_client do
+        system('sudo chef-client')
+      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 report # :nodoc:
+      desc "@desc with #{__method__}"
+      task :report do
+        system("sudo chef-client -o #{@task_name}::compile_report")
+      end
+    end
+  end
+end

data/lib/deploy_rubygem/rake/cookbook/inspec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# DeployRubygem module helper for rubygem
+module DeployRubygem
+  # RakeTask to use with DeployRubygem projects
+  module InspecCookbookTask
+    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"
+        ]
+        inspec_cmd = "inspec exec compliance/profiles/#{@task_name}-accept #{inspect_opts.join(' ')}"
+        puts "inspec_cmd = #{inspec_cmd}"
+        system(inspec_cmd)
+      end
+    end
+  end
+end

data/lib/deploy_rubygem/rake/cookbook/knife.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# DeployRubygem module helper for rubygem
+module DeployRubygem
+  # RakeTask to use with DeployRubygem projects
+  module KnifeCookbookTask
+    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[chef_client clean_cookbook cookstyle] do
+        system("knife cookbook upload #{@task_name}")
+      end
+    end
+  end
+end

data/lib/deploy_rubygem/rake/cookbook.rb

@@ -3,11 +3,18 @@
 require 'rake/dsl_definition'
 
 require_relative 'default'
+require_relative 'cookbook/chef'
+require_relative 'cookbook/inspec'
+require_relative 'cookbook/knife'
 
 # DeployRubygem module helper for rubygem
 module DeployRubygem
   # RakeTask to use with DeployRubygem projects
   class RakeCookbookTask < RakeDefaultTask
+    include ChefCookbookTask
+    include InspecCookbookTask
+    include KnifeCookbookTask
+
     def initialize(task_name = 'cookbook', desc = 'Run DeployRubygem task')
       super
     end
@@ -55,60 +62,6 @@ module DeployRubygem
       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

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.43'
+  VERSION = '0.60.45'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy_rubygem
 version: !ruby/object:Gem::Version
-  version: 0.60.43
+  version: 0.60.45
 platform: ruby
 authors:
 - Jimmy Provencher
@@ -135,6 +135,9 @@ files:
 - lib/deploy_rubygem/project.rb
 - lib/deploy_rubygem/rake.rb
 - lib/deploy_rubygem/rake/cookbook.rb
+- lib/deploy_rubygem/rake/cookbook/chef.rb
+- lib/deploy_rubygem/rake/cookbook/inspec.rb
+- lib/deploy_rubygem/rake/cookbook/knife.rb
 - lib/deploy_rubygem/rake/default.rb
 - lib/deploy_rubygem/rspec.rb
 - lib/deploy_rubygem/rspec/chef.rb