runfile 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87351dfdba90ed54e90de8659791d79242b993ee
-  data.tar.gz: d0fea602beebde2f9f47d754ceddcd9961d16bea
+  metadata.gz: 558258a98c5a64125802ab9612acd60906bfd069
+  data.tar.gz: d787f718632c0e16df8d176938a30a54e668d5c7
 SHA512:
-  metadata.gz: 01b40937adcc3301f2afe3143a7f85bae625a19c95a631d7f11774b4aca28328fe9f6dc738eeebc2b6c0dd43e0b13408111721d3eb62e23ea64e0acb782e4096
-  data.tar.gz: 06d21eab94577ec842795941c335621d198162965e30e2e49b079aebab2fae9ef159a5fd6064e9cbab9e57a3813ada6324fd7f700dcfae5a34f857379621c0e0
+  metadata.gz: 01ff19b161a0ab6492e87a5c432b2ca76de79802fa5356fb2103879e4ed67d11494d926f8343260414a3c51b56ae0c665ff7c423ea93377bc93e1519e68d0b84
+  data.tar.gz: 46ed488ad6b113c67223240d751a83409a7edb70950845cd1a34dd27133d5145ab74bf032b7a92da9e122658d51f7e8675d01af2e66a9c914713c22f80ab4445

data/lib/runfile/dsl.rb

@@ -3,7 +3,6 @@
 # for handling.
 
 module Runfile
-
 	# Set the version of your Runfile program
 	def version(ver)
 		Runner.instance.version = ver
@@ -44,4 +43,8 @@ module Runfile
 	def call(command_string)
 		Runner.instance.cross_call command_string
 	end
+
+	# Also allow to use 'endcommand' instead of 'command' to end
+	# a command namespace definition
+	alias_method :endcommand, :command
 end

data/lib/runfile/runner.rb

@@ -1,23 +1,25 @@
 require 'docopt'
+require 'pp'
 
 module Runfile
 
 	# The Runner class is the main workhorse behind Runfile.
 	# It handles all the Runfile DSL commands and executes the Runfile.
 	class Runner
-		attr_accessor :last_usage, :last_help, :version, :summary, :namespace
+		attr_accessor :last_usage, :last_help, :version, :summary, :namespace, :superspace
 
 		@@instance = nil
 
 		# Initialize all variables to sensible defaults.
 		def initialize
-			@last_usage = nil
-			@last_help = nil
-			@namespace = nil
-			@actions = {}
-			@options = {}
-			@version = "0.0.0"
-			@summary = false
+			@last_usage = nil  # dsl: usage
+			@last_help  = nil  # dsl: help
+			@superspace = nil  # used when filename != Runfile
+			@namespace  = nil  # dsl: #command
+			@actions = {}      # dsl: action
+			@options = {}      # dsl: option
+			@version = "0.0.0" # dsl: version
+			@summary = false   # dsl: summary
 		end
 
 		# Return a singleton Runner instance.
@@ -27,9 +29,9 @@ module Runfile
 		end
 
 		# Load and execute a Runfile call.
-		def execute(argv)
-			File.exist? 'Runfile' or handle_no_runfile argv
-			load 'Runfile'
+		def execute(argv, filename='Runfile')
+			File.exist? filename or handle_no_runfile argv
+			load filename
 			@@instance.run *argv
 		end
 
@@ -41,6 +43,10 @@ module Runfile
 				name = "#{namespace}_#{name}".to_sym
 				@last_usage = "#{@namespace} #{@last_usage}"
 			end
+			if @superspace 
+				name = "#{superspace}_#{name}".to_sym
+				@last_usage = "#{@superspace} #{@last_usage}"
+			end
 			@actions[name] = Action.new(block, @last_usage, @last_help)
 			@last_usage = nil
 			@last_help = nil
@@ -55,9 +61,8 @@ module Runfile
 		# generate the docopt document on the fly, using all the 
 		# information collected so far.
 		def run(*argv)
-			action = find_action argv
 			begin
-				docopt_exec action, argv
+				docopt_exec argv
 			rescue Docopt::Exit => e
 				puts e.message
 			end
@@ -68,9 +73,8 @@ module Runfile
 		# it was typed in the command prompt.
 		def cross_call(command_string) 
 			argv = command_string.split /\s(?=(?:[^"]|"[^"]*")*$)/
-			action = find_action argv
 			begin
-				docopt_exec action, argv
+				docopt_exec argv
 			rescue Docopt::Exit => e
 				puts "Cross call failed: #{command_string}"
 				abort e.message
@@ -89,24 +93,23 @@ module Runfile
 		# parsed arguments.
 		# This should always be called in a begin...rescue block and
 		# you should handle the Docopt::Exit exception.
-		def docopt_exec(action, argv)
+		def docopt_exec(argv)
 			args = Docopt::docopt(docopt, version: @version, argv:argv)
+			action = find_action argv
 			action or abort "Runfile error: Action not found"
 			@actions[action].execute args
 		end
 
-		# Inspect the first two arguments in the argv and look for
-		# a matching action or command_action.
-		# We give priority to the second form (:make_jam) in order to
-		# also allow "overloading" of the command as an action 
-		# (e.g. also allow a global action called :make).
+		# Inspect the first three arguments in the argv and look for
+		# a matching action.
+		# We will first look for a_b_c action, then for a_b and 
+		# finally for a. This is intended to allow "overloading" of 
+		# the command as an action (e.g. also allow a global action 
+		# called 'a').
 		def find_action(argv)
-			if argv.size >= 2
-				action = "#{argv[0]}_#{argv[1]}".to_sym
-				return action if @actions.has_key? action
-			end
-			if argv.size >= 1
-				action = argv[0].to_sym
+			3.downto(1).each do |n|
+				next unless argv.size >= n 
+				action = argv[0..n-1].join('_').to_sym
 				return action if @actions.has_key? action
 			end
 			return false
@@ -115,15 +118,26 @@ module Runfile
 		# Handle the case when `run` is called without a Runfile 
 		# present. We will let the user know they can type `run make`
 		# to create a new sample Runfile.
+		# If the first argument matches the name of a *.runfile name,
+		# we will execute it.
 		def handle_no_runfile(argv)
 			if argv[0] == "make"
 				sample = File.dirname(__FILE__) + "/../../examples/template/Runfile"
 				dest   = Dir.pwd + "/Runfile"
 				File.write(dest, File.read(sample))
 				abort "Runfile created."
+			elsif argv[0] and File.exist? "#{argv[0]}.runfile"
+				@superspace = argv[0]
+				execute argv, "#{argv[0]}.runfile"
 			else
-				abort "Runfile not found.\nUse 'run make' to create one."
+				runfiles = Dir['*.runfile']
+				runfiles.empty? and abort "Runfile not found.\nUse 'run make' to create one."
+				runfiles.each do |f|
+					f.slice! '.runfile'
+					puts "Did you mean 'run #{f}'"
+				end
 			end
+			exit
 		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runfile
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Danny Ben Shitrit