octo_merge 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f99ec38437701d28091542a65cf259e028b5f82
-  data.tar.gz: bbbc0e41c04fefde9a480b918ed0dda0633ab1f0
+  metadata.gz: e2482c938e80d647236fe97a04dbc6c1cfe37030
+  data.tar.gz: 3d73221e7a4333a12fb0c1c8cfb8b41654295ec2
 SHA512:
-  metadata.gz: b5958a05ec2db085d9294c0c347dc2c74c9c878351b94e288cb714134aee4c86b751b6d7a4120df805a26963d8afa77e3c4ac8e2a5917d1bff0b8f69c00dd050
-  data.tar.gz: ef24a2c90b7683514e1c29e43bb3e37c81e8d4b8cc175cc362b6fe07a951f61e942bc74655a249185c45ac7d540e67a0de4466b8b8204f06ef03a853d04bacfc
+  metadata.gz: 020c3885470f6fc1c9d75c0f37ee544213d5d723fd6fd2033eec035eb9ab66c257c383a73422fab703dd7309bb8c131ac10d1dd44b9fcf472813c2ef3c02168d
+  data.tar.gz: e0aeca7a705de6167661542eac69f5e803356c1ff6cb89682976c839a5a74c4cc7ade18c466770e07689cd510ded70a94315c4a3e99f8a01367a666945c6aefd

data/.travis.yml

@@ -2,3 +2,7 @@ language: ruby
 rvm:
   - 2.3.0
 before_install: gem install bundler -v 1.11.2
+
+before_script:
+  - git config --global user.email "anon@example.com"
+  - git config --global user.name "Anon"

data/README.md

@@ -39,56 +39,64 @@ octo-merge \
   --strategy=MergeWithRebase
 ```
 
-* You can find you API token [here](https://github.com/settings/tokens)
+* You can find your API token [here](https://github.com/settings/tokens)
 
-## Avilable strategies
+## Available Strategies
+
+* NOTE: All strategies are using read-only branches for a specific pull requests.
+        This way we avoid adding lot of remotes.
+* Read more: [Checking out pull requests locally](https://help.github.com/articles/checking-out-pull-requests-locally/)
 
 ### MergeWithoutRebase
 
-```ruby
-git.checkout(master)
-git.fetch(upstream)
-git.reset_hard("#{upstream}/#{master}")
-
-pull_requests.each do |pull_request|
-  git.remote_add("#{pull_request.remote} #{pull_request.remote_url}")
-  git.fetch(pull_request.remote)
-  git.merge_no_ff("#{pull_request.remote}/#{pull_request.branch}")
-end
+```
+# Reset master
+git checkout master
+git fetch upstream
+git reset --hard upstream/master
+
+# For each pull request
+  git fetch upstream pull/23/head:pull/23 --force"
+  git merge --no-ff pull/23
+  git branch -D pull/23
 ```
 
 ### MergeWithRebase
 
-```ruby
-git.checkout(master)
-git.fetch(upstream)
-git.reset_hard("#{upstream}/#{master}")
-
-pull_requests.each do |pull_request|
-  git.remote_add("#{pull_request.remote} #{pull_request.remote_url}")
-  git.fetch(pull_request.remote)
-  git.checkout(pull_request.branch)
-  git.rebase(master)
-  git.checkout(master)
-  git.merge_no_ff(pull_request.branch)
-end
+```
+# Reset master
+git checkout master
+git fetch upstream
+git reset --hard upstream/master
+
+# For each pull request
+  git fetch upstream pull/23/head:pull/23 --force"
+  git checkout pull/23
+  git rebase master
+
+  git checkout master
+  git merge --no-ff pull/23
+
+  git branch -D pull/23
 ```
 
 ### Rebase
 
-```ruby
-git.checkout(master)
-git.fetch(upstream)
-git.reset_hard("#{upstream}/#{master}")
-
-pull_requests.each do |pull_request|
-  git.remote_add("#{pull_request.remote} #{pull_request.remote_url}")
-  git.fetch(pull_request.remote)
-  git.checkout(pull_request.branch)
-  git.rebase(master)
-  git.checkout(master)
-  git.rebase("#{pull_request.branch}")
-end
+```
+# Reset master
+git checkout master
+git fetch upstream
+git reset --hard upstream/master
+
+# For each pull request
+  git fetch upstream pull/23/head:pull/23 --force"
+  git checkout pull/23
+  git rebase master
+
+  git checkout master
+  git rebase pull/23
+
+  git branch -D pull/23
 ```
 
 ## Development

