git_reflow 0.4.2 → 0.5.0

data/lib/git_reflow/sandbox.rb

@@ -2,6 +2,13 @@ module GitReflow
   module Sandbox
     extend self
 
+    COLOR_FOR_LABEL = {
+      notice:         :yellow,
+      error:          :red,
+      deliver_halted: :red,
+      success:        :green
+    }
+
     def run(command, options = {})
       options = { loud: true }.merge(options)
 
@@ -20,6 +27,14 @@ module GitReflow
       run(command, options)
     end
 
+    def say(message, label_type = :plain)
+      if COLOR_FOR_LABEL[label_type]
+        puts "[#{ label_type.to_s.gsub('_', ' ').colorize(COLOR_FOR_LABEL[label_type]) }] #{message}"
+      else
+        puts message
+      end
+    end
+
     # WARNING: this currently only supports OS X and UBUNTU
     def ask_to_open_in_browser(url)
       if RUBY_PLATFORM =~ /darwin|linux/i

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/spec/fixtures/repositories/commit.json

@@ -0,0 +1,53 @@
+{
+    "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
+    "commit": {
+        "url": "https://api.github.com/repos/reenhanced/repo/git/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
+        "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e",
+        "author": {
+            "name": "Monalisa Octocat",
+            "email": "support@github.com",
+            "date": "2011-04-14T16:00:49Z"
+        },
+        "committer": {
+            "name": "Monalisa Octocat",
+            "email": "support@github.com",
+            "date": "2011-04-14T16:00:49Z"
+        },
+        "message": "Fix all the bugs",
+        "tree": {
+            "url": "https://api.github.com/repos/reenhanced/repo/tree/6dcb09b5b57875f334f61aebed695e2e4193db5e",
+            "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
+        }
+    },
+    "author": {
+        "login": "reenhanced",
+        "id": 1,
+        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+        "url": "https://api.github.com/users/reenhanced"
+    },
+    "committer": {
+        "login": "reenhanced",
+        "id": 1,
+        "avatar_url": "https://github.com/images/error/octocat_happy.gif",
+        "url": "https://api.github.com/users/reenhanced"
+    },
+    "parents": [
+        {
+            "url": "https://api.github.com/repos/reenhanced/repo/commits/6dcb09b5b57875f334f61aebed695e2e4193db5e",
+            "sha": "6dcb09b5b57875f334f61aebed695e2e4193db5e"
+        }
+    ],
+    "stats": {
+        "additions": 104,
+        "deletions": 4,
+        "total": 108
+    },
+    "files": [
+        {
+            "filename": "file1.txt",
+            "additions": 10,
+            "deletions": 2,
+            "total": 12
+        }
+    ]
+}

data/spec/git_reflow_spec.rb

@@ -15,7 +15,7 @@ describe GitReflow do
 
   let(:github_authorizations)  { Github::Client::Authorizations.new }
   let(:existing_pull_requests) { JSON.parse(fixture('pull_requests/pull_requests.json').read).collect { |pull| Hashie::Mash.new(pull)} }
-  let(:existing_pull_request)  { existing_pull_requests.first }
+  let(:existing_pull_request)  { GitReflow::GitServer::GitHub::PullRequest.new existing_pull_requests.first }
 
   before do
     HighLine.any_instance.stub(:ask) do |terminal, question|
@@ -45,13 +45,13 @@ describe GitReflow do
     end
 
     context 'with no existing pull request' do
-      before { git_server.stub(:find_pull_request).with({from: feature_branch, to: base_branch}).and_return(nil) }
+      before { git_server.stub(:find_open_pull_request).with({from: feature_branch, to: base_branch}).and_return(nil) }
       it     { expect{ subject }.to have_output "\n[notice] No pull request exists for #{feature_branch} -> #{base_branch}" }
       it     { expect{ subject }.to have_output "[notice] Run 'git reflow review #{base_branch}' to start the review process" }
     end
 
     context 'with an existing pull request' do
-      before { git_server.stub(:find_pull_request).with({from: feature_branch, to: base_branch}).and_return(existing_pull_request) }
+      before { git_server.stub(:find_open_pull_request).with({from: feature_branch, to: base_branch}).and_return(existing_pull_request) }
 
       it 'displays a summary of the pull request and asks to open it in the browser' do
         GitReflow.should_receive(:display_pull_request_summary).with(existing_pull_request)
@@ -82,7 +82,7 @@ describe GitReflow do
         :password     => password,
         :repo         => repo,
         :branch       => branch,
-        :pull         => inputs
+        :pull         => Hashie::Mash.new(inputs)
       })
     end
 
@@ -90,20 +90,20 @@ describe GitReflow do
 
     it "fetches the latest changes to the destination branch" do
       GitReflow.should_receive(:fetch_destination).with(inputs['base'])
-      github.should_receive(:find_pull_request).and_return(nil)
+      github.should_receive(:find_open_pull_request).and_return(nil)
       github.stub(:create_pull_request).and_return(existing_pull_request)
       subject
     end
 
     it "pushes the latest current branch to the origin repo" do
       GitReflow.should_receive(:push_current_branch)
-      github.should_receive(:find_pull_request).and_return(nil)
+      github.should_receive(:find_open_pull_request).and_return(nil)
       github.stub(:create_pull_request).and_return(existing_pull_request)
       subject
     end
 
     context "pull request doesn't exist" do
-      before { github.stub(:find_pull_request).and_return(nil) }
+      before { github.stub(:find_open_pull_request).and_return(nil) }
 
       it "successfully creates a pull request if I do not provide one" do
         existing_pull_request.stub(:title).and_return(inputs['title'])
@@ -117,13 +117,13 @@ describe GitReflow do
         GitReflow.stub(:push_current_branch)
         github_error = Github::Error::UnprocessableEntity.new( eval(fixture('pull_requests/pull_request_exists_error.json').read) )
         github.stub(:create_pull_request).with(inputs.except('state')).and_raise(github_error)
-        GitReflow.stub(:display_pull_request_summary).with(existing_pull_request)
+        GitReflow.stub(:display_pull_request_summary)
       end
 
       subject { GitReflow.review inputs }
 
       it "displays a pull request summary for the existing pull request" do
-        GitReflow.should_receive(:display_pull_request_summary).with(existing_pull_request)
+        GitReflow.should_receive(:display_pull_request_summary)
         subject
       end
 
@@ -164,7 +164,7 @@ describe GitReflow do
     end
 
     it "looks for a pull request matching the feature branch and destination branch" do
-      github.should_receive(:find_pull_request).with(from: branch, to: 'master')
+      github.should_receive(:find_open_pull_request).with(from: branch, to: 'master')
       subject
     end
 
@@ -172,7 +172,6 @@ describe GitReflow do
       before do
         github.stub(:get_build_status).and_return(build_status)
         github.stub(:has_pull_request_comments?).and_return(true)
-        github.stub(:find_authors_of_open_pull_request_comments).and_return([])
         github.stub(:comment_authors_for_pull_request).and_return(['codenamev'])
       end
 
@@ -181,12 +180,11 @@ describe GitReflow do
 
         before do
           # just stubbing these in a locked state as the test is specific to this scenario
-          GitReflow.stub(:find_authors_of_open_pull_request_comments).and_return([])
           GitReflow.stub(:has_pull_request_comments?).and_return(true)
         end
 
         it "halts delivery and notifies user of a failed build" do
-          expect { subject }.to have_output "[#{ 'deliver halted'.colorize(:red) }] #{build_status.description}: #{build_status.target_url}"
+          expect { subject }.to have_said "#{build_status.description}: #{build_status.target_url}", :deliver_halted
         end
       end
 
@@ -196,7 +194,6 @@ describe GitReflow do
 
         before do
           # stubbing unrelated results so we can just test that it made it insdide the conditional block
-          GitReflow.stub(:find_authors_of_open_pull_request_comments).and_return([])
           GitReflow.stub(:has_pull_request_comments?).and_return(true)
           GitReflow.stub(:comment_authors_for_pull_request).and_return([])
           GitReflow.stub(:update_destination).and_return(true)
@@ -205,7 +202,7 @@ describe GitReflow do
         end
 
         it "ignores build status when not setup" do
