rake_github 0.8.0.pre.3 → 0.8.0.pre.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54aa46d54fad060c18e0812362c4a005cf0f4f1c3695648bab810d5df7dedc48
-  data.tar.gz: 99f4c2c9400157ce6ff3782c1629f78957bd67354031fec29c1ae6c47ff1e10b
+  metadata.gz: 5e9159f6c2f6127d4eb80825c8aa08e497a31acef53c8347de4626c61eb23d2e
+  data.tar.gz: 10f599d94fd23758afb53712cbc15f916102273f422818bf970172ca8601053a
 SHA512:
-  metadata.gz: '095922e501b9eeafb7756f36ffdaae6fd521f6b2f011e77bdbad48053ac2513101bd4df03d9bafa135bf136a6f87eed0c2801fdc30b17d2c35bbff4b8a095c0d'
-  data.tar.gz: 36c3d6418ce2d68002c4e6f054e6cd2c7bc6ddeee392c97402c663fb75b598ead1d64c7d5bd38faedb0056608f4f47bc476bfbe04e2e925449c7e0252fbdd36d
+  metadata.gz: 22586b5137c090b829d1c07b8ee51705382733966b6a08b01990fb6d36c11cf3e7c44f000616845c0e014274fae2a4307e110785db21cea26113980591767370
+  data.tar.gz: ba7918019f2a6fb7ece98bb36af11380ac6f66652dffb0f51bbd113e8fa85d7e2be0a35bfde533ec88f507af3468e3f0e2afa85980f6e813b134d7fce732c531

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rake_github (0.8.0.pre.3)
+    rake_github (0.8.0.pre.7)
       colored2 (~> 3.1)
       octokit (~> 4.16)
       rake_factory (~> 0.23)
@@ -10,11 +10,12 @@ 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)
+      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)
@@ -44,7 +45,7 @@ GEM
     gem-release (2.2.2)
     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)
@@ -99,15 +100,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)
@@ -120,4 +121,4 @@ DEPENDENCIES
   simplecov (~> 0.16)
 
 BUNDLED WITH
-   2.2.25
+   2.3.6

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'rake_factory'
+require 'octokit'
+
+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 :branch_name, required: true
+        parameter :commit_message, default: ''
+
+        action do |t|
+          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] == t.branch_name }
+
+          raise NoPullRequestError.new t.branch_name 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.3'
+  VERSION = '0.8.0.pre.7'
 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,211 +1,211 @@
 --- !ruby/object:Gem::Specification
 name: rake_github
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre.3
+  version: 0.8.0.pre.7
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-14 00:00:00.000000000 Z
+date: 2022-01-26 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: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.16'
 - !ruby/object:Gem::Dependency
-  name: octokit
+  name: rake_factory
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.16'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.16'
+        version: '0.23'
 - !ruby/object:Gem::Dependency
-  name: colored2
+  name: sshkey
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake_circle_ci
+  name: gem-release
   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: memfs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rake_ssh
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake_gpg
+  name: rake_circle_ci
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake_github
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: rake_gpg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rake_ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: memfs
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -244,6 +244,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