the_hulk 0.0.6 → 0.0.7

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in hulk.gemspec
 gemspec
 
-gem 'colorize', '~> 0.7.3'
+gem 'colorize', '~> 0.7.3'

data/README.md

@@ -20,7 +20,7 @@ deploy:
 
 The above example will give you the following: 
  1. Calling `hulk push` will run the 3 commands you see under `push:`, in the order they appear, in a synchronous manner.
- 2. Calling `hulk deploy` will run the `push` build, and then run the push to the heroku server. 
+ 2. Calling `hulk deploy` will run the `push` build, and then run the deploy to the heroku server. 
 
 ### Nesting builds
 
@@ -30,7 +30,7 @@ You can mix and match builds with commands, and nest builds as frequent, or infr
 
 ### Using variables
 
-Hulk can support one variable per command, with the use of `$$` as a placeholder.
+Hulk can support variables in commands, with the use of `$$` as a placeholder.
 
 ```YML
 build:
@@ -40,4 +40,11 @@ build:
 	- "git push -f heroku:$$"
 ```
 
-Hulk runs two passes on your .yml file and will discover all variables before the commands begin running. Hulk will prompt you for each variable in your build before the build runs, and then you may step away as Hulk smashes through your build with your assigned variables.
+Feel free to use multiple variables.
+
+```YML
+perform:
+	- "$$ and then $$ followed by $$"
+```
+
+Hulk will prompt you for each variable in your build before it runs, and then you may step away as Hulk smashes through your build with your assigned variables.

data/lib/hulk/version.rb

@@ -1,3 +1,3 @@
 module Hulk
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/hulk.rb

@@ -33,17 +33,17 @@ module Hulk
 
 		def list_builds
 			builds = parse_yaml
-			puts "Hulk show you builds!".colorize(:green) if builds.length > 0
+			puts "Hulk show builds!".colorize(:green) if builds.length > 0
 			count = 1
 			builds.each do |key, value|
-				puts " [#{count}] >> #{key}"
+				puts " #{count}: #{key}"
 				count += 1
 			end
 		end
 
 
 		def collect_build_commands build, commands
-			puts "Hulk run build: #{build.colorize(:green)}"
+			puts "#{'Hulk run build:'.colorize(:green)} #{build.colorize(:light_blue)}"
 			commands.each do |command|
 				if command =~ /^--/
 					cmds = []
@@ -57,12 +57,15 @@ module Hulk
 
 
 		def prep_command command
-				if command.include? '$$'
-					input = [(print "Enter var for: #{command.colorize(:light_blue)}: "), $stdin.gets.rstrip][1] # Prompt and gets on same line
-					$stdin.flush
-					command .sub! '$$', input
-				end
-				@complete_command_list << command
+			while command.include? '$$'
+				tokens = command.split('$$', 2)
+				before = tokens[0]
+				after = tokens[1]
+				puts "Enter replacement for: #{before}#{'$$'.colorize(:light_blue)}#{after}"
+				input = $stdin.gets.chomp
+				command.sub! '$$', input
+			end
+			@complete_command_list << command
 		end
 
 
@@ -72,7 +75,7 @@ module Hulk
 				if builds.has_key? arg
 					collect_build_commands arg, builds[arg]
 				else
-					puts "Hulk no find build: #{arg}".colorize(:green)
+					puts "#{'Hulk no find build:'.colorize(:green)} #{arg.colorize(:light_blue)}"
 				end
 			end
 		end
@@ -81,8 +84,8 @@ module Hulk
 		def run_builds
 			@complete_command_list.each do |command|
 				begin
-					puts "Hulk run command: #{command.colorize(:green)}"
-					system command
+					puts "#{'Hulk run command:'.colorize(:green)} #{command.colorize(:light_blue)}"
+					system(command + '2>&1')
 					puts
 				rescue
 					$stderr.puts "There was an error when attempting to run: #{command}".colorize(:red)
@@ -93,11 +96,9 @@ module Hulk
 
 
 		def parse args
-			options = OpenStruct.new
-
-			options.list = false
+			options = {}
 
-			opt_parser = OptionParser.new do |opts|
+			opt = OptionParser.new do |opts|
 				opts.banner = "Usage: hulk [options]"
 
 				opts.on('-l', '--list', 'List Builds') do |l|
@@ -107,12 +108,12 @@ module Hulk
 			end
 
 			begin
-				opt_parser.parse!(args)
+				opt.parse!
 			rescue OptionParser::InvalidOption => e
-				$stderr.puts "Invalid Hulk option: #{e}".colorize(:red)
-				exit 1
+				puts "#{'Hulk no find option:'.colorize(:green)} #{e}"
 			end
-	    options
+
+	    	return options
 		end
 
 
@@ -124,7 +125,7 @@ module Hulk
 
 			options = parse ARGV
 			if ARGV.empty?
-				list_builds if options.list == true
+				list_builds if options[:list] == true
 			else
 				collect_builds ARGV
 				run_builds
@@ -134,3 +135,7 @@ module Hulk
 	end
 
 end
+
+# TODO remove this
+runner = Hulk::Runner.new
+runner.bootstrap

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_hulk
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler