txgh 7.0.3.beta3 → 7.0.3.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddb70a73202419003bba2aeda693a5a704be5b88980c29da7a082cb1f3263162
-  data.tar.gz: 302e2a9608de1fb9f09ca065cdf15aa84c49319c6ac0c9660cf05a0491479e85
+  metadata.gz: 48e0eadcdb6ad07122b1373f84e39dbc8d219ae3cd2000c85cbdcd901ef4cd62
+  data.tar.gz: ee74522f8b4b97b0f0a2fd83a032e3f8a8734afb9f57e004d5dd7be4ffbccd36
 SHA512:
-  metadata.gz: 1d9fd68fe5103f5ff3b6e7754bfd175b593878dfcfe72a785e059bb38a8254bc2402d8f08db6743a7992c06890d55cdcb6f3728d7fbdce3ec4b7ecf9b06d87ce
-  data.tar.gz: f22f1e1c1ec3ce35737f96b17b0b77cf488be246f255c26a6377352e5c8138bcf92cb45d07ceb7d559d0462206ae70a87c0d4203a41b93cd012804ab62e4b479
+  metadata.gz: 8bfa277f9876adccb9bbbe8c01576bc08ed4294054afb522c49e97b5127d3cb2f4e355c847964405a6a764e29f9b6a220cac43b79923c4ac866a607bcce9d2ef
+  data.tar.gz: 972253d27b545b8ffa9e8f7b4793a8d96cd3259917d2a16b3900219798ed6006a22e632ffcb86229dd80a1caad51201185aaf29010ffefb7230a747ed2637f0a

data/lib/txgh/gitlab_api.rb

@@ -16,7 +16,7 @@ module Txgh
       content_list.each do |file_params|
         path = file_params.fetch(:path)
         new_contents = file_params.fetch(:contents)
-        branch = Utils.url_safe_relative_branch(branch)
+        branch = Utils.relative_branch(branch)
 
         file_sha = file_params.fetch(:sha) do
           begin
@@ -48,7 +48,7 @@ module Txgh
     end
 
     def download(path, branch)
-      file = client.get_file(repo_name, path, Utils.url_safe_relative_branch(branch))
+      file = client.get_file(repo_name, path, Utils.relative_branch(branch))
 
       # mock github response
       {

data/lib/txgh/version.rb

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

data/spec/gitlab_api_spec.rb

@@ -23,13 +23,13 @@ describe Txgh::GitlabApi do
 
       expect(client).to(
         receive(:get_file)
-          .with(repo, path, url_safe_branch)
+          .with(repo, path, filtered_branch)
           .and_return(double(blob_id: old_sha))
       )
 
       expect(client).to(
         receive(:edit_file)
-          .with(repo, path, url_safe_branch, new_contents, 'message')
+          .with(repo, path, filtered_branch, new_contents, 'message')
       )
 
       api.update_contents(branch, [{ path: path, contents: new_contents }], 'message')
@@ -38,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, url_safe_branch)
+          .with(repo, path, filtered_branch)
           .and_return(double(blob_id: old_sha))
       )
 
@@ -53,7 +53,7 @@ describe Txgh::GitlabApi do
 
       expect(client).to(
         receive(:edit_file)
-          .with(repo, path, url_safe_branch, new_contents, 'message')
+          .with(repo, path, filtered_branch, new_contents, 'message')
       )
 
       api.update_contents(branch, [{ path: path, contents: new_contents }], 'message')
@@ -64,7 +64,7 @@ describe Txgh::GitlabApi do
     it 'downloads the file from the given branch' do
       expect(client).to(
         receive(:get_file)
-          .with(repo, path, url_safe_branch)
+          .with(repo, path, filtered_branch)
           .and_return(double(content: 'content', encoding: 'utf-8'))
       )
 
@@ -76,7 +76,7 @@ describe Txgh::GitlabApi do
 
       expect(client).to(
         receive(:get_file)
-          .with(repo, path, url_safe_branch)
+          .with(repo, path, filtered_branch)
           .and_return(double(content: content, encoding: 'utf-16'))
       )
 
@@ -88,7 +88,7 @@ describe Txgh::GitlabApi do
     it 'automatically decodes base64-encoded content' do
       expect(client).to(
         receive(:get_file)
-          .with(repo, path, url_safe_branch)
+          .with(repo, path, filtered_branch)
           .and_return(double(content: Base64.encode64('content'), encoding: 'base64'))
       )
 
@@ -103,14 +103,14 @@ describe Txgh::GitlabApi do
 
     context 'when master branch' do
       let(:branch) { 'master' }
-      let(:url_safe_branch) { 'master' }
+      let(:filtered_branch) { 'master' }
 
       it_behaves_like 'an update_contents flow'
     end
 
     context 'when feature branch' do
-      let(:branch) { 'feature/foo-ticket' }
-      let(:url_safe_branch) { 'feature%2Ffoo-ticket' }
+      let(:branch) { 'heads/feature/foo-ticket' }
+      let(:filtered_branch) { 'feature/foo-ticket' }
 
       it_behaves_like 'an update_contents flow'
     end
@@ -149,14 +149,14 @@ describe Txgh::GitlabApi do
 
     context 'when master branch' do
       let(:branch) { 'master' }
-      let(:url_safe_branch) { 'master' }
+      let(:filtered_branch) { 'master' }
 
       it_behaves_like 'a download flow'
     end
 
     context 'when feature branch' do
-      let(:branch) { 'feature/foo-ticket' }
-      let(:url_safe_branch) { 'feature%2Ffoo-ticket' }
+      let(:branch) { 'heads/feature/foo-ticket' }
+      let(:filtered_branch) { 'feature/foo-ticket' }
 
       it_behaves_like 'a download flow'
     end

data/txgh.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'faraday_middleware', '0.14.0'
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh
 version: !ruby/object:Gem::Version
-  version: 7.0.3.beta3
+  version: 7.0.3.beta4
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abroad
@@ -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
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key:
 specification_version: 4
 summary: A library for syncing translation resources between Github and Transifex.