second_curtain 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDY0ZDVlNDY1MDRmMWYzNGE3NTAwZDUwYmQ5M2M2MjcyNTI4YTFjOQ==
+    NTNiMzEzMDRlOWI1OGU2OGQxMjIwM2MxNDA4OTQzNmZlNjQ5ZDAxZg==
   data.tar.gz: !binary |-
-    YTA0ZDI3ZDZlM2U0ZmJmNDI4YTI5OWNmZjVhNjMxNjhiMTUxNGRiZg==
+    MzBmMTNlMTU4NTliNTE2ZWQ1NWY2OGI4ODE4ZDUxZmVkY2MxNmRlYQ==
 SHA512:
   metadata.gz: !binary |-
-    OTUzOTNhMWZkNjY1NmIxZGEwNjE3NGEwMDI2MmI3YjNjN2NkYTI2YzgzYTcz
-    NWZlOGNkZTI5OWUyMzZmZTFjOTZhMDZmMjFlYmUzM2ZlNzhkZDUwYzJlNGEy
-    ZjFlOTczNTM3N2FkZmY3ZjFkMjFmNDk3ZGQ4YzlkMmMwY2NmYjI=
+    ZWE4NTRhZjAyMmJkOTBhOGUyM2UzMWU0OTNlZjEyNDUzNWQ2MzczNTA0ODRh
+    ZDFiNWVlNWQ0YTBkYzI4NmUyZGNiZmU1NWQwNDk5NThlZDhmNjUyYWRjZmQ3
+    OWNhYWEyYmY4YWRiMmMyMjQ0NWY5YjYzOWM4ZjJlYTAwZjlhODU=
   data.tar.gz: !binary |-
-    M2EwMDRmODI2ZDFhYTcyOTJhMWRmNGY1MzE4NDk4NjUxYTQxNDk2MDM3YzY0
-    Mzg3YzUyMjIxNTA2ZDlmOWFlZjFjZmU3MzAwOWNkZTYwYjAxZTM2ZjU1Y2Fh
-    YWNkOTE1M2Y3YzEwOTE2Yzk1M2NkMmI3Y2ZmYWMwMzdmYjk5ZTU=
+    NWMzYjk2ODI3OGNjMGU2YzM1YzA1MmQ3ODAyNjUzNTFmMGZiNWZkNGFmOWRk
+    NGE5MjIxNjBiZDdlMWQwMjNhN2JkNTM2MmI5NjVkY2E1YzNjZjA3M2Q4NzY4
+    NWYwY2EyODZlMDdlM2Q2YTg0MDE4NTc4NGYzZTk3MjE0MjM5ZGQ=

data/bin/second_curtain

@@ -2,45 +2,57 @@
 
 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

data/lib/second_curtain/upload.rb

@@ -4,32 +4,32 @@ require 'pathname'
 require 'uri'
 
 class Upload
-	attr_reader :expected_path
-	attr_reader :actual_path
-	attr_accessor :uploaded_expected_url
-	attr_accessor :uploaded_actual_url
+  attr_reader :expected_path
+  attr_reader :actual_path
+  attr_accessor :uploaded_expected_url
+  attr_accessor :uploaded_actual_url
 
-	def initialize(expected_path, actual_path)
-		@expected_path = expected_path
-		@actual_path = actual_path
-	end
+  def initialize(expected_path, actual_path)
+    @expected_path = expected_path
+    @actual_path = actual_path
+  end
 
-	def upload(bucket, path)
-		abort unless bucket
-		abort unless path
+  def upload(bucket, path)
+    abort unless bucket
+    abort unless path
 
-		expected_filename = Pathname.new(@expected_path).basename.to_s
-		expected_object = bucket.objects[path + "/" + expected_filename]
-		expected_object.write(:file => @expected_path)
-		@uploaded_expected_url = expected_object.url_for(:read)
+    expected_filename = Pathname.new(@expected_path).basename.to_s
+    expected_object = bucket.objects[path + "/" + expected_filename]
+    expected_object.write(:file => @expected_path)
+    @uploaded_expected_url = expected_object.url_for(:read)
 
-		actual_filename = Pathname.new(@actual_path).basename.to_s
-		actual_object = bucket.objects[path + "/" + actual_filename]
-		actual_object.write(:file => @actual_path)
-		@uploaded_actual_url = actual_object.url_for(:read)
-	end
+    actual_filename = Pathname.new(@actual_path).basename.to_s
+    actual_object = bucket.objects[path + "/" + actual_filename]
+    actual_object.write(:file => @actual_path)
+    @uploaded_actual_url = actual_object.url_for(:read)
+  end
 
-	def to_html
-		"<li><a href='#{ @uploaded_expected_url.to_s }'>Expected</a>, <a href='#{ @uploaded_actual_url.to_s }'>Actual</li>"
-	end
+  def to_html
+    "<li><a href='#{ @uploaded_expected_url.to_s }'>Expected</a>, <a href='#{ @uploaded_actual_url.to_s }'>Actual</li>"
+  end
 end

data/lib/second_curtain/upload_manager.rb

@@ -2,32 +2,32 @@ require 'aws-sdk'
 require 'upload'
 
 class UploadManager
-	def initialize (bucket, path_prefix)
-		abort "error: must supply an S3 bucket" unless bucket
-		abort "error: must supply a path prefix of at least '/'" unless path_prefix
+  def initialize (bucket, path_prefix)
+    abort "error: Second Curtain must supply an S3 bucket".red unless bucket
+    abort "error: Second Curtain must supply a path prefix of at least '/'".re unless path_prefix
 
-		@uploads = []
-		@path_prefix = path_prefix
-		@bucket = bucket
-	end
+    @uploads = []
+    @path_prefix = path_prefix
+    @bucket = bucket
+  end
 
-	def enqueue_upload(expected_path, actual_path)
-		@uploads.push(Upload.new(expected_path, actual_path))
-	end
+  def enqueue_upload(expected_path, actual_path)
+    @uploads.push(Upload.new(expected_path, actual_path))
+  end
 
-	def upload(folder_name)
-		return nil unless @uploads.count > 0
+  def upload(folder_name)
+    return nil unless @uploads.count > 0
 
-		@uploads.each do |upload|
-			upload.upload(@bucket, @path_prefix)
-		end
+    @uploads.each do |upload|
+      upload.upload(@bucket, @path_prefix)
+    end
 
-		index_object = @bucket.objects[@path_prefix + folder_name + "/index.html"]
-		index_object.write(to_html)
-		index_object.url_for(:read).to_s
-	end
+    index_object = @bucket.objects[@path_prefix + folder_name + "/index.html"]
+    index_object.write(to_html)
+    index_object.url_for(:read).to_s
+  end
 
-	def to_html
-		"<html><body>#{@uploads.map(&:to_html).join}</body></html>"
-	end
+  def to_html
+    "<html><body>#{@uploads.map(&:to_html).join}</body></html>"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: second_curtain
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ash Furrow
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.48'
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: ! "\n  If you're using the cool FBSnapshotTestCase to test your iOS view
   logic, awesome! Even better if you have continuous integration, like on Travis,
   to automate running those tests!\n\n  Wouldn't it be awesome if we could upload