rake_github 0.8.0.pre.2 → 0.8.0.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e220fd6e42edbeddaace2b3d15f6cff7a97ee0563cb3180702842d3b4bebe5ba
-  data.tar.gz: 8d5c4e5924d9e49b04160abd9783e0c0ac10cddea028e00f733faa371751028f
+  metadata.gz: a3e9be68ad0beb57b1e36b452b430bb9125277f907ca4ce07a8b7a3fc3866b13
+  data.tar.gz: 99b865614f763cd674e45459a359cdab295454d9af2ea2c3e9864549dae273c5
 SHA512:
-  metadata.gz: 8f73fd1a1812a80d7fba7b29159ab4c864c528472548e20765284466a158a90ab94b6df7c8b932c5cc99dfc31dfeb8b5f12677e53b56783bf3d65400e2197dda
-  data.tar.gz: 7db09491c8ef39dbb6c44c395846c8bc8112230d4f85955a9d71af5298c47b8ee5390fb2d95f737469b1f26334876f59706a092c9d196a027d8e2d6d17efaff3
+  metadata.gz: 3014f287b8d2dc142c87b186c961a5cd6d82f58e7b3ac35162f5d0d8c5554174db8852a7cb87d98646cb6f8ede435cfd018cb0cdc11cb31e9bb3dd7d9386af67
+  data.tar.gz: a9b22df5da0453c6d893f685e3a9ee1214ca9ec928ec98603fe349b79ab6b4dc142f676cefb8d5662a1ab71152f0b60f08a530008e927d6971a630dcca6ec20c

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    rake_github (0.8.0.pre.2)
+    rake_github (0.8.0.pre.6)
       colored2 (~> 3.1)
+      git (~> 1.9.1)
       octokit (~> 4.16)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
@@ -10,35 +11,44 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.6)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.7.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     docile (1.4.0)
-    excon (0.82.0)
-    faraday (1.4.2)
+    excon (0.85.0)
+    faraday (1.7.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
-    gem-release (2.2.1)
+    faraday-net_http_persistent (1.2.0)
+    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.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     lino (3.0.0)
       hamster (~> 3.0)
@@ -51,7 +61,7 @@ GEM
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
     public_suffix (4.0.6)
-    rake (13.0.3)
+    rake (13.0.6)
     rake_circle_ci (0.9.0)
       colored2 (~> 3.1)
       excon (~> 0.72)
@@ -67,6 +77,7 @@ 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)
@@ -80,7 +91,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     ruby_gpg2 (0.8.0)
       lino (>= 1.5)
     sawyer (0.8.2)
@@ -93,15 +104,15 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
     sshkey (2.0.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 5.2)
+  activesupport (~> 6.1)
   bundler (~> 2.0)
   gem-release (~> 2.0)
   memfs (~> 1.0)
@@ -114,4 +125,4 @@ DEPENDENCIES
   simplecov (~> 0.16)
 
 BUNDLED WITH
-   2.2.25
+   2.3.5

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'rake_factory'
+require 'octokit'
+require 'git'
+
+module RakeGithub
+  module Tasks
+    module PullRequests
+      class Merge < RakeFactory::Task
+        default_description(RakeFactory::DynamicValue.new do |t|
+          "Merges pull request on the current branch in the #{t.repository} repository"
+        end)
+
+        parameter :repository, required: true
+        parameter :access_token, 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 }
+
+          raise NoPullRequestError.new current_branch if current_pr.nil?
+
+          github_client.merge_pull_request(
+            t.repository,
+            current_pr[:number],
+            format(t.commit_message % current_pr[:title])
+          )
+        end
+      end
+    end
+  end
+end
+
+class NoPullRequestError < StandardError
+  attr_reader :branch_name
+  def initialize(branch_name)
+    @branch_name = branch_name
+  end
+
+  def message
+    "No pull request associated with branch %s" % branch_name
+  end
+end

data/lib/rake_github/tasks/pull_requests.rb

@@ -0,0 +1 @@
+require_relative 'pull_requests/merge'

data/lib/rake_github/tasks/releases/create.rb

@@ -25,6 +25,24 @@ module RakeGithub
         action do |t|
           client = Octokit::Client.new(access_token: access_token)
 
+          release_options = {
+            draft: t.draft,
+            prerelease: t.prerelease
+          }
+          if t.target_commitish
+            release_options[:target_commitish] = t.target_commitish
+          end
+          if t.release_name
+            release_options[:release_name] = t.release_name
+          end
+          if t.body
+            release_options[:body] = t.body
+          end
+          if t.discussion_category_name
+            release_options[:discussion_category_name] =
+              t.discussion_category_name
+          end
+
           puts 'Creating release' \
                "#{t.release_name ? " '#{t.release_name}'" : ''} " \
                "with tag '#{t.tag_name}' " \
@@ -32,12 +50,8 @@ module RakeGithub
           release = client.create_release(
             t.repository,
             t.tag_name,
-            target_commitish: t.target_commitish,
-            release_name: t.release_name,
-            body: t.body,
-            draft: t.draft,
-            prerelease: t.prerelease,
-            discussion_category_name: t.discussion_category_name)
+            release_options
+          )
 
           t.assets.each do |asset|
             if asset.is_a?(String)
@@ -46,8 +60,8 @@ module RakeGithub
             else
               puts(
                 "Uploading asset '#{asset[:path]}'" +
-                "#{asset[:name] ? " with name '#{asset[:name]}'" : ''} " +
-                "to release with tag '#{t.tag_name}'...")
+                  "#{asset[:name] ? " with name '#{asset[:name]}'" : ''} " +
+                  "to release with tag '#{t.tag_name}'...")
               client.upload_asset(
                 release.url, asset[:path], { name: asset[:name] })
             end

data/lib/rake_github/tasks.rb

@@ -1,2 +1,3 @@
 require_relative 'tasks/deploy_keys'
 require_relative 'tasks/releases'
+require_relative 'tasks/pull_requests'

data/lib/rake_github/version.rb

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

data/lib/rake_github.rb

@@ -10,4 +10,8 @@ module RakeGithub
   def self.define_repository_tasks(opts = {}, &block)
     RakeGithub::TaskSets::Repository.define(opts, &block)
   end
+
+  def self.define_release_task(opts = {}, &block)
+    RakeGithub::Tasks::Releases::Create.define(opts, &block)
+  end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rake_github
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre.2
+  version: 0.8.0.pre.6
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-13 00:00:00.000000000 Z
+date: 2022-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake_factory
+  name: colored2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.23'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: sshkey
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -53,27 +53,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.16'
 - !ruby/object:Gem::Dependency
-  name: colored2
+  name: rake_factory
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0.23'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: sshkey
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -81,131 +81,145 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: rake_circle_ci
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake_github
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake_ssh
+  name: memfs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rake_gpg
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake_circle_ci
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: rake_github
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rake_gpg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
-  name: memfs
+  name: rake_ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -244,6 +258,8 @@ files:
 - lib/rake_github/tasks/deploy_keys/destroy.rb
 - lib/rake_github/tasks/deploy_keys/ensure.rb
 - lib/rake_github/tasks/deploy_keys/provision.rb
+- lib/rake_github/tasks/pull_requests.rb
+- lib/rake_github/tasks/pull_requests/merge.rb
 - lib/rake_github/tasks/releases.rb
 - lib/rake_github/tasks/releases/create.rb
 - lib/rake_github/version.rb