deploy_rubygem 0.60.44 → 0.60.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3293c38588e7229b9f2074e0114709138d4fe9bb2b1a45eb4ac0291e9714d105
-  data.tar.gz: 924e84c8f20fa1f9b6eb36ff7c03a19f7079e6f6ee2ac0cec363fa0574d592f5
+  metadata.gz: dcb280a60ac45ab9bfbf1a3ad1695612181419f938d1f441f0279b63f9edc8ca
+  data.tar.gz: 4743439217104602a7b0e5dad88eeb1f7c2d3742987156bfc0ee021555e7ae26
 SHA512:
-  metadata.gz: 27ddeb97e43184716b2400c953b72c50c80efa5066e937702b7035ccc31eb27b9b10ecedd49398e491a6996e20bf53b85e93a78f133e626bd045c0bc47663253
-  data.tar.gz: 8d8784c64e002254dd347aec7dcc4906b01490d8ec469751349c2ff977a7131f9ed12dd606788ceb8369de0c0d23cc0fe7def45593168daaeccc9f38b31e3019
+  metadata.gz: d02cc582046267a7c559dfd188be79c7d517565c1584ea75ee6d6f3578bd89e4f9e878083f425b53e9e8899f7425f08ee9e51ae1787d43db45640fb8e9f92ad3
+  data.tar.gz: f2803a21df09a95090fb24825400ed8373d3f29ad3a964d2b5375346927d6734c9eefbb156f073b8666d33093ba340884c82b8b330a90eb600ac5ca755a788ad

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
@@ -23,6 +30,7 @@ module DeployRubygem
       install_cookbook
       report
       clean_cookbook
+      chef_client
     end
 
     def test_framework # :nodoc:
@@ -55,62 +63,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"
-        ]
-        inspec_cmd = "inspec exec compliance/profiles/#{@task_name}-accept #{inspect_opts.join(' ')}"
-        puts "inspec_cmd = #{inspec_cmd}"
-        system(inspec_cmd)
-      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.44'
+  VERSION = '0.60.46'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy_rubygem
 version: !ruby/object:Gem::Version
-  version: 0.60.44
+  version: 0.60.46
 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