-          expect { subject }.to have_output "Merge complete!"
+          expect { subject }.to have_said "Merge complete!", :success
         end
       end
 
@@ -215,12 +212,14 @@ describe GitReflow do
         context 'and has comments' do
           before do
             GitReflow.stub(:has_pull_request_comments?).and_return(true)
-            GitReflow.stub(:find_authors_of_open_pull_request_comments).and_return([])
           end
 
           context 'but there is a LGTM' do
             let(:lgtm_comment_authors) { ['nhance'] }
-            before { stub_with_fallback(github, :comment_authors_for_pull_request).with(existing_pull_request, with: GitReflow::LGTM).and_return(lgtm_comment_authors) }
+            before do
+              github.stub(:approvals).and_return(lgtm_comment_authors)
+              github.stub(:reviewers_pending_response).and_return([])
+            end
 
             it "includes the pull request body in the commit message" do
               squash_message = "#{existing_pull_request.body}\nCloses ##{existing_pull_request.number}\n\nLGTM given by: @nhance\n"
@@ -232,8 +231,8 @@ describe GitReflow do
               let(:first_commit_message) { "We'll do it live." }
 
               before do
-                existing_pull_request[:body] = ''
-                github.stub(:find_pull_request).and_return(existing_pull_request)
+                existing_pull_request.description = ''
+                github.stub(:find_open_pull_request).and_return(existing_pull_request)
                 GitReflow.stub(:get_first_commit_message).and_return(first_commit_message)
                 github.stub(:comment_authors_for_pull_request).and_return(lgtm_comment_authors)
               end
@@ -262,8 +261,7 @@ describe GitReflow do
             end
 
             it "commits the changes for the squash merge" do
-              subject
-              $output.should include 'Merge complete!'
+              expect{ subject }.to have_said 'Merge complete!', :success
             end
 
             context "and cleaning up feature branch" do
@@ -333,7 +331,7 @@ describe GitReflow do
             context "and there were issues commiting the squash merge to the base branch" do
               before { stub_with_fallback(GitReflow, :run_command_with_label).with('git commit', {with_system: true}).and_return false }
               it "notifies user of issues commiting the squash merge of the feature branch" do
-                expect { subject }.to have_output("There were problems commiting your feature... please check the errors above and try again.")
+                expect { subject }.to have_said("There were problems commiting your feature... please check the errors above and try again.", :error)
               end
             end
 
@@ -341,9 +339,9 @@ describe GitReflow do
 
           context 'but there are still unaddressed comments' do
             let(:open_comment_authors) { ['nhance', 'codenamev'] }
-            before { github.stub(:find_authors_of_open_pull_request_comments).and_return(open_comment_authors) }
+            before { github.stub(:reviewers_pending_response).and_return(open_comment_authors) }
             it "notifies the user to get their code reviewed" do
-              expect { subject }.to have_output "[deliver halted] You still need a LGTM from: #{open_comment_authors.join(', ')}"
+              expect { subject }.to have_said "You still need a LGTM from: #{open_comment_authors.join(', ')}", :deliver_halted
             end
           end
         end
@@ -351,11 +349,10 @@ describe GitReflow do
         context 'but has no comments' do
           before do
             github.stub(:has_pull_request_comments?).and_return(false)
-            github.stub(:find_authors_of_open_pull_request_comments).and_return([])
           end
 
           it "notifies the user to get their code reviewed" do
-            expect { subject }.to have_output "[deliver halted] Your code has not been reviewed yet."
+            expect { subject }.to have_said "Your code has not been reviewed yet.", :deliver_halted
           end
         end
 
@@ -376,10 +373,10 @@ describe GitReflow do
     end
 
     context "and no pull request exists for the feature branch to the destination branch" do
-      before { github.stub(:find_pull_request).and_return(nil) }
+      before { github.stub(:find_open_pull_request).and_return(nil) }
 
       it "notifies the user of a missing pull request" do
-        expect { subject }.to have_output "Error: No pull request exists for #{user}:#{branch}\nPlease submit your branch for review first with \`git reflow review\`"
+        expect { subject }.to have_said "No pull request exists for #{user}:#{branch}\nPlease submit your branch for review first with \`git reflow review\`", :deliver_halted
       end
     end
   end

