git_reflow 0.2

data/spec/fixtures/pull_requests/pull_request.json

@@ -0,0 +1,123 @@
+{
+  "url": "https://api.github.com/octocat/Hello-World/pulls/1",
+  "html_url": "https://github.com/octocat/Hello-World/pulls/1",
+  "diff_url": "https://github.com/octocat/Hello-World/pulls/1.diff",
+  "patch_url": "https://github.com/octocat/Hello-World/pulls/1.patch",
+  "issue_url": "https://github.com/octocat/Hello-World/issue/1",
+  "number": 1,
+  "state": "open",
+  "title": "new-feature",
+  "body": "Please pull these awesome changes",
+  "created_at": "2011-01-26T19:01:12Z",
+  "updated_at": "2011-01-26T19:01:12Z",
+  "closed_at": "2011-01-26T19:01:12Z",
+  "merged_at": "2011-01-26T19:01:12Z",
+  "_links": {
+    "self": {
+      "href": "https://api.github.com/octocat/Hello-World/pulls/1"
+    },
+    "html": {
+      "href": "https://github.com/octocat/Hello-World/pull/1"
+    },
+    "comments": {
+      "href": "https://api.github.com/octocat/Hello-World/issues/1/comments"
+    },
+    "review_comments": {
+      "href": "https://api.github.com/octocat/Hello-World/pulls/1/comments"
+    }
+  },
+  "merged": false,
+  "mergeable": true,
+  "merged_by": {
+    "login": "octocat",
+    "id": 1,
+    "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+    "gravatar_id": "somehexcode",
+    "url": "https://api.github.com/users/octocat"
+  },
+  "comments": 10,
+  "commits": 3,
+  "additions": 100,
+  "deletions": 3,
+  "changed_files": 5,
+  "head": {
+    "label": "new-topic",
+    "ref": "new-topic",
+    "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
+    "user": {
+      "login": "octocat",
+      "id": 1,
+      "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+      "gravatar_id": "somehexcode",
+      "url": "https://api.github.com/users/octocat"
+    },
+    "repo": {
+      "url": "https://api.github.com/repos/octocat/Hello-World",
+      "html_url": "https://github.com/octocat/Hello-World",
+      "clone_url": "https://github.com/octocat/Hello-World.git",
+      "git_url": "git://github.com/octocat/Hello-World.git",
+      "ssh_url": "git@github.com:octocat/Hello-World.git",
+      "svn_url": "https://svn.github.com/octocat/Hello-World",
+      "owner": {
+        "login": "octocat",
+        "id": 1,
+        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+        "gravatar_id": "somehexcode",
+        "url": "https://api.github.com/users/octocat"
+      },
+      "name": "Hello-World",
+      "description": "This your first repo!",
+      "homepage": "https://github.com",
+      "language": null,
+      "private": false,
+      "fork": false,
+      "forks": 9,
+      "watchers": 80,
+      "size": 108,
+      "master_branch": "master",
+      "open_issues": 0,
+      "pushed_at": "2011-01-26T19:06:43Z",
+      "created_at": "2011-01-26T19:01:12Z"
+    }
+  },
+  "base": {
+    "label": "master",
+    "ref": "master",
+    "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
+    "user": {
+      "login": "octocat",
+      "id": 1,
+      "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+      "gravatar_id": "somehexcode",
+      "url": "https://api.github.com/users/octocat"
+    },
+    "repo": {
+      "url": "https://api.github.com/repos/octocat/Hello-World",
+      "html_url": "https://github.com/octocat/Hello-World",
+      "clone_url": "https://github.com/octocat/Hello-World.git",
+      "git_url": "git://github.com/octocat/Hello-World.git",
+      "ssh_url": "git@github.com:octocat/Hello-World.git",
+      "svn_url": "https://svn.github.com/octocat/Hello-World",
+      "owner": {
+        "login": "octocat",
+        "id": 1,
+        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+        "gravatar_id": "somehexcode",
+        "url": "https://api.github.com/users/octocat"
+      },
+      "name": "Hello-World",
+      "description": "This your first repo!",
+      "homepage": "https://github.com",
+      "language": null,
+      "private": false,
+      "fork": false,
+      "forks": 9,
+      "watchers": 80,
+      "size": 108,
+      "master_branch": "master",
+      "open_issues": 0,
+      "pushed_at": "2011-01-26T19:06:43Z",
+      "created_at": "2011-01-26T19:01:12Z"
+    }
+  }
+}

data/spec/fixtures/pull_requests/pull_request_exists_error.json

@@ -0,0 +1,32 @@
+{
+  :method => :post,
+  :body   => "{
+    \"errors\"     : [{
+      \"code\"     : \"custom\",
+      \"field\"    : \"base\",
+      \"message\"  : \"base A pull request already exists for reenhanced:banana.\",
+      \"resource\" : \"PullRequest\" }],
+    \"message\" : \"Validation Failed\"}",
+  :url => "https://api.github.com/repos/reenhanced/gitreflow/pulls?access_token=12345",
+  :request_headers => {
+    "Content-Type"  => "application/json",
+    "Authorization" => "Token token=\"12345\""
+  },
+  :parallel_manager => nil,
+  :request          => {:proxy => nil},
+  :ssl              => {},
+  :status           => 422,
+  :response_headers => {
+    "server"                  => "nginx/1.0.13",
+    "date"                    => "Fri, 27 Apr 2012 13:02:49 GMT",
+    "content-type"            => "application/json; charset=utf-8",
+    "connection"              => "close",
+    "status"                  => "422 Unprocessable Entity",
+    "x-ratelimit-limit"       => "5000",
+    "etag"                    => "\"ebdeb717fe19444c308e608728569d5a\"",
+    "x-oauth-scopes"          => "repo",
+    "x-ratelimit-remaining"   => "4996",
+    "x-accepted-oauth-scopes" => "repo",
+    "content-length"          => "192"},
+  :response => ""
+}

data/spec/fixtures/pull_requests/pull_requests.json

@@ -0,0 +1,117 @@
+[
+  {
+    "url": "https://api.github.com/reenhanced/repo/pulls/1",
+    "html_url": "https://github.com/reenhanced/repo/pulls/1",
+    "diff_url": "https://github.com/reenhanced/repo/pulls/1.diff",
+    "patch_url": "https://github.com/reenhanced/repo/pulls/1.patch",
+    "issue_url": "https://github.com/reenhanced/repo/issue/1",
+    "number": 1,
+    "state": "open",
+    "title": "new-feature",
+    "body": "Please pull these awesome changes",
+    "created_at": "2011-01-26T19:01:12Z",
+    "updated_at": "2011-01-26T19:01:12Z",
+    "closed_at": "2011-01-26T19:01:12Z",
+    "merged_at": "2011-01-26T19:01:12Z",
+    "head": {
+      "label": "reenhanced:new-feature",
+      "ref": "new-feature",
+      "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
+      "user": {
+        "login": "reenhanced",
+        "id": 1,
+        "avatar_url": "https://github.com/images/error/reenhanced_happy.gif",
+        "gravatar_id": "somehexcode",
+        "url": "https://api.github.com/users/reenhanced"
+      },
+      "repo": {
+        "url": "https://api.github.com/repos/reenhanced/repo",
+        "html_url": "https://github.com/reenhanced/repo",
+        "clone_url": "https://github.com/reenhanced/repo.git",
+        "git_url": "git://github.com/reenhanced/repo.git",
+        "ssh_url": "git@github.com:reenhanced/repo.git",
+        "svn_url": "https://svn.github.com/reenhanced/repo",
+        "mirror_url": "git://git.example.com/reenhanced/repo",
+        "id": 1296269,
+        "owner": {
+          "login": "reenhanced",
+          "id": 1,
+          "avatar_url": "https://github.com/images/error/reenhanced_happy.gif",
+          "gravatar_id": "somehexcode",
+          "url": "https://api.github.com/users/reenhanced"
+        },
+        "name": "repo",
+        "description": "This your first repo!",
+        "homepage": "https://github.com",
+        "language": null,
+        "private": false,
+        "fork": false,
+        "forks": 9,
+        "watchers": 80,
+        "size": 108,
+        "master_branch": "master",
+        "open_issues": 0,
+        "pushed_at": "2011-01-26T19:06:43Z",
+        "created_at": "2011-01-26T19:01:12Z",
+        "updated_at": "2011-01-26T19:14:43Z"
+      }
+    },
+    "base": {
+      "label": "reenhanced:master",
+      "ref": "master",
+      "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
+      "user": {
+        "login": "reenhanced",
+        "id": 1,
+        "avatar_url": "https://github.com/images/error/reenhanced_happy.gif",
+        "gravatar_id": "somehexcode",
+        "url": "https://api.github.com/users/reenhanced"
+      },
+      "repo": {
+        "url": "https://api.github.com/repos/reenhanced/repo",
+        "html_url": "https://github.com/reenhanced/repo",
+        "clone_url": "https://github.com/reenhanced/repo.git",
+        "git_url": "git://github.com/reenhanced/repo.git",
+        "ssh_url": "git@github.com:reenhanced/repo.git",
+        "svn_url": "https://svn.github.com/reenhanced/repo",
+        "mirror_url": "git://git.example.com/reenhanced/repo",
+        "id": 1296269,
+        "owner": {
+          "login": "reenhanced",
+          "id": 1,
+          "avatar_url": "https://github.com/images/error/reenhanced_happy.gif",
+          "gravatar_id": "somehexcode",
+          "url": "https://api.github.com/users/reenhanced"
+        },
+        "name": "repo",
+        "description": "This your first repo!",
+        "homepage": "https://github.com",
+        "language": null,
+        "private": false,
+        "fork": false,
+        "forks": 9,
+        "watchers": 80,
+        "size": 108,
+        "master_branch": "master",
+        "open_issues": 0,
+        "pushed_at": "2011-01-26T19:06:43Z",
+        "created_at": "2011-01-26T19:01:12Z",
+        "updated_at": "2011-01-26T19:14:43Z"
+      }
+    },
+    "_links": {
+      "self": {
+        "href": "https://api.github.com/reenhanced/repo/pulls/1"
+      },
+      "html": {
+        "href": "https://github.com/reenhanced/repo/pull/1"
+      },
+      "comments": {
+        "href": "https://api.github.com/reenhanced/repo/issues/1/comments"
+      },
+      "review_comments": {
+        "href": "https://api.github.com/reenhanced/repo/pulls/1/comments"
+      }
+    }
+  }
+]

data/spec/git_reflow_spec.rb

