prospectus 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67fdaf9d85016c56745670bc3950906d07288129
-  data.tar.gz: d764a11f127a12a2ecc22f43f27fd5270dbb792a
+  metadata.gz: 16466b7521140177eec3581756cc3b92b6e07f53
+  data.tar.gz: b8046e6ac337e4f0170164b154cfbb58818c3b12
 SHA512:
-  metadata.gz: 78411e2c4e76f03c02b7c0487b60289c3be11bf74d2b1de02e6071303632c728eb83e13a514ae34d257b46302862facd4fb2335753b85a2f2266550dac7babde
-  data.tar.gz: 1a396dd894814191fb051b1c188f50aca8c3ca51e78c8ec01c8c9903a01d3f0967c022cdc860ef67af0b8cf80f235b8db7708e2d8a18bee36b5c290bf56cf9bd
+  metadata.gz: 4a143cbe9d1dd69249004647139c2b8aad22e457f090556e253f9e62c99d777700f60b4ab553614d7a0f73d4d162a4a8cfc03ee615e8ba37ddac813d55072af0
+  data.tar.gz: 67e8d2ab89810914376aaea950addf7dc1ccc65730bdad3397aafe2adc53c0eb93b78f84dc8a2b0996a0ab46d7559c55b38549ee2ca39b21c3edfc5db00dab05

data/.prospectus

@@ -0,0 +1,11 @@
+item do
+  expected do
+    static
+    set 'green'
+  end
+
+  actual do
+    gemnasium
+    slug 'akerl/prospectus'
+  end
+end

data/README.md

