percy-cli 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8448bc82def2c998cb14e2423d4d0b69ec2b8a20
-  data.tar.gz: 716dfc006d09195cabc054b8973fc2727c62b97e
+  metadata.gz: d4de0524f6c9f9e9a74c97ec4691d6ae6ed552dd
+  data.tar.gz: c989f4d7983a40f99b93aa969abd42341f56ec12
 SHA512:
-  metadata.gz: 68d0ff2c3a015601944b6b926f6ab441f79b40bec9a4fbaa9288c3bf3d1d51e86e12f66c2f4efdbb052304f5bb4f3accaae18f808f2ec7c07c119ccb8aa6c1d8
-  data.tar.gz: ec99b7a09a0ef1bc6fe1b25f7554198f1b8214be23fc7d3f727b47882fe224c0b50636d2064ff200a22e3d3b0b487f1a8b7cea7929c706def4af23a5e3783c2d
+  metadata.gz: eda54d6a7e2148a60446008c258b46a4d113d8c04df6bed75be400013f008e1fcc190ccbbfc2cb32c3a8566a542192e1732ab855df9c3765e2b76f749e697bc5
+  data.tar.gz: 9f89d396a58e54afec4bf169c28c13243131958e6dbadc430afdd077b31d2bed2d91073181ebd052cc7164c1d6222fa6ec0b66a6d7bfcdab0638e9abe4a52872

data/lib/percy/cli/snapshot.rb

@@ -39,11 +39,16 @@ module Percy
           exit(-1)
         end
 
-        say 'Creating build...'
-        build = Percy.create_build(repo, resources: related_resources)
+        build = rescue_connection_failures do
+          say 'Creating build...'
+          build = Percy.create_build(repo, resources: related_resources)
 
-        say 'Uploading build resources...'
-        upload_missing_resources(build, build, all_resources, {num_threads: num_threads})
+          say 'Uploading build resources...'
+          upload_missing_resources(build, build, all_resources, {num_threads: num_threads})
+
+          build
+        end
+        return if failed?
 
         # Upload a snapshot for every root resource, and associate the related_resources.
         output_lock = Mutex.new
@@ -55,9 +60,11 @@ module Percy
             output_lock.synchronize do
               say "Uploading snapshot (#{i+1}/#{total}): #{root_resource.resource_url}"
             end
-            snapshot = Percy.create_snapshot(build['data']['id'], [root_resource])
-            upload_missing_resources(build, snapshot, all_resources, {num_threads: num_threads})
-            Percy.finalize_snapshot(snapshot['data']['id'])
+            rescue_connection_failures do
+              snapshot = Percy.create_snapshot(build['data']['id'], [root_resource])
+              upload_missing_resources(build, snapshot, all_resources, {num_threads: num_threads})
+              Percy.finalize_snapshot(snapshot['data']['id'])
+            end
           end
         end
         snapshot_thread_pool.wait
@@ -65,13 +72,31 @@ module Percy
 
         # Finalize the build.
         say 'Finalizing build...'
-        Percy.finalize_build(build['data']['id'])
+        rescue_connection_failures { Percy.finalize_build(build['data']['id']) }
+        return if failed?
         say "Done! Percy is now processing, you can view the visual diffs here:"
         say build['data']['attributes']['web-url']
       end
 
       private
 
+      def failed?
+        !!@failed
+      end
+
+      def rescue_connection_failures(&block)
+        raise ArgumentError.new('block is requried') if !block_given?
+        begin
+          block.call
+        rescue Percy::Client::HttpError,
+            Percy::Client::ConnectionFailed,
+            Percy::Client::TimeoutError => e
+          Percy.logger.error(e)
+          @failed = true
+          nil
+        end
+      end
+
       def find_root_paths(dir_path, options = {})
         snapshots_regex = options[:snapshots_regex] || DEFAULT_SNAPSHOTS_REGEX
 

data/lib/percy/cli/version.rb

@@ -1,5 +1,5 @@
 module Percy
   class Cli
-    VERSION = '0.2.6'
+    VERSION = '0.3.0'
   end
 end

data/percy-cli.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'commander', '~> 4.3'
-  spec.add_dependency 'percy-client', '>= 0.10.0'
+  spec.add_dependency 'percy-client', '>= 0.11.0'
   spec.add_dependency 'thread', '~> 0.2'
 
   spec.add_development_dependency 'bundler', '~> 1.7'

data/spec/percy/cli/snapshot_spec.rb

@@ -5,7 +5,41 @@ RSpec.describe Percy::Cli::Snapshot do
 
   describe '#run_snapshot' do
     xit 'snapshots a root directory of static files' do
-      # TODO(fotinakis): tests for this.
+      # TODO(fotinakis): tests for the full flow.
+    end
+  end
+  describe '#rescue_connection_failures' do
+    let(:cli) { Percy::Cli.new }
+    it 'returns block result on success' do
+      result = cli.send(:rescue_connection_failures) do
+        true
+      end
+      expect(result).to eq(true)
+      expect(cli.send(:failed?)).to eq(false)
+    end
+    it 'makes block safe from HttpError' do
+      result = cli.send(:rescue_connection_failures) do
+        raise Percy::Client::HttpError.new(500, 'POST', '', '')
+      end
+      expect(result).to eq(nil)
+      expect(cli.send(:failed?)).to eq(true)
+    end
+    it 'makes block safe from ConnectionFailed' do
+      result = cli.send(:rescue_connection_failures) do
+        raise Percy::Client::ConnectionFailed
+      end
+      expect(result).to eq(nil)
+      expect(cli.send(:failed?)).to eq(true)
+    end
+    it 'makes block safe from TimeoutError' do
+      result = cli.send(:rescue_connection_failures) do
+        raise Percy::Client::TimeoutError
+      end
+      expect(result).to eq(nil)
+      expect(cli.send(:failed?)).to eq(true)
+    end
+    it 'requires a block' do
+      expect { cli.send(:rescue_connection_failures) }.to raise_error(ArgumentError)
     end
   end
   describe '#find_root_paths' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: thread
   requirement: !ruby/object:Gem::Requirement