octo-merge 0.7.0.rc1

data/lib/octo_merge/cli/parser.rb

@@ -0,0 +1,102 @@
+require 'optparse'
+
+module OctoMerge
+  class CLI
+    class Parser
+      def self.parse(args)
+        new(args).parse!
+      end
+
+      def initialize(args)
+        @args = args
+      end
+
+      def parse!
+        prepare
+        opts.parse!(args)
+        options
+      end
+
+      private
+
+      attr_reader :args
+
+      def prepare
+        prepare_banner
+
+        prepare_application
+
+        opts.separator ""
+        opts.separator "Common options:"
+
+        prepare_help
+        prepare_version
+      end
+
+      def prepare_banner
+        opts.banner = "Usage: octo-merge [options]"
+        opts.separator ""
+      end
+
+      def prepare_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
+
+        opts.on('--setup', 'Setup') do |setup|
+          options[:setup] = setup
+        end
+      end
+
+      def prepare_help
+        opts.on_tail('-h', '--help', 'Display this screen') do
+          puts opts
+          exit
+        end
+      end
+
+      def prepare_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/configuration.rb

@@ -0,0 +1,5 @@
+module OctoMerge
+  class Configuration
+    attr_accessor :login, :password
+  end
+end

data/lib/octo_merge/context.rb

@@ -0,0 +1,21 @@
+module OctoMerge
+  class Context
+    attr_reader :working_directory, :repo
+
+    def initialize(working_directory:, repo:, pull_request_numbers:)
+      @working_directory = working_directory
+      @repo = repo
+      @pull_request_numbers = pull_request_numbers
+    end
+
+    def pull_requests
+      @pull_requests ||= pull_request_numbers.map do |number|
+        PullRequest.new(repo: repo, number: number.to_s)
+      end
+    end
+
+    private
+
+    attr_reader :pull_request_numbers
+  end
+end

data/lib/octo_merge/execute.rb

@@ -0,0 +1,21 @@
+module OctoMerge
+  class Execute
+    attr_reader :context, :strategy
+
+    def initialize(context:, strategy:)
+      @context = context
+      @strategy = strategy
+    end
+
+    def run
+      env.run
+    end
+
+    def env
+      @env ||= strategy.new(
+        working_directory: context.working_directory,
+        pull_requests: context.pull_requests
+      )
+    end
+  end
+end

data/lib/octo_merge/interactive_pull_requests.rb

@@ -0,0 +1,47 @@
+require 'inquirer'
+
+module OctoMerge
+  class InteractivePullRequests
+    def initialize(repo:, query:)
+      @repo = repo
+      @query = query
+    end
+
+    def self.get(options = {})
+      new(repo: options[:repo], query: options[:query]).to_s
+    end
+
+    def to_s
+      system("clear")
+
+      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 formatted_pull_requests
+      pull_requests.map do |pull_request|
+        format_pull_request(pull_request)
+      end
+    end
+
+    def pull_requests
+      list.all
+    end
+
+    def format_pull_request(pull_request)
+      "#{pull_request.number}: \"#{pull_request.title}\" by @#{pull_request.user.login}"
+    end
+
+    def list
+      @list ||= OctoMerge::ListPullRequests.new(repo: repo, query: query)
+    end
+  end
+end

data/lib/octo_merge/list_pull_requests.rb

@@ -0,0 +1,20 @@
+module OctoMerge
+  class ListPullRequests
+    attr_reader :repo, :query
+
+    def initialize(repo:, query:)
+      @repo = repo
+      @query = query
+    end
+
+    def all
+      @all ||= github_client.search_issues("is:open is:pr repo:#{repo} #{query}")[:items]
+    end
+
+    private
+
+    def github_client
+      OctoMerge.github_client
+    end
+  end
+end

data/lib/octo_merge/options.rb

@@ -0,0 +1,108 @@
+require "pathname"
+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 :query
+    option :repo
+    option :setup
+    option :strategy
+
+    def [](key)
+      data[key]
+    end
+
+    def cli_options=(options)
+      reset_cache
+      @cli_options = options
+    end
+
+    def self.user_config_path
+      USER_CONFIG_PATH
+    end
+
+    def self.pathname
+      Pathname.new(CONFIG_FILE)
+    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

@@ -0,0 +1,54 @@
+require "octokit"
+
+module OctoMerge
+  class PullRequest
+    attr_reader :repo, :number
+
+    def initialize(repo:, number:)
+      @repo = repo
+      @number = number.to_s
+    end
+
+    def url
+      github_api_result.html_url
+    end
+
+    def remote
+      github_api_result.user.login
+    end
+
+    def remote_url
+      github_api_result.head.repo.ssh_url
+    end
+
+    def remote_branch
+      github_api_result.head.ref
+    end
+
+    def number_branch
+      "pull/#{number}"
+    end
+
+    def title
+      github_api_result.title
+    end
+
+    def body
+      github_api_result.body
+    end
+
+    def ==(other_pull_request)
+      repo == other_pull_request.repo && number == other_pull_request.number
+    end
+
+    private
+
+    def github_api_result
+      @github_api_result ||= github_client.pull_request(repo, number)
+    end
+
+    def github_client
+      OctoMerge.github_client
+    end
+  end
+end

data/lib/octo_merge/setup.rb

@@ -0,0 +1,74 @@
+module OctoMerge
+  class Setup
+    def initialize(options)
+      @options = options
+    end
+
+    def self.run(*args)
+      new(*args).tap { |setup| setup.run }
+    end
+
+    def run
+      setup_user_config_file
+      setup_project_config_file
+    end
+
+    private
+
+    HINTS = {
+      login: "login is your GitHub username",
+      password: "You can manage your GitHub API tokens at: https://github.com/settings/tokens"
+    }
+    private_constant :HINTS
+
+    attr_reader :options
+
+    def setup_user_config_file
+      setup(
+        name: "user",
+        path: Options.user_config_path,
+        attributes: [:login, :password],
+        default: true
+      )
+    end
+
+    def setup_project_config_file
+      setup(
+        name: "project",
+        path: Options.pathname.realpath.to_s,
+        attributes: [:repo, :strategy, :query],
+        default: false
+      )
+    end
+
+    def setup(name:, path:, attributes:, default:)
+      return unless Ask.confirm "Create #{name} config file? (#{path})", default: default
+
+      create(path: path, config: config_for(attributes))
+    end
+
+    def config_for(attributes)
+      attributes.inject({}) { |hash, key|
+        hash[key] = ask_for(key)
+        hash
+      }
+    end
+
+    def ask_for(key)
+      puts "[INFO] #{HINTS[key]}" if HINTS[key]
+
+      Ask.input "#{key}", default: options.send(key)
+    end
+
+    def create(path:, config:)
+      File.write(path.to_s, content_for(config))
+    end
+
+    def content_for(config)
+      config
+        .select { |key, value| !value.nil? && value != "" }
+        .map { |key, value| "#{key}: \"#{value}\"" }
+        .join("\n")
+    end
+  end
+end