percy-client 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38079cf3929991dac36dafcec0f7d74f9c028932
-  data.tar.gz: 54075dce61dbd5973892706b30c10ae18176d057
+  metadata.gz: 07ab97ad5b889b060f38c6bfda3344133adc9c92
+  data.tar.gz: a18153dedd45120c932c0ceeefbce61d497d67ef
 SHA512:
-  metadata.gz: 273681bc819851c01cc1a96aed84215737927d9e19862e430917311c09b8defd03ac4345800f72b4159ee6ee582898650c5111e84ecdbfb7dcf24a99bcc0f396
-  data.tar.gz: 8e040316357f34c6014f1620aa5c69b36e8b0186b42523dbb9cc263b80f0e06520a8b19b55feb93e4ed230f0bbf5444182acaa7dc71159a395bc57940c70d1c2
+  metadata.gz: d451d0d9b8762beec56b2199a4b9d3e22bce3235d11b8915bb452cd206b2f400e3111bab917db7607ae2349ca4189b2d4f3b1a299ed74e071795e9331aa8048f
+  data.tar.gz: 512f86bfd854452cc5f9f8957cf30db13ec5a4c54a4b571ec99d98eff5fed3329f2b4d877fd13d97b26d343fd4ba9cb7064eee315cbf6c1d3f444c04efce2a29

data/lib/percy/client.rb

@@ -1,7 +1,7 @@
 require 'json'
 require 'percy/config'
+require 'percy/client/environment'
 require 'percy/client/connection'
-require 'percy/client/local_git'
 require 'percy/client/version'
 require 'percy/client/builds'
 require 'percy/client/snapshots'

data/lib/percy/client/builds.rb

@@ -2,7 +2,9 @@ module Percy
   class Client
     module Builds
       def create_build(repo, options = {})
-        commit_data = options[:commit_data] || Percy::Client::LocalGit.commit
+        pull_request_number = options[:pull_request_number] ||
+          Percy::Client::Environment.pull_request_number
+        commit_data = options[:commit_data] || Percy::Client::Environment.commit
         data = {
           'data' => {
             'type' => 'builds',
@@ -15,7 +17,7 @@ module Percy
               'commit-committer-name' => commit_data[:committer_name],
               'commit-committer-email' => commit_data[:committer_email],
               'commit-message' => commit_data[:message],
-              'pull-request-number' => nil,
+              'pull-request-number' => pull_request_number,
             },
           }
         }

data/lib/percy/client/environment.rb

@@ -0,0 +1,111 @@
+module Percy
+  class Client
+    module Environment
+      GIT_FORMAT_LINES = [
+        'COMMIT_SHA:%H',
+        'AUTHOR_NAME:%an',
+        'AUTHOR_EMAIL:%ae',
+        'COMMITTER_NAME:%an',
+        'COMMITTER_EMAIL:%ae',
+        'COMMITTED_DATE:%ai',
+        # Note: order is important, this must come last because the regex is a multiline match.
+        'COMMIT_MESSAGE:%B'
+      ].freeze
+
+      class Error < Exception; end
+      class RepoNotFoundError < Exception; end
+      class BranchNotFoundError < Exception; end
+
+      def self.current_ci
+        return :travis if ENV['TRAVIS_BUILD_ID']
+        return :jenkins if ENV['JENKINS_URL'] && ENV['ghprbPullId']  # Pull Request Builder plugin.
+        return :circle if ENV['CIRCLECI']
+      end
+
+      def self.commit_sha
+        return ENV['PERCY_COMMIT'] if ENV['PERCY_COMMIT']
+
+        case current_ci
+        when :jenkins
+          ENV['ghprbActualCommit']
+        when :travis
+          ENV['TRAVIS_COMMIT']
+        when :circle
+          ENV['CIRCLE_SHA1']
+        else
+          'HEAD'
+        end
+      end
+
+      def self.commit
+        format = GIT_FORMAT_LINES.join('%n')  # "git show" format uses %n for newlines.
+        output = `git show --quiet #{commit_sha} --format="#{format}"`.strip
+        data = {
+          sha: output.match(/COMMIT_SHA:(.*)/)[1],
+          branch: branch,
+          committed_at: output.match(/COMMITTED_DATE:(.*)/)[1],
+          author_name: output.match(/AUTHOR_NAME:(.*)/)[1],
+          author_email: output.match(/AUTHOR_EMAIL:(.*)/)[1],
+          committer_name: output.match(/COMMITTER_NAME:(.*)/)[1],
+          committer_email: output.match(/COMMITTER_EMAIL:(.*)/)[1],
+          message: output.match(/COMMIT_MESSAGE:(.*)/m)[1],
+        }
+      end
+
+      # The name of the target branch that the build will be compared against.
+      def self.branch
+        return ENV['PERCY_BRANCH'] if ENV['PERCY_BRANCH']
+
+        result = case current_ci
+        when :jenkins
+          ENV['ghprbTargetBranch']
+        when :travis
+          ENV['TRAVIS_BRANCH']
+        when :circle
+          ENV['CIRCLE_BRANCH']
+        else
+          # Discover from current git repo branch name.
+          `git rev-parse --abbrev-ref HEAD`.strip
+        end
+        if result == ''
+          raise Percy::Client::Environment::BranchNotFoundError.new('No target branch found.')
+        end
+        result
+      end
+
+      def self.repo
+        return ENV['PERCY_REPO_SLUG'] if ENV['PERCY_REPO_SLUG']
+
+        case current_ci
+        when :travis
+          ENV['TRAVIS_REPO_SLUG']
+        when :circle
+          "#{ENV['CIRCLE_PROJECT_USERNAME']}/#{ENV['CIRCLE_PROJECT_REPONAME']}"
+        else
+          origin_url = `git config --get remote.origin.url`
+          if origin_url == ''
+            raise Percy::Client::Environment::RepoNotFoundError.new('No local git repository found.')
+          end
+          match = origin_url.match(Regexp.new('[:/]([^/]+\/[^/]+)\.git'))
+          match[1]
+        end
+      end
+
+      def self.pull_request_number
+        return ENV['PERCY_PULL_REQUEST'] if ENV['PERCY_PULL_REQUEST']
+
+        case current_ci
+        when :jenkins
+          # GitHub Pull Request Builder plugin.
+          ENV['ghprbPullId']
+        when :travis
+          ENV['TRAVIS_PULL_REQUEST'] if ENV['TRAVIS_PULL_REQUEST'] != 'false'
+        when :circle
+          if ENV['CI_PULL_REQUESTS'] && ENV['CI_PULL_REQUESTS'] != ''
+            ENV['CI_PULL_REQUESTS'].split(',')[0]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/percy/client/resources.rb

@@ -12,9 +12,15 @@ module Percy
       attr_accessor :mimetype
       attr_accessor :content
 
-      def initialize(sha, resource_url, options = {})
-        @sha = sha
+      def initialize(resource_url, options = {})
         @resource_url = resource_url
+
+        if !options[:sha] && !options[:content]
+          raise ArgumentError, 'Either "sha" or "content" must be given.'
+        end
+        @sha = options[:sha] || Digest::SHA256.hexdigest(options[:content])
+        @content = options[:content]
+
         @is_root = options[:is_root]
         @mimetype = options[:mimetype]
 

data/lib/percy/client/version.rb

@@ -1,5 +1,5 @@
 module Percy
   class Client
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
   end
 end

data/lib/percy/config.rb

@@ -28,7 +28,7 @@ module Percy
     end
 
     def repo
-      @repo ||= ENV['PERCY_REPO'] || Percy::Client::LocalGit.repo
+      @repo ||= ENV['PERCY_REPO'] || Percy::Client::Environment.repo
     end
   end
 end

data/spec/cassettes/Percy_Client_Builds/_create_build/creates_a_build.yml

@@ -7,7 +7,7 @@ http_interactions:
       encoding: UTF-8
       string: '{"data":{"type":"builds","attributes":{"commit-sha":"85e1b2fc5e80c462bb281d4a9b72b3d86e9f5e8f","commit-branch":"master","commit-committed-at":"2015-05-16
         19:39:41 -0700","commit-author-name":"<COMMIT_AUTHOR_NAME>","commit-author-email":"<COMMIT_AUTHOR_EMAIL>","commit-committer-name":"<COMMIT_AUTHOR_NAME>","commit-committer-email":"<COMMIT_AUTHOR_EMAIL>","commit-message":"Checkpoint
-        some initial resources and snapshots work.","pull-request-number":null}}}'
+        some initial resources and snapshots work.","pull-request-number":"123"}}}'
     headers:
       User-Agent:
       - Faraday v0.9.1
@@ -56,9 +56,9 @@ http_interactions:
       - Keep-Alive
     body:
       encoding: UTF-8
-      string: '{"data":{"id":"14","type":"builds","attributes":{"state":"pending","is-pull-request":false,"pull-request-number":0,"pull-request-title":null,"approved-at":null,"created-at":"2015-05-17T04:14:20.322Z","updated-at":"2015-05-17T04:14:20.322Z"},"links":{"self":"/api/v1/builds/14","commit":{"self":"/api/v1/builds/14/links/commit","related":"/api/v1/builds/14/commit","linkage":{"type":"commits","id":"1"}},"repo":{"self":"/api/v1/builds/14/links/repo","related":"/api/v1/builds/14/repo"},"base-build":{"self":"/api/v1/builds/14/links/base-build","related":"/api/v1/builds/14/base-build","linkage":{"type":"builds","id":"13"}},"approved-by":{"self":"/api/v1/builds/14/links/approved-by","related":"/api/v1/builds/14/approved-by"},"snapshots":{"self":"/api/v1/builds/14/links/snapshots","related":"/api/v1/builds/14/snapshots"},"comparisons":{"self":"/api/v1/builds/14/links/comparisons","related":"/api/v1/builds/14/comparisons"}},"meta":{"finalize-link":"/api/v1/builds/14/finalize","approve-link":"/api/v1/builds/14/approve"}},"included":[{"id":"1","type":"commits","attributes":{"sha":"85e1b2fc5e80c462bb281d4a9b72b3d86e9f5e8f","branch":"master","message":"Checkpoint
+      string: '{"data":{"id":"14","type":"builds","attributes":{"state":"pending","is-pull-request":true,"pull-request-number":123,"pull-request-title":null,"approved-at":null,"created-at":"2015-05-17T04:14:20.322Z","updated-at":"2015-05-17T04:14:20.322Z"},"links":{"self":"/api/v1/builds/14","commit":{"self":"/api/v1/builds/14/links/commit","related":"/api/v1/builds/14/commit","linkage":{"type":"commits","id":"1"}},"repo":{"self":"/api/v1/builds/14/links/repo","related":"/api/v1/builds/14/repo"},"base-build":{"self":"/api/v1/builds/14/links/base-build","related":"/api/v1/builds/14/base-build","linkage":{"type":"builds","id":"13"}},"approved-by":{"self":"/api/v1/builds/14/links/approved-by","related":"/api/v1/builds/14/approved-by"},"snapshots":{"self":"/api/v1/builds/14/links/snapshots","related":"/api/v1/builds/14/snapshots"},"comparisons":{"self":"/api/v1/builds/14/links/comparisons","related":"/api/v1/builds/14/comparisons"}},"meta":{"finalize-link":"/api/v1/builds/14/finalize","approve-link":"/api/v1/builds/14/approve"}},"included":[{"id":"1","type":"commits","attributes":{"sha":"85e1b2fc5e80c462bb281d4a9b72b3d86e9f5e8f","branch":"master","message":"Checkpoint
         some initial resources and snapshots work.","committed-at":"2015-05-16 19:39:41
         -0700","author-name":"<COMMIT_AUTHOR_NAME>","committer-name":"<COMMIT_AUTHOR_NAME>","created-at":"2015-05-17T04:02:54.000Z","updated-at":"2015-05-17T04:02:54.000Z"},"links":{"self":"/api/v1/commits/1"}},{"id":"13","type":"builds","attributes":{"state":"finished","is-pull-request":false,"pull-request-number":0,"pull-request-title":null,"approved-at":null,"created-at":"2015-05-17T04:14:20.000Z","updated-at":"2015-05-17T04:14:20.000Z"},"links":{"self":"/api/v1/builds/13","commit":{"self":"/api/v1/builds/13/links/commit","related":"/api/v1/builds/13/commit","linkage":{"type":"commits","id":"1"}},"repo":{"self":"/api/v1/builds/13/links/repo","related":"/api/v1/builds/13/repo"},"base-build":{"self":"/api/v1/builds/13/links/base-build","related":"/api/v1/builds/13/base-build"},"approved-by":{"self":"/api/v1/builds/13/links/approved-by","related":"/api/v1/builds/13/approved-by"},"snapshots":{"self":"/api/v1/builds/13/links/snapshots","related":"/api/v1/builds/13/snapshots"},"comparisons":{"self":"/api/v1/builds/13/links/comparisons","related":"/api/v1/builds/13/comparisons"}},"meta":{"finalize-link":"/api/v1/builds/13/finalize","approve-link":"/api/v1/builds/13/approve"}}]}'
