openscap 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de8f677ade591343896be83be887fb9951ae0dff
-  data.tar.gz: e970e06de1f035553cc0dca86fcaacf7c0d28bd6
+  metadata.gz: 0bd3f590e5876554843cf78f32d92869dcfcad36
+  data.tar.gz: 3daf5f1520a8932045a9ba0f43916934d114b66c
 SHA512:
-  metadata.gz: e7ff6530f527abe9f131fff313eb937f9e50eaec812eb0e084f57d1f1318fab5e9f778b0e3fb833ec01b39471353bec13e2adb162ac1c2c264ee2e73f58a124d
-  data.tar.gz: 98c6a0a6a5cb3e9f9dc494ee4e7ba0be5158de74073ccd1ee5aca9e597b2e9b717bf32d82503fd88e53178617994b5f0e23f76e8adbd62857a6139d0898fa2f1
+  metadata.gz: abef2aa76207a6ba403dd7ba219672970b3ac51616972d5113ac944f70912ecdb23a143ad90d7d6a699cced9b57c24bd6bf649632f3ec3b8d5a87e0be40faa39
+  data.tar.gz: d26290405c9d441ab477730d8e1de22bd95bf3d0a274cc9ad0ac794ca7c9104a570561e924ad5c166ca5b54b96d3f048c33fe0aedb5f9dfdcd6389c1924b62bf

data/README.md

@@ -17,6 +17,6 @@ Sample Scanner Implementation
     s.load
     s.profile = "xccdf_org.ssgproject.content_profile_common"
     s.evaluate
-    s.export_results(rds_file:"results.rds.xml")
+    s.export_results(:rds_file => "results.rds.xml")
     s.destroy
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/openscap/xccdf/session.rb

@@ -26,10 +26,14 @@ module OpenSCAP
         return OpenSCAP.xccdf_session_is_sds(@s)
       end
 
-      def load(datastream_id:nil, component_id:nil)
+      def load(opts = {})
+        o = {
+          :datastream_id => nil,
+          :component_id => nil,
+        }.merge(opts)
         if sds?
-          OpenSCAP.xccdf_session_set_datastream_id(@s, datastream_id)
-          OpenSCAP.xccdf_session_set_component_id(@s, component_id)
+          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!
@@ -54,14 +58,21 @@ module OpenSCAP
         OpenSCAP.raise! unless OpenSCAP.xccdf_session_remediate(@s) == 0
       end
 
-      def export_results(rds_file:nil, xccdf_file:nil, report_file:nil,
-        oval_results:false, oval_variables:false, engines_results:false)
-        OpenSCAP.raise! unless OpenSCAP.xccdf_session_set_arf_export(@s, rds_file)
-        OpenSCAP.raise! unless OpenSCAP.xccdf_session_set_xccdf_export(@s, xccdf_file)
-        OpenSCAP.raise! unless OpenSCAP.xccdf_session_set_report_export(@s, report_file)
-        OpenSCAP.xccdf_session_set_oval_results_export(@s, oval_results)
-        OpenSCAP.xccdf_session_set_oval_variables_export(@s, oval_variables)
-        OpenSCAP.xccdf_session_set_check_engine_plugins_results_export(@s, engines_results)
+      def export_results(opts = {})
+        o = {
+          :rds_file => nil,
+          :xccdf_file => nil,
+          :report_file => nil,
+          :oval_results => false,
+          :oval_variables => 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])
 
         OpenSCAP.raise! unless OpenSCAP.xccdf_session_export_oval(@s) == 0
         OpenSCAP.raise! unless OpenSCAP.xccdf_session_export_check_engine_plugins(@s) == 0

data/openscap.gemspec

@@ -9,7 +9,7 @@ GEMSPEC = Gem::Specification.new do |gem|
 
   gem.author = "Šimon Lukašík"
   gem.email = "isimluk@fedoraproject.org"
-  gem.homepage = "https://github.com/isimluk/ruby-openscap"
+  gem.homepage = "https://github.com/OpenSCAP/ruby-openscap"
   gem.license = "GPL-2.0"
 
   gem.summary = "A FFI wrapper around the OpenSCAP library"
@@ -21,5 +21,4 @@ GEMSPEC = Gem::Specification.new do |gem|
 
   gem.files = `git ls-files`.split("\n")
   gem.require_path = 'lib'
-  gem.required_ruby_version = '>= 2.0.0'
 end

data/test/common/testcase.rb

@@ -25,6 +25,9 @@ module OpenSCAP
 
     def setup
       workdir = "test/output"
+      if Dir.pwd.end_with? 'test/output'
+        cleanup # Older TestCase do not run cleanup method.
+      end
       FileUtils.rm_rf workdir
       Dir.mkdir workdir
       Dir.chdir workdir
@@ -36,5 +39,8 @@ module OpenSCAP
       Dir.chdir "../.."
       OpenSCAP.raise! if OpenSCAP.error?
     end
+
+    def test_x
+    end
   end
 end

data/test/xccdf/session_ds_test.rb

@@ -26,7 +26,7 @@ class TestSessionDS < OpenSCAP::TestCase
 
   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.load(:datastream_id => "scap_org.open-scap_datastream_tst2", :component_id => "scap_org.open-scap_cref_second-xccdf.xml2")
     @s.evaluate
   end
 
@@ -34,7 +34,7 @@ class TestSessionDS < OpenSCAP::TestCase
     @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
@@ -46,7 +46,7 @@ class TestSessionDS < OpenSCAP::TestCase
     @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
@@ -56,7 +56,7 @@ class TestSessionDS < OpenSCAP::TestCase
 
   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.load(:component_id => "scap_org.open-scap_cref_second-xccdf.xml")
     @s.profile = "xccdf_moc.elpmaxe.www_profile_1"
     @s.evaluate
   end
@@ -78,40 +78,40 @@ class TestSessionDS < OpenSCAP::TestCase
     @s = OpenSCAP::Xccdf::Session.new("../data/sds-complex.xml")
     @s.load
     @s.evaluate
-    @s.export_results(rds_file:"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.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.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.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.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.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.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.load(:component_id =>"scap_org.open-scap_cref_second-xccdf.xml")
     @s.profile = "xccdf_moc.elpmaxe.www_profile_1"
     @s.evaluate
     @s.remediate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openscap
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Šimon Lukašík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,7 +62,7 @@ files:
 - test/openscap_test.rb
 - test/xccdf/session_ds_test.rb
 - test/xccdf/session_test.rb
-homepage: https://github.com/isimluk/ruby-openscap
+homepage: https://github.com/OpenSCAP/ruby-openscap
 licenses:
 - GPL-2.0
 metadata: {}
@@ -74,7 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='