percy-client 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7bdc0235c385840d4ec620b1acc715cf4d5ff5d
-  data.tar.gz: 348d42bf9fdb3eab082dcbe7792a5ceb908c1fb1
+  metadata.gz: 8f6af0faf6189f292d1d1a286825a429857143c2
+  data.tar.gz: fedbcc8381eabc6eef7f871c3b6c99a60df1366b
 SHA512:
-  metadata.gz: ee7213d7dc36a823973ddb6aafa6d6f2245da9cfe522f913ef48a50b09d4c60f6cd61d72d1056003703afe5ea00e0034545f13b7b1cff49a5a421a75df16653c
-  data.tar.gz: d3b374b37dc133b1167b9d02c8d8bbdf16e07ab64c7f1519b653a86ae923d5b6ec5766c858f695f5dc1fb33380df76888d138e2d48aae4bc5e4103cdb0eb6532
+  metadata.gz: 44a0e1b2611e2167d5e5d5246d96ba56cc3e33a2736c9ad5fe0fe2e5d403f618601bfdfc1ff95c79829c23bc6aee4fea36778f9df815d56da331c5d05be035f8
+  data.tar.gz: 42252d79be679cfdcb585c40eb683b207e7b0ee79370ee4c45441b9965d5caa0f04d599633f6994538b2d5b7bd17d947b4f1a89e90db5ffc7051a856e87a2461

data/lib/percy/client/environment.rb

@@ -87,11 +87,16 @@ module Percy
         when :circle
           "#{ENV['CIRCLE_PROJECT_USERNAME']}/#{ENV['CIRCLE_PROJECT_REPONAME']}"
         else
-          origin_url = `git config --get remote.origin.url`
+          origin_url = _get_origin_url.strip
           if origin_url == ''
             raise Percy::Client::Environment::RepoNotFoundError.new('No local git repository found.')
           end
-          match = origin_url.match(Regexp.new('[:/]([^/]+\/[^/]+)\.git'))
+          match = origin_url.match(Regexp.new('[:/]([^/]+\/[^/]+?)(\.git)?\Z'))
+          if !match
+            raise Percy::Client::Environment::RepoNotFoundError.new(
+              "Could not determine repository name from URL: #{origin_url.inspect}\n" +
+              "You can manually set PERCY_REPO to fix this.")
+          end
           match[1]
         end
       end
@@ -113,6 +118,12 @@ module Percy
           # Unfortunately, codeship always returns 'false' for CI_PULL_REQUEST. For now, return nil.
         end
       end
+
+      # @private
+      def self._get_origin_url
+        `git config --get remote.origin.url`
+      end
+      class << self; private :_get_origin_url; end
     end
   end
 end

data/lib/percy/client/version.rb

@@ -1,5 +1,5 @@
 module Percy
   class Client
-    VERSION = '0.2.5'
+    VERSION = '0.2.6'
   end
 end

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

@@ -96,6 +96,37 @@ RSpec.describe Percy::Client::Environment do
         ENV['PERCY_REPO_SLUG'] = 'percy/slug'
         expect(Percy::Client::Environment.repo).to eq('percy/slug')
       end
+      it 'handles git ssh urls' do
+        expect(Percy::Client::Environment).to receive(:_get_origin_url)
+          .once.and_return('git@github.com:org-name/repo-name.git')
+        expect(Percy::Client::Environment.repo).to eq('org-name/repo-name')
+
+        expect(Percy::Client::Environment).to receive(:_get_origin_url)
+          .once.and_return('git@github.com:org-name/repo-name.org.git')
+        expect(Percy::Client::Environment.repo).to eq('org-name/repo-name.org')
+
+        expect(Percy::Client::Environment).to receive(:_get_origin_url)
+          .once.and_return('git@custom-local-hostname:org-name/repo-name.org')
+        expect(Percy::Client::Environment.repo).to eq('org-name/repo-name.org')
+      end
+      it 'handles git https urls' do
+        expect(Percy::Client::Environment).to receive(:_get_origin_url)
+          .once.and_return('https://github.com/org-name/repo-name.git')
+        expect(Percy::Client::Environment.repo).to eq('org-name/repo-name')
+
+        expect(Percy::Client::Environment).to receive(:_get_origin_url)
+          .once.and_return('https://github.com/org-name/repo-name.org.git')
+        expect(Percy::Client::Environment.repo).to eq('org-name/repo-name.org')
+
+        expect(Percy::Client::Environment).to receive(:_get_origin_url)
+          .once.and_return("https://github.com/org-name/repo-name.org\n")
+        expect(Percy::Client::Environment.repo).to eq('org-name/repo-name.org')
+      end
+      it 'errors if unable to parse local repo name' do
+        expect(Percy::Client::Environment).to receive(:_get_origin_url).once.and_return('foo')
+        expect { Percy::Client::Environment.repo }.to raise_error(
+          Percy::Client::Environment::RepoNotFoundError)
+      end
     end
   end
   context 'in Jenkins CI' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: percy-client
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Perceptual Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday