git_pr 0.0.14.beta5 → 0.0.14.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 573b7338fa036257caa40bb7c7f00ecda6df4aec
-  data.tar.gz: dde80e1260e6bf1f1935e49a3434f16d2ee0d3f9
+  metadata.gz: cb208f68843fc8f6d4c49dd94d21c0f0c578f3cd
+  data.tar.gz: d3da8529e1b679bd2f332d8951982e8518247783
 SHA512:
-  metadata.gz: 8b780c90bbb5a808797cf1ff4f86bb1ecd94cb5a91644eb6e4c68232aaa345e1196ee9506806960917a96eaf2e23c2b71e0f37ec48cffa73709937834dd93b87
-  data.tar.gz: c9f7289ec7ebdd679988b106aa51e1dc5bbb0c2141366b891db4f865e76a98ac23c71f36db4e27e550405dbf13bfaf03ebff7454b5e94afd8fa49dbecbc23ab1
+  metadata.gz: b97805df16a6150b8012077a130cea578d2bc82fdf98a3e88c8947a923f37032edf9301e724afbba28ef8f6fabf11bf51ae017648a3a8b8294947ce7457b666a
+  data.tar.gz: b674b6cf148703f32a5f38fc0a05494f20d6b9a7c8edefba571e97550502f1a7d55d6453997e3f9e565f7af2c88a412aeebf41f43cce309b09cf9436324c197e

data/bin/git-pr

@@ -256,7 +256,7 @@ when "merge"
 when "list"
   pulls = Octokit.pulls("#{github_project}").map { |p| GitPr::PullRequest.new(p) }
   if options.list.user
-    pulls = pulls.select { |p| p[:user][:login] == options.list.user }
+    pulls = pulls.select { |p| p.user.login == options.list.user }
   end
   include_status = false
   if options.list.to_h.has_key?(:status)
@@ -343,11 +343,11 @@ when "diff", "difftool"
     end
     true
   end
-  source_remote.fetch unless have_commit_locally git, pull[:head][:sha]
-  target_remote.fetch unless have_commit_locally git, pull[:base][:sha]
+  source_remote.fetch unless have_commit_locally git, pull.head.sha
+  target_remote.fetch unless have_commit_locally git, pull.base.sha
 
-  source_branch = pull[:head][:ref]
-  target_branch = pull[:base][:ref]
+  source_branch = pull.head.ref
+  target_branch = pull.base.ref
   merge_base = `git merge-base #{source_remote}/#{source_branch} #{target_remote}/#{target_branch}`.strip!
   diff_command = "git #{command} #{options[command].additional_arguments.join " "} #{merge_base} #{source_remote}/#{source_branch}".gsub /\s* /, " "
   puts "Executing #{diff_command}"

data/lib/git_pr/github.rb

@@ -148,7 +148,7 @@ module GitPr
       end
       if pull_request
         pull_request = pull_request
-        pull = pulls.find { |p| p[:number] == pull_request }
+        pull = pulls.find { |p| p.number == pull_request }
         unless pull
           puts "Pull request #{pull_request} not found in project '#{github_project}'!".red
           exit -1

data/lib/git_pr/merge.rb

@@ -24,6 +24,7 @@ module GitPr
         max_context = failed_statuses.map { |s| s.context.length }.max
         puts <<EOS
 #{"ERROR".red}: One or more status checks have failed on this pull request!
+You should fix these before merging.
 
 #{" " * (max_context + 5)}(cmd-double-click to open links)
 EOS

data/lib/git_pr/version.rb

@@ -1,3 +1,3 @@
 module GitPr
-  VERSION = "0.0.14.beta5"
+  VERSION = "0.0.14.beta6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_pr
 version: !ruby/object:Gem::Version
-  version: 0.0.14.beta5
+  version: 0.0.14.beta6
 platform: ruby
 authors:
 - Brian Sharon