@@ -0,0 +1,139 @@
+require 'spec_helper'
+require 'aruba/api'
+
+describe :git_reflow do
+  include Aruba::Api
+  let(:github) { Github.new }
+  let(:user)   { 'reenhanced' }
+  let(:repo)   { 'repo' }
+
+  before do
+    Github.stub :new => github
+  end
+
+  after { reset_authentication_for github }
+
+  context :setup do
+
+     before do
+       github.oauth.stub(:create).and_return({:token => '12345'})
+       GitReflow.stub(:set_oauth_token)
+     end
+
+     it "creates a new authorization" do
+       STDIN.stub(:gets).and_return("user", "password")
+       Github.should_receive :new
+       github.oauth.should_receive(:create).with('scopes' => ['repo'])
+       GitReflow.should_receive(:set_oauth_token).with('12345')
+       GitReflow.setup
+     end
+  end
+
+  context :github do
+    before do
+      GitReflow.stub(:get_oauth_token).and_return('12345')
+    end
+
+    it "creates a new authorization from the stored oauth token" do
+      Github.should_receive(:new).with({:oauth_token => '12345'})
+      GitReflow.should_receive(:get_oauth_token)
+      GitReflow.github
+    end
+  end
+
+  # Github Response specs thanks to:
+  # https://github.com/peter-murach/github/blob/master/spec/github/pull_requests_spec.rb
+  context :review do
+    let(:inputs) {
+      {
+       "title" => "Amazing new feature",
+       "body" => "Please pull this in!",
+       "head" => "reenhanced:new-feature",
+       "base" => "master",
+       "state" => "open"
+      }
+    }
+
+    before do
+      GitReflow.stub(:push_current_branch).and_return(true)
+      GitReflow.stub(:github).and_return(github)
+      GitReflow.stub(:current_branch).and_return('new-feature')
+      GitReflow.stub(:remote_repo_name).and_return(repo)
+      GitReflow.stub(:fetch_destination).and_return(true)
+      github.pull_requests.stub(:create).with(user, repo, inputs.except('state')).and_return(Hashie::Mash.new(:number => '1', :title => inputs['title'], :html_url => "http://github.com/#{user}/#{repo}/pulls/1"))
+      stub_post("/repos/#{user}/#{repo}/pulls").
+        to_return(:body => fixture('pull_requests/pull_request.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+    end
+
+    it "successfully creates a pull request if I do not provide one" do
+      github.pull_requests.should_receive(:create).with(user, repo, inputs.except('state'))
+      STDOUT.should_receive(:puts).with("Successfully created pull request #1: #{inputs['title']}\nPull Request URL: http://github.com/#{user}/#{repo}/pulls/1\n")
+      GitReflow.review inputs
+    end
+
+    it "reports any errors returned from github" do
+      github_error = Github::Error::UnprocessableEntity.new( eval(fixture('pull_requests/pull_request_exists_error.json').read) )
+      github.pull_requests.stub(:create).with(user, repo, inputs.except('state')).and_raise(github_error)
+      stub_post("/repos/#{user}/#{repo}/pulls").
+        to_return(:body => fixture('pull_requests/pull_request_exists_error.json'), :status => 422, :headers => {:content_type => "application/json; charset=utf-8"})
+
+      STDOUT.should_receive(:puts).with("GitHub Error: A pull request already exists for reenhanced:banana.")
+      GitReflow.review inputs
+    end
+
+    it "pushes the latest current branch to the origin repo" do
+      github.pull_requests.should_receive(:create)
+      GitReflow.should_receive(:push_current_branch)
+      GitReflow.should_receive(:current_branch)
+      GitReflow.review
+    end
+
+    it "fetches the latest changes to the destination branch" do
+      GitReflow.should_receive(:fetch_destination)
+      github.pull_requests.should_receive(:create)
+      GitReflow.review
+    end
+  end
+
+  context :deliver do
+    before do
+      GitReflow.stub(:github).and_return(github)
+      GitReflow.stub(:current_branch).and_return('new-feature')
+      GitReflow.stub(:remote_repo_name).and_return(repo)
+      GitReflow.stub(:fetch_destination).and_return(true)
+      GitReflow.stub(:update_destination).and_return(true)
+      stub_get("/repos/#{user}/#{repo}/pulls").with(:query => {'state' => 'open'}).
+        to_return(:body => fixture('pull_requests/pull_requests.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+    end
+
+    it "successfully finds a pull request for the current feature branch" do
+      STDOUT.should_receive(:puts).with("Merging pull request #1: 'new-feature', from 'reenhanced:new-feature' into 'reenhanced:master'")
+      GitReflow.deliver
+    end
+
+    it "reports an errors if no open pull requests exist for the current feature branch" do
+      github.pull_requests.stub(:all).with(user, repo, :state => 'open')
+      stub_get("/repos/#{user}/#{repo}/pulls").
+        to_return(:body => "[]", :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+
+      STDOUT.should_receive(:puts).with("Error: No pull request exists for reenhanced:new-feature\nPlease submit your branch for review first with \`git reflow review\`")
+      GitReflow.deliver
+    end
+
+    it "fetches the latest changes to the destination branch" do
+      GitReflow.should_receive(:fetch_destination)
+      github.pull_requests.should_receive(:all)
+      GitReflow.deliver
+    end
+
+    it "checks out the destination branch and updates any remote changes" do
+      GitReflow.should_receive(:update_destination)
+      GitReflow.deliver
+    end
+
+    it "merges and squashes the feature branch into the master branch" do
+      GitReflow.should_receive(:merge_feature_branch)
+      GitReflow.deliver
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,28 @@
+require 'rubygems'
+require 'rspec'
+require 'json'
+require 'webmock/rspec'
+require 'ruby-debug'
+
+$LOAD_PATH << 'lib'
+require 'git_reflow'
+require 'github_api'
+
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each {|f| require f}
+
+RSpec.configure do |config|
+  config.include GithubHelpers
+  config.include WebMock::API
+  config.color_enabled = true
+  config.before(:each) do
+    WebMock.reset!
+  end
+end
+
+OAUTH_TOKEN = 'bafec72922f31fe86aacc8aca4261117f3bd62cf'
+
+def reset_authentication_for(object)
+  [ 'user', 'repo', 'basic_auth', 'oauth_token', 'login', 'password' ].each do |item|
+    object.send("#{item}=", nil)
+  end
+end

data/spec/support/fixtures.rb

@@ -0,0 +1,8 @@
+def fixture_path
+  File.expand_path("../../fixtures", __FILE__)
+end
+
+def fixture(file)
+  File.new(File.join(fixture_path, '/', file))
+end
+

data/spec/support/github_helpers.rb

@@ -0,0 +1,45 @@
+$LOAD_PATH << 'lib'
+require 'git_reflow'
+require 'github_api'
+require File.expand_path('../web_mocks', __FILE__)
+require File.expand_path('../fixtures', __FILE__)
+
+module GithubHelpers
+  def stub_github_with(options = {})
+    github = Github.new
+    user = options[:user] || 'reenhanced'
+    repo = options[:repo] || 'repo'
+    branch = options[:branch] || 'new-feature'
+    pull = options[:pull]
+
+    Github.stub :new => github
+    GitReflow.stub(:push_current_branch).and_return(true)
+    GitReflow.stub(:github).and_return(github)
+    GitReflow.stub(:current_branch).and_return(branch)
+    GitReflow.stub(:remote_repo_name).and_return(repo)
+    GitReflow.stub(:remote_user).and_return(user)
+    GitReflow.stub(:fetch_destination).and_return(true)
+    GitReflow.stub(:update_destination).and_return(true)
+
+    if pull
+      # Stubbing review
+      github.pull_requests.stub(:create).with(user, repo, pull.except('state')).and_return(Hashie::Mash.new(:number => '1', :title => pull['title'], :html_url => "http://github.com/#{user}/#{repo}/pulls/1"))
+      stub_post("/repos/#{user}/#{repo}/pulls").
+        to_return(:body => fixture('pull_requests/pull_request.json'), :status => 201, :headers => {:content_type => "application/json\; charset=utf-8"})
+
+      # Stubbing pull request finder
+      stub_get("/repos/#{user}/#{repo}/pulls").with(:query => {'state' => 'open'}).
+        to_return(:body => fixture('pull_requests/pull_requests.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+    end
+  end
+end
+
+# the github_api gem does some overrides to Hash so we have to make sure
+# this still works here...
+class Hash
+  def except(*keys)
+    cpy = self.dup
+    keys.each { |key| cpy.delete(key) }
+    cpy
+  end
+end

data/spec/support/web_mocks.rb

@@ -0,0 +1,39 @@
+def stub_get(path, endpoint = Github.endpoint.to_s)
+  stub_request(:get, endpoint + path)
+end
+
+def stub_post(path, endpoint = Github.endpoint.to_s)
+  stub_request(:post, endpoint + path)
+end
+
+def stub_patch(path, endpoint = Github.endpoint.to_s)
+  stub_request(:patch, endpoint + path)
+end
+
+def stub_put(path, endpoint = Github.endpoint.to_s)
+  stub_request(:put, endpoint + path)
+end
+
+def stub_delete(path, endpoint = Github.endpoint.to_s)
+  stub_request(:delete, endpoint + path)
+end
+
+def a_get(path, endpoint = Github.endpoint.to_s)
+  a_request(:get, endpoint + path)
+end
+
+def a_post(path, endpoint = Github.endpoint.to_s)
+  a_request(:post, endpoint + path)
+end
+
+def a_patch(path, endpoint = Github.endpoint.to_s)
+  a_request(:patch, endpoint + path)
+end
+
+def a_put(path, endpoint = Github.endpoint)
+  a_request(:put, endpoint + path)
+end
+
+def a_delete(path, endpoint = Github.endpoint)
+  a_request(:delete, endpoint + path)
+end