txgh 7.0.0.beta4 → 7.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 115f8465e3521a85f6ebb9fb137410cdef753203d30dca1343bc00261d832db9
-  data.tar.gz: d3b5774e8a1d1699e7dd47b5537d74075004b3b2def59f8457c259ad518d8c7a
+  metadata.gz: 83666fa045f577661ee033da2f8d07151aabf8a70f05a7009e4886163d8a7b80
+  data.tar.gz: 3d309e4dd07b942cee64ac861f0e821e057b7ac8f4f25bab6593c1819ba550c6
 SHA512:
-  metadata.gz: 566fe97c0391c74fc21924b101f34727956bd3cc1a49c31f47b8a8c30d2a86876c9f3997ce8e8daa89584e2971bed0211843c3120e5f783293996cedaae3add9
-  data.tar.gz: 9986dfc7e5875e0c1b0ae8534d71ba02d86f2c2b2ad995930ebb52fe92bfe723a2e0a99ea9a61b7b813dca627e94ce4002e85940b2e97065bbf917bc477b9f16
+  metadata.gz: dbdc40b7dde617ed3431e6b87d3cd36b18a5300d150dab984ade909ca412418f720d53fa08de11e49655e279a1db546ccc58a96e092ad78491824dad56226b7d
+  data.tar.gz: f81028991588b2f481a42db9760ba3a34009cb697802ef9daee8c7bbeed62e8eb9623d07de3bd7d94c65bf3a25ca52ab8232acb87d24538bdba73d2a4f0a1137

data/lib/txgh/git_api.rb

@@ -14,72 +14,5 @@ module Txgh
       @client = client
       @repo_name = repo_name
     end
-
-    def tree(sha)
-      client.tree(repo_name, sha, recursive: 1)
-    end
-
-    def blob(sha)
-      client.blob(repo_name, sha)
-    end
-
-    def create_ref(branch, sha)
-      client.create_ref(repo_name, branch, sha) rescue false
-    end
-
-    def update_contents(branch, content_list, message)
-      content_list.each do |file_params|
-        path = file_params.fetch(:path)
-        new_contents = file_params.fetch(:contents)
-        branch = Utils.relative_branch(branch)
-
-        file_sha = file_params.fetch(:sha) do
-          begin
-            client.contents(repo_name, { path: path, ref: branch })[:sha]
-          rescue Octokit::NotFound
-            nil
-          end
-        end
-
-        # If the file doesnt exist, then it isn't tracked by git and file_sha
-        # will be nil. In git land, a SHA of all zeroes means create a new file
-        # instead of updating an existing one.
-        current_sha = file_sha || '0' * 40
-        new_sha = Utils.git_hash_blob(new_contents)
-        options = { branch: branch }
-
-        if current_sha != new_sha
-          client.update_contents(
-            repo_name, path, message, current_sha, new_contents, options
-          )
-        end
-      end
-    end
-
-    def get_commit(sha)
-      client.commit(repo_name, sha)
-    end
-
-    def get_ref(ref)
-      client.ref(repo_name, ref)
-    end
-
-    def download(path, branch)
-      file = client.contents(repo_name, { path: path, ref: branch }).to_h
-
-      file[:content] = case file[:encoding]
-        when 'base64'
-          Base64.decode64(file[:content])
-        else
-          file[:content].force_encoding(file[:encoding])
-      end
-
-      file.delete(:encoding)
-      file
-    end
-
-    def create_status(sha, state, options = {})
-      client.create_status(repo_name, sha, state, options)
-    end
   end
 end

data/lib/txgh/gitlab_api.rb

@@ -20,7 +20,7 @@ module Txgh
 
         file_sha = file_params.fetch(:sha) do
           begin
-            client.get_file(repo_name, path, branch).content_sha256
+            client.get_file(repo_name, path, branch).blob_id
           rescue ::Gitlab::Error::NotFound
             nil
           end
@@ -52,7 +52,8 @@ module Txgh
 
       # mock github response
       {
-        content: file.encoding == 'base64' ? Base64.decode64(file.content) : file.content.force_encoding(file.encoding)
+        content: file.encoding == 'base64' ? Base64.decode64(file.content) : file.content.force_encoding(file.encoding),
+        path: path
       }
     end
 

data/lib/txgh/version.rb

@@ -1,3 +1,3 @@
 module Txgh
-  VERSION = '7.0.0.beta4'
+  VERSION = '7.0.0.beta5'
 end

data/spec/github_api_spec.rb

@@ -37,7 +37,7 @@ describe Txgh::GithubApi do
   describe '#update_contents' do
     let(:path) { 'path/to/file.txt' }
     let(:old_contents) { 'abc123' }
-    let(:old_sha) { Utils.git_hash_blob(old_contents) }
+    let(:old_sha) { Txgh::Utils.git_hash_blob(old_contents) }
 
     it 'updates the given file contents' do
       new_contents = 'def456'

data/spec/gitlab_api_spec.rb

@@ -21,7 +21,7 @@ describe Txgh::GitlabApi do
   describe '#update_contents' do
     let(:path) { 'path/to/file.txt' }
     let(:old_contents) { 'abc123' }
-    let(:old_sha) { Utils.git_hash_blob(old_contents) }
+    let(:old_sha) { Txgh::Utils.git_hash_blob(old_contents) }
 
     it 'updates the given file contents' do
       new_contents = 'def456'
@@ -29,7 +29,7 @@ describe Txgh::GitlabApi do
       expect(client).to(
         receive(:get_file)
           .with(repo, path, branch)
-          .and_return(double(content_sha256: old_sha))
+          .and_return(double(blob_id: old_sha))
       )
 
       expect(client).to(
@@ -44,7 +44,7 @@ describe Txgh::GitlabApi do
       expect(client).to(
         receive(:get_file)
           .with(repo, path, branch)
-          .and_return(double(content_sha256: old_sha))
+          .and_return(double(blob_id: old_sha))
       )
 
       expect(client).to_not receive(:edit_file)
@@ -82,7 +82,7 @@ describe Txgh::GitlabApi do
           .and_return(double(content: 'content', encoding: 'utf-8'))
       )
 
-      expect(api.download(path, branch)).to eq({ content: 'content' })
+      expect(api.download(path, branch)).to eq({ content: 'content', path: path })
     end
 
     it 'encodes the string using the encoding specified in the response' do
@@ -106,7 +106,7 @@ describe Txgh::GitlabApi do
           .and_return(double(content: Base64.encode64('content'), encoding: 'base64'))
       )
 
-      expect(api.download(path, branch)).to eq({ content: 'content' })
+      expect(api.download(path, branch)).to eq({ content: 'content', path: path })
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh
 version: !ruby/object:Gem::Version
-  version: 7.0.0.beta4
+  version: 7.0.0.beta5
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abroad