rebaser 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bf5a5c25788631d8326bbac9f4a5d2fbab8386d
-  data.tar.gz: 8b200af6e4b7596aa9f07eb61109ddf7a165aeec
+  metadata.gz: 7477000b1abf1ca3434dd64432d437c547654aa1
+  data.tar.gz: 3e1957903d1c665ace7b020ef072dcc3d3eef2e2
 SHA512:
-  metadata.gz: 72129e169435c4905c978d78e756abd8abe33259ad7de6bf2a9f0455523c746a60061fd99cfc5a1ebd8d6794f0c5d73c9edec0d71966d1d3bb5dba5b0b34867c
-  data.tar.gz: f21b73dd4c264383e12544fac1c3b3835f5b9e745e5b4e99d0acafe41db63b2eeb018d200a42bebc48052342400978303d725b56b1b8b0a69f3ccf6ded6c55ce
+  metadata.gz: b95d38e48cf2da578e855a4bbcb42f54814fe7a2bc693b29054952b2ec322a7a425f4ce4bd943fc1d75e1eb9a97189185f443a8aeed1ea076e0336090fc75a55
+  data.tar.gz: de88c3ae0c796678023f7ceb751815a42dc1069fa94a0be6af7baca0bc9ae6c97c748dc3d6ce8d9d272873846e5ffcf2a4a059cffaa70f0f7417646a837a66d0

data/lib/rebaser/open_branch_fetcher.rb

@@ -2,11 +2,12 @@ require 'github_api'
 
 module Rebaser
   class OpenBranchFetcher
-    def initialize(username:, password:, token:, remote:)
+    def initialize(username:, password:, token:, remote:, rebase_branch:)
       @username = username
       @password = password
       @token = token
       @remote = remote
+      @rebase_branch = rebase_branch
     end
 
     def fetch
@@ -23,11 +24,11 @@ module Rebaser
 
       pull_requests = github.pull_requests.list remote_user, remote_repo, state: 'open'
 
-      branches = pull_requests.map { |pr| pr.head.ref }
+      branches = pull_requests.map { |pr| pr.head.ref if pr.base.ref === rebase_branch }.compact
       branches
     end
 
     private
-    attr_reader :username, :password, :token, :remote
+    attr_reader :username, :password, :token, :remote, :rebase_branch
   end
 end

data/lib/rebaser/version.rb

@@ -1,3 +1,3 @@
 module Rebaser
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/rebaser.rb

@@ -32,16 +32,22 @@ module Rebaser
       end
     end
 
+    unless options[:rebase_branch]
+      options[:rebase_branch] = Ask.input "Please enter the branch to rebase onto", default: 'master'
+    end
+
     branches = OpenBranchFetcher.new(
       username: options[:username],
       password: options[:password],
       token: options[:token],
       remote: options[:remote],
+      rebase_branch: options[:rebase_branch],
     ).fetch
 
     puts "\n\nHere's what I'll be rebasing today:\n"
     puts branches
     puts "\nI'll rebase these branches onto #{options[:rebase_branch]}."
+    puts "I'll only rebase if the pull request is opened against the target branch."
     puts "If I run into merge conflicts, I'll skip that branch."
     puts "This can be dangerous as I will be force pushing."
     continue = Ask.confirm "Are you sure you want to continue?", default: false
@@ -49,9 +55,6 @@ module Rebaser
     return unless continue
 
     remote = Ask.input "Please enter the remote name to push to", default: 'origin'
-    unless options[:rebase_branch]
-      options[:rebase_branch] = Ask.input "Please enter the branch to rebase onto", default: 'master'
-    end
 
     rebaser = Rebaser.new(branches, options[:rebase_branch], remote)
     rebaser.begin

data/rebaser.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'pry'
   spec.add_runtime_dependency 'github_api'
   spec.add_runtime_dependency 'inquirer'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rebaser
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tim Minkov
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: github_api
   requirement: !ruby/object:Gem::Requirement