deploy_rubygem 0.60.18 → 0.60.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 428b3075e54be6e8c5d25d116b682807664ec7881e38fd7e2fcb61267374394d
-  data.tar.gz: b1d648319b872db65d43204e0a0411014944e82a994664036da9dda6ded21850
+  metadata.gz: ee7c9d9e75a9bb9a640edffb6d267bb28385677078e28dfaca96cf17edba4a24
+  data.tar.gz: 103b0f1bd56705075451e8ce3f72759b25b5f5d60067ddc1bf93dbd31c0ca3a6
 SHA512:
-  metadata.gz: ac50c3bb314cee3c6f23994eaad5b4e2a35c901e2821166c7f58793019a094da62ee16708cfd354563f93d79f34ad3071f65413372ff07427382d6f1eb80f2de
-  data.tar.gz: 16d64454be82d7186fdac0a17b1fdf311a415cfb580dc5172bf0ee9e05233eb268752eabd5936e73b733a739562877b23405989bfe931ebaf233002581555390
+  metadata.gz: c5cbaf614cc2b00d6d22f514a818592d8f2201d2808d6adb6c6e142c1e98ff3dd2327275fc73bea627b2c565b83529f80e9d29eb6c50149d17b942e202eeda5a
+  data.tar.gz: d2f6ad82f811b76618d10d0af44f8109e3457f103ed41a6e8c48b1a419a130621c9db5f2356645f26ec03d5cef6ef8c306c7409e545745c7b2d8a30afba0bcbd

data/lib/deploy_rubygem/cookbook.rb

@@ -2,7 +2,7 @@
 
 require_relative 'project'
 require_relative 'kitchen'
-require_relative 'inspec'
+require_relative 'inspectestor'
 require_relative 'rubygem'
 
 # DeployRubygem - deploy a gem using rake
@@ -17,13 +17,13 @@ module DeployRubygem
       @profiles = cookbook_info[:compliance_profiles].map do |profile_name|
         input_file = File.join(%w[compliance inputs] + ["#{cookbook_name}.yml"])
         waiver_file = File.join(%w[compliance waivers] + ["#{cookbook_name}.yml"])
-        Inspec.new(profile_name, input_file, waiver_file)
+        InspecTestor.new(profile_name, input_file, waiver_file)
       end
       @kitchens = cookbook_info[:kitchens].map do |kitchen_name|
         Kitchen.new(kitchen_name, self)
       end
       @execute_profiles = cookbook_info[:execute_profiles].map do |profile_name|
-        Inspec.new(profile_name)
+        InspecTestor.new(profile_name)
       end
     end
 

data/lib/deploy_rubygem/{inspec.rb → inspectestor.rb}

@@ -1,18 +1,24 @@
 # frozen_string_literal: true
 
+require 'json'
+
 # DeployRubygem - deploy a gem using rake
 # Containing a class
 module DeployRubygem
   # Using Inspec to deploy and manage Inspec
-  class Inspec
-    attr_reader :inspec_name, :input_file, :waiver_file
+  class InspecTestor
+    attr_reader :inspec_path, :input_file, :waiver_file
 
-    def initialize(inspec_name, input_file = nil, waiver_file = nil)
-      @inspec_name = inspec_name
+    def initialize(inspec_path, input_file = nil, waiver_file = nil)
+      @inspec_path = inspec_path
       @input_file = input_file
       @waiver_file = waiver_file
     end
 
+    def inspect_name
+      File.basename(inspec_path)
+    end
+
     def inspec_options
       cmd_opt = []
 
@@ -29,7 +35,8 @@ module DeployRubygem
     end
 
     def check
-      system("inspec check compliance/profiles/#{inspec_name}")
+      update
+      system("inspec check #{inspec_path}")
     end
 
     def apply
@@ -39,23 +46,24 @@ module DeployRubygem
       puts "waiver_file = #{waiver_file}"
 
       check
-      system("inspec exec compliance/profiles/#{inspec_name} #{inspec_options.join(' ')}")
+      system("inspec exec #{inspec_path} #{inspec_options.join(' ')}")
     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("rm -rf #{inspec_path}/vendor")
+      system("rm #{inspec_path}/inspec.lock")
+      system("inspec vendor #{inspec_path}")
     end
 
     def save_as_html(html_file)
       check
-      system("inspec exec compliance/profiles/#{inspec_name} #{inspec_options.join(' ')} --reporter html:#{html_file}")
+      system("inspec exec #{inspec_path} #{inspec_options.join(' ')} --reporter html:#{html_file}")
     end
 
     def as_json
       check
-      `inspec exec compliance/profiles/#{inspec_name} #{inspec_options.join(' ')} --reporter json")`
+      request_str = `inspec exec #{inspec_path} #{inspec_options.join(' ')} --reporter json`
+      JSON.parse(request_str)
     end
   end
 end

data/lib/deploy_rubygem/project.rb

@@ -19,7 +19,7 @@ module DeployRubygem
         new_cookbook_option[:chefrepo_path] = chefrepo_path
         Cookbook.new(new_cookbook_option)
       end
-      @compliance_profile = Inspec.new(project_options[:compliance_profile])
+      @compliance_profile = InspecTestor.new(project_options[:compliance_profile])
     end
 
     def project_name

data/lib/deploy_rubygem/rspec.rb

@@ -95,5 +95,21 @@ module DeployRubygem
         end
       end
     end
+
+    def testing_inspec(inspec_path, input_file = nil, waiver_file = nil)
+      inspect_test = InspecTestor.new(inspec_path, input_file, waiver_file)
+      RSpec.describe "Testing #{inspect_test} at #{Dir.pwd}" do
+        it 'Should be a kind of Html' do
+          test_json = inspect_test.save_as_html('/tmp/html/deploy_rubygem_kind_of_html.html')
+          expect(test_json).not_to be nil
+          expect(test_json).to be true
+        end
+        it 'Should be a kind of Json' do
+          test_json = inspect_test.as_json
+          expect(test_json).not_to be nil
+          expect(test_json).to be_kind_of(Hash)
+        end
+      end
+    end
   end
 end

data/lib/deploy_rubygem/version.rb

@@ -17,5 +17,5 @@ module DeployRubygem
   end
 
   # VERSION = new_deploy_rubygem.gvb_version.short_version
-  VERSION = '0.60.18'
+  VERSION = '0.60.19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy_rubygem
 version: !ruby/object:Gem::Version
-  version: 0.60.18
+  version: 0.60.19
 platform: ruby
 authors:
 - Jimmy Provencher
@@ -138,7 +138,7 @@ files:
 - lib/deploy_rubygem.rb
 - lib/deploy_rubygem/cookbook.rb
 - lib/deploy_rubygem/deploy_rubygem_options.rb
-- lib/deploy_rubygem/inspec.rb
+- lib/deploy_rubygem/inspectestor.rb
 - lib/deploy_rubygem/kitchen.rb
 - lib/deploy_rubygem/project.rb
 - lib/deploy_rubygem/rspec.rb