data/spec/lib/git_reflow/config_spec.rb

@@ -4,6 +4,11 @@ describe GitReflow::Config do
   describe ".get(key)" do
     subject { GitReflow::Config.get('chucknorris.roundhouse') }
     it      { expect{ subject }.to have_run_command_silently 'git config --get chucknorris.roundhouse' }
+
+    context "and getting all values" do
+      subject { GitReflow::Config.get('chucknorris.roundhouse', all: true) }
+      it      { expect{ subject }.to have_run_command_silently 'git config --get-all chucknorris.roundhouse' }
+    end
   end
 
   describe ".set(key)" do
@@ -15,4 +20,34 @@ describe GitReflow::Config do
       it      { expect{ subject }.to have_run_command_silently 'git config --replace-all chucknorris.roundhouse "to the face"' }
     end
   end
+
+  describe ".unset(key)" do
+    subject { GitReflow::Config.unset('chucknorris.roundhouse') }
+    it      { expect{ subject }.to have_run_command_silently 'git config --global --unset chucknorris.roundhouse ' }
+
+    context "for multi-value keys" do
+      subject { GitReflow::Config.unset('chucknorris.roundhouse', value: 'to the face') }
+      it      { expect{ subject }.to have_run_command_silently 'git config --global --unset chucknorris.roundhouse "to the face"' }
+    end
+
+    context "for current project only" do
+      subject { GitReflow::Config.unset('chucknorris.roundhouse', local: true) }
+      it      { expect{ subject }.to have_run_command_silently 'git config --unset chucknorris.roundhouse ' }
+
+      context "for multi-value keys" do
+        subject { GitReflow::Config.unset('chucknorris.roundhouse', value: 'to the face', local: true) }
+        it      { expect{ subject }.to have_run_command_silently 'git config --unset chucknorris.roundhouse "to the face"' }
+      end
+    end
+  end
+
+  describe ".add(key)" do
+    subject { GitReflow::Config.add('chucknorris.roundhouse', 'to the face') }
+    it      { expect{ subject }.to have_run_command_silently 'git config --global --add chucknorris.roundhouse "to the face"' }
+
+    context "for current project only" do
+      subject { GitReflow::Config.add('chucknorris.roundhouse', 'to the face', local: true) }
+      it      { expect{ subject }.to have_run_command_silently 'git config --add chucknorris.roundhouse "to the face"' }
+    end
+  end
 end

data/spec/lib/git_server/bit_bucket_spec.rb

@@ -0,0 +1,110 @@
+require 'spec_helper'
+
+describe GitReflow::GitServer::BitBucket do
+  let(:user)         { 'reenhanced' }
+  let(:password)     { 'shazam' }
+  let(:repo)         { 'repo' }
+  let(:api_key)      { 'a1b2c3d4e5f6g7h8i9j0' }
+  let(:hostname)     { 'hostname.local' }
+  let(:api_endpoint) { 'https://bitbucket.org/api/1.0' }
+  let(:site)         { 'https://bitbucket.org' }
+  let(:remote_url)   { "git@bitbucket.org:#{user}/#{repo}.git" }
+
+  before do
+    HighLine.any_instance.stub(:ask) do |terminal, question|
+      values = {
+        "Please enter your BitBucket username: " => user
+      }
+     return_value = values[question]
+     question = ""
+     return_value
+    end
+  end
+
+  describe '#initialize(options)' do
+    subject { GitReflow::GitServer::BitBucket.new({}) }
+
+    it 'sets the reflow git server provider to BitBucket in the git config' do
+      GitReflow::Config.should_receive(:set).once.with('reflow.git-server', 'BitBucket')
+      subject
+    end
+
+    context 'storing git config settings only for this project' do
+      subject { GitReflow::GitServer::BitBucket.new(project_only: true) }
+
+      it 'sets the enterprise site and api as the site and api endpoints for the BitBucket provider in the git config' do
+        GitReflow::Config.should_receive(:set).once.with('reflow.git-server', 'BitBucket', local: true)
+        subject
+      end
+    end
+
+  end
+
+  describe '#authenticate' do
+    let(:bitbucket)      { GitReflow::GitServer::BitBucket.new( { }) }
+    let!(:bitbucket_api) { BitBucket.new }
+    subject              { bitbucket.authenticate }
+
+    context 'already authenticated' do
+      it "notifies the user of successful setup" do
+        GitReflow::Config.should_receive(:set).with('reflow.git-server', 'BitBucket')
+        allow(GitReflow::Config).to receive(:get).with('remote.origin.url').and_return(remote_url)
+        allow(GitReflow::Config).to receive(:get).with('bitbucket.user').and_return(user)
+        allow(GitReflow::Config).to receive(:get).with('bitbucket.api-key', reload: true).and_return(api_key)
+        expect { subject }.to have_output "\nYour BitBucket account was already setup with:"
+        expect { subject }.to have_output "\tUser Name: #{user}"
+      end
+    end
+
+    context 'not yet authenticated' do
+      context 'with valid BitBucket credentials' do
+        before do
+          GitReflow::Config.stub(:get).and_return('')
+          GitReflow::Config.stub(:set)
+          GitReflow::Config.stub(:set).with('bitbucket.api-key', reload: true).and_return(api_key)
+          allow(GitReflow::Config).to receive(:get).with('bitbucket.api-key', reload: true).and_return('')
+          allow(GitReflow::Config).to receive(:get).with('remote.origin.url').and_return(remote_url)
+          allow(GitReflow::Config).to receive(:get).with('reflow.local-projects').and_return('')
+          bitbucket.stub(:connection).and_return double(repos: double(all: []))
+        end
+
+        it "prompts me to setup an API key" do
+          expect { subject }.to have_output "\nIn order to connect your BitBucket account,"
+          expect { subject }.to have_output "you'll need to generate an API key for your team"
+          expect { subject }.to have_output "Visit https://bitbucket.org/account/user/reenhanced/api-key/, to generate it\n"
+        end
+      end
+    end
+  end
+
+  xdescribe '#create_pull_request(options)' do
+    let(:title)          { 'Fresh title' }
+    let(:body)           { 'Funky body' }
+    let(:current_branch) { 'new-feature' }
+
+    it 'creates a pull request using the remote user and repo' do
+    end
+  end
+
+  xdescribe '#find_pull_request(from, to)' do
+  end
+
+  xdescribe '#pull_request_comments(pull_request)' do
+  end
+
+  xdescribe '#has_pull_request_comments?(pull_request)' do
+  end
+
+  xdescribe '#get_build_status(sha)' do
+  end
+
+  xdescribe '#find_authors_of_open_pull_request_comments(pull_request)' do
+  end
+
+  xdescribe '#comment_authors_for_pull_request(pull_request, options = {})' do
+  end
+
+  xdescribe '#get_commited_time(commit_sha)' do
+  end
+
+end

data/spec/lib/git_server/git_hub_spec.rb

@@ -28,9 +28,8 @@ describe GitReflow::GitServer::GitHub do
      return_value
     end
 
-    github.stub(:remote_user).and_return(user)
-    github.stub(:remote_repo_name).and_return(repo)
-    github.stub(:run).with('hostname', loud: false).and_return(hostname)
+    github.class.stub(:remote_user).and_return(user)
+    github.class.stub(:remote_repo_name).and_return(repo)
   end
 
   describe '#initialize(options)' do
@@ -58,6 +57,10 @@ describe GitReflow::GitServer::GitHub do
     context 'storing git config settings only for this project' do
       subject { GitReflow::GitServer::GitHub.new(project_only: true) }
 
+      before do
+        GitReflow::Config.should_receive(:get).twice.with('reflow.local-projects', all: true).and_return("#{user}/#{repo}")
+      end
+
       it 'sets the enterprise site and api as the site and api endpoints for the GitHub provider in the git config' do
         GitReflow::Config.should_receive(:set).once.with('github.site', github_site, local: true).and_call_original
         GitReflow::Config.should_receive(:set).once.with('github.endpoint', github_api_endpoint, local: true)
@@ -107,8 +110,12 @@ describe GitReflow::GitServer::GitHub do
         end
 
         context "exclusive to project" do
-          let(:github) { GitReflow::GitServer::GitHub.new(project_only: true) }
-          before       { GitReflow::GitServer::GitHub.stub(:@project_only).and_return(true) }
+          let(:github) do
+            allow(GitReflow::GitServer::GitHub).to receive(:project_only?).and_return(true)
+            allow(GitReflow::GitServer::GitHub).to receive(:remote_user).and_return(user)
+            allow(GitReflow::GitServer::GitHub).to receive(:remote_repo_name).and_return(repo)
+            GitReflow::GitServer::GitHub.new(project_only: true)
+          end
 
           it "creates _local_ git config keys for github connections" do
             expect{ subject }.to_not have_run_command_silently "git config --global --replace-all github.site \"#{GitReflow::GitServer::GitHub.site_url}\""
@@ -120,6 +127,7 @@ describe GitReflow::GitServer::GitHub do
             expect{ subject }.to have_run_command_silently "git config --replace-all github.endpoint \"#{GitReflow::GitServer::GitHub.api_endpoint}\""
             expect{ subject }.to have_run_command_silently "git config --replace-all github.oauth-token \"#{oauth_token_hash[:token]}\""
             expect{ subject }.to have_run_command_silently "git config --replace-all reflow.git-server \"GitHub\""
+            expect{ subject }.to have_run_command_silently "git config --global --add reflow.local-projects \"#{user}/#{repo}\""
           end
         end
 
@@ -159,7 +167,7 @@ describe GitReflow::GitServer::GitHub do
     let(:body)           { 'Funky body' }
     let(:current_branch) { 'new-feature' }
 
-    before { github.stub(:current_branch).and_return(current_branch) }
+    before { github.class.stub(:current_branch).and_return(current_branch) }
 
     it 'creates a pull request using the remote user and repo' do
       github_api.stub(:pull_requests)
@@ -168,16 +176,19 @@ describe GitReflow::GitServer::GitHub do
     end
   end
 
-  describe '#find_pull_request(from, to)' do
-    subject { github.find_pull_request({ from: 'new-feature', to: 'master'}) }
+  describe '#find_open_pull_request(from, to)' do
+    subject { github.find_open_pull_request({ from: 'new-feature', to: 'master'}) }
 
     it 'looks for an open pull request matching the remote user/repo' do
-      subject.should == existing_pull_requests.first
+      subject.number.should == existing_pull_requests.first.number
     end
 
     context 'no pull request exists' do
-      before { github.stub(:find_pull_request).and_return([]) }
-      it     { should == [] }
+      before do
+        github_api.stub(:pull_requests)
+        github_api.pull_requests.should_receive(:all).and_return([])
+      end
+      it     { should == nil }
     end
   end
 
@@ -198,21 +209,6 @@ describe GitReflow::GitServer::GitHub do
     end
   end
 
-  describe '#has_pull_request_comments?(pull_request)' do
-    let(:existing_pull_request) { Hashie::Mash.new JSON.parse(fixture('pull_requests/pull_request.json').read) }
-    let(:pull_request_comments) { JSON.parse(fixture('pull_requests/comments.json').read).collect {|c| Hashie::Mash.new(c) } }
-
-    before  { github.stub(:pull_request_comments).and_return([pull_request_comments]) }
-    subject { github.has_pull_request_comments?(existing_pull_request) }
-
-    it { should == true }
-
-    context 'no comments exist for the given pull request' do
-      before { github.stub(:pull_request_comments).and_return([]) }
-      it     { should == false }
-    end
-  end
-
   describe '#get_build_status(sha)' do
     let(:sha) { '6dcb09b5b57875f334f61aebed695e2e4193db5e' }
     subject   { github.get_build_status(sha) }
@@ -224,9 +220,6 @@ describe GitReflow::GitServer::GitHub do
     end
   end
 
-  describe '#find_authors_of_open_pull_request_comments(pull_request)' do
-  end
-
   describe '#comment_authors_for_pull_request(pull_request, options = {})' do
   end