-    http_version: 
+    http_version:
   recorded_at: Sun, 17 May 2015 04:14:20 GMT
 recorded_with: VCR 2.9.3

data/spec/lib/percy/client/builds_spec.rb

@@ -1,5 +1,7 @@
 RSpec.describe Percy::Client::Builds, :vcr do
   describe '#create_build' do
+    before(:each) { ENV['PERCY_PULL_REQUEST'] = '123' }
+    after(:each) { ENV['PERCY_PULL_REQUEST'] = nil }
     it 'creates a build' do
       build = Percy.create_build('fotinakis/percy-examples')
       expect(build).to be
@@ -7,6 +9,8 @@ RSpec.describe Percy::Client::Builds, :vcr do
       expect(build['data']['id']).to be
       expect(build['data']['type']).to eq('builds')
       expect(build['data']['attributes']['state']).to eq('pending')
+      expect(build['data']['attributes']['is-pull-request']).to be_truthy
+      expect(build['data']['attributes']['pull-request-number']).to eq(123)
     end
   end
   describe '#finalize_build' do

data/spec/lib/percy/client/environment_spec.rb

@@ -0,0 +1,217 @@
+RSpec.describe Percy::Client::Environment do
+  def clear_env_vars
+    # Unset Percy vars.
+    ENV['PERCY_COMMIT'] = nil
+    ENV['PERCY_BRANCH'] = nil
+    ENV['PERCY_PULL_REQUEST'] = nil
+    ENV['PERCY_REPO_SLUG'] = nil
+
+    # Unset Travis vars.
+    ENV['TRAVIS_BUILD_ID'] = nil
+    ENV['TRAVIS_COMMIT'] = nil
+    ENV['TRAVIS_BRANCH'] = nil
+    ENV['TRAVIS_PULL_REQUEST'] = nil
+    ENV['TRAVIS_REPO_SLUG'] = nil
+
+    # Unset Jenkins vars.
+    ENV['JENKINS_URL'] = nil
+    ENV['ghprbPullId'] = nil
+    ENV['ghprbActualCommit'] = nil
+    ENV['ghprbTargetBranch'] = nil
+
+    # Unset Circle CI vars.
+    ENV['CIRCLECI'] = nil
+    ENV['CIRCLE_SHA1'] = nil
+    ENV['CIRCLE_BRANCH'] = nil
+    ENV['CIRCLE_PROJECT_USERNAME'] = nil
+    ENV['CIRCLE_PROJECT_REPONAME'] = nil
+    ENV['CI_PULL_REQUESTS'] = nil
+  end
+
+  before(:each) do
+    @original_env = {
+      'TRAVIS_BUILD_ID' => ENV['TRAVIS_BUILD_ID'],
+      'TRAVIS_COMMIT' => ENV['TRAVIS_COMMIT'],
+      'TRAVIS_BRANCH' => ENV['TRAVIS_BRANCH'],
+      'TRAVIS_PULL_REQUEST' => ENV['TRAVIS_PULL_REQUEST'],
+      'TRAVIS_REPO_SLUG' => ENV['TRAVIS_REPO_SLUG'],
+    }
+    clear_env_vars
+  end
+  after(:each) do
+    clear_env_vars
+    ENV['TRAVIS_BUILD_ID'] = @original_env['TRAVIS_BUILD_ID']
+    ENV['TRAVIS_COMMIT'] = @original_env['TRAVIS_COMMIT']
+    ENV['TRAVIS_BRANCH'] = @original_env['TRAVIS_BRANCH']
+    ENV['TRAVIS_PULL_REQUEST'] = @original_env['TRAVIS_PULL_REQUEST']
+    ENV['TRAVIS_REPO_SLUG'] = @original_env['TRAVIS_REPO_SLUG']
+  end
+
+  context 'no known CI environment' do
+    describe '#current_ci' do
+      it 'is nil' do
+        expect(Percy::Client::Environment.current_ci).to be_nil
+      end
+    end
+    describe '#branch' do
+      it 'reads from the current local repo' do
+        expect(Percy::Client::Environment.branch).to_not be_empty
+      end
+      it 'can be overridden with PERCY_BRANCH' do
+        ENV['PERCY_BRANCH'] = 'test-branch'
+        expect(Percy::Client::Environment.branch).to eq('test-branch')
+      end
+    end
+    describe '#commit_sha' do
+      it 'reads from the current local repo' do
+        expect(Percy::Client::Environment.commit_sha).to eq('HEAD')
+      end
+      it 'can be overridden with PERCY_COMMIT' do
+        ENV['PERCY_COMMIT'] = 'test-commit'
+        expect(Percy::Client::Environment.commit_sha).to eq('test-commit')
+      end
+    end
+    describe '#pull_request_number' do
+      it 'returns nil if no CI environment' do
+        expect(Percy::Client::Environment.pull_request_number).to be_nil
+      end
+      it 'can be overridden with PERCY_PULL_REQUEST' do
+        ENV['PERCY_PULL_REQUEST'] = '123'
+        ENV['TRAVIS_BUILD_ID'] = '1234'
+        ENV['TRAVIS_PULL_REQUEST'] = '256'
+        expect(Percy::Client::Environment.pull_request_number).to eq('123')
+      end
+    end
+    describe '#repo' do
+      it 'returns the current local repo name' do
+        expect(Percy::Client::Environment.repo).to eq('percy/percy-client')
+      end
+      it 'can be overridden with PERCY_REPO_SLUG' do
+        ENV['PERCY_REPO_SLUG'] = 'percy/slug'
+        expect(Percy::Client::Environment.repo).to eq('percy/slug')
+      end
+    end
+  end
+  context 'in Jenkins CI' do
+    before(:each) do
+      ENV['JENKINS_URL'] = 'http://localhost:8080/'
+      ENV['ghprbPullId'] = '123'
+      ENV['ghprbTargetBranch'] = 'jenkins-target-branch'
+      ENV['ghprbActualCommit'] = 'jenkins-actual-commit'
+    end
+
+    describe '#current_ci' do
+      it 'is :jenkins' do
+        expect(Percy::Client::Environment.current_ci).to eq(:jenkins)
+      end
+    end
+    describe '#branch' do
+      it 'reads from the CI environment' do
+        expect(Percy::Client::Environment.branch).to eq('jenkins-target-branch')
+      end
+    end
+    describe '#commit_sha' do
+      it 'reads from the CI environment' do
+        expect(Percy::Client::Environment.commit_sha).to eq('jenkins-actual-commit')
+      end
+    end
+    describe '#pull_request_number' do
+      it 'reads from the CI environment' do
+        expect(Percy::Client::Environment.pull_request_number).to eq('123')
+      end
+    end
+    describe '#repo' do
+      it 'returns the current local repo name' do
+        expect(Percy::Client::Environment.repo).to eq('percy/percy-client')
+      end
+    end
+  end
+  context 'in Travis CI' do
+    before(:each) do
+      ENV['TRAVIS_BUILD_ID'] = '1234'
+      ENV['TRAVIS_PULL_REQUEST'] = '256'
+      ENV['TRAVIS_REPO_SLUG'] = 'travis/repo-slug'
+      ENV['TRAVIS_COMMIT'] = 'travis-commit-sha'
+      ENV['TRAVIS_BRANCH'] = 'travis-branch'
+    end
+
+    describe '#current_ci' do
+      it 'is :travis' do
+        expect(Percy::Client::Environment.current_ci).to eq(:travis)
+      end
+    end
+    describe '#branch' do
+      it 'reads from the CI environment' do
+        expect(Percy::Client::Environment.branch).to eq('travis-branch')
+      end
+    end
+    describe '#commit_sha' do
+      it 'reads from the CI environment' do
+        expect(Percy::Client::Environment.commit_sha).to eq('travis-commit-sha')
+      end
+    end
+    describe '#pull_request_number' do
+      it 'reads from the CI environment' do
+        expect(Percy::Client::Environment.pull_request_number).to eq('256')
+      end
+    end
+    describe '#repo' do
+      it 'reads from the CI environment' do
+        expect(Percy::Client::Environment.repo).to eq('travis/repo-slug')
+      end
+    end
+  end
+  context 'in Circle CI' do
+    before(:each) do
+      ENV['CIRCLECI'] = 'true'
+      ENV['CIRCLE_BRANCH'] = 'circle-branch'
+      ENV['CIRCLE_SHA1'] = 'circle-commit-sha'
+      ENV['CIRCLE_PROJECT_USERNAME'] = 'circle'
+      ENV['CIRCLE_PROJECT_REPONAME'] = 'repo-name'
+      ENV['CI_PULL_REQUESTS'] = '123,234'
+    end
+
+    describe '#current_ci' do
+      it 'is :circle' do
+        expect(Percy::Client::Environment.current_ci).to eq(:circle)
+      end
+    end
+    describe '#branch' do
+      it 'reads from the CI environment' do
+        expect(Percy::Client::Environment.branch).to eq('circle-branch')
+      end
+    end
+    describe '#commit_sha' do
+      it 'reads from the CI environment' do
+        expect(Percy::Client::Environment.commit_sha).to eq('circle-commit-sha')
+      end
+    end
+
+    describe '#pull_request_number' do
+      it 'reads from the CI environment' do
+        expect(Percy::Client::Environment.pull_request_number).to eq('123')
+      end
+    end
+    describe '#repo' do
+      it 'reads from the CI environment' do
+        expect(Percy::Client::Environment.repo).to eq('circle/repo-name')
+      end
+    end
+  end
+  describe 'local git repo methods' do
+    describe '#commit' do
+      it 'returns current local commit data' do
+        commit = Percy::Client::Environment.commit
+        expect(commit[:author_email]).to match(/.+@.+\..+/)
+        expect(commit[:author_name]).to_not be_empty
+        expect(commit[:branch]).to_not be_empty
+        expect(commit[:committed_at]).to_not be_empty
+        expect(commit[:committer_email]).to_not be_empty
+        expect(commit[:committer_name]).to_not be_empty
+        expect(commit[:message]).to_not be_empty
+        expect(commit[:sha]).to_not be_empty
+        expect(commit[:sha].length).to eq(40)
+      end
+    end
+  end
+end

data/spec/lib/percy/client/resources_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Percy::Client::Resources, :vcr do
 
   describe 'Percy::Client::Resource' do
     it 'can be initialized with minimal data' do
-      resource = Percy::Client::Resource.new(sha, '/foo.html')
+      resource = Percy::Client::Resource.new('/foo.html', sha: sha)
       expect(resource.serialize).to eq({
         'type' => 'resources',
         'id' => sha,
@@ -16,7 +16,13 @@ RSpec.describe Percy::Client::Resources, :vcr do
       })
     end
     it 'can be initialized with all data' do
-      resource = Percy::Client::Resource.new(sha, '/foo.html', is_root: true, mimetype: 'text/html')
+      resource = Percy::Client::Resource.new(
+        '/foo.html',
+        sha: sha,
+        is_root: true,
+        mimetype: 'text/html',
+        content: content,
+      )
       expect(resource.serialize).to eq({
         'type' => 'resources',
         'id' => sha,
@@ -25,11 +31,14 @@ RSpec.describe Percy::Client::Resources, :vcr do
         'is-root' => true,
       })
     end
+    it 'errors if not given sha or content' do
+      expect { Percy::Client::Resource.new('/foo.html') }.to raise_error(ArgumentError)
+    end
   end
   describe '#upload_resource' do
     it 'returns true with success' do
       build = Percy.create_build('fotinakis/percy-examples')
