pull-request 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47ba8b480d14f0f71f0042798a035228d44c4d9bf7f446555f4af5f092b0747c
-  data.tar.gz: d33393ceb042ef7c29625712902252091c38b38986dfbe9ddc9b64effc35d7d0
+  metadata.gz: 261192d356923a392825fd2fe7d5c35c2ce231c24176744cb2723805c9dd061c
+  data.tar.gz: 76f0369668811d60647bef5dfaed3933e23c79c159e87f146c08ac7d5470b03b
 SHA512:
-  metadata.gz: ed68a9afa54c9a0bccde8b6b28a6fa75b506d28e0ca1d8ae3664a1e0b6f7aaab5357c6781bf6f9c55ab7f38a2d72f92ce3b9a5bc0dbb6157f0c9df971c35d899
-  data.tar.gz: ae80c14c3c83c29b03175d237c0f7856b3b00fd8488dc33bbcdf9191fb7fbcf8c89535ccfb435537896d906df5e88db98775ffdadd4d01fcc13b837d49033bfe
+  metadata.gz: b3463de3bc7cf7dc0eda769fcb1cf3c633161d00eecd2b51e0006d09ce0c3e9a226cdeccc50722d25b8bcda7922d7ac9790094eb1448a71468599439b307c6b4
+  data.tar.gz: e0e855760653160be77eaf4112baedba74cdce3737e26ae6ff0f02ee83542636b7131cd80ac1b088d365bcf05c962f234666d882ccc72ab1836b3de142c65121

data/.github/workflows/publish.yml

@@ -0,0 +1,16 @@
+name: Publish to RubyGems
+on:
+  release:
+    types: [created]
+jobs:
+  gem:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+      - run: sed -i "s/0.0.1/$(echo $GITHUB_REF_NAME | cut -c 2-)/" pullrequest.gemspec
+      - name: Publish gem
+        uses: dawidd6/action-publish-gem@v1
+        with:
+          api_key: ${{secrets.RUBYGEMS_API_KEY}}

data/.ruby-version

@@ -0,0 +1 @@
+3.1.2

data/README.md

@@ -6,12 +6,12 @@ Automatically branch and create an empty pull request, automating an early-revie
 
 ### Requirements
 
-#### hub
+#### GitHub CLI
 
-[GitHub's `hub`](https://hub.github.com/) CLI tool is required. On macOS, simply install it through _HomeBrew_
+[GitHub's CLI](https://cli.github.com//) (aka `gh`) is required. On _macOS_, simply install it through _HomeBrew_.
 
 ```bash
-brew install hub
+brew install gh
 ```
 
 ### Installing pr (pull-request) as part of your application
@@ -34,7 +34,7 @@ Install it yourself as:
 
 ```bash
 gem install pull-request
-````
+```
 
 ## Usage
 
@@ -69,8 +69,6 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/Jens Ravens/pullrequest. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/exe/pr

@@ -3,7 +3,6 @@ require "optionparser"
 require "active_support"
 require "active_support/all"
 
-@estimation = nil
 @simulate = false
 @issue_number = nil
 
@@ -35,11 +34,15 @@ def current_branch
   sh_get "git rev-parse --abbrev-ref HEAD"
 end
 
-OptionParser.new do |opts|
-  opts.banner = "Usage: pr [options] [name]\nDefaults: pr" + File::SEPARATOR
-  opts.on("-e", "--estimation ESTIMATION", Integer, "Estimated time in hours.") do |e|
-    @estimation = e.presence
+def issue_json
+  @issue_json ||= begin
+    error "can't get issue information from GitHub unless the '-i' options is used" unless @issue_number.present?
+    JSON.parse(sh_get("gh issue view #{@issue_number} --json title"))
   end
+end
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: pr [options] [title]\nDefaults: pr" + File::SEPARATOR
   opts.on("-s", "--simulate", "Simulate the actions: prints out the write-commands instead of executing them, prefixed with ▶️ .") do
     @simulate = true
   end
@@ -48,23 +51,22 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-name =
-  if @issue_number
-    sh_get("hub issue show #{@issue_number} -f %t")
-  else
-    ARGV.join(" ")
-  end
-error "Please specify a name for your Pull Request" if name.blank?
-
-title = name
-title += " [#{@estimation}]" if @estimation
-title += "\n\nfixes ##{@issue_number}" if @issue_number
+name = @issue_number ? issue_json["title"] : ARGV.join(" ")
+error "Please specify a title for your Pull Request" if name.blank?
 
 branch = "feature/"
 branch += "#{@issue_number}_" if @issue_number
 branch += name.parameterize.underscore
-base_branch = current_branch
 
+title = name
+
+body_lines = []
+path = ".github/pull_request_template.md"
+body_lines.push File.read(path) if File.exists?(path)
+body_lines.push "fixes ##{@issue_number}" if @issue_number
+body = body_lines.join("\n\n")
+
+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}'"
@@ -73,10 +75,13 @@ puts "Creating branch #{branch}"
 sh "git checkout -b #{branch}"
 
 puts "Creating empty commit"
-sh "git commit -m 'initial commit for #{name}' --allow-empty"
+commit_message = "initial commit for #{title}"
+commit_message += ", fixes ##{@issue_number}" if @issue_number
+sh "git commit -m '#{commit_message}' --allow-empty"
 
 puts "Pushing to origin"
 sh "git push -u origin #{branch}"
 
 puts "Creating pull request"
-sh "hub pull-request -d -m '#{title}' -b #{base_branch}"
+ENV["PR_BODY"] = body_lines.join("\n")
+sh "gh pr create --draft --title '#{title}' --body \"$PR_BODY\" --base #{base_branch}"

data/pullrequest.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = "pull-request"
-  spec.version       = "0.4.0"
+  spec.version       = "0.6.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.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jens Ravens
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -62,8 +62,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/publish.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -92,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Automatically create PRs for GitHub Flow