pully 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfac1f15dc32ea73cea429df9e08e5f6b1ce2603
-  data.tar.gz: a02b5a8a9b17e3cf0f2a72f897cf921711cfcb89
+  metadata.gz: 72439241dc5b76e35e22d418d4d9d244461dda6f
+  data.tar.gz: 4902037b47f120482a278373ae6135d93e80daa6
 SHA512:
-  metadata.gz: 60a3d82905a951e4a1e456340655c6a8863269a8aeaefaa84ed47b68a7a680128a57ddcb679057267dd5b886edffed9c8f023e4474d1be20d8ef7eab1c2151ca
-  data.tar.gz: a7e963a02497934fa619f4eb6ba2a81e42c19b7949a1e598c17682b348a1213c80361da1da2bdc464ef6a7b7f472a3a3a56f40cddc5c2ea80b673211980a2e5f
+  metadata.gz: 80906d784784c1e7fc625a02f2731edb055debb605392a8ddf537ab3f04085f605c32991a62c57fe41f9e5bcaa4b1a8ae8b2afc1482155e2c49554303f888d96
+  data.tar.gz: 96c64213e4265778e44f6dfef352eba64cd7a2d814ae02a3c76d0e3d91ce5153233c877cf7f15b09a33bb33db43ab130338bb98f8cf290ae37f8286a2011d277

data/README.md

@@ -20,6 +20,9 @@ require 'pully'
 #Create a new pully object, each pully object targets (1) repository.
 pully = Pully.new(user:"github_username", pass:"github_password", repo:"my_repository")
 
+#Get a list of all open pull requests (An array of pull numbers)
+open = pully.pull_requests
+
 #Create a new pull request to merge 'my_branch' into 'master' with the title 'My pull request' and the message 'Hey XXX...'
 pull_number = pully.create_pull_request(from:"my_branch", to:"master", subject:"My pull request", message:"Hey XXXX, can you merge this for me?")
 

data/lib/pully/version.rb

@@ -1,3 +1,3 @@
 module Pully
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/pully.rb

@@ -48,17 +48,17 @@ module Pully
       @gh_client.combined_status(@repo_selector, sha)["state"]
     end
 
+    def pull_requests
+      return @gh_client.pull_requests(@repo_selector, :state => 'open').map{|e| e["number"]}
+    end
+
     def set_pull_request_status(pull_number, status)
       sha = sha_for_pull_request pull_number
       @gh_client.create_status(@repo_selector, sha, status)
     end
 
-    def merge_pull_request(pull_number)
-      branches = pull_request_branches(pull_number)
-      from_name = branches[:from]
-      to_name = branches[:to]
-      @gh_client.merge(@repo_selector, to_name, from_name)
-      @gh_client.close_pull_request(@repo_selector, pull_number)
+    def merge_pull_request(pull_number, message='Merged Pull Request')
+      @gh_client.merge_pull_request(@repo_selector, pull_number, message)
     end
 
     def pull_request_branches(pull_number)
@@ -160,6 +160,11 @@ module Pully
         @git_client.object("HEAD").sha
       end
 
+      def latest_message branch_name
+        @git_client.checkout(branch_name)
+        @git_client.object("HEAD").message
+      end
+
       def master_branch
         @repo.default_branch
       end

data/spec/lib_spec.rb

@@ -188,7 +188,7 @@ RSpec.describe "Library" do
     th.create_branch(new_branch_name)
     th.commit_new_random_file(new_branch_name)
 
-    pully = Pully.new(user: gh_info["user"], pass: gh_info["pass"], repo: gh_info["org_repo"])
+    pully = Pully.new(user: gh_info["user"], pass: gh_info["pass"], repo: gh_info["org_repo"], owner: gh_info["org_owner"])
     pull_number = pully.create_pull_request(from:new_branch_name, to:"master", subject:"My pull request", message:"Hey XXXX, can you merge this for me?")
     branches = pully.pull_request_branches(pull_number) 
 
@@ -208,15 +208,33 @@ RSpec.describe "Library" do
 
     pully = Pully.new(user: gh_info["user"], pass: gh_info["pass"], repo: gh_info["repo"])
     pull_number = pully.create_pull_request(from:new_branch_name, to:"master", subject:"My pull request", message:"Hey XXXX, can you merge this for me?")
-    pully.merge_pull_request(pull_number)
+    msg = SecureRandom.hex
+    pully.merge_pull_request(pull_number, msg)
 
-    #Check leading sha
+    #Commit message contains message given
     th = Pully::TestHelpers::Branch.new(user: gh_info["user"], pass: gh_info["pass"], repo_selector: repo_selector(user: gh_info["user"], repo: gh_info["repo"], owner:nil), clone_url: gh_info["clone_url"])
-    expect(th.latest_sha("master")).to eq(last_sha)
+    expect(th.latest_message("master") =~ /#{msg}/).not_to eq(nil)
 
     #We expect the pull request to be closed
     expect(pully.pull_request_is_open?(pull_number)).to eq(false)
 
     th.delete_branch(new_branch_name)
   end
+
+  it "Can list pull requests" do
+    sleep 10
+    #test branch creator
+    new_branch_name = SecureRandom.hex
+    th = Pully::TestHelpers::Branch.new(user: gh_info["user"], pass: gh_info["pass"], repo_selector: repo_selector(user: gh_info["user"], repo: gh_info["repo"], owner:nil), clone_url: gh_info["clone_url"])
+    th.create_branch(new_branch_name)
+    last_sha = th.commit_new_random_file(new_branch_name)
+
+    pully = Pully.new(user: gh_info["user"], pass: gh_info["pass"], repo: gh_info["repo"])
+    pull_number = pully.create_pull_request(from:new_branch_name, to:"master", subject:"My pull request", message:"Hey XXXX, can you merge this for me?")
+
+    expect(pully.pull_requests).to include(pull_number)
+
+    th.delete_branch(new_branch_name)
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pully
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Seo Townsend