-      resources = [Percy::Client::Resource.new(sha, '/foo/test.html', is_root: true)]
+      resources = [Percy::Client::Resource.new('/foo/test.html', sha: sha, is_root: true)]
       Percy.create_snapshot(build['data']['id'], resources, name: 'homepage')
 
       # Verify that upload_resource hides conflict errors, though they are output to stderr.

data/spec/lib/percy/client/snapshots_spec.rb

@@ -6,8 +6,8 @@ RSpec.describe Percy::Client::Snapshots, :vcr do
     it 'creates a build' do
       build = Percy.create_build('fotinakis/percy-examples')
       resources = []
-      resources << Percy::Client::Resource.new(sha, '/foo/test.html', is_root: true)
-      resources << Percy::Client::Resource.new(sha, '/css/test.css')
+      resources << Percy::Client::Resource.new('/foo/test.html', sha: sha, is_root: true)
+      resources << Percy::Client::Resource.new('/css/test.css', sha: sha)
       snapshot = Percy.create_snapshot(build['data']['id'], resources, name: 'homepage')
 
       expect(snapshot['data']).to be

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-client
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -127,7 +127,7 @@ files:
 - lib/percy/client.rb
 - lib/percy/client/builds.rb
 - lib/percy/client/connection.rb
-- lib/percy/client/local_git.rb
+- lib/percy/client/environment.rb
 - lib/percy/client/resources.rb
 - lib/percy/client/snapshots.rb
 - lib/percy/client/version.rb
