prospectus 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16466b7521140177eec3581756cc3b92b6e07f53
-  data.tar.gz: b8046e6ac337e4f0170164b154cfbb58818c3b12
+  metadata.gz: 6a83caa1e8c5df11f5a75a0504dd2ee30bff50b1
+  data.tar.gz: a8f7968847301c55278e5166c83ba2ccce6d41cb
 SHA512:
-  metadata.gz: 4a143cbe9d1dd69249004647139c2b8aad22e457f090556e253f9e62c99d777700f60b4ab553614d7a0f73d4d162a4a8cfc03ee615e8ba37ddac813d55072af0
-  data.tar.gz: 67e8d2ab89810914376aaea950addf7dc1ccc65730bdad3397aafe2adc53c0eb93b78f84dc8a2b0996a0ab46d7559c55b38549ee2ca39b21c3edfc5db00dab05
+  metadata.gz: 4335beb6154e75c29497c1926c32f21e12828f88710513e60d3be891c24707ef5b4199b4f1d3d3b02687cdc2fd55de0783e618c608f9d32d69b7b09efee2cfbf
+  data.tar.gz: 0143bab868fe7240835782fbfb8358107cde332afcd20c639584f866bbbd586dccaf439f0af75e6a2d35619011f3e32ffd57f8a31615466616ffa00839d0d5c3

data/README.md

@@ -39,6 +39,10 @@ The expected/actual blocks first define the module to be used, and then define a
 
 To run the check, just run `prospectus` in the directory with the .prospectus file, or use `prospectus -d /path/to/directory`.
 
+### Parsing output
+
+If you're looking to parse the output with something else, consider using -j to get JSON output.
+
 ## Included Modules
 
 The following modules are included with Prospectus.

data/bin/prospectus

@@ -3,15 +3,19 @@
 require 'prospectus'
 require 'mercenary'
 
+def run_file(params, file = nil)
+  Prospectus.load_from_file({ file: file }.merge(params)).check
+rescue RuntimeError
+  puts "Failed parsing #{Dir.pwd}/#{file}"
+  raise
+end
+
 def load_list(params)
-  return Prospectus.load_from_file(params).check if File.exist? '.prospectus'
+  return run_file(params) if File.exist? '.prospectus'
   fail('No .prospectus/.prospectus.d found') unless Dir.exist? '.prospectus.d'
   files = Dir.glob('.prospectus.d/*')
   fail('No files in .prospectus.d') if files.empty?
-  results = files.map do |x|
-    Prospectus.load_from_file({ file: x }.merge(params)).check
-  end
-  results.flatten
+  files.map { |x| run_file(params, x) }.flatten
 end
 
 Mercenary.program(:prospectus) do |p|
@@ -23,14 +27,17 @@ Mercenary.program(:prospectus) do |p|
   p.option :directory, '-d DIR', '--directory DIR', 'Change to directory before loading'
   p.option :good_only, '-g', '--good', 'Show only items with good state'
   p.option :all, '-a', '--all', 'Show all items'
+  p.option :json, '-j', '--json', 'Output results as json'
   # rubocop:enable Metrics/LineLength
 
   p.action do |_, options|
     options[:directory] ||= '.'
     Dir.chdir(options[:directory]) do
       results = load_list(options)
-      results.each do |x|
-        puts "#{x.name}: #{x.actual} / #{x.expected}"
+      if options[:json]
+        puts results.to_json
+      else
+        results.each { |x| puts "#{x.name}: #{x.actual} / #{x.expected}" }
       end
     end
   end

data/lib/prospectus.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 require 'logcabin'
 
 ##
 # Tool and DSL for checking expected vs actual state
 module Prospectus
-  DEFAULT_FILE = './.prospectus'
+  DEFAULT_FILE = './.prospectus'.freeze
 
   class << self
     ##

data/lib/prospectus/helpers/chdir.rb

@@ -3,9 +3,9 @@ module LogCabin
     ##
     # Change directory before running module
     module Chdir
-      def chdir_helper(&block)
+      def chdir_helper
         @dir ||= '.'
-        Dir.chdir(@dir) { block.call }
+        Dir.chdir(@dir) { yield }
       end
 
       private

data/lib/prospectus/item.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module Prospectus
   ##
   # Define item objects that defined expected vs actual state
@@ -23,6 +25,10 @@ module Prospectus
     def actual
       @actual || fail("No actual state was loaded for #{name}")
     end
+
+    def to_json(_ = {})
+      { name: name, expected: expected, actual: actual }.to_json
+    end
   end
 
   ##

data/lib/prospectus/version.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 ##
 # Declare package version
 module Prospectus
-  VERSION = '0.0.6'
+  VERSION = '0.0.8'.freeze
 end

data/prospectus.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'mercenary', '~> 0.3.4'
   s.add_dependency 'logcabin', '~> 0.0.1'
 
-  s.add_development_dependency 'rubocop', '~> 0.35.0'
-  s.add_development_dependency 'rake', '~> 10.4.0'
+  s.add_development_dependency 'rubocop', '~> 0.36.0'
+  s.add_development_dependency 'rake', '~> 10.5.0'
   s.add_development_dependency 'codecov', '~> 0.1.1'
   s.add_development_dependency 'rspec', '~> 3.4.0'
   s.add_development_dependency 'fuubar', '~> 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prospectus
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.36.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.0
+        version: 10.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.0
+        version: 10.5.0
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement