percy-client 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac390ac562cecfd4bf1d32a46d95e9ec544f7eb3
-  data.tar.gz: 14920f3b71e0038f51dd6bb10c30af279e5631e6
+  metadata.gz: bdab0f8284a32f328fb7dc4741ca66373dbf05ae
+  data.tar.gz: 1d43a124e5727b0fe60d20b51a7bc370af2d5b3e
 SHA512:
-  metadata.gz: a4c7491bfa30fff592390a09c0d83dc23e621ab523fe71ef82b7b173dd7d4118b59e9aea942b8eb59aaedf45298f84516e13fb2355ce8d197a9d01856696426f
-  data.tar.gz: 23ab3e161e502438af1ae6bc4f4661c7fca4e46b6b060d0bf1c2b57d5481d5d0fb415237d8e59f7be05c9db52831d1d93ac9107af1f533ba38f22921088454f7
+  metadata.gz: 39677cbd0273d1f524160396a5a422146c2277a906a85c4ec7d41922c12b64df450a3dc02c85f40b9612e6fce96ad54161522ab125654461d5659b4e2e025bec
+  data.tar.gz: 6368f16f4aade526c1389aa1da24a800c35cef56607cee402d9e61ea398fc1de5c5f41a0c4f0c7bcf2aac9fbdb6a7a678530f6981aa386cb9e0ce93c785ee44d

data/lib/percy/client.rb

@@ -10,7 +10,6 @@ require 'percy/client/resources'
 module Percy
   class Client
     include Percy::Client::Connection
-    include Percy::Client::LocalGit
     include Percy::Client::Builds
     include Percy::Client::Snapshots
     include Percy::Client::Resources

data/lib/percy/client/builds.rb

@@ -1,25 +1,25 @@
 module Percy
   class Client
     module Builds
-      def create_build(repo_slug)
-        commit = Percy.current_local_commit
+      def create_build(repo, options = {})
+        commit_data = options[:commit_data] || Percy::Client::LocalGit.commit
         data = {
           'data' => {
             'type' => 'builds',
             'attributes' => {
-              'commit-sha' => commit[:sha],
-              'commit-branch' => commit[:branch],
-              'commit-committed-at' => commit[:committed_at],
-              'commit-author-name' => commit[:author_name],
-              'commit-author-email' => commit[:author_email],
-              'commit-committer-name' => commit[:committer_name],
-              'commit-committer-email' => commit[:committer_email],
-              'commit-message' => commit[:message],
+              'commit-sha' => commit_data[:sha],
+              'commit-branch' => commit_data[:branch],
+              'commit-committed-at' => commit_data[:committed_at],
+              'commit-author-name' => commit_data[:author_name],
+              'commit-author-email' => commit_data[:author_email],
+              'commit-committer-name' => commit_data[:committer_name],
+              'commit-committer-email' => commit_data[:committer_email],
+              'commit-message' => commit_data[:message],
               'pull-request-number' => nil,
             },
           }
         }
-        post("#{config.api_url}/repos/#{repo_slug}/builds/", data)
+        post("#{config.api_url}/repos/#{repo}/builds/", data)
       end
 
       def finalize_build(build_id)

data/lib/percy/client/local_git.rb

@@ -3,12 +3,11 @@ module Percy
     module LocalGit
       GIT_FORMAT_LINES = [
         'COMMIT_SHA:%H',
-        'AUTHOR_DATE:%ai',
         'AUTHOR_NAME:%an',
         'AUTHOR_EMAIL:%ae',
         'COMMITTER_NAME:%an',
         'COMMITTER_EMAIL:%ae',
-        'COMMITTER_DATE:%ai',
+        'COMMITTED_DATE:%ai',
         # Note: order is important, this must come last because the regex is a multiline match.
         'COMMIT_MESSAGE:%B'
       ].freeze
@@ -16,7 +15,7 @@ module Percy
       class Error < Exception; end
       class NoLocalRepo < Exception; end
 
-      def current_local_commit
+      def self.commit
         commit = ENV['PERCY_COMMIT'] || 'HEAD'
         branch = ENV['PERCY_BRANCH'] || `git rev-parse --abbrev-ref HEAD`.strip
         if branch == ''
@@ -28,7 +27,7 @@ module Percy
         data = {
           sha: output.match(/COMMIT_SHA:(.*)/)[1],
           branch: branch,
-          committed_at: output.match(/AUTHOR_DATE:(.*)/)[1],
+          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],
@@ -37,7 +36,7 @@ module Percy
         }
       end
 
-      def current_local_repo
+      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.')

data/lib/percy/client/version.rb

@@ -1,5 +1,5 @@
 module Percy
   class Client
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/lib/percy/config.rb

@@ -7,6 +7,7 @@ module Percy
 
     attr_accessor :access_token
     attr_accessor :api_url
+    attr_accessor :repo
 
     # List of configurable keys for {Percy::Client}
     # @return [Array] Option keys.
@@ -14,6 +15,7 @@ module Percy
       @keys ||= [
         :access_token,
         :api_url,
+        :repo,
       ]
     end
 
@@ -24,5 +26,9 @@ module Percy
     def api_url
       @api_url ||= ENV['PERCY_API'] || 'https://percy.io/api/v1'
     end
+
+    def repo
+      @repo ||= ENV['PERCY_REPO'] || Percy::Client::LocalGit.repo
+    end
   end
 end

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

@@ -1,12 +1,12 @@
 RSpec.describe Percy::Client::LocalGit do
-  describe '#current_local_repo' do
+  describe '#repo' do
     it 'returns the current local repo name' do
-      expect(Percy.current_local_repo).to eq('percy/percy-client')
+      expect(Percy::Client::LocalGit.repo).to eq('percy/percy-client')
     end
   end
-  describe '#current_local_commit' do
+  describe '#commit' do
     it 'returns current local commit data' do
-      commit = Percy.current_local_commit
+      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

data/spec/lib/percy/client_spec.rb

@@ -4,6 +4,14 @@ RSpec.describe Percy::Client do
       config = Percy::Config.new
       client = Percy::Client.new(config: config)
       expect(client.config).to eq(config)
+      expect(client.config.keys).to eq([
+        :access_token,
+        :api_url,
+        :repo,
+      ])
+      expect(client.config.access_token).to be_nil
+      expect(client.config.api_url).to eq(ENV['PERCY_API'])
+      expect(client.config.repo).to eq('percy/percy-client')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: percy-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Perceptual Inc.