rake_github 0.8.0.pre.6 → 0.8.0.pre.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3e9be68ad0beb57b1e36b452b430bb9125277f907ca4ce07a8b7a3fc3866b13
-  data.tar.gz: 99b865614f763cd674e45459a359cdab295454d9af2ea2c3e9864549dae273c5
+  metadata.gz: 5e9159f6c2f6127d4eb80825c8aa08e497a31acef53c8347de4626c61eb23d2e
+  data.tar.gz: 10f599d94fd23758afb53712cbc15f916102273f422818bf970172ca8601053a
 SHA512:
-  metadata.gz: 3014f287b8d2dc142c87b186c961a5cd6d82f58e7b3ac35162f5d0d8c5554174db8852a7cb87d98646cb6f8ede435cfd018cb0cdc11cb31e9bb3dd7d9386af67
-  data.tar.gz: a9b22df5da0453c6d893f685e3a9ee1214ca9ec928ec98603fe349b79ab6b4dc142f676cefb8d5662a1ab71152f0b60f08a530008e927d6971a630dcca6ec20c
+  metadata.gz: 22586b5137c090b829d1c07b8ee51705382733966b6a08b01990fb6d36c11cf3e7c44f000616845c0e014274fae2a4307e110785db21cea26113980591767370
+  data.tar.gz: ba7918019f2a6fb7ece98bb36af11380ac6f66652dffb0f51bbd113e8fa85d7e2be0a35bfde533ec88f507af3468e3f0e2afa85980f6e813b134d7fce732c531

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    rake_github (0.8.0.pre.6)
+    rake_github (0.8.0.pre.7)
       colored2 (~> 3.1)
-      git (~> 1.9.1)
       octokit (~> 4.16)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
@@ -44,8 +43,6 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     gem-release (2.2.2)
-    git (1.9.1)
-      rchardet (~> 1.8)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     i18n (1.8.11)
@@ -77,7 +74,6 @@ GEM
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rchardet (1.8.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -125,4 +121,4 @@ DEPENDENCIES
   simplecov (~> 0.16)
 
 BUNDLED WITH
-   2.3.5
+   2.3.6

data/lib/rake_github/tasks/pull_requests/merge.rb

@@ -2,7 +2,6 @@
 
 require 'rake_factory'
 require 'octokit'
-require 'git'
 
 module RakeGithub
   module Tasks
@@ -14,18 +13,18 @@ module RakeGithub
 
         parameter :repository, required: true
         parameter :access_token, required: true
+        parameter :branch_name, required: true
         parameter :commit_message, default: ''
 
         action do |t|
-          current_branch = Git.open(Pathname.new('.')).current_branch
           github_client = Octokit::Client.new(access_token: access_token)
 
           open_prs = github_client.pull_requests(t.repository)
 
           current_pr = open_prs
-            .find { |pr| pr[:head][:ref] == current_branch }
+            .find { |pr| pr[:head][:ref] == t.branch_name }
 
-          raise NoPullRequestError.new current_branch if current_pr.nil?
+          raise NoPullRequestError.new t.branch_name if current_pr.nil?
 
           github_client.merge_pull_request(
             t.repository,

data/lib/rake_github/version.rb

@@ -1,3 +1,3 @@
 module RakeGithub
-  VERSION = '0.8.0.pre.6'
+  VERSION = '0.8.0.pre.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake_github
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre.6
+  version: 0.8.0.pre.7
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: git
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.9.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement