Skip to content
Browse files

rename runner class to requests

  • Loading branch information...
1 parent c15ef7a commit 04b9f59716a01c0cc5b6373bddc817f9a0205cc1 Jeff Wallace committed
Showing with 5 additions and 9 deletions.
  1. +3 −3 bin/mergemaster
  2. +1 −5 lib/mergemaster.rb
  3. +1 −1 lib/mergemaster/{runner.rb → requests.rb}
View
6 bin/mergemaster
@@ -9,13 +9,13 @@ class App
include Methadone::CLILogging
main do |base_branch, merge_branch, *pull_requests|
- ::Mergemaster.merge(base_branch, merge_branch, pull_requests, options)
+ Mergemaster::Requests.new(base_branch, merge_branch, pull_requests, options).run!
end
description 'Merge multiple pull requests into one branch'
- arg :basebranch
- arg :mergebranch
+ arg :basebranch, 'Branch to create merge branch off of'
+ arg :mergebranch, 'New branch where pull requests will be merged into'
arg :pullrequests, :many
on '-f', '--force', 'Do not confirm before creating merge branch'
View
6 lib/mergemaster.rb
@@ -1,14 +1,10 @@
require 'github_api'
require 'mergemaster/version'
-require 'mergemaster/runner'
+require 'mergemaster/requests'
module Mergemaster
- def self.merge(base_branch, merge_branch, pull_requests, options)
- Runner.new(base_branch, merge_branch, pull_requests, options).run!
- end
-
def self.github
@@github ||= Github.new(:oauth_token => oauth_token)
end
View
2 lib/mergemaster/runner.rb → lib/mergemaster/requests.rb
@@ -2,7 +2,7 @@
require 'methadone'
module Mergemaster
- class Runner
+ class Requests
include Methadone::CLILogging
include Methadone::SH

0 comments on commit 04b9f59

Please sign in to comment.
Something went wrong with that request. Please try again.