openscap 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22bf07db627e929232b8e13998a9dcc1697c6499
-  data.tar.gz: 44893a70952b97513875e80270852f3bdd5e40b4
+  metadata.gz: 656bc0ebd59609bc9109fb6083ef128aeae3e33e
+  data.tar.gz: 71a336555edb6144fe9a70336c6ae84b90d9bfc3
 SHA512:
-  metadata.gz: f9ae19a6ec32d41bd800a656457417d14e5360b5a9ba394258eb7d2d13ff95b7c32f4d9d793d3cce0ccefec580376a68840767f1855b8a8ff0ee2be1119babf5
-  data.tar.gz: 246fe898e061abca50b86328d1ed89a5a360cec810d3624f45d72890e10e5be710cc03356b5d3f4c35208dec973ac93ed50b1aba6f909a9a620bfb82757375c0
+  metadata.gz: d5ba959dbecb7a822016a7fd2dff3340aa26ee10a9527afb77049decd340d7039725ccdd6af90ef2216487c49dca1890e721e7d750f4ab8d6ef67fdfbc381d3f
+  data.tar.gz: 8902784778405499e98d60c5c486437c5b227ea2a29b3435bf9bff9c46b19edfdf935593b8ed45d5fbde5c1eb28e335b5464f94c41fa54cba65f68893ae57301

data/lib/openscap/ds/arf.rb

@@ -25,22 +25,20 @@ module OpenSCAP
           @source = OpenSCAP::Source.new(param)
           @session = OpenSCAP.ds_rds_session_new_from_source @source.raw
         else
-          raise OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::DS:Arf with '#{param}'"
-        end
-        if @session.null?
-          OpenSCAP.raise!
+          fail OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::DS:Arf with '#{param}'"
         end
+        OpenSCAP.raise! if @session.null?
       end
 
       def destroy
         OpenSCAP.ds_rds_session_free(@session)
         @session = nil
-        @source.destroy()
+        @source.destroy
       end
 
-      def test_result(id=nil)
+      def test_result(id = nil)
         source = OpenSCAP.ds_rds_session_select_report(@session, id)
-        OpenSCAP.raise!() if source.nil?
+        OpenSCAP.raise! if source.nil?
         OpenSCAP::Xccdf::TestResult.new(source)
       end
 
@@ -49,9 +47,9 @@ module OpenSCAP
         OpenSCAP.raise! unless OpenSCAP.ds_rds_session_replace_report_with_source(@session, source.raw) == 0
       end
 
-      def report_request(id=nil)
+      def report_request(id = nil)
         source_p = OpenSCAP.ds_rds_session_select_report_request(@session, id)
-	source = OpenSCAP::Source.new source_p
+        source = OpenSCAP::Source.new source_p
         OpenSCAP::DS::Sds.new(source)
       end
 
@@ -59,9 +57,9 @@ module OpenSCAP
         html_p = OpenSCAP.ds_rds_session_get_html_report @session
         OpenSCAP.raise! if OpenSCAP.error?
         return nil if html_p.null?
-        html = html_p.read_string()
+        html = html_p.read_string
         OpenSCAP::LibC.free html_p
-        return html
+        html
       end
     end
   end
@@ -72,4 +70,4 @@ module OpenSCAP
   attach_function :ds_rds_session_replace_report_with_source, [:pointer, :pointer], :int
   attach_function :ds_rds_session_select_report_request, [:pointer, :string], :pointer
   attach_function :ds_rds_session_get_html_report, [:pointer], :pointer
-end
+end

data/lib/openscap/ds/sds.rb

@@ -18,29 +18,29 @@ module OpenSCAP
 
       def initialize(param)
         @raw = case param
-        when OpenSCAP::Source
-          @raw = OpenSCAP.ds_sds_session_new_from_source param.raw
-        when Hash
-          @raw = OpenSCAP.ds_sds_session_new_from_source param[:source].raw
-        end
+               when OpenSCAP::Source
+                 OpenSCAP.ds_sds_session_new_from_source param.raw
+               when Hash
+                 OpenSCAP.ds_sds_session_new_from_source param[:source].raw
+               end
         OpenSCAP.raise! if @raw.null?
       end
 
-      def select_checklist(p={})
+      def select_checklist(p = {})
         source_p = OpenSCAP.ds_sds_session_select_checklist(@raw, p[:datastream_id], p[:component_id], nil)
         OpenSCAP::Source.new source_p
       end
 
-      def select_checklist!(p={})
+      def select_checklist!(p = {})
         checklist = select_checklist(p)
         OpenSCAP.raise! if checklist.nil? or checklist.raw.null?
-        return checklist
+        checklist
       end
 
-      def html_guide(profile=nil)
+      def html_guide(profile = nil)
         html = OpenSCAP.ds_sds_session_get_html_guide(@raw, profile)
         OpenSCAP.raise! if html.nil?
