runfile 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b8d1335452e9e1c70cea059ebac5b1743adf73d
-  data.tar.gz: 0884aebdc5d2be2953a3b17a9f0b7fc433868bab
+  metadata.gz: b2a0ccfa3a80cd356498b5a90abc45d2f799e36c
+  data.tar.gz: 343fb0c27e72cd670943ba0a8050efe92d3ccaf0
 SHA512:
-  metadata.gz: c7868a1d609c16a0bc51cfa1eaa8e9b4cf16fa2f5fcae8d27df78535a940644a0bc16cd3be0858989b051e7cfbfd75f417d5ee8fbd19f08853be611c24b2def5
-  data.tar.gz: 5b034f814a152e651aea2a06ed9db2401476612b803ec61e34eaac6fa2597d993770e33c24dc5949dc0825473d2a8f59af3356447da2c994085efa97b0bb51de
+  metadata.gz: e172263529326fc9fd885faea650cacb0cbd08ffa35fe3222f9ffae3f42f73cd3fa642cbe74ad911ef0fad91286113f3aa04758b625744706aa0d04316bb9e69
+  data.tar.gz: bb064103aefc63311412ed55344c75183c8727d08304916013830a5840e252d8914588880aa7e9680cbb37023a9a53732ee576f999459724e83057f6339b4bc6

data/README.md

@@ -2,6 +2,7 @@ Runfile - If Rake and Docopt had a baby
 =======================================
 
 [![Gem Version](https://badge.fury.io/rb/runfile.svg)](http://badge.fury.io/rb/runfile)
+[![Build Status](https://travis-ci.org/DannyBen/runfile.svg?branch=master)](https://travis-ci.org/DannyBen/runfile)
 
 A beautiful command line application framework.  
 Rake-inspired, Docopt inside.

data/lib/runfile/runfile_helper.rb

@@ -53,15 +53,21 @@ module Runfile
 			end
 		end
 
-		# Find all *.runfiles path-wide
+		# Find all *.runfile files in in our search difrectories
 		def find_runfiles
-			find_all_in_path '*.runfile'
+			result = []
+			dirs = runfile_folders
+			dirs.each do |d|
+				found = Dir[File.join(d, '*.runfile')]
+				result << found unless found.empty?
+			end
+			return result.empty? ? false : result.flatten.uniq
 		end
 
 		# Show some helpful tips, and a list of available runfiles
 		def show_make_help(runfiles)
 			say "!txtpur!Runfile engine v#{Runfile::VERSION}"
-			runfiles.size < 5 and say "\nTip:  Type '!txtblu!run make!txtrst!' or '!txtblu!run make name!txtrst!' to create a runfile.\n      Place !txtblu!named.runfiles!txtrst! anywhere in the PATH for global access."
+			runfiles.size < 3 and say "\nTip: Type '!txtblu!run make!txtrst!' or '!txtblu!run make name!txtrst!' to create a runfile.\nFor global access, place !txtblu!named.runfiles!txtrst! in ~/runfile/ or in /etc/runfile/ or anywhere in the PATH."
 			if runfiles.empty? 
 				say "\n!txtred!Runfile not found."
 			else
@@ -78,5 +84,13 @@ module Runfile
 				end
 			end
 		end
+
+		# Return array of folders we should search for runfiles
+		def runfile_folders
+			dirs = path_dirs
+			dirs.insert 0, Dir.pwd, "#{Dir.home}/runfile", "/etc/runfile"
+			dirs
+		end
+
 	end
 end

data/lib/runfile/runner.rb

@@ -19,7 +19,7 @@ module Runfile
 			@superspace = nil    # used when filename != Runfile
 			@last_usage = nil    # dsl: usage
 			@last_help  = nil    # dsl: help
-			@namespace  = nil    # dsl: #command
+			@namespace  = nil    # dsl: command
 			@actions = {}        # dsl: action
 			@options = {}        # dsl: option
 			@name    = "Runfile" # dsl: name

data/lib/runfile/util.rb

@@ -1,29 +1,12 @@
 module Runfile
-
 	# Debug print and exit
 	def d(obj)
 		p obj 
 		exit
 	end
 
-	# Find a single file in any of the path directories
-	def find_in_path(file)
-		ENV['PATH'].split(File::PATH_SEPARATOR).any? do |d|
-			candidate = File.join(d, file)
-			return candidate if File.exist? candidate
-		end
-		false
-	end
-
-	# Find all files matching a pattern in any of the path directories
-	def find_all_in_path(pattern, include_cwd=true)
-		result = []
-		dirs = ENV['PATH'].split(File::PATH_SEPARATOR)
-		dirs.insert(0, Dir.pwd) if include_cwd 
-		dirs.each do |d|
-			found = Dir[File.join(d, pattern)]
-			result << found unless found.empty?
-		end
-		return result.empty? ? false : result.flatten.uniq
+	# Return an array of path directories
+	def path_dirs
+		ENV['PATH'].split(File::PATH_SEPARATOR)
 	end
 end

data/lib/runfile/version.rb

@@ -1,3 +1,3 @@
 module Runfile
-	VERSION = "0.3.1"
+	VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runfile
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 description: A beautiful command line application framework. Rake-inspired, Docopt
   inside.
 email: db@dannyben.com