runfile 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b145578577cc500e75a76396084f5c708f3ffc19
-  data.tar.gz: d3f5047c705832d2184c8975b0f55dfb7149354e
+  metadata.gz: 87351dfdba90ed54e90de8659791d79242b993ee
+  data.tar.gz: d0fea602beebde2f9f47d754ceddcd9961d16bea
 SHA512:
-  metadata.gz: 075be67037b4a3bb1680f0c90188332a4ca757f6f2672052496551a5bd8b8d763928e68d5ae304395e0f96306f3d7e058f21b6d3d310c706fd57811be589d674
-  data.tar.gz: 64f564a08e4e93deb4ba3ec4afcb371dc7788a68b7c1bf819efd37ff57f2bf4b526f138bac7aae0f89d76c208aabae1deffd841d6bbd45a58217eef52eed45b3
+  metadata.gz: 01b40937adcc3301f2afe3143a7f85bae625a19c95a631d7f11774b4aca28328fe9f6dc738eeebc2b6c0dd43e0b13408111721d3eb62e23ea64e0acb782e4096
+  data.tar.gz: 06d21eab94577ec842795941c335621d198162965e30e2e49b079aebab2fae9ef159a5fd6064e9cbab9e57a3813ada6324fd7f700dcfae5a34f857379621c0e0

data/lib/runfile/dsl.rb

@@ -35,7 +35,13 @@ module Runfile
 		Runner.instance.add_action name, &block
 	end
 
-	def command(name)
+	# Define a new command namespace
+	def command(name=nil)
 		Runner.instance.namespace = name
 	end
+
+	# Cross-call another action
+	def call(command_string)
+		Runner.instance.cross_call command_string
+	end
 end

data/lib/runfile/runner.rb

@@ -9,7 +9,7 @@ module Runfile
 
 		@@instance = nil
 
-		# Initialize all variables to a sensible default.
+		# Initialize all variables to sensible defaults.
 		def initialize
 			@last_usage = nil
 			@last_help = nil
@@ -28,7 +28,7 @@ module Runfile
 
 		# Load and execute a Runfile call.
 		def execute(argv)
-			File.exist? 'Runfile' or abort "Runfile not found"
+			File.exist? 'Runfile' or handle_no_runfile argv
 			load 'Runfile'
 			@@instance.run *argv
 		end
@@ -57,14 +57,26 @@ module Runfile
 		def run(*argv)
 			action = find_action argv
 			begin
-				args = Docopt::docopt(docopt, version: @version, argv:argv)
-				action or abort "Runfile error: Action not found"
-				@actions[action].execute args
+				docopt_exec action, argv
 			rescue Docopt::Exit => e
 				puts e.message
 			end
 		end
 
+		# Invoke action from another action. Used by the DSL's #call 
+		# function. Expects to get a single string that looks as if
+		# 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
+			rescue Docopt::Exit => e
+				puts "Cross call failed: #{command_string}"
+				abort e.message
+			end
+		end
+
 		private
 
 		# Dynamically generate the docopt document.
@@ -73,6 +85,16 @@ module Runfile
 			maker.make
 		end
 
+		# Call the docopt parser and execute the action with the 
+		# 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)
+			args = Docopt::docopt(docopt, version: @version, argv: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
@@ -89,5 +111,19 @@ module Runfile
 			end
 			return false
 		end
+
+		# 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.
+		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."
+			else
+				abort "Runfile not found.\nUse 'run make' to create one."
+			end
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: runfile
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colsole