-        return html
+        html
       end
 
       def destroy
@@ -54,5 +54,4 @@ module OpenSCAP
   attach_function :ds_sds_session_free, [:pointer], :void
   attach_function :ds_sds_session_select_checklist, [:pointer, :string, :string, :string], :pointer
   attach_function :ds_sds_session_get_html_guide, [:pointer, :string], :string
-
-end
+end

data/lib/openscap/exceptions.rb

@@ -12,4 +12,4 @@
 module OpenSCAP
   class OpenSCAPError < StandardError
   end
-end
+end

data/lib/openscap/libc.rb

@@ -19,4 +19,4 @@ module OpenSCAP
 
     attach_function :free, [:pointer], :void
   end
-end
+end

data/lib/openscap/openscap.rb

@@ -16,22 +16,22 @@ module OpenSCAP
   ffi_lib ['libopenscap.so.8', 'openscap']
 
   def self.error?
-    return oscap_err()
+    oscap_err
   end
 
-  def self.get_full_error
+  def self.full_error
     err = oscap_err_get_full_error
-    return err.null? ? nil : err.read_string()
+    err.null? ? nil : err.read_string
   end
 
-  def self.raise!(msg=nil)
-    err = get_full_error
+  def self.raise!(msg = nil)
+    err = full_error
     if err.nil?
       err = msg.nil? ? '(unknown error)' : msg
     else
       err += "\n#{msg}"
     end
-    raise OpenSCAPError, err
+    fail OpenSCAPError, err
   end
 
   attach_function :oscap_init, [], :void
@@ -43,4 +43,4 @@ module OpenSCAP
   attach_function :oscap_err, [], :bool
   attach_function :oscap_err_get_full_error, [], :pointer
   private_class_method :oscap_err, :oscap_err_get_full_error
-end
+end

data/lib/openscap/source.rb

@@ -9,59 +9,67 @@
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 #
 
+require 'openscap'
+
 module OpenSCAP
   class Source
+    attr_reader :raw
+
     def initialize(param)
       case param
       when nil
-        raise OpenSCAPError, "No filename specified!"
+        fail OpenSCAPError, 'No filename specified!'
       when String
-        @s = OpenSCAP.oscap_source_new_from_file(param)
+        @raw = OpenSCAP.oscap_source_new_from_file(param)
       when Hash
-        @s = OpenSCAP.oscap_source_new_from_memory param[:content], param[:content].length, param[:path]
+        @raw = create_from_memory param
       when FFI::Pointer
-        @s = param
+        @raw = param
       else
-        raise OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Source with '#{param}'"
+        fail OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Source with '#{param}'"
       end
-      OpenSCAP.raise! if @s.null?
+      OpenSCAP.raise! if @raw.null?
     end
 
     def type
-      OpenSCAP.oscap_document_type_to_string(OpenSCAP.oscap_source_get_scap_type(@s))
+      OpenSCAP.oscap_document_type_to_string(OpenSCAP.oscap_source_get_scap_type(@raw))
     end
 
     def validate!
       e = FFI::MemoryPointer.new(:char, 4096)
-      if 0 != OpenSCAP.oscap_source_validate(@s, XmlReporterCallback, e)
+      if 0 != OpenSCAP.oscap_source_validate(@raw, XmlReporterCallback, e)
         OpenSCAP.raise! e.read_string
       end
-
     end
 
-    def raw
-      @s
+    def save(filepath = nil)
+      OpenSCAP.raise! unless OpenSCAP.oscap_source_save_as(@raw, filepath) == 0
     end
 
-    def save(filepath=nil)
-      OpenSCAP.raise! unless OpenSCAP.oscap_source_save_as(raw, filepath) == 0
+    def destroy
+      OpenSCAP.oscap_source_free(@raw)
+      @raw = nil
     end
 
-    def destroy
-      OpenSCAP.oscap_source_free(@s)
-      @s = nil
+    private
+
+    def create_from_memory(param)
+      param[:length] = param[:content].length unless param[:length]
+      buf = FFI::MemoryPointer.new(:char, param[:length])
+      buf.put_bytes(0, param[:content])
+      OpenSCAP.oscap_source_new_from_memory param[:content], param[:length], param[:path]
     end
   end
 
   attach_function :oscap_source_new_from_file, [:string], :pointer
-  attach_function :oscap_source_new_from_memory, [:string, :int, :string], :pointer
+  attach_function :oscap_source_new_from_memory, [:pointer, :int, :string], :pointer
   attach_function :oscap_source_get_scap_type, [:pointer], :int
   attach_function :oscap_source_free, [:pointer], :void
   attach_function :oscap_source_save_as, [:pointer, :string], :int
 
   callback :xml_reporter, [:string, :int, :string, :pointer], :int
   attach_function :oscap_source_validate, [:pointer, :xml_reporter, :pointer], :int
