octool 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7ba13a2d5661f8cb124c8f76390bd475535b816d33a613ed5d3b77b807b1c30
-  data.tar.gz: fd7758b697928e0807727360f669e6bef91fa85935a1c040b8bbf63e35a111fc
+  metadata.gz: 2b4309625dcbe93d28161179e763a38c4d4c25bd46f75b8a717e314167984356
+  data.tar.gz: eb021712e5165c88df02c1ecb40b6017c4c1abbe9c05c7ef77e074255b04298a
 SHA512:
-  metadata.gz: f18379a0d61d2326066d788279f2f2466112441b84f2c120bc7e062bc98991913afcc84273b0cc868fa302eba5a43518a8a9889f1a424df4710975b3e33727f0
-  data.tar.gz: dcf36feada04da9dd6368dca3c5a80f5bd9a77c750afbef93bc7d70d55049333636fec95f552bbeb1fca5303b158933507a464eaabadc3c14307d415d6d29fc9
+  metadata.gz: 4534786fd6fbb5a0e1be118872e9a0fba4cb50b87d05b59ba4262b6cf6fc884d3f81b9dd48690cb382c5f5cc347228e37497dc2a4c02ecc9bdb2c1290b4268b1
+  data.tar.gz: a715d521b431f1f20770bba0df3ac1eb2091f837a1902c017bc15d881f09a9301c3eef794f54c18d7eccc9b8836b8d347a0d71819a1a7b688590f5fb14f4a9be

data/bin/octool

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require 'gli'
 require 'octool'
 
@@ -37,14 +39,13 @@ class App
     arg_name 'path/to/system/config.yaml'
     command :ssp do |s|
         s.desc 'where to store outputs'
-        s.default_value Dir.tmpdir
+        s.default_value OCTool::DEFAULT_OUTPUT_DIR
         s.long_desc 'Default output directory respects env vars TMPDIR, TMP, TEMP'
         s.arg_name 'path/to/output/dir'
         s.flag [:d, :dir]
 
         s.action do |global_options, options, args|
             export_dir = options[:dir]
-            FileUtils.mkdir_p export_dir unless File.directory?(export_dir)
             config_file = find_config(args)
             system = OCTool::Parser.new(config_file).load_system
             Dir.chdir File.dirname(config_file) do
@@ -75,12 +76,13 @@ class App
         # Error logic here
         # Return false to skip default error handling.
         if ENV['DEBUG']
-            puts exception.backtrace
+            STDERR.puts exception.message
+            STDERR.puts exception.backtrace
             pp exception
             false
-        else
-            true
         end
+        STDERR.puts '[FAIL]'
+        true
     end
 end
 

data/lib/octool.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'octool/version.rb'
 
 # Built-ins.

data/lib/octool/constants.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 module OCTool
-    LATEST_SCHEMA_VERSION = 'v1.0.0'.freeze
+    LATEST_SCHEMA_VERSION = 'v1.0.0'
     BASE_SCHEMA_DIR = File.join(File.dirname(__FILE__), '..', '..', 'schemas').freeze
     ERB_DIR = File.join(File.dirname(__FILE__), '..', '..', 'templates').freeze
-    DEFAULT_CONFIG_FILENAME = 'config.yaml'.freeze
+    DEFAULT_CONFIG_FILENAME = 'config.yaml'
+    DEFAULT_OUTPUT_DIR = '/data'
 end

data/lib/octool/parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OCTool
     # Custom error to show validation errors.
     class ValidationError < StandardError
@@ -56,9 +58,7 @@ module OCTool
         end
 
         def schema_dir
-            @schema_dir ||= begin
-                File.join(BASE_SCHEMA_DIR, schema_version).freeze
-            end
+            @schema_dir ||= File.join(BASE_SCHEMA_DIR, schema_version)
         end
 
         def schema_version

data/lib/octool/ssp.rb

@@ -15,6 +15,10 @@ module OCTool
         end
 
         def generate
+            if not File.writable?(@output_dir)
+                STDERR.puts "[FAIL] #{@output_dir} is not writable"
+                exit(1)
+            end
             render_template
             write
         end

data/lib/octool/system.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OCTool
     # Representation of a system
     class System

data/lib/octool/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module OCTool
-    VERSION = '0.0.2'.freeze
+    VERSION = '0.0.3'
 end

data/octool.rdoc

@@ -1,6 +1,6 @@
 == octool - Open Compliance Tool
 
-v0.0.2
+v0.0.3
 
 === Global Options
 === --help
@@ -33,7 +33,7 @@ generate System Security Plan
 
 where to store outputs
 
-[Default Value] /tmp
+[Default Value] /data
 Default output directory respects env vars TMPDIR, TMP, TEMP
 
 ==== Command: <tt>validate </tt>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octool
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Paul Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -64,6 +64,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: etc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="