openscap 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c04e6a4f80a1b4543f0fec9f9b3e77dd212754ff
-  data.tar.gz: 63b800808bc11cf29bc1913e9e707c241b30d288
+  metadata.gz: de8f677ade591343896be83be887fb9951ae0dff
+  data.tar.gz: e970e06de1f035553cc0dca86fcaacf7c0d28bd6
 SHA512:
-  metadata.gz: 93c3b39ef2fe40f07a45e6a6a1c588e7dfb9b7a723df0855216560b1b140b65f8b12c33521586ed6b349237bc54a88a0a0e027ebfee96ad9b46dda44732f07d8
-  data.tar.gz: cf83e53fac11ae9ffcab9aa7a68572c4d3766b13a1418ed57b73eeee595c6904bd061c52a976730e3010e9ab53ecd74626c62b7bee2f45db0057081262e70af3
+  metadata.gz: e7ff6530f527abe9f131fff313eb937f9e50eaec812eb0e084f57d1f1318fab5e9f778b0e3fb833ec01b39471353bec13e2adb162ac1c2c264ee2e73f58a124d
+  data.tar.gz: 98c6a0a6a5cb3e9f9dc494ee4e7ba0be5158de74073ccd1ee5aca9e597b2e9b717bf32d82503fd88e53178617994b5f0e23f76e8adbd62857a6139d0898fa2f1

data/README.md

@@ -18,4 +18,5 @@ Sample Scanner Implementation
     s.profile = "xccdf_org.ssgproject.content_profile_common"
     s.evaluate
     s.export_results(rds_file:"results.rds.xml")
+    s.destroy
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/openscap/xccdf/session.rb

@@ -14,6 +14,7 @@ module OpenSCAP
 
     class Session
       def initialize(input_filename)
+        raise OpenSCAPError, "No filename specified!" unless input_filename
         @input_filename = input_filename
         @s = OpenSCAP.xccdf_session_new(input_filename)
         if @s.null?
@@ -68,8 +69,9 @@ module OpenSCAP
         OpenSCAP.raise! unless OpenSCAP.xccdf_session_export_arf(@s) == 0
       end
 
-      def finalize(s)
-        OpenSCAP.xccdf_session_free(s.s)
+      def destroy
+        OpenSCAP.xccdf_session_free(@s)
+        @s = nil
       end
     end
   end

data/test/common/testcase.rb

@@ -28,9 +28,11 @@ module OpenSCAP
       FileUtils.rm_rf workdir
       Dir.mkdir workdir
       Dir.chdir workdir
+      @s = nil
     end
 
     def cleanup
+      @s.destroy if @s
       Dir.chdir "../.."
       OpenSCAP.raise! if OpenSCAP.error?
     end

data/test/xccdf/session_ds_test.rb

@@ -14,27 +14,27 @@ require 'common/testcase'
 
 class TestSessionDS < OpenSCAP::TestCase
   def test_sds_true
-    s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
-    assert s.sds?
+    @s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
+    assert @s.sds?
   end
 
   def test_session_load
-    s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
-    s.load
-    s.evaluate
+    @s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
+    @s.load
+    @s.evaluate
   end
 
   def test_session_load_ds_comp
-    s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
-    s.load(datastream_id:"scap_org.open-scap_datastream_tst2", component_id:"scap_org.open-scap_cref_second-xccdf.xml2")
-    s.evaluate
+    @s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
+    @s.load(datastream_id:"scap_org.open-scap_datastream_tst2", component_id:"scap_org.open-scap_cref_second-xccdf.xml2")
+    @s.evaluate
   end
 
   def test_session_load_bad_datastream
-    s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
+    @s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
     msg = nil
     begin
-      s.load(datastream_id:"nonexistent")
+      @s.load(datastream_id:"nonexistent")
       assert false
     rescue OpenSCAP::OpenSCAPError => e
       msg = e.to_s
@@ -43,10 +43,10 @@ class TestSessionDS < OpenSCAP::TestCase
   end
 
   def test_session_load_bad_component
-    s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
+    @s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
     msg = nil
     begin
-      s.load(component_id:"nonexistent")
+      @s.load(component_id:"nonexistent")
       assert false
     rescue OpenSCAP::OpenSCAPError => e
       msg = e.to_s
@@ -55,18 +55,18 @@ class TestSessionDS < OpenSCAP::TestCase
   end
 
   def test_session_set_profile
-    s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
-    s.load(component_id:"scap_org.open-scap_cref_second-xccdf.xml")
-    s.profile = "xccdf_moc.elpmaxe.www_profile_1"
-    s.evaluate
+    @s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
+    @s.load(component_id:"scap_org.open-scap_cref_second-xccdf.xml")
+    @s.profile = "xccdf_moc.elpmaxe.www_profile_1"
+    @s.evaluate
   end
 
   def test_session_set_profile_bad
-    s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
-    s.load
+    @s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
+    @s.load
     msg = nil
     begin
-      s.profile = "xccdf_moc.elpmaxe.www_profile_1"
+      @s.profile = "xccdf_moc.elpmaxe.www_profile_1"
       assert false
     rescue OpenSCAP::OpenSCAPError => e
       msg = e.to_s
@@ -75,46 +75,46 @@ class TestSessionDS < OpenSCAP::TestCase
   end
 
   def test_session_export_rds
-    s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
-    s.load
-    s.evaluate
-    s.export_results(rds_file:"report.rds.xml")
+    @s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
+    @s.load
+    @s.evaluate
+    @s.export_results(rds_file:"report.rds.xml")
     assert_exported ["report.rds.xml"]
   end
 
   def test_session_export_xccdf_results
-    s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
-    s.load(component_id:"scap_org.open-scap_cref_second-xccdf.xml")
-    s.profile = "xccdf_moc.elpmaxe.www_profile_1"
-    s.evaluate
-    s.export_results(xccdf_file:"result.xccdf.xml")
+    @s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
+    @s.load(component_id:"scap_org.open-scap_cref_second-xccdf.xml")
+    @s.profile = "xccdf_moc.elpmaxe.www_profile_1"
+    @s.evaluate
+    @s.export_results(xccdf_file:"result.xccdf.xml")
     assert_exported ["result.xccdf.xml"]
   end
 
   def test_session_export_html_report
-    s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
-    s.load(component_id:"scap_org.open-scap_cref_second-xccdf.xml")
-    s.profile = "xccdf_moc.elpmaxe.www_profile_1"
-    s.evaluate
-    s.export_results(report_file:"report.html", xccdf_file:"result.xccdf.xml")
+    @s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
+    @s.load(component_id:"scap_org.open-scap_cref_second-xccdf.xml")
+    @s.profile = "xccdf_moc.elpmaxe.www_profile_1"
+    @s.evaluate
+    @s.export_results(report_file:"report.html", xccdf_file:"result.xccdf.xml")
     assert_exported ["report.html", "result.xccdf.xml"]
   end
 
   def test_session_export_oval_variables
-    s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
-    s.load(component_id:"scap_org.open-scap_cref_second-xccdf.xml")
-    s.profile = "xccdf_moc.elpmaxe.www_profile_1"
-    s.evaluate
-    s.export_results(oval_variables:true)
+    @s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
+    @s.load(component_id:"scap_org.open-scap_cref_second-xccdf.xml")
+    @s.profile = "xccdf_moc.elpmaxe.www_profile_1"
+    @s.evaluate
+    @s.export_results(oval_variables:true)
     assert_exported []
   end
 
   def test_remediate
-    s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
-    s.load(component_id:"scap_org.open-scap_cref_second-xccdf.xml")
-    s.profile = "xccdf_moc.elpmaxe.www_profile_1"
-    s.evaluate
-    s.remediate
+    @s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
+    @s.load(component_id:"scap_org.open-scap_cref_second-xccdf.xml")
+    @s.profile = "xccdf_moc.elpmaxe.www_profile_1"
+    @s.evaluate
+    @s.remediate
   end
 
   def assert_exported(files)

data/test/xccdf/session_test.rb

@@ -24,8 +24,19 @@ class TestSession < OpenSCAP::TestCase
     assert msg.start_with?("Unable to open file: ''"), "Message was: " + msg
   end
 
+  def test_session_new_nil
+    msg = nil
+    begin
+      s = OpenSCAP::Xccdf::Session.new(nil)
+      assert false
+    rescue OpenSCAP::OpenSCAPError => e
+      msg = e.to_s
+    end
+    assert msg.start_with?("No filename specified!"), "Message was: " + msg
+  end
+
   def test_sds_false
-    s = OpenSCAP::Xccdf::Session.new("../data/xccdf.xml")
-    assert ! s.sds?
+    @s = OpenSCAP::Xccdf::Session.new("../data/xccdf.xml")
+    assert ! @s.sds?
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openscap
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Šimon Lukašík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler