git_helper 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 130ab19f392a258f0869dc46d7791b041da124d640d7d403233ea4dedb9c0877
-  data.tar.gz: 3be0a8d79b78e8a56e09f658dcaa7c19ee944a19b49e0da1c4c49752608454c5
+  metadata.gz: 4cc3fc36c08dc2723f9f8bfcca211b1370cd55108c6c62767d1ef9f9bdd722f4
+  data.tar.gz: a00ace631f1832579d1fe8836bfffa91ef4833f38bc108029bc5b5cc9422f1ae
 SHA512:
-  metadata.gz: 84351ee9438d3f8579ffa655ab10d50f156df16f8cb0421503363bff82870432683e511291a852ec47b8802ff1827b21dd15e1fe2fe4ce18fe8bc5576515ae28
-  data.tar.gz: 8195c5bfd1760835379de77182302e329579cd16b92b03bb5e646e042c73124a32156477a1b7623e1ed495619745aa33891aae86cbfd3c0c66d12b48aabbf8b4
+  metadata.gz: 9526890d2b4d389a08edebbb7009ec66fe2532be829fe3bfaaec2a6f1e931ff063f61dfdb1dbeb9343787e1b2d9c4e2f04e979b3308b70730120c14b1315667a
+  data.tar.gz: 8ac4ef4d0ccd75c8ca95cc3fd6aa73090cd273ac2161089289abb9724a879d1edad520f683aafbe35426ebbe6cdd50b0456a6e9e9f7b519411a7647e992da71d

data/README.md

@@ -173,3 +173,5 @@ To make a new release of this gem:
 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
+
+To set up your local machine to push to RubyGems via the API, see the [RubyGems documentation](https://guides.rubygems.org/publishing/#publishing-to-rubygemsorg).

data/lib/git_helper/merge_request.rb

@@ -97,7 +97,32 @@ module GitHelper
     end
 
     private def autogenerated_title
-      @autogenerated_title ||= local_branch.split('_')[0..-1].join(' ').capitalize
+      @autogenerated_title ||= generate_title
+    end
+
+    private def generate_title
+      branch_arr = local_branch.split(local_branch.include?('_') ? '_' : '-')
+
+      return if branch_arr.empty?
+
+      if branch_arr.length == 1
+        return branch_arr.first.capitalize
+      end
+
+      if branch_arr[0].scan(/([\w]+)/).empty? || branch_arr[1].scan(/([\d]+)/).empty?
+        branch_arr[0..-1].join(' ').capitalize
+      else
+        issue = branch_arr[0].upcase
+
+        if issue.include?('-')
+          description = branch_arr[1..-1].join(' ')
+        else
+          issue = "#{issue}-#{branch_arr[1]}"
+          description = branch_arr[2..-1].join(' ')
+        end
+
+        "#{issue} #{description.capitalize}"
+      end
     end
 
     private def default_branch
@@ -137,8 +162,14 @@ module GitHelper
     end
 
     private def accept_autogenerated_title?
-      answer = cli.ask("Accept the autogenerated merge request title '#{autogenerated_title}'? (y/n)")
-      !!(answer =~ /^y/i)
+      title = autogenerated_title
+
+      if title
+        answer = cli.ask("Accept the autogenerated merge request title '#{title}'? (y/n)")
+        !!(answer =~ /^y/i)
+      else
+        false
+      end
     end
 
     private def squash_merge_request?

data/lib/git_helper/pull_request.rb

@@ -112,7 +112,32 @@ module GitHelper
     end
 
     private def autogenerated_title
-      @autogenerated_title ||= local_branch.split('_')[0..-1].join(' ').capitalize
+      @autogenerated_title ||= generate_title
+    end
+
+    private def generate_title
+      branch_arr = local_branch.split(local_branch.include?('_') ? '_' : '-')
+
+      return if branch_arr.empty?
+
+      if branch_arr.length == 1
+        return branch_arr.first.capitalize
+      end
+
+      if branch_arr[0].scan(/([\w]+)/).empty? || branch_arr[1].scan(/([\d]+)/).empty?
+        branch_arr[0..-1].join(' ').capitalize
+      else
+        issue = branch_arr[0].upcase
+
+        if issue.include?('-')
+          description = branch_arr[1..-1].join(' ')
+        else
+          issue = "#{issue}-#{branch_arr[1]}"
+          description = branch_arr[2..-1].join(' ')
+        end
+
+        "#{issue} #{description.capitalize}"
+      end
     end
 
     private def default_branch
@@ -145,8 +170,14 @@ module GitHelper
     end
 
     private def accept_autogenerated_title?
-      answer = cli.ask("Accept the autogenerated pull request title '#{autogenerated_title}'? (y/n)")
-      !!(answer =~ /^y/i)
+      title = autogenerated_title
+
+      if title
+        answer = cli.ask("Accept the autogenerated merge request title '#{title}'? (y/n)")
+        !!(answer =~ /^y/i)
+      else
+        false
+      end
     end
 
     private def apply_template?(template_file_name)

data/lib/git_helper/version.rb

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

metadata

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