git_helper 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8f1759701099c875fd08dd2b4fe00f55732c7d005a3437a5adea5019bbcf78b
-  data.tar.gz: e659e2c1bc529059854e9d35daa3d8afea6f9e13877d6cd1681b621a299995f0
+  metadata.gz: 130ab19f392a258f0869dc46d7791b041da124d640d7d403233ea4dedb9c0877
+  data.tar.gz: 3be0a8d79b78e8a56e09f658dcaa7c19ee944a19b49e0da1c4c49752608454c5
 SHA512:
-  metadata.gz: 01f01fcf9cb8e962a07488e76ae04f2ac0b0e612c089b7479da39f26598adccd8c005fa85d38bd430a5642fc8d1760e4738d3ef76759c77eb7cbce1926ff34d3
-  data.tar.gz: 9e7b63ec6d2ed7b62ca689c1cfd33eeb5830becdfef13fffe06f068a9181834393e5f4ff3f1885df2f63b12a1a90f4f22024d4d72a3d88ea4c0c7191a8fa90a8
+  metadata.gz: 84351ee9438d3f8579ffa655ab10d50f156df16f8cb0421503363bff82870432683e511291a852ec47b8802ff1827b21dd15e1fe2fe4ce18fe8bc5576515ae28
+  data.tar.gz: 8195c5bfd1760835379de77182302e329579cd16b92b03bb5e646e042c73124a32156477a1b7623e1ed495619745aa33891aae86cbfd3c0c66d12b48aabbf8b4

data/README.md

@@ -162,3 +162,14 @@ To submit a feature request, bug ticket, etc, please submit an official [GitHub
 To report any security vulnerabilities, please view this project's [Security Policy](https://github.com/emmasax4/git_helper/security/policy).
 
 This repository does have a standard [Code of Conduct](https://github.com/emmasax4/git_helper/blob/main/.github/code_of_conduct.md).
+
+## Releasing
+
+To make a new release of this gem:
+
+1. Merge the pull request via the big green button
+2. Run `git tag vX.X.X` and `git push --tag`
+3. Make a new release [here](https://github.com/emmasax4/git_helper/releases/new)
+4. Run `gem build *.gemspec`
+5. Run `gem push *.gem` to push the new gem to RubyGems
+6. Run `rm *.gem` to clean up your local repository

data/lib/git_helper/merge_request.rb

@@ -15,7 +15,7 @@ module GitHelper
         }
 
         puts "Creating merge request: #{new_mr_title}"
-        mr = gitlab_client.create_merge_request(local_repo, new_mr_title, options)
+        mr = gitlab_client.create_merge_request(local_project, new_mr_title, options)
 
         if mr.diff_refs.base_sha == mr.diff_refs.head_sha
           puts "Merge request was created, but no commits have been pushed to GitLab: #{mr.web_url}"
@@ -41,7 +41,7 @@ module GitHelper
         options[:squash_commit_message] = existing_mr_title
 
         puts "Merging merge request: #{mr_id}"
-        merge = gitlab_client.accept_merge_request(local_repo, mr_id, options)
+        merge = gitlab_client.accept_merge_request(local_project, mr_id, options)
         puts "Merge request successfully merged: #{merge.merge_commit_sha}"
       rescue Gitlab::Error::MethodNotAllowed => e
         puts 'Could not merge merge request:'
@@ -55,8 +55,8 @@ module GitHelper
       end
     end
 
-    private def local_repo
-      # Get the repository by looking in the remote URLs for the full repository name
+    private def local_project
+      # Get the project by looking in the remote URLs for the full project name
       remotes = `git remote -v`
       return remotes.scan(/\S[\s]*[\S]+.com[\S]{1}([\S]*).git/).first.first
     end
@@ -81,7 +81,7 @@ module GitHelper
     end
 
     private def existing_mr_title
-      @existing_mr_title ||= gitlab_client.merge_request(local_repo, mr_id).title
+      @existing_mr_title ||= gitlab_client.merge_request(local_project, mr_id).title
     end
 
     private def new_mr_title
@@ -101,7 +101,20 @@ module GitHelper
     end
 
     private def default_branch
-      @default_branch ||= gitlab_client.branches(local_repo).select { |branch| branch.default }.first.name
+      return @default_branch if @default_branch
+      page_number = 1
+      counter = 1
+      branches = []
+
+      while counter > 0
+        break if default_branch = branches.select { |branch| branch.default }.first
+        page_branches = gitlab_client.branches(local_project, page: page_number, per_page: 100)
+        branches = page_branches
+        counter = page_branches.count
+        page_number += 1
+      end
+
+      @default_branch = default_branch.name
     end
 
     private def template_to_apply

data/lib/git_helper/version.rb

@@ -1,3 +1,3 @@
 module GitHelper
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_helper
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Emma Sax
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab