pully 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac6ecacdbc362f4fc022fc9fa9fa2d81013a25fa
-  data.tar.gz: 1c878608104e3d72f23702a2f153382c11fccc11
+  metadata.gz: 60cb6b722172142529c46b79835a40df267f064a
+  data.tar.gz: 04c49a7512ea7c1eb87f1b693afb7bdb0ab2e09a
 SHA512:
-  metadata.gz: 2c6131eabbc8ba34f82a79c0a39de726c50cfa5716a039921cfb2d3cd84284b7b3ce0d227596a7044ad95e307683ae54369ccdd86a6e0b383d8e12fd21e770d4
-  data.tar.gz: 2497f645f7e725aec7a42812de990f69061f297280ce70ff2483676ce2c2f9bb26363eff0bfabe728696dc111dca677c17920b707a0e1e31a1451f5c01376cc6
+  metadata.gz: 5b751f7a8ffdb0c564c2e9eb31c8fd7a8eb94266c3046c190f66e6c5b7dd50846c4d363706ba016cae3d607f347dfe586cb0839a8838bf868ba3b84d56bcd72a
+  data.tar.gz: 8ae2840d65a0449645563ac2a7a50276c95ad187fe14057239d41f11df447529444e9446ded01be499394e9cd6743050af758e146cd60107419fcd152715d9a7

data/README.md

@@ -14,7 +14,7 @@ A work in progress
 require 'pully'
 
 #Create a new pully object, each pully object targets (1) repository.
-pully = Pully.new("github_username", "github_password", "my_repository")
+pully = Pully.new(user:"github_username", pass:"github_password", repo:"my_repository")
 
 #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?")
@@ -26,6 +26,16 @@ pully.write_comment_to_pull_request(pull_number, "Test Comment")
 comments = pully.comments_for_pull_request(pull_number)
 ```
 
+# Organization / Repositories not owned by you
+If your repositories are not owner by you, i.e. they are owned by an organization or another user who has granted you permissions, you will need to
+pass the `owner` field for the other individual or organization.
+
+```ruby
+#Create a new pully object, each pully object targets (1) repository in an organization.
+pully = Pully.new(user:"github_username", pass:"github_password", repo:"my_repository", owner:"my_organization")
+
+```
+
 ## Requirements
 
 - Ruby 2.1 or Higher

data/lib/pully/version.rb

@@ -1,3 +1,3 @@
 module Pully
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/pully.rb

@@ -1,27 +1,34 @@
 require "pully/version"
-require 'ghee'
 require 'octokit'
 require 'git'
 require 'tempfile'
 
 module Pully
   class Pully
-    def initialize(user:, pass:, repo:)
+    module Error
+      class NonExistantRepository < StandardError; end
+      class BadLogin < StandardError; end
+    end
+
+    def initialize(user:, pass:, repo:, owner:)
       @user = user
       @pass = pass
       @repo = repo
-      @repo_selector = "#{@user}/#{@repo}"
+      @owner = owner
+      @repo_selector = @owner ? "#{@owner}/#{@repo}" : "#{@user}/#{@repo}"
 
-      @ghee = Ghee.basic_auth(@user, @pass)
       @gh_client = Octokit::Client.new(:login => @user, :password => @pass)
 
-      #Test authentication, to_s required to have side-effects
-      @ghee.repos(user, repo).to_s
-      @gh_client.user #throw exception if auth is bad
+      begin
+        @gh_client.user #throw exception if auth is bad
+      rescue Octokit::Unauthorized
+        raise Error::BadLogin
+      end
+      raise Error::NonExistantRepository unless @gh_client.repository?(@repo_selector)
     end
 
     def create_pull_request(from:, to:, subject:, message:)
-      @ghee.repos(@user, @repo).pulls.create(:title => subject, :body => message, :base => to, :head => from)["number"]
+      @gh_client.create_pull_request(@repo_selector, to, from, subject, message)["number"]
     end
 
     def comments_for_pull_request pull_number
@@ -49,7 +56,6 @@ module Pully
         @repo_selector = repo_selector
         @clone_url = clone_url
 
-
         #Setup the local git client
         ##############################################################
         Git.configure do |config|
@@ -135,7 +141,7 @@ module Pully
     end
   end
 
-  def self.new(user:, pass:, repo:)
-    Pully.new(user: user, pass: pass, repo: repo)
+  def self.new(user:, pass:, repo:, owner: nil)
+    Pully.new(user: user, pass: pass, repo: repo, owner: owner)
   end
 end

data/spec/assets/test.yml

@@ -3,3 +3,6 @@ github:
   pass: pully-test-account0
   repo: pully-test-account
   clone_url: git@github.com:pully-test-account/pully-test-account.git
+  org_owner: pully-test-organization
+  org_repo: pully-test-organization
+  org_clone_url: git@github.com:pully-test-organization/pully-test-organization.git

data/spec/lib_spec.rb

@@ -9,18 +9,31 @@ def gh_info
 end
 
 RSpec.describe "Library" do
+  def repo_selector(user:, repo:, owner:)
+    return "#{user}/#{repo}" unless owner
+    return "#{owner}/#{repo}"
+  end
+
   it "Does throw an exception with INcorrect credentials while creating an object" do
-    expect { pully = Pully.new(user: "abcdefgh", pass: "abcdefgh", repo: "abcdefgh") }.to raise_error(Ghee::Unauthorized)
+    expect { pully = Pully.new(user: "abcdefgh", pass: "abcdefgh", repo: "abcdefgh") }.to raise_error(Pully::Pully::Error::BadLogin)
   end
 
   it "Does NOT throw an exception with correct credentials while creating an object" do
     pully = Pully.new(user: gh_info["user"], pass: gh_info["pass"], repo: gh_info["repo"])
   end
 
+  it "DOES throw an exception with correct credentials while creating an object but with a non-existant repository" do
+    expect { pully = Pully.new(user: gh_info["user"], pass: gh_info["pass"], repo: SecureRandom.hex) }.to raise_error(Pully::Pully::Error::NonExistantRepository)
+  end
+
+  #it "Does throw an exception with correct credentials while creating an object with an alternate owner but without specifying that owner" do
+    #expect { pully = Pully.new(user: gh_info["user"], pass: gh_info["pass"], repo: gh_info["org_repo"])}.to raise_error
+  #end
+
   it "Can call create a new pull request and returns an integer for the pull request #" do
     #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, clone_url: gh_info["clone_url"])
+    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)
     th.commit_new_random_file(new_branch_name)
 
@@ -31,10 +44,24 @@ RSpec.describe "Library" do
     th.delete_branch(new_branch_name)
   end
 
+  it "Can call create a new pull request for an organization repo and returns an integer for the pull request #" do
+    #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["org_repo"], owner:gh_info["org_owner"]), clone_url: gh_info["org_clone_url"])
+    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"], owner: gh_info["org_owner"])
+    n = pully.create_pull_request(from:new_branch_name, to:"master", subject:"My pull request", message:"Hey XXXX, can you merge this for me?")
+    expect(n.class).to be(Fixnum)
+
+    th.delete_branch(new_branch_name)
+  end
+
   it "Can call create a new pull request and write a comment on that pull request" do
     #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, clone_url: gh_info["clone_url"])
+    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)
     th.commit_new_random_file(new_branch_name)
 
@@ -49,4 +76,23 @@ RSpec.describe "Library" do
 
     th.delete_branch(new_branch_name)
   end
+
+  it "Can call create a new pull request and write a comment on that pull request for an organization" do
+    #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["org_repo"], owner:gh_info["org_owner"]), clone_url: gh_info["org_clone_url"])
+    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"], 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?")
+
+    before_create = pully.comments_for_pull_request(pull_number).length
+    pully.write_comment_to_pull_request(pull_number, "Test Comment")
+    after_create = pully.comments_for_pull_request(pull_number).length
+
+    expect(after_create).to eq(before_create+1)
+
+    th.delete_branch(new_branch_name)
+  end
 end

data/spec/lib_test_spec.rb

@@ -3,21 +3,22 @@ require 'ghee'
 require './lib/pully.rb'
 require 'securerandom'
 
-#Get github information
-def gh_info
-  yaml = YAML.load_file("./spec/assets/test.yml")
-  return yaml["github"]
-end
 
-def repo_selector
-  return "#{gh_info["user"]}/#{gh_info["repo"]}"
-end
+RSpec.describe "Test Library" do
+  #Get github information
+  def gh_info
+    yaml = YAML.load_file("./spec/assets/test.yml")
+    return yaml["github"]
+  end
 
-def rand_repo_selector
-  return "#{gh_info["user"]}/#{SecureRandom.hex}"
-end
+  def repo_selector
+    return "#{gh_info["user"]}/#{gh_info["repo"]}"
+  end
+
+  def rand_repo_selector
+    return "#{gh_info["user"]}/#{SecureRandom.hex}"
+  end
 
-RSpec.describe "Test Library" do
   it "Fails creation with incorrect credentials" do
     expect { Pully::TestHelpers::Branch.new(user: SecureRandom.hex, pass: SecureRandom.hex, repo_selector: repo_selector, clone_url: gh_info["clone_url"]) }.to raise_error(Pully::TestHelpers::Branch::Error::BadLogin)
   end

metadata

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