octo_merge 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7b9a5819e11f475b2e7676343592c274f4a17ac
-  data.tar.gz: 4a5f04d70abfbacc7718ab84143e7e68000762b7
+  metadata.gz: fc888e5760a08871d2d68cd5e43044e4cc03eb92
+  data.tar.gz: e715350366209678d5c31d315ac5d905ef9e1904
 SHA512:
-  metadata.gz: 96bb75ccc5a91b4b9009b0e9bbb6dc888b6a49ff59917c85bada93f6fcd9c293035b5b03a1d1d806715ca4cf5b2c0a44439a4a8abb05ab3563399038bd6d270d
-  data.tar.gz: 13ff3e0eaa02942eb16cd998257b4501b34fdb798b12edd029f5d44e5959e620ed0562ded954f4121c006485b2ef87aedd88d4fdd01407e2dee28e7557772686
+  metadata.gz: 777dc01da1a20b0c2df6711089a0fce0a065a76e789c7c1aae5a9948c96ad0ee14954929ce222c77cf47839873da37584efd432c4b74ed9f9663741af05a6748
+  data.tar.gz: 53660d4e55248fff632d5cee36c71cc32c3024047769b3a6aaf12bbad188a740764425224e538538cd4f7d0a5ee0dc2eccf0bc7df743d706add9379713a917f3

data/exe/octo-merge

@@ -41,6 +41,14 @@ OptionParser.new do |opts|
     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
@@ -52,15 +60,17 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-options[:dir] = File.expand_path(options[:dir])
-options[:pull_requests] = options[:pull_requests].split(",")
-options[:strategy] = Object.const_get("OctoMerge::#{options[:strategy]}")
-
 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::#{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],

data/lib/octo_merge/interactive_pull_requests.rb

@@ -0,0 +1,46 @@
+module OctoMerge
+  # TODO: Write specs
+  class InteractivePullRequests
+    def initialize(repo:, query:)
+      @repo = repo
+      @query = query
+    end
+
+    def self.get(options = {})
+      new(repo: options[:repo], query: options[:query]).pull_requests
+    end
+
+    def pull_requests
+      display_pull_requests
+      display_input_message
+
+      gets.strip
+    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)
+      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 "$: "
+    end
+
+    def format_pull_request(pull_request)
+      "* #{pull_request.number}:\t\"#{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/pull_request.rb

@@ -32,14 +32,7 @@ module OctoMerge
     end
 
     def github_client
-      @github_client ||= Octokit::Client.new(
-        login: config.login,
-        password: config.password
-      )
-    end
-
-    def config
-      OctoMerge.configuration
+      OctoMerge.github_client
     end
   end
 end

data/lib/octo_merge/version.rb

@@ -1,3 +1,3 @@
 module OctoMerge
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/octo_merge.rb

@@ -4,6 +4,8 @@ require "octo_merge/configuration"
 require "octo_merge/context"
 require "octo_merge/execute"
 require "octo_merge/git"
+require "octo_merge/interactive_pull_requests"
+require "octo_merge/list_pull_requests"
 require "octo_merge/pull_request"
 
 require "octo_merge/abstract_merge"
@@ -23,11 +25,19 @@ module OctoMerge
     end
 
     def configure
+      @github_client = nil
       yield(configuration)
     end
 
     def configuration
       @configuration ||= Configuration.new
     end
+
+    def github_client
+      @github_client ||= Octokit::Client.new(
+        login: configuration.login,
+        password: configuration.password
+      )
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octo_merge
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Patrick Helm
@@ -134,6 +134,8 @@ files:
 - lib/octo_merge/context.rb
 - lib/octo_merge/execute.rb
 - lib/octo_merge/git.rb
+- lib/octo_merge/interactive_pull_requests.rb
+- lib/octo_merge/list_pull_requests.rb
 - lib/octo_merge/merge_with_rebase.rb
 - lib/octo_merge/merge_without_rebase.rb
 - lib/octo_merge/pull_request.rb