-  XmlReporterCallback = Proc.new do |filename, line_number, error_message, e|
+  XmlReporterCallback = proc do |filename, line_number, error_message, e|
     offset = e.get_string(0).length
     msg = "#{filename}:#{line_number}: #{error_message}"
     if msg.length + offset + 1 < e.size
@@ -71,4 +79,4 @@ module OpenSCAP
       1
     end
   end
-end
+end

data/lib/openscap/text.rb

@@ -27,7 +27,7 @@ module OpenSCAP
 
     def destroy
       OpenSCAP.oscap_text_free(raw)
-      raw = nil
+      @raw = nil
     end
   end
 
@@ -36,7 +36,7 @@ module OpenSCAP
       @raw = oscap_text_iterator
     end
 
-    def plaintext(lang=nil)
+    def plaintext(lang = nil)
       OpenSCAP.oscap_textlist_get_preferred_plaintext @raw, lang
     end
 
@@ -52,4 +52,4 @@ module OpenSCAP
 
   attach_function :oscap_textlist_get_preferred_plaintext, [:pointer, :string], :string
   attach_function :oscap_text_iterator_free, [:pointer], :void
-end
+end

data/lib/openscap/version.rb

@@ -10,5 +10,5 @@
 #
 
 module OpenSCAP
-  VERSION = "0.4.0"
+  VERSION = '0.4.1'
 end

data/lib/openscap/xccdf/benchmark.rb

@@ -22,8 +22,8 @@ module OpenSCAP
         when OpenSCAP::Source
           @raw = OpenSCAP.xccdf_benchmark_import_source p.raw
         else
-          raise OpenSCAP::OpenSCAPError,
-            "Cannot initialize OpenSCAP::Xccdf::Benchmark with '#{p}'"
+          fail OpenSCAP::OpenSCAPError,
+               "Cannot initialize OpenSCAP::Xccdf::Benchmark with '#{p}'"
         end
         OpenSCAP.raise! if @raw.null?
       end
@@ -38,6 +38,7 @@ module OpenSCAP
       end
 
       private
+
       def profiles_init
         profiles = {}
         profit = OpenSCAP.xccdf_benchmark_get_profiles raw
@@ -59,4 +60,4 @@ module OpenSCAP
   attach_function :xccdf_profile_iterator_has_more, [:pointer], :bool
   attach_function :xccdf_profile_iterator_next, [:pointer], :pointer
   attach_function :xccdf_profile_iterator_free, [:pointer], :void
-end
+end

data/lib/openscap/xccdf/profile.rb

@@ -21,7 +21,7 @@ module OpenSCAP
         when FFI::Pointer
           @raw = p
         else
-          raise OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Xccdf::Profile with #{p}"
+          fail OpenSCAP::OpenSCAPError, "Cannot initialize OpenSCAP::Xccdf::Profile with #{p}"
         end
       end
 
@@ -29,15 +29,15 @@ module OpenSCAP
         OpenSCAP.xccdf_profile_get_id raw
       end
 
-      def title(prefered_lang=nil)
+      def title(prefered_lang = nil)
         textlist = OpenSCAP::TextList.new(OpenSCAP.xccdf_profile_get_title(@raw))
         title = textlist.plaintext(prefered_lang)
         textlist.destroy
-        return title
+        title
       end
     end
   end
 
   attach_function :xccdf_profile_get_id, [:pointer], :string
   attach_function :xccdf_profile_get_title, [:pointer], :pointer
-end
+end

data/lib/openscap/xccdf/ruleresult.rb

@@ -20,7 +20,7 @@ module OpenSCAP
         when FFI::Pointer
           @rr = t
         else
-          raise OpenSCAP::OpenSCAPError, "Cannot initialize TestResult with #{t}"
+          fail OpenSCAP::OpenSCAPError, "Cannot initialize TestResult with #{t}"
         end
       end
 
@@ -34,14 +34,12 @@ module OpenSCAP
       end
 
       def override!(param)
-        if OpenSCAP::XccdfResult[param[:new_result]] > OpenSCAP::XccdfResult[:fixed]
-          raise OpenSCAPError, "Could not recognize result type: '#{param[:new_result]}'"
-        end
+        validate_xccdf_result! param[:new_result]
         t = OpenSCAP::Text.new
         t.text = param[:raw_text]
-        if !OpenSCAP.xccdf_rule_result_override(@rr,
-              OpenSCAP::XccdfResult[param[:new_result]],
-              param[:time], param[:authority], t.raw)
+        unless OpenSCAP.xccdf_rule_result_override(@rr,
+                                                   OpenSCAP::XccdfResult[param[:new_result]],
+                                                   param[:time], param[:authority], t.raw)
           OpenSCAP.raise!
         end
       end
@@ -49,6 +47,14 @@ module OpenSCAP
       def destroy
         OpenSCAP.xccdf_rule_result_free @rr
       end