data/TODO.md

@@ -2,10 +2,10 @@
 
 Before we release `v1.0.0` the following tasks needs to be done:
 
-* [ ] Move logic from `exe/octo-merge` into a testable class
-* [ ] Add specs for `InteractivePullRequests`
+* [x] Move logic from `exe/octo-merge` into a testable class
+* [x] Add specs for `InteractivePullRequests`
 * [ ] Create a setup task
 * [ ] Complete docs (`README.md`)
 * [ ] Try to get rid of external dependencies (`octokit`, `inquirer`)
 * [ ] Decide on gem name (`octo_merge` VS `octo-merge`)
-* [ ] Use GitHubs `secret` pull requests branches instead of adding new remotes
+* [x] Use GitHubs `secret` pull requests branches instead of adding new remotes

data/bin/octo-merge

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "octo_merge"
+
+verbose = !(ENV["VERBOSE"] == "0")
+Git.verbose!(verbose)
+
+OctoMerge::CLI.run(ARGV)

data/exe/octo-merge

@@ -1,90 +1,8 @@
 #!/usr/bin/env ruby
 
-require "optparse"
 require "octo_merge"
-require "yaml"
 
-options = {
-  dir: ".",
-  strategy: "MergeWithoutRebase"
-}
+verbose = !(ENV["VERBOSE"] == "0")
+Git.verbose!(verbose)
 
-user_config_path = File.expand_path("~/.octo-merge.yml")
-
-if File.exist?(user_config_path)
-  body = File.read(user_config_path)
-  options.merge!(YAML.load(body))
-end
-
-if File.exist?(".octo-merge.yml")
-  body = File.read(".octo-merge.yml")
-  options.merge!(YAML.load(body))
-end
-
-# Symbolize keys
-options = options.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
-
-OptionParser.new do |opts|
-  opts.banner = "Usage: octo-merge [options]"
-
-  opts.on("--repo=REPO", "Repository (e.g.: 'rails/rails')") do |repo|
-    options[:repo] = repo
-  end
-
-  opts.on("--dir=DIR", "Working directory (e.g.: '~/Dev/Rails/rails')") do |dir|
-    options[:dir] = dir
-  end
-
-  opts.on("--pull_requests=PULL_REQUESTS", "Pull requests (e.g.: '23,42,66')") do |pull_requests|
-    options[:pull_requests] = pull_requests
-  end
-
-  opts.on("--login=login", "Login (Your GitHub username)") do |login|
-    options[:login] = login
-  end
-
-  opts.on("--password=password", "Password (Your GitHub API-Token)") do |password|
-    options[:password] = password
-  end
-
-  opts.on("--strategy=STRATEGY", "Merge strategy (e.g.: 'MergeWithoutRebase')") do |strategy|
-    options[:strategy] = strategy
-  end
-
-  opts.on("--query=QUERY", "Query to use in interactive mode (e.g.: 'label:ready-to-merge')") do |query|
-    options[:query] = query
-  end
-
-  opts.on('--interactive', 'Select PullRequests within an interactive session') do |interactive|
-    options[:interactive] = interactive
-  end
-
-  opts.on('-h', '--help', 'Display this screen') do
-    puts opts
-    exit
-  end
-
-  opts.on('-v', '--version', 'Display the version') do
-    puts OctoMerge::VERSION
-    exit
-  end
-end.parse!
-
-OctoMerge.configure do |config|
-  config.login = options[:login]
-  config.password = options[:password]
-end
-
-options[:dir] = File.expand_path(options[:dir])
-
-options[:strategy] = Object.const_get("OctoMerge::Strategy::#{options[:strategy]}")
-
-options[:pull_requests] = OctoMerge::InteractivePullRequests.get(options) if options[:interactive]
-options[:pull_requests] = options[:pull_requests].to_s.split(",")
-
-OctoMerge.run(
-  repo: options[:repo],
-  pull_request_numbers: options[:pull_requests],
-  working_directory: options[:dir],
-  strategy: options[:strategy]
-)
+OctoMerge::CLI.run(ARGV)

data/lib/git.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 # TODO: Move to another repository (e.g.: `SimpleGit`)
 class Git
   def self.git(method_name, cmd = nil)
@@ -10,6 +12,14 @@ class Git
     end
   end
 
+  def self.verbose!(is_verbose = true)
+    @verbose = is_verbose
+  end
+
+  def self.verbose?
+    !!@verbose
+  end
+
   attr_reader :working_directory
 
   def initialize(working_directory)
@@ -18,6 +28,7 @@ class Git
 
   git :checkout
   git :commit
+  git :delete_branch, "branch -D"
   git :fetch
   git :merge_no_ff, "merge --no-ff"
   git :rebase
@@ -30,12 +41,21 @@ class Git
     run "git #{cmd}"
   end
 
+  def verbose?
+    self.class.verbose?
+  end
+
   def run(cmd)
+    puts "$: #{cmd}" if verbose?
+
     cmd = <<-CMD
       cd #{working_directory} &&
       #{cmd}
     CMD
 
-    `#{cmd}`
+    # NOTE: Logging and debugging is writte to stderr
+    _stdin, stdout, stderr = Open3.popen3(cmd)
+    print stderr.read if verbose?
+    stdout.read
   end
 end

data/lib/octo_merge.rb

@@ -2,11 +2,13 @@ require "octo_merge/version"
 
 require "git"
 
+require "octo_merge/cli"
 require "octo_merge/configuration"
 require "octo_merge/context"
 require "octo_merge/execute"
 require "octo_merge/interactive_pull_requests"
 require "octo_merge/list_pull_requests"
+require "octo_merge/options"
 require "octo_merge/pull_request"
 require "octo_merge/strategy"
 

data/lib/octo_merge/cli.rb

@@ -0,0 +1,44 @@
+require "octo_merge/cli/parser"
+
+module OctoMerge
+  class CLI
+    attr_reader :args
+
+    def self.run(*args)
+      new(*args).run
+    end
+
+    def initialize(args)
+      @args = args
+    end
+
+    def run
+      configure
+      execute
+    end
+
+    private
+
+    def configure
+      OctoMerge.configure do |config|
+        config.login = options.login
+        config.password = options.password
+      end
+    end
+
+    def execute
+      OctoMerge.run(
+        pull_request_numbers: options.pull_requests,
+        repo: options.repo,
+        strategy: options.strategy,
+        working_directory: options.dir
+      )
+    end
+
+    def options
+      @options ||= Options.new.tap do |options|
+        options.cli_options = Parser.parse(args)
+      end
+    end
+  end
+end

data/lib/octo_merge/cli/parser.rb