@@ -117,6 +117,47 @@ expected do
 end
 ```
 
+### github_hash
+
+This checks the latest commit hash on GitHub. Uses the github_api helper, which requires octoauth. Designed to be used alongside the git_hash module for comparing local submodules with upstream commits.
+
+Will give the 7 character short hash unless "long" is specified.
+
+```
+expected do
+  github_hash
+  repo 'akerl/keys'
+end
+
+expected do
+  github_hash
+  repo 'akerl/keys'
+  long
+end
+```
+
+### homebrew_formula
+
+Checks a Formula file for the current version. This uses the grep module, and expects the formula to be in ./Formula/$NAME.rb.
+
+```
+actual do
+  homebrew_formula
+  name 'openssh'
+end
+```
+
+### homebrew_cask
+
+Checks a Cask file for the current version. This uses the grep module, and expects the cask to be in ./Casks/$NAME.rb.
+
+```
+actual do
+  homebrew_cask
+  name 'alfred'
+end
+```
+
 ### grep
 
 This checks a local file's contents. Supports the Regex helper, and uses the provided regex pattern to match which line of the file to use. If no regex is specified, it will use the full first line of the file.

data/bin/prospectus

@@ -3,6 +3,17 @@
 require 'prospectus'
 require 'mercenary'
 
+def load_list(params)
+  return Prospectus.load_from_file(params).check 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
+end
+
 Mercenary.program(:prospectus) do |p|
   p.version Prospectus::VERSION
   p.description 'Tool and DSL for checking expected vs actual state'
@@ -17,7 +28,8 @@ Mercenary.program(:prospectus) do |p|
   p.action do |_, options|
     options[:directory] ||= '.'
     Dir.chdir(options[:directory]) do
-      Prospectus.load_from_file(options).check.each do |x|
+      results = load_list(options)
+      results.each do |x|
         puts "#{x.name}: #{x.actual} / #{x.expected}"
       end
     end

data/lib/prospectus.rb

@@ -15,10 +15,10 @@ module Prospectus
     ##
     # Method for loading list from DSL
     def load_from_file(params = {})
-      params[:file] ||= DEFAULT_FILE
+      file = params[:file] || DEFAULT_FILE
       list = List.new(params)
       dsl = ListDSL.new(list, params)
-      dsl.instance_eval(File.read(params[:file]), params[:file])
+      dsl.instance_eval(File.read(file), file)
       list
     end
 

data/lib/prospectus/item.rb

@@ -10,7 +10,10 @@ module Prospectus
     end
 
     def name
-      @name ||= File.basename Dir.pwd
+      return @name if @name
+      @name = File.basename Dir.pwd
+      @name << "::#{File.basename @options[:file]}" if @options[:file]
+      @name
     end
 
     def expected
@@ -53,10 +56,7 @@ module Prospectus
     private
 
     def state(name, &block)
-      state = State.new(@options)
-      dsl = StateDSL.new(state, @options)
-      dsl.instance_eval(&block)
-      dsl.load!
+      state = Prospectus::State.from_block(@options, &block)
       @item.instance_variable_set(name, state.value)
     end
   end

data/lib/prospectus/modules/github_hash.rb

@@ -0,0 +1,33 @@
+module LogCabin
+  module Modules
+    ##
+    # Pull state from the latest GitHub commit
+    module GithubHash
+      include Prospectus.helpers.find(:github_api)
+
+      def load!
+        fail('No repo specified') unless @repo
+        @branch ||= 'master'
+        @state.value = @long ? hash : hash.slice(0, 7)
+      end
+
+      private
+
+      def hash
+        @hash ||= github_api.branch(@repo, @branch).commit.sha
+      end
+
+      def repo(value)
+        @repo = value
+      end
+
+      def branch(value)
+        @branch = value
+      end
+
+      def long
+        @long = true
+      end
+    end
+  end
+end

data/lib/prospectus/modules/homebrew_cask.rb

@@ -0,0 +1,24 @@
+module LogCabin
+  module Modules
+    ##
+    # Pull state from a homebrew cask file
+    module HomebrewCask
+      def load!
+        fail('No name specified') unless @name
+        cask_file = "Casks/#{@name}.rb"
+        version_regex = /^\s+version ['"](.+)['"]$/
+        Prospectus::State.from_block(@option, @state) do
+          grep
+          file cask_file
+          regex version_regex
+        end
+      end
+
+      private
+
+      def name(value)
+        @name = value
+      end
+    end
+  end
+end

data/lib/prospectus/modules/homebrew_formula.rb

@@ -0,0 +1,24 @@
+module LogCabin
+  module Modules
+    ##
+    # Pull state from a homebrew formula file
+    module HomebrewFormula
+      def load!
+        fail('No name specified') unless @name
+        cask_file = "Formula/#{@name}.rb"
+        version_regex = /^\s+version ['"](.+)['"]$/
+        Prospectus::State.from_block(@option, @state) do
+          grep
+          file cask_file
+          regex version_regex
+        end
+      end
+
+      private
+
+      def name(value)
+        @name = value
+      end
+    end
+  end
+end

data/lib/prospectus/state.rb

@@ -7,6 +7,14 @@ module Prospectus
     def initialize(params = {})
       @options = params
     end
+
+    def self.from_block(params = {}, state = nil, &block)
+      state ||= State.new(params)
+      dsl = StateDSL.new(state, params)
+      dsl.instance_eval(&block)
+      dsl.load!
+      state
+    end
   end
 
   ##

data/lib/prospectus/version.rb

@@ -1,5 +1,5 @@
 ##
 # Declare package version
 module Prospectus
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prospectus
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2015-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -116,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".prospectus"
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
@@ -133,9 +134,12 @@ files:
 - lib/prospectus/modules/gemnasium.rb
 - lib/prospectus/modules/git_hash.rb
 - lib/prospectus/modules/git_tag.rb
+- lib/prospectus/modules/github_hash.rb
 - lib/prospectus/modules/github_release.rb
 - lib/prospectus/modules/github_tag.rb
 - lib/prospectus/modules/grep.rb
+- lib/prospectus/modules/homebrew_cask.rb
+- lib/prospectus/modules/homebrew_formula.rb
 - lib/prospectus/modules/static.rb
 - lib/prospectus/modules/url_xpath.rb
 - lib/prospectus/state.rb