+
+      private
+
+      def validate_xccdf_result!(result_label)
+        if OpenSCAP::XccdfResult[result_label] > OpenSCAP::XccdfResult[:fixed]
+          fail OpenSCAPError, "Could not recognize result type: '#{result_label}'"
+        end
+      end
     end
   end
 
@@ -67,5 +73,5 @@ module OpenSCAP
                      :informational,
                      :fixed)
   attach_function :xccdf_rule_result_override,
-    [:pointer, XccdfResult, :string, :string, :pointer], :bool
+                  [:pointer, XccdfResult, :string, :string, :pointer], :bool
 end

data/lib/openscap/xccdf/session.rb

@@ -11,47 +11,40 @@
 
 module OpenSCAP
   module Xccdf
-
     class Session
       def initialize(input_filename)
-        raise OpenSCAPError, "No filename specified!" unless input_filename
+        fail OpenSCAPError, 'No filename specified!' unless input_filename
         @input_filename = input_filename
         @s = OpenSCAP.xccdf_session_new(input_filename)
-        if @s.null?
-          OpenSCAP.raise!
-        end
+        OpenSCAP.raise! if @s.null?
       end
 
       def sds?
-        return OpenSCAP.xccdf_session_is_sds(@s)
+        OpenSCAP.xccdf_session_is_sds(@s)
       end
 
       def load(opts = {})
         o = {
           :datastream_id => nil,
-          :component_id => nil,
+          :component_id => nil
         }.merge(opts)
         if sds?
           OpenSCAP.xccdf_session_set_datastream_id(@s, o[:datastream_id])
           OpenSCAP.xccdf_session_set_component_id(@s, o[:component_id])
         end
-        if OpenSCAP.xccdf_session_load(@s) != 0
-          OpenSCAP.raise!
-        end
+        OpenSCAP.raise! if OpenSCAP.xccdf_session_load(@s) != 0
         OpenSCAP.raise! unless OpenSCAP.xccdf_session_load_check_engine_plugins(@s) == 0
       end
 
       def profile=(p)
         @profile = p
         if OpenSCAP.xccdf_session_set_profile_id(@s, p) == false
-          raise OpenSCAPError, "No profile '" + p + "' found"
+          fail OpenSCAPError, "No profile '" + p + "' found"
         end
       end
 
       def evaluate
-        if OpenSCAP.xccdf_session_evaluate(@s) != 0
-          OpenSCAP.raise!
-        end
+        OpenSCAP.raise! if OpenSCAP.xccdf_session_evaluate(@s) != 0
       end
 
       def remediate
@@ -65,24 +58,33 @@ module OpenSCAP
           :report_file => nil,
           :oval_results => false,
           :oval_variables => false,
-          :engines_results => false,
+          :engines_results => false
         }.merge!(opts)
-        OpenSCAP.raise! unless OpenSCAP.xccdf_session_set_arf_export(@s, o[:rds_file])
-        OpenSCAP.raise! unless OpenSCAP.xccdf_session_set_xccdf_export(@s, o[:xccdf_file])
-        OpenSCAP.raise! unless OpenSCAP.xccdf_session_set_report_export(@s, o[:report_file])
-        OpenSCAP.xccdf_session_set_oval_results_export(@s, o[:oval_results])
-        OpenSCAP.xccdf_session_set_oval_variables_export(@s, o[:oval_variables])
-        OpenSCAP.xccdf_session_set_check_engine_plugins_results_export(@s, o[:engines_results])
+        export_targets o
+        export
+      end
+
+      def destroy
+        OpenSCAP.xccdf_session_free(@s)
+        @s = nil
+      end
+
+      private
 
+      def export
         OpenSCAP.raise! unless OpenSCAP.xccdf_session_export_oval(@s) == 0
         OpenSCAP.raise! unless OpenSCAP.xccdf_session_export_check_engine_plugins(@s) == 0
         OpenSCAP.raise! unless OpenSCAP.xccdf_session_export_xccdf(@s) == 0
         OpenSCAP.raise! unless OpenSCAP.xccdf_session_export_arf(@s) == 0
       end
 
-      def destroy
-        OpenSCAP.xccdf_session_free(@s)
-        @s = nil
+      def export_targets(opts = {})
+        OpenSCAP.raise! unless OpenSCAP.xccdf_session_set_arf_export(@s, opts[:rds_file])
+        OpenSCAP.raise! unless OpenSCAP.xccdf_session_set_xccdf_export(@s, opts[:xccdf_file])
+        OpenSCAP.raise! unless OpenSCAP.xccdf_session_set_report_export(@s, opts[:report_file])
+        OpenSCAP.xccdf_session_set_oval_results_export(@s, opts[:oval_results])
+        OpenSCAP.xccdf_session_set_oval_variables_export(@s, opts[:oval_variables])
+        OpenSCAP.xccdf_session_set_check_engine_plugins_results_export(@s, opts[:engines_results])
       end
     end
   end
