smart_proxy_openscap 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46266786f19a4f1fd7aa1ad487310855685d1dba
-  data.tar.gz: d352fd8adc7ea2b53db56fd405b9eb6c1b7ec842
+  metadata.gz: 1d6c00f161b70fbab31c6ccf9c8bdf9ab2682fa3
+  data.tar.gz: cbb4bc57214e6f68c19fe30fff5448d188190d7a
 SHA512:
-  metadata.gz: ea02f6412f880c8f2bdc910d93cd144ffef2b9f08362272286aece54f38baac730fea7527f68e4eda32b45ace2c1ebf447eba485233959a3314931580eaf07fb
-  data.tar.gz: 3ee40b98764a161555babd11e0dc9204394fda7365e9c884d9ebdb693015395cab4706d7fc12e4c7cb99192a6889375b37e2b5aff3717fefda8f560cef595343
+  metadata.gz: db24f262b735f44a7b60f30ed0b89eeb78cc1b5daaebc14bdae22b663063e8c000dbda9ea5b0d3e6bda081dc67af6bb5d9033930f67c0876dc904074d2fed4f0
+  data.tar.gz: c2c87b3bde1eec166aed4c064c52b0beabfb2f366492a1fb3492423f44b78a7398fcbea0fbd261287e8c7e15145b41c7070986214c3b2eb42d332ea7adc88eb6

data/lib/smart_proxy_openscap/arf_html.rb

@@ -7,6 +7,7 @@ module Proxy
       def generate_html(file_in, file_out)
         ::OpenSCAP.oscap_init
         File.write file_out, get_arf_html(file_in)
+      ensure
         ::OpenSCAP.oscap_cleanup
       end
 

data/lib/smart_proxy_openscap/policy_guide.rb

@@ -14,8 +14,9 @@ module Proxy
         profile_id = policy ? nil : policy
         html = sds.html_guide profile_id
         File.write(out_file, { :html => html.force_encoding('UTF-8') }.to_json)
-        sds.destroy
-        source.destroy
+      ensure
+        sds.destroy if sds
+        source.destroy if source
         ::OpenSCAP.oscap_cleanup
       end
     end

data/lib/smart_proxy_openscap/scap_profiles.rb

@@ -13,22 +13,25 @@ module Proxy
         source = ::OpenSCAP::Source.new(in_file)
         json = type == 'scap_content' ? scap_content_profiles(source) : tailoring_profiles(source)
         File.write out_file, json
-        source.destroy
+      ensure
+        source.destroy if source
         ::OpenSCAP.oscap_cleanup
       end
 
       def scap_content_profiles(source)
         bench = benchmark_profiles source
         profiles = collect_profiles bench
-        bench.destroy
         profiles.to_json
+      ensure
+        bench.destroy if bench
       end
 
       def tailoring_profiles(source)
         tailoring = ::OpenSCAP::Xccdf::Tailoring.new(source, nil)
         profiles = collect_profiles tailoring
-        tailoring.destroy
         profiles.to_json
+      ensure
+        tailoring.destroy if tailoring
       end
 
       def collect_profiles(profile_source)
@@ -41,8 +44,8 @@ module Proxy
         sds          = ::OpenSCAP::DS::Sds.new(source)
         bench_source = sds.select_checklist!
         benchmark = ::OpenSCAP::Xccdf::Benchmark.new(bench_source)
-        sds.destroy
-        benchmark
+      ensure
+        sds.destroy if sds
       end
     end
   end

data/lib/smart_proxy_openscap/scap_validation.rb

@@ -26,7 +26,8 @@ module Proxy
           errors << "Invalid SCAP file type"
         end
         File.write out_file, { :errors => errors }.to_json
-        source.destroy
+      ensure
+        source.destroy if source
         ::OpenSCAP.oscap_cleanup
       end
     end

data/lib/smart_proxy_openscap/version.rb

@@ -10,6 +10,6 @@
 
 module Proxy
   module OpenSCAP
-    VERSION = '0.6.7'
+    VERSION = '0.6.8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_openscap
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Šimon Lukašík
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake