txgh 7.0.1 → 7.0.3.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdb50c066c21ad6c3ca33db9e53e10a199bb02e4a4e814d73860c929d04322f7
-  data.tar.gz: c9a9ed9b5e8bd74341c26b7449e95ad3f6a657ed7fbe2d42db927a7ad0635035
+  metadata.gz: 48e0eadcdb6ad07122b1373f84e39dbc8d219ae3cd2000c85cbdcd901ef4cd62
+  data.tar.gz: ee74522f8b4b97b0f0a2fd83a032e3f8a8734afb9f57e004d5dd7be4ffbccd36
 SHA512:
-  metadata.gz: 06e7187ef0979e02ad65e91f6d8c91ecb86aa5760909f125e927cf69b5c7c21351c25ab7d6bbccbc64c8400e86603992d9d2e0f50a8879131c47c68b950827af
-  data.tar.gz: 16875e8594818e3408c149b4313746c77c9b87bedbe23038ea395a85ce0b6ef300d5df2fd732140389cd02fdb402cb88a3ba2157ce3eccbe4dc64047858f95fe
+  metadata.gz: 8bfa277f9876adccb9bbbe8c01576bc08ed4294054afb522c49e97b5127d3cb2f4e355c847964405a6a764e29f9b6a220cac43b79923c4ac866a607bcce9d2ef
+  data.tar.gz: 972253d27b545b8ffa9e8f7b4793a8d96cd3259917d2a16b3900219798ed6006a22e632ffcb86229dd80a1caad51201185aaf29010ffefb7230a747ed2637f0a

data/lib/txgh/config/providers/git_provider.rb

@@ -33,10 +33,6 @@ module Txgh
 
         private
 
-        def download
-          raise NotImplementedError
-        end
-
         def ref
           unless @ref
             raise TxghError,

data/lib/txgh/git_status.rb

@@ -1,4 +1,4 @@
-require 'celluloid/current'
+require 'celluloid/autostart'
 
 module Txgh
   class GitStatus

data/lib/txgh/gitlab_api.rb

@@ -42,13 +42,13 @@ module Txgh
       # mock github response
       {
         object: {
-          sha: client.commit(repo_name, ref.gsub('heads/', '')).short_id
+          sha: client.commit(repo_name, Utils.url_safe_relative_branch(ref)).short_id
         }
       }
     end
 
     def download(path, branch)
