octool 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 776fce8b2089c05dcaf562c769ab2c65a81a3887977390a75e3fadda41c2ffe8
-  data.tar.gz: 107d9de9a54bac2b28bac82f26f10be04a28786bce24673b8ddd3cc6fe5afadd
+  metadata.gz: f7ba13a2d5661f8cb124c8f76390bd475535b816d33a613ed5d3b77b807b1c30
+  data.tar.gz: fd7758b697928e0807727360f669e6bef91fa85935a1c040b8bbf63e35a111fc
 SHA512:
-  metadata.gz: 1c864f87036e072690a9fe2645aa95eb0a50b3e51011bb23e3fc3c5e3cf4efd27b8b999098e2a1b2792af90aeaf35f88d79aaea3e2506cb970f89e167b196e23
-  data.tar.gz: 5e99234200a87b85a7b4de20da9196f3c72814f520bdc0329e8fc47b670b2064e2e5a2b950a11f76954c9becf29ef4d737eb01dde1b29eee49dada9fb329d674
+  metadata.gz: f18379a0d61d2326066d788279f2f2466112441b84f2c120bc7e062bc98991913afcc84273b0cc868fa302eba5a43518a8a9889f1a424df4710975b3e33727f0
+  data.tar.gz: dcf36feada04da9dd6368dca3c5a80f5bd9a77c750afbef93bc7d70d55049333636fec95f552bbeb1fca5303b158933507a464eaabadc3c14307d415d6d29fc9

data/bin/octool

@@ -48,7 +48,7 @@ class App
             config_file = find_config(args)
             system = OCTool::Parser.new(config_file).load_system
             Dir.chdir File.dirname(config_file) do
-                OCTool::SSP.new(system, export_dir)
+                OCTool::SSP.new(system, export_dir).generate
             end
         end
     end

data/lib/octool.rb

@@ -7,7 +7,6 @@ require 'tmpdir'
 # 3rd-party libs.
 require 'kwalify'
 require 'kwalify/util/hashlike'
-require 'paru/pandoc'
 
 # OCTool libs.
 require 'octool/constants'

data/lib/octool/parser.rb

@@ -63,9 +63,9 @@ module OCTool
 
         def schema_version
             @schema_version ||= Kwalify::Yaml.load_file(@config_file)['schema_version']
-        rescue StandardError
-            warn "Setting schema_version to #{LATEST_SCHEMA_VERSION}"
-            LATEST_SCHEMA_VERSION
+        rescue StandarError
+            STDERR.puts '[FAIL] Unable to read schema_version'
+            exit(1)
         end
 
         # Check that all data files are valid.

data/lib/octool/ssp.rb

@@ -6,6 +6,15 @@ module OCTool
         def initialize(system, output_dir)
             @system = system
             @output_dir = output_dir
+            # Load paru/pandoc late enough that help functions work
+            # and early enough to be confident that we catch the correct error.
+            require 'paru/pandoc'
+        rescue UncaughtThrowError => e
+            STDERR.puts '[FAIL] octool requires pandoc to generate the SSP. Is pandoc installed?'
+            exit(1)
+        end
+
+        def generate
             render_template
             write
         end

data/lib/octool/version.rb

@@ -1,3 +1,3 @@
 module OCTool
-    VERSION = '0.0.1'.freeze
+    VERSION = '0.0.2'.freeze
 end

data/octool.rdoc

@@ -1,6 +1,6 @@
 == octool - Open Compliance Tool
 
-v0.0.1
+v0.0.2
 
 === Global Options
 === --help

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octool
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Paul Morgan