@@ -0,0 +1,98 @@
+require 'optparse'
+
+module OctoMerge
+  class CLI
+    class Parser
+      def self.parse(args)
+        new(args).parse!
+      end
+
+      def initialize(args)
+        @args = args
+      end
+
+      def parse!
+        setup
+        opts.parse!(args)
+        options
+      end
+
+      private
+
+      attr_reader :args
+
+      def setup
+        setup_banner
+
+        setup_application
+
+        opts.separator ""
+        opts.separator "Common options:"
+
+        setup_help
+        setup_version
+      end
+
+      def setup_banner
+        opts.banner = "Usage: octo-merge [options]"
+        opts.separator ""
+      end
+
+      def setup_application
+        opts.on("--repo=REPO", "Repository (e.g.: 'rails/rails')") do |repo|
+          options[:repo] = repo
+        end
+
+        opts.on("--dir=DIR", "Working directory (e.g.: '~/Dev/Rails/rails')") do |dir|
+          options[:dir] = dir
+        end
+
+        opts.on("--pull_requests=PULL_REQUESTS", "Pull requests (e.g.: '23,42,66')") do |pull_requests|
+          options[:pull_requests] = pull_requests
+        end
+
+        opts.on("--login=login", "Login (Your GitHub username)") do |login|
+          options[:login] = login
+        end
+
+        opts.on("--password=password", "Password (Your GitHub API-Token)") do |password|
+          options[:password] = password
+        end
+
+        opts.on("--strategy=STRATEGY", "Merge strategy (e.g.: 'MergeWithoutRebase')") do |strategy|
+          options[:strategy] = strategy
+        end
+
+        opts.on("--query=QUERY", "Query to use in interactive mode (e.g.: 'label:ready-to-merge')") do |query|
+          options[:query] = query
+        end
+
+        opts.on('--interactive', 'Select PullRequests within an interactive session') do |interactive|
+          options[:interactive] = interactive
+        end
+      end
+
+      def setup_help
+        opts.on_tail('-h', '--help', 'Display this screen') do
+          puts opts
+          exit
+        end
+      end
+
+      def setup_version
+        opts.on_tail('-v', '--version', 'Display the version') do
+          puts OctoMerge::VERSION
+          exit
+        end
+      end
+
+      def opts
+        @opts ||= OptionParser.new
+      end
+
+      def options
+        @options ||= {}
+      end
+    end
+  end
+end

data/lib/octo_merge/interactive_pull_requests.rb

@@ -1,7 +1,6 @@
 require 'inquirer'
 
 module OctoMerge
-  # TODO: Write specs
   class InteractivePullRequests
     def initialize(repo:, query:)
       @repo = repo
@@ -9,37 +8,32 @@ module OctoMerge
     end
 
     def self.get(options = {})
-      new(repo: options[:repo], query: options[:query]).pull_requests
+      new(repo: options[:repo], query: options[:query]).to_s
     end
 
-    def pull_requests
-      prs = list.all
-
-      formatted_prs = prs.map do |pull_request|
-        format_pull_request(pull_request)
-      end
-
+    def to_s
       system("clear")
-      idx = Ask.checkbox "Select the pull requests you want to merge", formatted_prs
 
-      idx.zip(prs).select { |e| e[0] }.map { |e| e[1][:number] }.join(",")
+      idx = Ask.checkbox(
+        "Select the pull requests you want to merge",
+        formatted_pull_requests
+      )
+
+      idx.zip(pull_requests).select { |e| e[0] }.map { |e| e[1].number }.join(",")
     end
 
     private
 
     attr_reader :repo, :query
 
-    def display_pull_requests
-      puts "[INFO] Fetching PullRequests. Please wait ...\n\n"
-
-      list.all.each do |pull_request|
-        puts format_pull_request(pull_request)
+    def formatted_pull_requests
+      pull_requests.map do |pull_request|
+        format_pull_request(pull_request)
       end
     end
 
-    def display_input_message
-      puts "\n\nPlease enter the pull requests you want to merge: (e.g.: '23,42,66'):\n\n"
-      print "$: "
+    def pull_requests
+      list.all
     end
 
     def format_pull_request(pull_request)
@@ -51,4 +45,3 @@ module OctoMerge
     end
   end
 end
-

data/lib/octo_merge/options.rb

