pull-request 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a24bfa9cadb0ef0ede06d5e1c94ae69f6eb15d765a64c7ab3c6ad9af28eee44
-  data.tar.gz: d91143af59fdeb21f53827bbea50b48237fadeb7b0d31a3f24d714d3901b5fe3
+  metadata.gz: 47ba8b480d14f0f71f0042798a035228d44c4d9bf7f446555f4af5f092b0747c
+  data.tar.gz: d33393ceb042ef7c29625712902252091c38b38986dfbe9ddc9b64effc35d7d0
 SHA512:
-  metadata.gz: 1418f787d24cfca340f6bfaf477277b80ad1f081068abdb685ed70a8c94997f21e9d113f8fd04b85d911d787363834be46232d2bfafe08bb48d1ac882f0e72f0
-  data.tar.gz: f0c48a452e439ca7791b412253e59d6a66714c6c6c08f089e2391fa6af3a032f9845fd490681b4b2a88ff6ecb7f3d3e50046c65e99577d487df0fe44b0eb9c16
+  metadata.gz: ed68a9afa54c9a0bccde8b6b28a6fa75b506d28e0ca1d8ae3664a1e0b6f7aaab5357c6781bf6f9c55ab7f38a2d72f92ce3b9a5bc0dbb6157f0c9df971c35d899
+  data.tar.gz: ae80c14c3c83c29b03175d237c0f7856b3b00fd8488dc33bbcdf9191fb7fbcf8c89535ccfb435537896d906df5e88db98775ffdadd4d01fcc13b837d49033bfe

data/exe/pr

@@ -12,6 +12,12 @@ def error(title)
   exit 1
 end
 
+def confirm(title)
+  printf "#{title}\npress 'y' to continue: "
+  prompt = STDIN.gets.chomp
+  prompt == 'y'
+end
+
 def sh(command)
   return puts "▶️  #{command}" if @simulate
 
@@ -22,7 +28,11 @@ def sh_get(command)
   value = `#{command}`
   error "could not execute '#{command}'" unless $? == 0
 
-  value
+  value.strip
+end
+
+def current_branch
+  sh_get "git rev-parse --abbrev-ref HEAD"
 end
 
 OptionParser.new do |opts|
@@ -53,6 +63,9 @@ title += "\n\nfixes ##{@issue_number}" if @issue_number
 branch = "feature/"
 branch += "#{@issue_number}_" if @issue_number
 branch += name.parameterize.underscore
+base_branch = current_branch
+
+exit 1 unless ["master", "main", "develop"].include?(base_branch) || confirm("Your base branch #{base_branch} doesn't seem to be a common base branch name. Do you want to continue?")
 
 puts "Creating new PR for feature '#{title}'"
 
@@ -66,4 +79,4 @@ puts "Pushing to origin"
 sh "git push -u origin #{branch}"
 
 puts "Creating pull request"
-sh "hub pull-request -d -m '#{title}'"
+sh "hub pull-request -d -m '#{title}' -b #{base_branch}"

data/pullrequest.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = "pull-request"
-  spec.version       = "0.3.0"
+  spec.version       = "0.4.0"
   spec.authors       = ["Jens Ravens", "David Dufour-Boivin"]
   spec.email         = ["jens@nerdgeschoss.de", "david@nerdgeschoss.de"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pull-request
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jens Ravens
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-10 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport