prospectus 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4f1bb78a5ab3c1031f9a69e7089b858e1bec9a5
-  data.tar.gz: ab0d4015eca705a6b6a47bbb774dd84519e47d69
+  metadata.gz: d6a7c68d906bd417f0f089b15566e1a577b9272a
+  data.tar.gz: 465c39908596caefa93c39b2a3f395eb3cdbb967
 SHA512:
-  metadata.gz: 27edc960edbdfbae7683b0dadc3597a0585ab8d2c595f8ec3832629d49e990c326d728a21be2b84aa430fa19f75eb98793cb1e0e7ba94c84a59979fcefa9c88c
-  data.tar.gz: b6fa22f4f0556981b7e0acc576f1209f5bcb361be0c538970a0b0d744585968820cbd29662698d5b98a5af9d608cfbad7b8aed60a894088ffaf40f4c03884d9b
+  metadata.gz: 0e1c5e5f7a5efbfeb296f2edda70750c599ff7a8af8c1d98b45c768f22ecab52e0411f2eae2805e1352d0d7927640dc3a6c5c8728f5f2f8e8a2ff07dc50d5aea
+  data.tar.gz: 57e611969ca62a66ba376116bdc1e3c40047e1e52d7f413afb425950424b146b358c26927c7c4461722b649e3c398b852891f236eea4979b2d62ddbae0d31709

data/.prospectus

@@ -1,11 +1,25 @@
+Prospectus.extra_dep('file', 'prospectus_circleci')
+
+my_slug = 'akerl/prospectus'
+
 item do
-  expected do
-    static
-    set 'green'
-  end
+  noop
 
-  actual do
-    gemnasium
-    slug 'akerl/prospectus'
+  deps do
+    item do
+      name 'gems'
+
+      expected do
+        static
+        set 'green'
+      end
+
+      actual do
+        gemnasium
+        slug my_slug
+      end
+    end
   end
+
+  extend ProspectusCircleci::Build.new(my_slug)
 end

data/bin/prospectus

@@ -3,21 +3,6 @@
 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 run_file(params) if File.exist? '.prospectus'
-  raise('No .prospectus/.prospectus.d found') unless Dir.exist? '.prospectus.d'
-  files = Dir.glob('.prospectus.d/*')
-  raise('No files in .prospectus.d') if files.empty?
-  files.map { |x| run_file(params, x) }.flatten
-end
-
 Mercenary.program(:prospectus) do |p|
   p.version Prospectus::VERSION
   p.description 'Tool and DSL for checking expected vs actual state'
@@ -34,7 +19,7 @@ Mercenary.program(:prospectus) do |p|
   p.action do |_, options|
     options[:directory] ||= '.'
     Dir.chdir(options[:directory]) do
-      results = load_list(options)
+      results = Prospectus.load(options)
       unless options[:quiet]
         if options[:json]
           puts results.to_json

data/lib/prospectus.rb

@@ -5,8 +5,6 @@ require 'logcabin'
 ##
 # Tool and DSL for checking expected vs actual state
 module Prospectus
-  DEFAULT_FILE = './.prospectus'.freeze
-
   class << self
     ##
     # Insert a helper .new() method for creating a new Cache object
@@ -14,13 +12,17 @@ module Prospectus
       self::List.new(*args)
     end
 
+    def load(*args)
+      self::Loader.new(*args).load
+    end
+
     ##
     # Method for loading list from DSL
     def load_from_file(params = {})
-      file = params[:file] || DEFAULT_FILE
+      file = params[:file] || raise('File path required for load_from_file')
       list = List.new(params)
       dsl = ListDSL.new(list, params)
-      dsl.instance_eval(File.read(file), file)
+      dsl.instance_eval(File.read(file), File.realpath(file, Dir.pwd))
       list
     end
 
@@ -51,6 +53,7 @@ module Prospectus
 end
 
 require 'prospectus/version'
+require 'prospectus/loader'
 require 'prospectus/list'
 require 'prospectus/item'
 require 'prospectus/state'

data/lib/prospectus/item.rb

@@ -14,7 +14,7 @@ module Prospectus
     def name
       return @name if @name
       @name = File.basename Dir.pwd
-      @name << "::#{File.basename @options[:file]}" if @options[:file]
+      @name << "::#{File.basename @options[:file]}" if @options[:suffix_file]
       @name
     end
 

data/lib/prospectus/loader.rb

@@ -0,0 +1,31 @@
+module Prospectus
+  DEFAULT_FILE = './.prospectus'.freeze
+
+  ##
+  # Helper for loading prospectus from the current directory
+  class Loader
+    def initialize(params = {})
+      @options = params
+      @file = params[:file] || DEFAULT_FILE
+      @dir = @file + '.d'
+    end
+
+    def load
+      return run_file(@options, @file) if File.exist? @file
+      raise("No #{@file}/#{@dir} found") unless Dir.exist? @dir
+      files = Dir.glob(@dir + '/*')
+      raise('No files in ' + @dir) if files.empty?
+      files.map { |x| run_file(@options, x, true) }.flatten
+    end
+
+    private
+
+    def run_file(params, file, suffix_file = false)
+      options = { file: file, suffix_file: suffix_file }.merge(params)
+      Prospectus.load_from_file(options).check
+    rescue RuntimeError
+      puts "Failed parsing #{Dir.pwd}/#{file}"
+      raise
+    end
+  end
+end

data/lib/prospectus/version.rb

@@ -3,5 +3,5 @@
 ##
 # Declare package version
 module Prospectus
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prospectus
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2017-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -134,6 +134,7 @@ files:
 - lib/prospectus/helpers/regex.rb
 - lib/prospectus/item.rb
 - lib/prospectus/list.rb
+- lib/prospectus/loader.rb
 - lib/prospectus/modules/gemnasium.rb
 - lib/prospectus/modules/git_hash.rb
 - lib/prospectus/modules/git_tag.rb