@@ -0,0 +1,97 @@
+require "yaml"
+
+module OctoMerge
+  class Options
+    def self.option(key)
+      define_method(key) { self[key] }
+    end
+
+    option :login
+    option :password
+
+    option :dir
+    option :pull_requests
+    option :repo
+    option :strategy
+
+    def [](key)
+      data[key]
+    end
+
+    def cli_options=(options)
+      reset_cache
+      @cli_options = options
+    end
+
+    private
+
+    CONFIG_FILE = ".octo-merge.yml"
+    DEFAULT_OPTIONS = {
+      dir: ".",
+      strategy: "MergeWithoutRebase"
+    }
+    USER_CONFIG_PATH = File.expand_path("~/#{CONFIG_FILE}")
+
+    def data
+      @data ||= begin
+        options = default_options
+          .merge(user_options)
+          .merge(project_options)
+          .merge(cli_options)
+
+
+        # Sanitize input
+        options[:dir] = File.expand_path(options[:dir])
+        options[:strategy] = Object.const_get("OctoMerge::Strategy::#{options[:strategy]}")
+        options[:pull_requests] = get_interactive_pull_requests(options) if options[:interactive]
+        options[:pull_requests] = options[:pull_requests].to_s.split(",")
+
+        options
+      end
+    end
+
+    # This hotfix will configure the API credentials before doing the API call.
+    def get_interactive_pull_requests(options)
+      OctoMerge.configure do |config|
+        config.login = options[:login]
+        config.password = options[:password]
+      end
+
+      OctoMerge::InteractivePullRequests.get(options)
+    end
+
+    def reset_cache
+      @data = nil
+    end
+
+    def default_options
+      DEFAULT_OPTIONS
+    end
+
+    def user_options
+      if File.exist?(USER_CONFIG_PATH)
+        body = File.read(USER_CONFIG_PATH)
+        symbolize_keys YAML.load(body)
+      else
+        {}
+      end
+    end
+
+    def project_options
+      if File.exist?(CONFIG_FILE)
+        body = File.read(CONFIG_FILE)
+        symbolize_keys YAML.load(body)
+      else
+        {}
+      end
+    end
+
+    def cli_options
+      @cli_options ||= {}
+    end
+
+    def symbolize_keys(hash)
+      hash.inject({}){ |memo, (k, v)| memo[k.to_sym] = v; memo }
+    end
+  end
+end

data/lib/octo_merge/pull_request.rb

@@ -21,10 +21,14 @@ module OctoMerge
       github_api_result.head.repo.ssh_url
     end
 
-    def branch
+    def remote_branch
       github_api_result.head.ref
     end
 
+    def number_branch
+      "pull/#{number}"
+    end
+
     def title
       github_api_result.title
     end

data/lib/octo_merge/strategy/base.rb

@@ -26,6 +26,21 @@ module OctoMerge
         @git ||= Git.new(working_directory)
       end
 
+      # Fetch the read-only branch for the corresponding pull request and
+      # create a local branch to rebase the current master on.
+      #
+      # Read more: [Checking out pull requests locally](https://help.github.com/articles/checking-out-pull-requests-locally/)
+      def fetch(pull_request)
+        git.fetch "#{upstream} #{pull_request.number_branch}/head:#{pull_request.number_branch} --force"
+      end
+
+      def fetch_master
+        git.checkout(master)
+        git.fetch(upstream)
+        git.reset_hard("#{upstream}/#{master}")
+      end
+
+
       def upstream
         :upstream
       end

data/lib/octo_merge/strategy/merge_with_rebase.rb

@@ -2,19 +2,28 @@ module OctoMerge
   module Strategy
     class MergeWithRebase < Base
       def run
-        git.checkout(master)
-        git.fetch(upstream)
-        git.reset_hard("#{upstream}/#{master}")
+        fetch_master
 
         pull_requests.each do |pull_request|
-          git.remote_add("#{pull_request.remote} #{pull_request.remote_url}")
-          git.fetch(pull_request.remote)
-          git.checkout(pull_request.branch)
+          fetch(pull_request)
+
+          git.checkout(pull_request.number_branch)
           git.rebase(master)
+
           git.checkout(master)
-          git.merge_no_ff(pull_request.branch)
+          merge(pull_request)
+
+          git.delete_branch(pull_request.number_branch)
         end
       end
+
+      private
+
+      def merge(pull_request)
+        message = "Merge branch '#{pull_request.remote_branch}'"
+
+        git.merge_no_ff("-m \"#{message}\" #{pull_request.number_branch}")
+      end
     end
   end
 end

data/lib/octo_merge/strategy/merge_with_rebase_and_message.rb

