rake_github 0.8.0.pre.6 → 0.8.0.pre.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +2 -6
  3. data/lib/rake_github/task_sets/repository.rb +8 -0
  4. data/lib/rake_github/tasks/pull_requests/merge.rb +4 -5
  5. data/lib/rake_github/version.rb +1 -1
  6. metadata +2 -16
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a3e9be68ad0beb57b1e36b452b430bb9125277f907ca4ce07a8b7a3fc3866b13
4
- data.tar.gz: 99b865614f763cd674e45459a359cdab295454d9af2ea2c3e9864549dae273c5
3
+ metadata.gz: 58bf764629e27ce0d7bff01133829de1b8040551c48bf17b212a2bfe7af7829e
4
+ data.tar.gz: fa115d61a3f9243ba8cfced662b0e0554c40a93414bfba25db6c9249ef5624ed
5
5
  SHA512:
6
- metadata.gz: 3014f287b8d2dc142c87b186c961a5cd6d82f58e7b3ac35162f5d0d8c5554174db8852a7cb87d98646cb6f8ede435cfd018cb0cdc11cb31e9bb3dd7d9386af67
7
- data.tar.gz: a9b22df5da0453c6d893f685e3a9ee1214ca9ec928ec98603fe349b79ab6b4dc142f676cefb8d5662a1ab71152f0b60f08a530008e927d6971a630dcca6ec20c
6
+ metadata.gz: 7943e90fd007826c43be50680280f38bb39dbb8b422882da998e4011425b93df7c77aa4d24d9128f906639bce3687e440552745eb9371ca3adb929ca2c5f2e78
7
+ data.tar.gz: 8226d06ac3ff4ebea27ce61d9e132cd001a6c4186f2133bb16cdc7ef15e33322d97894c4915a8203c516af14112fbe862389bbdfc2c245c5a6532339378376b6
data/Gemfile.lock CHANGED
@@ -1,9 +1,8 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rake_github (0.8.0.pre.6)
4
+ rake_github (0.8.0.pre.10)
5
5
  colored2 (~> 3.1)
6
- git (~> 1.9.1)
7
6
  octokit (~> 4.16)
8
7
  rake_factory (~> 0.23)
9
8
  sshkey (~> 2.0)
@@ -44,8 +43,6 @@ GEM
44
43
  faraday-patron (1.0.0)
45
44
  faraday-rack (1.0.0)
46
45
  gem-release (2.2.2)
47
- git (1.9.1)
48
- rchardet (~> 1.8)
49
46
  hamster (3.0.0)
50
47
  concurrent-ruby (~> 1.0)
51
48
  i18n (1.8.11)
@@ -77,7 +74,6 @@ GEM
77
74
  colored2 (~> 3.1)
78
75
  rake_factory (~> 0.23)
79
76
  sshkey (~> 2.0)
80
- rchardet (1.8.0)
81
77
  rspec (3.10.0)
82
78
  rspec-core (~> 3.10.0)
83
79
  rspec-expectations (~> 3.10.0)
@@ -125,4 +121,4 @@ DEPENDENCIES
125
121
  simplecov (~> 0.16)
126
122
 
127
123
  BUNDLED WITH
128
- 2.3.5
124
+ 2.3.6
data/lib/rake_github/task_sets/repository.rb CHANGED
@@ -15,6 +15,7 @@ module RakeGithub
15
15
  parameter :deploy_keys_destroy_task_name, default: :destroy
16
16
  parameter :deploy_keys_provision_task_name, default: :provision
17
17
  parameter :deploy_keys_ensure_task_name, default: :ensure
18
+ parameter :branch_name
18
19
 
19
20
  task Tasks::DeployKeys::Provision,
20
21
  name: RakeFactory::DynamicValue.new { |ts|
@@ -34,6 +35,11 @@ module RakeGithub
34
35
  destroy_task_name: RakeFactory::DynamicValue.new { |ts|
35
36
  ts.deploy_keys_destroy_task_name
36
37
  }
38
+ task Tasks::PullRequests::Merge,
39
+ argument_names: [:branch_name],
40
+ branch_name: RakeFactory::DynamicValue.new { |ts|
41
+ ts.branch_name
42
+ }
37
43
 
38
44
  def define_on(application)
39
45
  around_define(application) do
@@ -41,6 +47,8 @@ module RakeGithub
41
47
  ns = case task_definition.klass.to_s
42
48
  when /DeployKeys/
43
49
  deploy_keys_namespace
50
+ when /PullRequests/
51
+ :pull_requests
44
52
  else
45
53
  nil
46
54
  end
data/lib/rake_github/tasks/pull_requests/merge.rb CHANGED
@@ -2,30 +2,29 @@
2
2
 
3
3
  require 'rake_factory'
4
4
  require 'octokit'
5
- require 'git'
6
5
 
7
6
  module RakeGithub
8
7
  module Tasks
9
8
  module PullRequests
10
9
  class Merge < RakeFactory::Task
11
10
  default_description(RakeFactory::DynamicValue.new do |t|
12
- "Merges pull request on the current branch in the #{t.repository} repository"
11
+ "Merges pull request on the specified branch in the #{t.repository} repository"
13
12
  end)
14
13
 
15
14
  parameter :repository, required: true
16
15
  parameter :access_token, required: true
16
+ parameter :branch_name, required: true
17
17
  parameter :commit_message, default: ''
18
18
 
19
19
  action do |t|
20
- current_branch = Git.open(Pathname.new('.')).current_branch
21
20
  github_client = Octokit::Client.new(access_token: access_token)
22
21
 
23
22
  open_prs = github_client.pull_requests(t.repository)
24
23
 
25
24
  current_pr = open_prs
26
- .find { |pr| pr[:head][:ref] == current_branch }
25
+ .find { |pr| pr[:head][:ref] == t.branch_name }
27
26
 
28
- raise NoPullRequestError.new current_branch if current_pr.nil?
27
+ raise NoPullRequestError.new t.branch_name if current_pr.nil?
29
28
 
30
29
  github_client.merge_pull_request(
31
30
  t.repository,
data/lib/rake_github/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RakeGithub
2
- VERSION = '0.8.0.pre.6'
2
+ VERSION = '0.8.0.pre.10'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rake_github
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.0.pre.6
4
+ version: 0.8.0.pre.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - InfraBlocks Maintainers
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-01-25 00:00:00.000000000 Z
11
+ date: 2022-01-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: colored2
@@ -24,20 +24,6 @@ dependencies:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: '3.1'
27
- - !ruby/object:Gem::Dependency
28
- name: git
29
- requirement: !ruby/object:Gem::Requirement
30
- requirements:
31
- - - "~>"
32
- - !ruby/object:Gem::Version
33
- version: 1.9.1
34
- type: :runtime
35
- prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
37
- requirements:
38
- - - "~>"
39
- - !ruby/object:Gem::Version
40
- version: 1.9.1
41
27
  - !ruby/object:Gem::Dependency
42
28
  name: octokit
43
29
  requirement: !ruby/object:Gem::Requirement