Json

.rubocop.yml

@@ -27,10 +27,7 @@ Metrics/CyclomaticComplexity:
 Metrics/PerceivedComplexity:
   Max: 10
 Metrics/AbcSize:
-  Max: 29
-Style/DotPosition:
-  EnforcedStyle: trailing
-  Enabled: true
+  Max: 33
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     '%':  '{}'

bin/vulcano

@@ -9,41 +9,6 @@ require 'json'
 require_relative '../lib/vulcano'
 
 class VulcanoCLI < Thor
-  desc 'json PATH', 'read all tests in PATH and generate a JSON-profile'
-  option :output, aliases: :o, type: :string
-  option :print, aliases: :p, type: :boolean
-  option :id, type: :string
-  def json(*paths)
-    require_relative '../lib/verify'
-    paths.each do |path|
-      Vulcano::Profiles.new.valid_folder? path unless options[:print]
-      vc = Vulcano::Profiles.new({ quiet: options[:print], id: options[:id] })
-      vc.add_folder(path)
-      if options[:print]
-        puts JSON.pretty_generate(vc.profiles)
-      else
-        dst = options[:output] || File.join(path, '.vulcano.json')
-        if File.exist? dst
-          puts "----> updating #{dst}"
-        else
-          puts "----> creating #{dst}"
-        end
-        fdst = File.expand_path(dst)
-        File.write(fdst, JSON.dump(vc.profiles))
-      end
-    end
-  end
-
-  desc 'check PATH', 'check all tests in PATH'
-  def check(*paths)
-    require_relative '../lib/verify'
-    paths.each do |path|
-      puts "#{path}"
-      Vulcano::Profiles.new.valid_folder? path
-      puts
-    end
-  end
-
   def self.target_options
     option :target, aliases: :t, type: :string, default: nil,
       desc: 'Simple targeting option using URIs, e.g. ssh://user:pass@host:port'
@@ -73,6 +38,28 @@ class VulcanoCLI < Thor
       desc: 'Allow remote scans with self-signed certificates (WinRM).'
   end
 
+  desc 'json PATH', 'read all tests in PATH and generate a JSON-profile'
+  target_options
+  option :id, type: :string,
+    desc: 'Attach a profile ID to all test results'
+  option :output, aliases: :o, type: :string,
+    desc: 'Save the created profile to a path'
+  def json(path)
+    profile = Vulcano::Profile.from_path(path, options)
+    dst = options[:output].to_s
+    if dst.empty?
+      puts JSON.pretty_generate(profile.params)
+    else
+      if File.exist? dst
+        puts "----> updating #{dst}"
+      else
+        puts "----> creating #{dst}"
+      end
+      fdst = File.expand_path(dst)
+      File.write(fdst, JSON.dump(profile.params))
+    end
+  end
+
   desc 'exec PATHS', 'run all test files'
   option :id, type: :string,
     desc: 'Attach a profile ID to all test results'

lib/resources/postgres_session.rb

@@ -45,11 +45,11 @@ def describe(query, db = [], &block)
         end
       end
     else
-      lines = cmd.stdout.
-              # remove the whole header (i.e. up to the first ^-----+------+------$)
-              sub(/(.*\n)+([-]+[+])*[-]+\n/, '').
-              # remove the tail
-              sub(/\n[^\n]*\n\n$/, '')
+      # remove the whole header (i.e. up to the first ^-----+------+------$)
+      # remove the tail
+      lines = cmd.stdout
+              .sub(/(.*\n)+([-]+[+])*[-]+\n/, '')
+              .sub(/\n[^\n]*\n\n$/, '')
       l = Lines.new(lines.strip, "PostgreSQL query: #{query}")
       RSpec.__send__('describe', l, &block)
     end

lib/utils/find_files.rb

@@ -28,9 +28,9 @@ def find_files(path, opts = {})
     exit_status = result.exit_status
 
     return [nil, exit_status] unless exit_status == 0
-    files = result.stdout.split("\n").
-            map(&:strip).
-            find_all { |x| !x.empty? }
+    files = result.stdout.split("\n")
+            .map(&:strip)
+            .find_all { |x| !x.empty? }
     [files, exit_status]
   end
 end