-      file = client.get_file(repo_name, path, branch.gsub('heads/', ''))
+      file = client.get_file(repo_name, path, Utils.relative_branch(branch))
 
       # mock github response
       {
@@ -58,7 +58,10 @@ module Txgh
     end
 
     def create_status(sha, state, options = {})
-      client.update_commit_status(repo_name, sha, state, options)
+      client.update_commit_status(repo_name, Utils.url_safe_relative_branch(sha), state, options)
+    rescue ::Gitlab::Error::BadRequest => error
+      # Gitlab pipeline may have several jobs and txgh should not override commit statuses set by others
+      raise error unless error.message.include?('Cannot transition status')
     end
   end
 end

data/lib/txgh/utils.rb

@@ -24,6 +24,10 @@ module Txgh
       branch.strip.sub(/\A(heads|tags)\//, '')
     end
 
+    def url_safe_relative_branch(branch)
+      CGI.escape(relative_branch(branch))
+    end
+
     def branches_equal?(first, second)
       absolute_branch(first) == absolute_branch(second)
     end

data/lib/txgh/version.rb

@@ -1,3 +1,3 @@
 module Txgh
-  VERSION = '7.0.1'
+  VERSION = '7.0.3.beta4'
 end

data/spec/gitlab_api_spec.rb

@@ -5,7 +5,6 @@ describe Txgh::GitlabApi do
   let(:client) { double(:client) }
   let(:api) { described_class.create_from_client(client, repo) }
   let(:repo) { 'my_org/my_repo' }
-  let(:branch) { 'master' }
   let(:sha) { 'abc123' }
   let(:gitlab_response) do
     OpenStruct.new({
@@ -18,23 +17,19 @@ describe Txgh::GitlabApi do
     })
   end
 
-  describe '#update_contents' do
-    let(:path) { 'path/to/file.txt' }
-    let(:old_contents) { 'abc123' }
-    let(:old_sha) { Txgh::Utils.git_hash_blob(old_contents) }
-
+  shared_examples 'an update_contents flow' do
     it 'updates the given file contents' do
       new_contents = 'def456'
 
       expect(client).to(
         receive(:get_file)
-          .with(repo, path, branch)
+          .with(repo, path, filtered_branch)
           .and_return(double(blob_id: old_sha))
       )
 
       expect(client).to(
         receive(:edit_file)
-          .with(repo, path, branch, new_contents, 'message')
+          .with(repo, path, filtered_branch, new_contents, 'message')
       )
 
       api.update_contents(branch, [{ path: path, contents: new_contents }], 'message')
@@ -43,7 +38,7 @@ describe Txgh::GitlabApi do
     it "doesn't update the file contents if the file hasn't changed" do
       expect(client).to(
         receive(:get_file)
-          .with(repo, path, branch)
+          .with(repo, path, filtered_branch)
           .and_return(double(blob_id: old_sha))
       )
 
@@ -58,27 +53,18 @@ describe Txgh::GitlabApi do
 
       expect(client).to(
         receive(:edit_file)
-          .with(repo, path, branch, new_contents, 'message')
+          .with(repo, path, filtered_branch, new_contents, 'message')
       )
 
       api.update_contents(branch, [{ path: path, contents: new_contents }], 'message')
     end
   end
 
-  describe '#get_ref' do
-    it 'retrieves the given ref (i.e. branch) using the client' do
-      expect(client).to receive(:commit).with(repo, sha) { double(short_id: '0') }
-      api.get_ref(sha)
-    end
-  end
-
-  describe '#download' do
-    let(:path) { 'path/to/file.xyz' }
-
+  shared_examples 'a download flow' do
     it 'downloads the file from the given branch' do
       expect(client).to(
         receive(:get_file)
-          .with(repo, path, branch)
+          .with(repo, path, filtered_branch)
           .and_return(double(content: 'content', encoding: 'utf-8'))
       )
 
@@ -90,7 +76,7 @@ describe Txgh::GitlabApi do
 
       expect(client).to(
         receive(:get_file)
-          .with(repo, path, branch)
+          .with(repo, path, filtered_branch)
           .and_return(double(content: content, encoding: 'utf-16'))
       )
 
@@ -102,11 +88,96 @@ describe Txgh::GitlabApi do
     it 'automatically decodes base64-encoded content' do
       expect(client).to(
         receive(:get_file)
-          .with(repo, path, branch)
+          .with(repo, path, filtered_branch)
           .and_return(double(content: Base64.encode64('content'), encoding: 'base64'))
       )
 
       expect(api.download(path, branch)).to eq({ content: 'content', path: path })
     end
   end
+
+  describe '#update_contents' do
+    let(:path) { 'path/to/file.txt' }
+    let(:old_contents) { 'abc123' }
+    let(:old_sha) { Txgh::Utils.git_hash_blob(old_contents) }
+
+    context 'when master branch' do
+      let(:branch) { 'master' }
+      let(:filtered_branch) { 'master' }
+
+      it_behaves_like 'an update_contents flow'
+    end
+
+    context 'when feature branch' do
+      let(:branch) { 'heads/feature/foo-ticket' }
+      let(:filtered_branch) { 'feature/foo-ticket' }
+
+      it_behaves_like 'an update_contents flow'
+    end
+  end
+
+  describe '#get_ref' do
+    context 'when ref is a sha' do
+      it 'retrieves the given ref (i.e. branch) using the client' do
+        expect(client).to receive(:commit).with(repo, sha) { double(short_id: '0') }
+        api.get_ref(sha)
+      end
+    end
+
+    context 'when ref is a master branch' do
+      let(:sha) { 'master' }
+
+      it 'retrieves the given ref (i.e. branch) using the client' do
+        expect(client).to receive(:commit).with(repo, sha) { double(short_id: '0') }
+        api.get_ref(sha)
+      end
+    end
+
+    context 'when ref is a feature branch' do
+      let(:sha) { 'feature/foo-ticket' }
+      let(:url_safe_sha) { 'feature%2Ffoo-ticket' }
+
+      it 'retrieves the given ref (i.e. branch) using the client' do
+        expect(client).to receive(:commit).with(repo, url_safe_sha) { double(short_id: '0') }
+        api.get_ref(sha)
+      end
+    end
+  end
+
+  describe '#download' do
+    let(:path) { 'path/to/file.xyz' }
+
+    context 'when master branch' do
+      let(:branch) { 'master' }
+      let(:filtered_branch) { 'master' }
+
+      it_behaves_like 'a download flow'
+    end
+
+    context 'when feature branch' do
+      let(:branch) { 'heads/feature/foo-ticket' }
+      let(:filtered_branch) { 'feature/foo-ticket' }
+
+      it_behaves_like 'a download flow'
+    end
+  end
+
+  describe '#create_status' do
+    let(:gitlab_response) do
+      OpenStruct.new({
+        code: 404,
+        request: double(base_uri: 'https://gitlab.com/api/v3', path: '/foo'),
+        parsed_response: Gitlab::ObjectifiedHash.new(
+          error_description: 'Cannot transition status via :enqueue from :pending',
+          error: 'also will not be displayed'
+        )
+      })
+    end
+
+    it 'does not raise error if cannot change status' do
+      expect(client).to receive(:update_commit_status).and_raise(::Gitlab::Error::BadRequest.new(gitlab_response))
+
+      api.create_status('sha', 'state', {})
+    end
+  end
 end

data/spec/utils_spec.rb

@@ -47,6 +47,20 @@ describe Txgh::Utils do
     end
   end
 
+  describe '.url_safe_relative_branch' do
+    it 'removes tags/ if present' do
+      expect(described_class.url_safe_relative_branch('tags/feature/foobar')).to eq('feature%2Ffoobar')
+    end
+
+    it 'removes heads/ if present' do
+      expect(described_class.url_safe_relative_branch('heads/foobar')).to eq('foobar')
+    end
+
+    it 'does nothing if no prefix can be removed' do
+      expect(described_class.url_safe_relative_branch('feature/foo-ticket')).to eq('feature%2Ffoo-ticket')
+    end
+  end
+
   describe '.is_tag?' do
     it 'returns true if given a tag' do
       expect(described_class.is_tag?('tags/foo')).to eq(true)

data/txgh.gemspec

@@ -13,12 +13,12 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.add_dependency 'abroad', '~> 4.6'
-  s.add_dependency 'celluloid'
+  s.add_dependency 'celluloid', '~> 0.18.0'
   s.add_dependency 'faraday', '0.17.3'
   s.add_dependency 'faraday_middleware', '0.14.0'
-  s.add_dependency 'json', '~> 1.8'
+  s.add_dependency 'json', '~> 2.3'
   s.add_dependency 'octokit', '~> 4.2'
-  s.add_dependency 'gitlab', '~> 4.14'
+  s.add_dependency 'gitlab', '~> 4.17'
   s.add_dependency 'parseconfig', '~> 1.0'
 
   s.require_path = 'lib'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: txgh
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.3.beta4
 platform: ruby
 authors:
 - Matthew Jackowski
 - Cameron Dutro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abroad
@@ -29,16 +29,16 @@ dependencies:
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.14'
+        version: '4.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.14'
+        version: '4.17'
 - !ruby/object:Gem::Dependency
   name: parseconfig
   requirement: !ruby/object:Gem::Requirement
@@ -213,7 +213,7 @@ files:
 homepage: https://github.com/lumoslabs/txgh
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -224,13 +224,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: A library for syncing translation resources between Github and Transifex.
 test_files: []