@@ -109,4 +111,4 @@ module OpenSCAP
   attach_function :xccdf_session_set_oval_variables_export, [:pointer, :bool], :void
   attach_function :xccdf_session_set_oval_results_export, [:pointer, :bool], :void
   attach_function :xccdf_session_set_check_engine_plugins_results_export, [:pointer, :bool], :void
-end
+end

data/lib/openscap/xccdf/testresult.rb

@@ -29,17 +29,17 @@ module OpenSCAP
           @raw = OpenSCAP.xccdf_result_import_source(t)
           OpenSCAP.raise! if @raw.null?
         else
-          raise OpenSCAP::OpenSCAPError, "Cannot initialize TestResult with #{t}"
+          fail OpenSCAP::OpenSCAPError, "Cannot initialize TestResult with #{t}"
         end
         init_ruleresults
       end
 
       def id
-        return OpenSCAP.xccdf_result_get_id(@raw)
+        OpenSCAP.xccdf_result_get_id(@raw)
       end
 
       def profile
-        return OpenSCAP.xccdf_result_get_profile(@raw)
+        OpenSCAP.xccdf_result_get_profile(@raw)
       end
 
       def score
@@ -47,7 +47,7 @@ module OpenSCAP
       end
 
       def score!(benchmark)
-        #recalculate the scores in the scope of given benchmark
+        # recalculate the scores in the scope of given benchmark
         @score = nil
         OpenSCAP.raise! unless OpenSCAP.xccdf_result_recalculate_scores(@raw, benchmark.raw) == 0
         score
@@ -64,10 +64,11 @@ module OpenSCAP
       end
 
       private
+
       def init_ruleresults
-        @rr = Hash.new
+        @rr = {}
         rr_it = OpenSCAP.xccdf_result_get_rule_results(@raw)
-        while OpenSCAP.xccdf_rule_result_iterator_has_more(rr_it) do
+        while OpenSCAP.xccdf_rule_result_iterator_has_more(rr_it)
           rr_raw = OpenSCAP.xccdf_rule_result_iterator_next(rr_it)
           rr = OpenSCAP::Xccdf::RuleResult.new rr_raw
           @rr[rr.id] = rr
@@ -76,15 +77,15 @@ module OpenSCAP
       end
 
       def score_init
-        scores = Hash.new
+        scores = {}
         scorit = OpenSCAP.xccdf_result_get_scores(@raw)
-        while OpenSCAP.xccdf_score_iterator_has_more(scorit) do
+        while OpenSCAP.xccdf_score_iterator_has_more(scorit)
           s = OpenSCAP.xccdf_score_iterator_next(scorit)
           scores[OpenSCAP.xccdf_score_get_system(s)] = {
             :system => OpenSCAP.xccdf_score_get_system(s),
             :value => OpenSCAP.xccdf_score_get_score(s),
             :max => OpenSCAP.xccdf_score_get_maximum(s)
-            }
+          }
         end
         OpenSCAP.xccdf_score_iterator_free(scorit)
         scores
@@ -99,7 +100,7 @@ module OpenSCAP
   attach_function :xccdf_result_recalculate_scores, [:pointer, :pointer], :int
   attach_function :xccdf_result_export_source, [:pointer, :string], :pointer
 
-  attach_function :xccdf_result_get_rule_results, [:pointer] ,:pointer
+  attach_function :xccdf_result_get_rule_results, [:pointer], :pointer
   attach_function :xccdf_rule_result_iterator_has_more, [:pointer], :bool
   attach_function :xccdf_rule_result_iterator_free, [:pointer], :void
   attach_function :xccdf_rule_result_iterator_next, [:pointer], :pointer

data/test/common/testcase.rb

@@ -14,7 +14,7 @@ require 'test/unit'
 module OpenSCAP
   class TestCase < Test::Unit::TestCase
     def setup
-      workdir = "test/output"
+      workdir = 'test/output'
       if Dir.pwd.end_with? 'test/output'
         cleanup # Older TestCase do not run cleanup method.
       end
@@ -27,7 +27,7 @@ module OpenSCAP
 
     def cleanup
       @s.destroy if @s
-      Dir.chdir "../.."
+      Dir.chdir '../..'
       OpenSCAP.raise! if OpenSCAP.error?
       OpenSCAP.oscap_cleanup
     end
@@ -36,6 +36,7 @@ module OpenSCAP
     end
 
     protected
+
     def assert_default_score(scores, low, high)
       assert scores.size == 1
       s = scores['urn:xccdf:scoring:default']

data/test/ds/arf_test.rb

@@ -14,34 +14,36 @@ require 'openscap/ds/arf'
 require 'common/testcase'
 
 class TestArf < OpenSCAP::TestCase
+  REPORT = 'report.rds.xml'
+
   def test_arf_new_nil
     msg = nil
     begin
