giddyup-deploy 0.1.1 → 0.2.0

data/lib/giddyup/command_wrapper.rb

@@ -36,6 +36,9 @@ class Giddyup::CommandWrapper
 	# Giddyup::CommandWrapper::CommandFailed exception is raised containing
 	# the status of the failed command and all output.
 	#
+	# If a block is passed, it will be called for each line of output, and
+	# pass two arguments: `<stream>` and `<line>`.
+	#
 	def self.run_command(cmd)
 		output = []
 		rv = nil
@@ -70,7 +73,9 @@ class Giddyup::CommandWrapper
 						stdout.close
 						fds.delete(stdout)
 					else
-						output << [:stdout, stdout.readline.chomp]
+						l = stdout.readline.chomp
+						yield :stdout, l if block_given?
+						output << [:stdout, l]
 					end
 				end
 
@@ -79,7 +84,9 @@ class Giddyup::CommandWrapper
 						stderr.close
 						fds.delete(stderr)
 					else
-						output << [:stderr, stderr.readline.chomp]
+						l = stderr.readline.chomp
+						yield :stderr, l if block_given?
+						output << [:stderr, l]
 					end
 				end
 			end

data/lib/giddyup/git_deploy.rb

@@ -51,6 +51,11 @@ class Giddyup::GitDeploy
 			      "No environment given to deploy to"
 		end
 
+		unless valid_environment?
+			raise RuntimeError,
+			      "Unknown or unconfigured environment '#{@env}'"
+		end
+
 		@stdout.puts "Deploying to environment '#{@env}'"
 
 		do_push
@@ -60,6 +65,10 @@ class Giddyup::GitDeploy
 	end
 
 	private
+	def valid_environment?
+		!config_list('(pushTo|target(Enumerator)?)$').empty?
+	end
+
 	def do_push
 		config_item("pushTo", true).each do |t|
 			run_command "Pushing HEAD to remote '#{t}'",
@@ -81,25 +90,23 @@ class Giddyup::GitDeploy
 	# array of strings containing the names of all machines to deploy to.
 	#
 	def targets
-		@targets ||= enumerate_targets
-	end
-
-	def enumerate_targets
-		config_list('target(Enumerator)?$').map do |li|
-			if li[0].downcase == 'target'
-				li[1]
-			elsif li[0].downcase == 'targetenumerator'
-				rv = run_command("Enumerating targets using '#{li[1]}'", li[1]).split(/\s+/)
-				if $?.exitstatus != 0
+		@targets ||= begin
+			config_list('target(Enumerator)?$').map do |li|
+				if li[0].downcase == 'target'
+					li[1]
+				elsif li[0].downcase == 'targetenumerator'
+					rv = run_command("Enumerating targets using '#{li[1]}'", li[1]).split(/\s+/)
+					if $?.exitstatus != 0
+						raise RuntimeError,
+								"Target enumeration failed.  Aborting."
+					end
+					rv
+				else
 					raise RuntimeError,
-					      "Target enumeration failed.  Aborting."
+							"Unknown target expansion option: #{li[0]}"
 				end
-				rv
-			else
-				raise RuntimeError,
-				      "Unknown target expansion option: #{li[0]}"
-			end
-		end.flatten
+			end.flatten
+		end
 	end
 
 	# Get the value(s) of a configuration item from the config file.
@@ -178,12 +185,18 @@ class Giddyup::GitDeploy
 	# as a string.
 	#
 	def run_command(desc, cmdline)
-		@stdout.print "[....] #{desc}"
+		in_progress = "[....] #{desc}"
+
+		$stdout.print in_progress
 
 		output = nil
 		failed = false
 		begin
-			output = @command.run_command(cmdline)
+			output = @command.run_command(cmdline) do |fd, l|
+				next unless @verbose
+				@stdout.puts "\x0d\x1b[K#{fd.to_s.send(fd == :stderr ? :cyan : purple)}: #{l}"
+				@stdout.print in_progress
+			end
 		rescue Giddyup::CommandWrapper::CommandFailed => e
 			@stdout.puts "\x0d["+"FAIL".red+"] #{desc}"
 			output = e.output
@@ -192,7 +205,7 @@ class Giddyup::GitDeploy
 			@stdout.puts "\x0d["+" OK ".green+"] #{desc}"
 		end
 
-		if @verbose or failed
+		if failed and !@verbose
 			@stdout.puts cmdline
 			@stdout.puts output.map { |l| "#{l[0].to_s.send(l[0] == :stderr ? :cyan : :purple)}: #{l[1]}" }.join("\n")
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: giddyup-deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git-version-bump
@@ -197,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3538091426769745759
+      hash: -1324647467486882675
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3538091426769745759
+      hash: -1324647467486882675
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23