@@ -4,19 +4,20 @@ module OctoMerge
   module Strategy
     class MergeWithRebaseAndMessage < Base
       def run
-        git.checkout(master)
-        git.fetch(upstream)
-        git.reset_hard("#{upstream}/#{master}")
+        fetch_master
 
         pull_requests.each do |pull_request|
-          git.remote_add("#{pull_request.remote} #{pull_request.remote_url}")
-          git.fetch(pull_request.remote)
-          git.checkout(pull_request.branch)
+          fetch(pull_request)
+
+          git.checkout(pull_request.number_branch)
           git.rebase(master)
+
           git.checkout(master)
-          git.merge_no_ff(pull_request.branch)
+          git.merge_no_ff(pull_request.number_branch)
 
           add_merge_message(pull_request)
+
+          git.delete_branch(pull_request.number_branch)
         end
       end
 
@@ -66,7 +67,7 @@ module OctoMerge
 
         def body
           sanitize <<-BODY
-Merge branch '#{pull_request.branch}'
+Merge branch '#{pull_request.remote_branch}'
 
 Resolves and closes: #{pull_request.url}
 

data/lib/octo_merge/strategy/merge_without_rebase.rb

@@ -2,16 +2,23 @@ module OctoMerge
   module Strategy
     class MergeWithoutRebase < Base
       def run
-        git.checkout(master)
-        git.fetch(upstream)
-        git.reset_hard("#{upstream}/#{master}")
+        fetch_master
 
         pull_requests.each do |pull_request|
-          git.remote_add("#{pull_request.remote} #{pull_request.remote_url}")
-          git.fetch(pull_request.remote)
-          git.merge_no_ff("#{pull_request.remote}/#{pull_request.branch}")
+          fetch(pull_request)
+          merge(pull_request)
+
+          git.delete_branch(pull_request.number_branch)
         end
       end
+
+      private
+
+      def merge(pull_request)
+        message = "Merge remote branch '#{pull_request.remote}/#{pull_request.remote_branch}'"
+
+        git.merge_no_ff("-m \"#{message}\" #{pull_request.number_branch}")
+      end
     end
   end
 end

data/lib/octo_merge/strategy/rebase.rb

@@ -2,17 +2,18 @@ module OctoMerge
   module Strategy
     class Rebase < Base
       def run
-        git.checkout(master)
-        git.fetch(upstream)
-        git.reset_hard("#{upstream}/#{master}")
+        fetch_master
 
         pull_requests.each do |pull_request|
-          git.remote_add("#{pull_request.remote} #{pull_request.remote_url}")
-          git.fetch(pull_request.remote)
-          git.checkout(pull_request.branch)
+          fetch(pull_request)
+
+          git.checkout(pull_request.number_branch)
           git.rebase(master)
+
           git.checkout(master)
-          git.rebase("#{pull_request.branch}")
+          git.rebase("#{pull_request.number_branch}")
+
+          git.delete_branch(pull_request.number_branch)
         end
       end
     end

data/lib/octo_merge/version.rb

@@ -1,3 +1,3 @@
 module OctoMerge
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/octo_merge.gemspec

@@ -37,5 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-its"
+  spec.add_development_dependency "simplecov"
   spec.add_development_dependency "webmock"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octo_merge
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Patrick Helm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -141,15 +155,19 @@ files:
 - Rakefile
 - TODO.md
 - bin/console
+- bin/octo-merge
 - bin/setup
 - exe/octo-merge
 - lib/git.rb
 - lib/octo_merge.rb
+- lib/octo_merge/cli.rb
+- lib/octo_merge/cli/parser.rb
 - lib/octo_merge/configuration.rb
 - lib/octo_merge/context.rb
 - lib/octo_merge/execute.rb
 - lib/octo_merge/interactive_pull_requests.rb
 - lib/octo_merge/list_pull_requests.rb
+- lib/octo_merge/options.rb
 - lib/octo_merge/pull_request.rb
 - lib/octo_merge/strategy.rb
 - lib/octo_merge/strategy/base.rb