-      s = OpenSCAP::DS::Arf.new(nil)
+      OpenSCAP::DS::Arf.new(nil)
       assert false
     rescue OpenSCAP::OpenSCAPError => e
       msg = e.to_s
     end
-    assert msg.start_with?("Cannot initialize OpenSCAP::DS:Arf with ''"), "Message was: " + msg
+    assert msg.start_with?("Cannot initialize OpenSCAP::DS:Arf with ''"), 'Message was: ' + msg
   end
 
   def test_arf_new_wrong_format
     msg = nil
     begin
-      s = OpenSCAP::DS::Arf.new("../data/xccdf.xml")
+      OpenSCAP::DS::Arf.new('../data/xccdf.xml')
       assert false
     rescue OpenSCAP::OpenSCAPError => e
       msg = e.to_s
     end
     assert msg.include?('Could not create Result DataStream session: File is not Result DataStream.'),
-        "Message was: " + msg
+           'Message was: ' + msg
   end
 
   def test_create_arf_and_get_html
     arf = new_arf
     html = arf.html
     arf.destroy
-    assert html.start_with?('<!DOCTYPE html><html'), "DOCTYPE missing."
+    assert html.start_with?('<!DOCTYPE html><html'), 'DOCTYPE missing.'
     assert html.include?('OpenSCAP')
     assert html.include?('Compliance and Scoring')
   end
@@ -50,30 +52,43 @@ class TestArf < OpenSCAP::TestCase
     arf = new_arf
     tr = arf.test_result
     assert tr.profile == 'xccdf_moc.elpmaxe.www_profile_1',
-      "TestResult.profile was '#{tr.profile}'"
+           "TestResult.profile was '#{tr.profile}'"
     tr.destroy
     arf.destroy
   end
 
   def test_new_memory
     create_arf
-    raw_data = File.read("report.rds.xml")
+    raw_data = File.read(REPORT)
     assert raw_data.length > 0
-    arf = OpenSCAP::DS::Arf.new :content => raw_data, :path => "report.rds.xml"
+    arf = OpenSCAP::DS::Arf.new :content => raw_data, :path => REPORT
+    arf.destroy
+  end
+
+  def test_new_bz_memory
+    create_arf
+    system('/bin/bzip2 ' + REPORT)
+    bziped_file = REPORT + '.bz2'
+    raw_data = File.open(bziped_file, 'rb').read
+    assert !raw_data.empty?
+    len = File.size(bziped_file)
+    FileUtils.rm bziped_file
+    arf = OpenSCAP::DS::Arf.new :content => raw_data, :path => bziped_file, :length => len
     arf.destroy
   end
 
   private
+
   def new_arf
     create_arf
-    arf = OpenSCAP::DS::Arf.new("report.rds.xml")
+    OpenSCAP::DS::Arf.new(REPORT)
   end
 
   def create_arf
-    @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 = 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(:rds_file => "report.rds.xml")
+    @s.export_results(:rds_file => 'report.rds.xml')
   end
 end

data/test/ds/sds_test.rb

@@ -25,7 +25,7 @@ class TestSds < OpenSCAP::TestCase
     assert !@s.nil?
     msg = nil
     begin
-      sds = OpenSCAP::DS::Sds.new :source => @s
+      OpenSCAP::DS::Sds.new :source => @s
       assert false
     rescue OpenSCAP::OpenSCAPError => e
       msg = e.to_s
@@ -44,11 +44,11 @@ class TestSds < OpenSCAP::TestCase
     sds = new_sds
     benchmark_source = sds.select_checklist!
     benchmark = OpenSCAP::Xccdf::Benchmark.new benchmark_source
-    benchmark.profiles.keys.each { |id|
+    benchmark.profiles.keys.each do |id|
       guide = sds.html_guide id
       assert !guide.nil?
       assert guide.include?(id)
-    }
+    end
     benchmark.destroy
     sds.destroy
   end
@@ -57,7 +57,7 @@ class TestSds < OpenSCAP::TestCase
     sds = new_sds
     msg = nil
     begin
-      benchmark = sds.select_checklist! :datastream_id => "wrong"
+      benchmark = sds.select_checklist! :datastream_id => 'wrong'
       assert false
     rescue OpenSCAP::OpenSCAPError => e
       msg = e.to_s
@@ -68,12 +68,13 @@ class TestSds < OpenSCAP::TestCase
   end
 
   private
+
   def new_sds
     filename = '../data/sds-complex.xml'
     @s = OpenSCAP::Source.new filename
     assert !@s.nil?
     sds = OpenSCAP::DS::Sds.new :source => @s
     assert !sds.nil?
-    return sds
+    sds
   end
-end
+end

data/test/integration/arf_waiver_test.rb

@@ -27,13 +27,13 @@ class TestArfWaiver < OpenSCAP::TestCase
                  :time => 'yesterday',
                  :authority => 'John Hacker',
                  :raw_text => 'This should have passed')
-    rr.result == 'pass'
+    assert rr.result == 'pass'
 
     assert_default_score tr.score, -1, 1
     assert_default_score tr.score!(benchmark), 99, 101
 
     # create updated DOM (that includes the override element and new score)
-    arf.test_result=tr
+    arf.test_result = tr
     arf.source.save('modified.rds.xml')
     tr.destroy
     arf.destroy
@@ -48,6 +48,7 @@ class TestArfWaiver < OpenSCAP::TestCase
   end
 
   private
+
   def benchmark
     @benchmark ||= benchmark_init
   end
@@ -90,10 +91,10 @@ class TestArfWaiver < OpenSCAP::TestCase
   end
 
   def arf_init
-    @s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
+    @s = OpenSCAP::Xccdf::Session.new('../data/sds-complex.xml')
     @s.load
     @s.evaluate
-    @s.export_results(:rds_file => "report.rds.xml")
-    OpenSCAP::DS::Arf.new("report.rds.xml")
+    @s.export_results(:rds_file => 'report.rds.xml')
+    OpenSCAP::DS::Arf.new('report.rds.xml')
   end
 end

data/test/openscap_test.rb

@@ -17,14 +17,14 @@ class TestOscapVersion < OpenSCAP::TestCase
     OpenSCAP.oscap_init
     version = OpenSCAP.oscap_get_version
     OpenSCAP.oscap_cleanup
-    assert version.include?(".")
+    assert version.include?('.')
   end
 
   def test_double_read_error
-    assert ! OpenSCAP.error?
-    msg = OpenSCAP.get_full_error
+    assert !OpenSCAP.error?
+    msg = OpenSCAP.full_error
     assert msg.nil?
-    msg = OpenSCAP.get_full_error
+    msg = OpenSCAP.full_error
     assert msg.nil?
   end
 end

data/test/source_test.rb

@@ -17,49 +17,49 @@ class TestSource < OpenSCAP::TestCase
   def test_source_new_nil
     msg = nil
     begin
-      s = OpenSCAP::Source.new(nil)
+      OpenSCAP::Source.new(nil)
       assert false
     rescue OpenSCAP::OpenSCAPError => e
       msg = e.to_s
     end
-    assert msg.start_with?("No filename specified!"), "Message was: " + msg
+    assert msg.start_with?('No filename specified!'), 'Message was: ' + msg
   end
 
   def test_source_new_ok
-    s = OpenSCAP::Source.new("../data/xccdf.xml")
+    s = OpenSCAP::Source.new('../data/xccdf.xml')
     s.destroy
   end
 
   def test_source_new_memory
-    raw_data = File.read("../data/xccdf.xml")
+    raw_data = File.read('../data/xccdf.xml')
     assert raw_data.length > 0
     s = OpenSCAP::Source.new(:content => raw_data, :path => '/mytestpath')
     s.destroy
   end
 
   def test_type_xccdf
-    s = OpenSCAP::Source.new("../data/xccdf.xml")
+    s = OpenSCAP::Source.new('../data/xccdf.xml')
     assert s.type == 'XCCDF Checklist', "Type was #{s.type}"
     s.validate!
     s.destroy
   end
 
   def test_type_sds
-    s = OpenSCAP::Source.new("../data/sds-complex.xml")
+    s = OpenSCAP::Source.new('../data/sds-complex.xml')
     assert s.type == 'SCAP Source Datastream', "Type was #{s.type}"
     s.validate!
     s.destroy
   end
 
   def test_type_test_result
-    s = OpenSCAP::Source.new("../data/testresult.xml")
+    s = OpenSCAP::Source.new('../data/testresult.xml')
     assert s.type == 'XCCDF Checklist', "Type was #{s.type}"
     s.validate!
     s.destroy
   end
 
   def test_validate_invalid
-    s = OpenSCAP::Source.new("../data/invalid.xml")
+    s = OpenSCAP::Source.new('../data/invalid.xml')
     msg = nil
     begin
       s.validate!
@@ -68,20 +68,20 @@ class TestSource < OpenSCAP::TestCase
       msg = e.to_s
     end
     assert msg.start_with?('Invalid XCCDF Checklist (1.2) content in ../data/invalid.xml.'),
-      "Message was: " + msg
+           'Message was: ' + msg
     assert msg.include?("../data/invalid.xml:3: Element '{http"),
-      "Message was: " + msg
-    assert msg.include?("This element is not expected. Expected is"),
-      "Message was: " + msg
+           'Message was: ' + msg
+    assert msg.include?('This element is not expected. Expected is'),
+           'Message was: ' + msg
     s.destroy
   end
 
   def test_save
-    s = OpenSCAP::Source.new("../data/testresult.xml")
+    s = OpenSCAP::Source.new('../data/testresult.xml')
     filename = './newly_created.xml'
-    assert !File.exists?(filename)
+    assert !File.exist?(filename)
     s.save(filename)
-    assert File.exists?(filename)
+    assert File.exist?(filename)
     FileUtils.rm_rf filename
   end
-end
+end

data/test/xccdf/benchmark_test.rb

@@ -15,7 +15,7 @@ require 'openscap/ds/sds'
 require 'openscap/source'
 require 'openscap/xccdf/benchmark'
 
-class TestBenchmark< OpenSCAP::TestCase
+class TestBenchmark < OpenSCAP::TestCase
   def test_new_from_file
     @s = OpenSCAP::Source.new '../data/xccdf.xml'
     b = OpenSCAP::Xccdf::Benchmark.new @s
@@ -38,11 +38,11 @@ class TestBenchmark< OpenSCAP::TestCase
     @s = OpenSCAP::Source.new '../data/testresult.xml'
     msg = nil
     begin
-      bench = OpenSCAP::Xccdf::Benchmark.new @s
+      OpenSCAP::Xccdf::Benchmark.new @s
       assert false
     rescue OpenSCAP::OpenSCAPError => e
       msg = e.to_s
     end
     assert msg.start_with?('Failed to import XCCDF content from'), msg
   end
-end
+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")
+    @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 = 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 = 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 = 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 = 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,51 +75,51 @@ class TestSessionDS < OpenSCAP::TestCase
   end
 
   def test_session_export_rds
-    @s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.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"]
+    @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 = 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"]
+    @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 = 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"]
+    @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 = 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 = 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)
     # libopenscap compiled with --enable-debug creates debug files
-    FileUtils.rm_rf(Dir.glob "oscap_debug.log.*")
-    assert files.sort == Dir.glob("*").sort
+    FileUtils.rm_rf(Dir.glob 'oscap_debug.log.*')
+    assert files.sort == Dir.glob('*').sort
   end
 end

data/test/xccdf/session_test.rb

@@ -16,28 +16,28 @@ class TestSession < OpenSCAP::TestCase
   def test_session_new_bad
     msg = nil
     begin
-      s = OpenSCAP::Xccdf::Session.new("")
+      OpenSCAP::Xccdf::Session.new('')
       assert false
     rescue OpenSCAP::OpenSCAPError => e
       msg = e.to_s
     end
-    assert msg.start_with?('failed to load external entity ""'), "Message was: " + msg
-    assert msg.include?('Unable to parse XML at:'), "Message was: " + msg
+    assert msg.start_with?('failed to load external entity ""'), 'Message was: ' + msg
+    assert msg.include?('Unable to parse XML at:'), 'Message was: ' + msg
   end
 
   def test_session_new_nil
     msg = nil
     begin
-      s = OpenSCAP::Xccdf::Session.new(nil)
+      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
+    assert msg.start_with?('No filename specified!'), 'Message was: ' + msg
   end
 
   def test_sds_false
-    @s = OpenSCAP::Xccdf::Session.new("../data/xccdf.xml")
+    @s = OpenSCAP::Xccdf::Session.new('../data/xccdf.xml')
     assert ! @s.sds?
   end
 end

data/test/xccdf/testresult_test.rb

@@ -9,6 +9,7 @@
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
 #
 
+require 'openscap'
 require 'openscap/source'
 require 'openscap/xccdf/benchmark'
 require 'openscap/xccdf/testresult'
@@ -20,21 +21,21 @@ class TestTestResult < OpenSCAP::TestCase
     assert !source.nil?
     msg = nil
     begin
-      s = OpenSCAP::Xccdf::TestResult.new(source)
+      OpenSCAP::Xccdf::TestResult.new(source)
       assert false
     rescue OpenSCAP::OpenSCAPError => e
       msg = e.to_s
     end
     assert msg.start_with?("Expected 'TestResult' element while found 'Benchmark'."),
-        "Message was: " + msg
+           'Message was: ' + msg
   end
 
   def test_result_create_and_query_properties
     tr = new_tr
     assert tr.id == 'xccdf_org.open-scap_testresult_xccdf_org.ssgproject.content_profile_common',
-        "TestResult.id was '#{tr.id}"
+           "TestResult.id was '#{tr.id}"
     assert tr.profile == 'xccdf_org.ssgproject.content_profile_common',
-        "TestResult.profile was '#{tr.profile}'"
+           "TestResult.profile was '#{tr.profile}'"
     tr.destroy
   end
 
@@ -89,6 +90,7 @@ class TestTestResult < OpenSCAP::TestCase
   end
 
   private
+
   def benchmark_for_tr
     source = OpenSCAP::Source.new('../data/xccdf.xml')
     benchmark = OpenSCAP::Xccdf::Benchmark.new source
@@ -101,6 +103,6 @@ class TestTestResult < OpenSCAP::TestCase
     assert !source.nil?
     tr = OpenSCAP::Xccdf::TestResult.new(source)
     source.destroy
-    return tr
+    tr
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openscap
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Simon Lukasik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler