bin/second_curtain in second_curtain-0.1.1 vs bin/second_curtain in second_curtain-0.1.2

@@ -1,46 +1,58 @@
 #!/usr/bin/env ruby
 
 require 'second_curtain'
 
+input = []
+
+ARGF.each_line do |line|
+  input.push(line)
+  print line
+end
+
 bucket_name = ENV['UPLOAD_IOS_SNAPSHOT_BUCKET_NAME']
 
 if bucket_name == nil
-	abort "error: bucket name must be specified in environment UPLOAD_IOS_SNAPSHOT_BUCKET_NAME variable"
+  abort "error: Second Curtain bucket name must be specified in environment UPLOAD_IOS_SNAPSHOT_BUCKET_NAME variable".red
 end
 
 aws_key = ENV['AWS_ACCESS_KEY_ID']
 aws_secret = ENV['AWS_SECRET_ACCESS_KEY']
 if aws_key == nil || aws_secret == nil
-	abort "error: AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY must be defined as environment variables"
+  abort "error: Second Curtain AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY must be defined as environment variables".red
 end
 
 path_prefix = ENV['UPLOAD_IOS_SNAPSHOT_BUCKET_PREFIX'] || '/'
 if !path_prefix.end_with?('/')
-	path_prefix += '/'
+  path_prefix += '/'
 end
 
+folder_name = ENV['UPLOAD_IOS_SNAPSHOT_FOLDER_NAME']
+if !folder_name
+  folder_name = ENV['TRAVIS_JOB_ID']
+end
+
+if !folder_name
+  now = DateTime.now()
+  folder_name = now.strftime('%Y-%m-%d--%H-%M')
+end
+
 s3 = AWS::S3.new
 bucket = s3.buckets[bucket_name]
 manager = UploadManager.new(bucket, path_prefix)
 
-ARGF.each_line do |line|
-	if line.start_with?('ksdiff')
-		parts = line.split(/"/)
-		if (parts.count >= 4)
-			expected_path = parts[1]
-			actual_path = parts[3]
-			manager.enqueue_upload(expected_path, actual_path)
-		end
-	end
-
-	# Print the line normally, saving output for the end
-	print line
+input.each do |line|
+  if line.start_with?('ksdiff')
+    parts = line.split(/"/)
+    if (parts.count >= 4)
+      expected_path = parts[1]
+      actual_path = parts[3]
+      manager.enqueue_upload(expected_path, actual_path)
+    end
+  end
 end
 
-now = DateTime.now()
-folder_name = now.strftime('%Y-%m-%d--%H-%M')
 
 failures_address = manager.upload(folder_name)
 if failures_address
-	$stderr.puts "Failures: " + failures_address
+  $stderr.puts "Failures: " + failures_address
 end