@@ -140,7 +140,7 @@ files:
 - spec/cassettes/Percy_Client_Snapshots/_create_snapshot/fails_if_no_resources_are_given.yml
 - spec/lib/percy/client/builds_spec.rb
 - spec/lib/percy/client/connection_spec.rb
-- spec/lib/percy/client/local_git_spec.rb
+- spec/lib/percy/client/environment_spec.rb
 - spec/lib/percy/client/resources_spec.rb
 - spec/lib/percy/client/snapshots_spec.rb
 - spec/lib/percy/client_spec.rb
@@ -179,7 +179,7 @@ test_files:
 - spec/cassettes/Percy_Client_Snapshots/_create_snapshot/fails_if_no_resources_are_given.yml
 - spec/lib/percy/client/builds_spec.rb
 - spec/lib/percy/client/connection_spec.rb
-- spec/lib/percy/client/local_git_spec.rb
+- spec/lib/percy/client/environment_spec.rb
 - spec/lib/percy/client/resources_spec.rb
 - spec/lib/percy/client/snapshots_spec.rb
 - spec/lib/percy/client_spec.rb

data/lib/percy/client/local_git.rb

@@ -1,49 +0,0 @@
-module Percy
-  class Client
-    module LocalGit
-      GIT_FORMAT_LINES = [
-        'COMMIT_SHA:%H',
-        'AUTHOR_NAME:%an',
-        'AUTHOR_EMAIL:%ae',
-        'COMMITTER_NAME:%an',
-        'COMMITTER_EMAIL:%ae',
-        'COMMITTED_DATE:%ai',
-        # Note: order is important, this must come last because the regex is a multiline match.
-        'COMMIT_MESSAGE:%B'
-      ].freeze
-
-      class Error < Exception; end
-      class NoLocalRepo < Exception; end
-
-      def self.commit
-        commit = ENV['PERCY_COMMIT'] || 'HEAD'
-        branch = ENV['PERCY_BRANCH'] || `git rev-parse --abbrev-ref HEAD`.strip
-        if branch == ''
-          raise Percy::Client::LocalGit::NoLocalRepo.new('No local git repository found.')
-        end
-
-        format = GIT_FORMAT_LINES.join('%n')  # "git show" format uses %n for newlines.
-        output = `git show --quiet #{commit} --format="#{format}"`.strip
-        data = {
-          sha: output.match(/COMMIT_SHA:(.*)/)[1],
-          branch: branch,
-          committed_at: output.match(/COMMITTED_DATE:(.*)/)[1],
-          author_name: output.match(/AUTHOR_NAME:(.*)/)[1],
-          author_email: output.match(/AUTHOR_EMAIL:(.*)/)[1],
-          committer_name: output.match(/COMMITTER_NAME:(.*)/)[1],
-          committer_email: output.match(/COMMITTER_EMAIL:(.*)/)[1],
-          message: output.match(/COMMIT_MESSAGE:(.*)/m)[1],
-        }
-      end
-
-      def self.repo
-        origin_url = `git config --get remote.origin.url`
-        if origin_url == ''
-          raise Percy::Client::LocalGit::NoLocalRepo.new('No local git repository found.')
-        end
-        match = origin_url.match(Regexp.new('[:/]([^/]+\/[^/]+)\.git'))
-        match[1]
-      end
-    end
-  end
-end

data/spec/lib/percy/client/local_git_spec.rb

@@ -1,21 +0,0 @@
-RSpec.describe Percy::Client::LocalGit do
-  describe '#repo' do
-    it 'returns the current local repo name' do
-      expect(Percy::Client::LocalGit.repo).to eq('percy/percy-client')
-    end
-  end
-  describe '#commit' do
-    it 'returns current local commit data' do
-      commit = Percy::Client::LocalGit.commit
-      expect(commit[:author_email]).to match(/.+@.+\..+/)
-      expect(commit[:author_name]).to_not be_empty
-      expect(commit[:branch]).to_not be_empty
-      expect(commit[:committed_at]).to_not be_empty
-      expect(commit[:committer_email]).to_not be_empty
-      expect(commit[:committer_name]).to_not be_empty
-      expect(commit[:message]).to_not be_empty
-      expect(commit[:sha]).to_not be_empty
-      expect(commit[:sha].length).to eq(40)
-    end
-  end
-end