git_pretty_accept 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baed368a4681ba4cdc080936905f4ec5afdeac40
-  data.tar.gz: 9c0199114740ec78a142dd764b76fd140a29518d
+  metadata.gz: f87f9416e6f2fa9ffab67ff78e28c62052f40584
+  data.tar.gz: f7d1cd58d438f24d312236f6bf1d845c3660f6b5
 SHA512:
-  metadata.gz: 3de4384cd754693b1d5d2c35db4d7560a1ebd9acf180fc02d9d80c95454597db3aa3ff7a461ff2f1e45f7f92dfba8278217cf1036739e99ecb394b55152bf9c2
-  data.tar.gz: a2f42af113a5733054f9bbc9f77ecf9f0961e3955856db40ba8d3b1a94b414c701c2b0a79dcf086502fc9b3848b988f7eeff7f8c621af6b9995c06495ec9f70a
+  metadata.gz: 050fc7845fa9e5d1998662fa1b9ec13111c6c9c804a5b5ed3ad65c366c652257b220ec3ff7b806daa9c0a659628e6d97c24ab5ad0ae88ecf97055015572001b9
+  data.tar.gz: 9aae68dd5f32c4e303415e777b89fa94f8a6a29da8b497938ea1833c8aa8da0146b2ef677e3c8c129c79ca500ce10021e2039551f035067c9c32b35bda95168d

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+## 0.3.0 - 2013-12-14
+
+* Rebase local PR branch from remote.
+* Revamp test repo object helpers.
+
 ## 0.2.0 - 2013-12-03
 
 * Fix: do not force-delete local PR branch.

data/lib/git_pretty_accept/transaction.rb

@@ -14,6 +14,7 @@ module GitPrettyAccept
         "git fetch origin",
         "git rebase origin/#{source_branch}",
         "git checkout #{branch}",
+        "git rebase origin/#{branch}",
         "git rebase origin/#{source_branch}",
         "git push --force origin #{branch}",
         "git checkout #{source_branch}",

data/lib/git_pretty_accept/version.rb

@@ -1,3 +1,3 @@
 module GitPrettyAccept
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/spec/git_pretty_accept/app_spec.rb

@@ -12,89 +12,76 @@ describe GitPrettyAccept::App do
 
   let(:pr_branch) { 'pr_branch' }
 
+  let(:remote_repo) { RemoteRepo.new(project_path, remote_path) }
+  let(:local_repo) do
+    LocalRepo.new(project_path, our_path, remote_repo).tap do |result|
+      result.add_initial_commit
+    end
+  end
+
+  let(:other_repo) { LocalRepo.new(project_path, their_path, remote_repo) }
+
   before do
     FileUtils.rm_rf tmp_path
   end
 
   Steps "I can accept a pull request... prettily" do
-    our = nil
+    their_change_in_master = 'their_change_in_master'
+    our_change_in_pr_branch = 'our_change_in_pr_branch'
 
     Given 'I have a local repo tracking a remote repo' do
-      Git.init remote_path, bare: true
-
-      # Add initial commit. Otherwise, `our.branch(pr_branch)`
-      # below won't be able to create a new branch.
-
-      Git.clone remote_path, our_path
-      our = Git.open(our_path)
-
-      File.open("#{our_path}/readme.txt", 'w') { |f| f.write('readme') }
-      our.add all: true
-      our.commit 'Add readme'
-      our.push
+      local_repo
     end
 
     And 'I have a PR_BRANCH that is not up-to-date with master' do
-      Git.clone remote_path, their_path
-      their = Git.open(their_path)
-
-      File.open("#{their_path}/readme.txt", 'w') { |f| f.write('updated readme') }
-      their.add all: true
-      their.commit 'Update readme'
-      their.push
+      other_repo.checkout 'master'
+      other_repo.push_some_change their_change_in_master
 
-      our.branch(pr_branch).checkout
-      File.open("#{our_path}/changelog.txt", 'w') { |f| f.write('changelog') }
-      our.add all: true
-      our.commit 'Add changelog'
-      our.push our.remote('origin'), pr_branch
+      local_repo.checkout pr_branch
+      local_repo.push_some_change our_change_in_pr_branch
     end
 
     And 'the current branch is master' do
-      our.branch('master').checkout
+      local_repo.checkout 'master'
     end
 
     When 'I run `git pretty-accept PR_BRANCH`' do
-      FileUtils.cd(our_path) do
-        `bundle exec #{project_path}/bin/git-pretty-accept --no-edit #{pr_branch}`
-        expect($CHILD_STATUS.exitstatus).to eq(0)
-      end
+      local_repo.git_pretty_accept pr_branch
     end
 
     Then 'it should rebase the PR_BRANCH before merging to master' do
-      expect(our.log.size).to eq(4)
+      expect(local_repo.git.log.size).to eq(4)
 
-      expect(our.log[0].message).to eq("Merge branch 'pr_branch'")
-      expect(our.log[0].parents.size).to eq(2)
+      expect(local_repo.git.log[0].message).to eq("Merge branch '#{pr_branch}'")
+      expect(local_repo.git.log[0].parents.size).to eq(2)
 
       # For some reason, the order of the logs 1 and 2 is indeterminate.
-      expect(our.log[1 .. 2].map(&:message).sort)
-        .to eq(['Add changelog', 'Update readme'])
+      expect(local_repo.git.log[1 .. 2].map(&:message).sort)
+        .to eq([our_change_in_pr_branch, their_change_in_master])
 
-      expect(our.log[1].parents.size).to eq(1)
-      expect(our.log[2].parents.size).to eq(1)
+      expect(local_repo.git.log[1].parents.size).to eq(1)
+      expect(local_repo.git.log[2].parents.size).to eq(1)
 
-      expect(our.log[3].message).to eq('Add readme')
-      expect(our.log[3].parents.size).to eq(0)
+      expect(local_repo.git.log[3].parents.size).to eq(0)
     end
 
     And 'it should push the PR_BRANCH commits' do
-      expect(our.branches['origin/master'].gcommit.message)
-        .to eq("Merge branch 'pr_branch'")
+      expect(local_repo.git.branches['origin/master'].gcommit.message)
+        .to eq("Merge branch '#{pr_branch}'")
     end
 
     And 'it should delete the local PR_BRANCH' do
-      expect(our.branches[pr_branch]).to be_nil
+      expect(local_repo.git.branches[pr_branch]).to be_nil
     end
 
     And 'it should delete the remote PR_BRANCH' do
-      expect(our.branches["origin/#{pr_branch}"]).to be_nil
+      expect(local_repo.git.branches["origin/#{pr_branch}"]).to be_nil
     end
   end
 
   Steps "should not allow master to be accepted as a PR branch" do
     Given 'I have a local repo' do
-      Git.init(our_path)
+      local_repo
     end
 
     When 'I run `git pretty-accept master`' do
@@ -113,61 +100,104 @@ describe GitPrettyAccept::App do
 
   Steps "should use the .git-pretty-accept-template.txt if available" do
     merge_message = "hello\nworld!"
-    repo = TestRepo.new(project_path, tmp_path)
 
     Given 'I have a local repo tracking a remote repo' do
-      repo.build
+      local_repo
     end
 
     And 'the local repo has a .git-pretty-accept-template.txt' do
-      repo.our.add_merge_message_template_file merge_message
+      local_repo.add_merge_message_template_file merge_message
     end
 
     And 'I have a PR branch' do
-      repo.our.add_branch pr_branch
+      local_repo.create_branch pr_branch
+      local_repo.commit_some_change 'some-change'
     end
 
     And 'the current branch is master' do
-      repo.our.branch('master').checkout
+      local_repo.checkout 'master'
     end
 
     When 'I run `git pretty-accept PR_BRANCH`' do
-      repo.git_pretty_accept pr_branch
+      local_repo.git_pretty_accept pr_branch
     end
 
     Then 'I should see that the .git-pretty-accept-template.txt is the content of
       the merge message' do
-      expect(repo.our.log[0].message).to eq(merge_message)
+      expect(local_repo.git.log[0].message).to eq(merge_message)
     end
   end
 
   Steps "should be able to use a .git-pretty-accept-template.txt with an apostrophe" do
     merge_message = "hello apostrophe (')"
-    repo = TestRepo.new(project_path, tmp_path)
 
     Given 'I have a local repo tracking a remote repo' do
-      repo.build
+      local_repo
     end
 
     And 'the local repo has a .git-pretty-accept-template.txt' do
-      repo.our.add_merge_message_template_file merge_message
+      local_repo.add_merge_message_template_file merge_message
     end
 
     And 'I have a PR branch' do
-      repo.our.add_branch pr_branch
+      local_repo.create_branch pr_branch
+      local_repo.commit_some_change 'some-change'
     end
 
     And 'the current branch is master' do
-      repo.our.branch('master').checkout
+      local_repo.checkout 'master'
     end
 
     When 'I run `git pretty-accept PR_BRANCH`' do
-      repo.git_pretty_accept pr_branch
+      local_repo.git_pretty_accept pr_branch
     end
 
     Then 'I should see that the .git-pretty-accept-template.txt is the content of
       the merge message' do
-      expect(repo.our.log[0].message).to eq(merge_message)
+      expect(local_repo.git.log[0].message).to eq(merge_message)
+    end
+  end
+
+  Steps 'should rebase the branch from its remote branch' do
+    local_pr_message = 'local-pr-branch-change.txt'
+    remote_pr_message = 'remote-pr-branch-change.txt'
+
+    Given 'I have a local repo tracking a remote repo' do
+      local_repo
+    end
+
+    And 'I have a PR branch tracking a remote PR branch' do
+      other_repo.create_branch pr_branch
+      local_repo.track pr_branch
+    end
+
+    And 'both local and remote PR branch have been updated' do
+      local_repo.commit_some_change local_pr_message
+
+      other_repo.checkout pr_branch
+      other_repo.push_some_change remote_pr_message
+    end
+
+    And 'the current branch is master' do
+      local_repo.checkout 'master'
+    end
+
+    When 'I run `git pretty-accept PR_BRANCH`' do
+      local_repo.git_pretty_accept pr_branch
+    end
+
+    Then 'I should see the commit in the remote PR branch incorporated to master' do
+      expect(local_repo.git.log.size).to eq(4)
+
+      expect(local_repo.git.log[0].message).to eq("Merge branch '#{pr_branch}'")
+      expect(local_repo.git.log[0].parents.size).to eq(2)
+
+      expect(local_repo.git.log[1].message).to eq(local_pr_message)
+      expect(local_repo.git.log[1].parents.size).to eq(1)
+
+      # For some reason, the order of the logs 2 and 3 is indeterminate.
+      expect(local_repo.git.log[2 .. 3].map(&:message).sort)
+        .to include(remote_pr_message)
     end
   end
 end

data/spec/spec_helper.rb

@@ -7,8 +7,8 @@ require 'git_pretty_accept'
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
-require 'support/test_repo'
-require 'support/test_repo/local_repo'
+require 'support/local_repo'
+require 'support/remote_repo'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

data/spec/support/local_repo.rb

@@ -0,0 +1,59 @@
+class LocalRepo
+  attr_reader :git, :project_path, :path
+
+  def initialize(project_path, path, remote_repo)
+    @project_path = project_path
+    @path = path
+    @remote_repo = remote_repo
+
+    Git.clone remote_repo.path, path
+    @git = Git.open(path)
+  end
+
+  def add_initial_commit
+    File.open("#{path}/readme.txt", 'w') { |f| f.write('readme') }
+    File.open("#{path}/.gitignore", 'w') do |f|
+      f.write('.git-pretty-accept-template.txt')
+    end
+
+    git.add all: true
+    git.commit 'Initial commit.'
+    git.push
+  end
+
+  def add_merge_message_template_file(message)
+    File.open("#{path}/.git-pretty-accept-template.txt", 'w') do |file|
+      file.write message
+    end
+  end
+
+  def checkout(branch)
+    git.branch(branch).checkout
+  end
+
+  def commit_some_change(message)
+    File.open("#{path}/#{message}.txt", 'w') { |f| f.write(message) }
+    git.add all: true
+    git.commit message
+  end
+
+  def create_branch(branch)
+    git.branch(branch).checkout
+    git.push git.remote('origin'), branch
+  end
+
+  def git_pretty_accept(branch)
+    FileUtils.cd(path) do
+      puts `bundle exec #{project_path}/bin/git-pretty-accept --no-edit #{branch}`
+    end
+  end
+
+  def push_some_change(message)
+    commit_some_change message
+    git.push git.remote('origin'), git.branches.local.find(&:current)
+  end
+
+  def track(branch)
+    git.branch(branch).checkout
+  end
+end

data/spec/support/remote_repo.rb

@@ -0,0 +1,10 @@
+class RemoteRepo
+  attr_reader :path
+
+  def initialize(project_path, path)
+    @project_path = project_path
+    @path = path
+
+    Git.init path, bare: true
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_pretty_accept
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - George Mendoza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -176,8 +176,8 @@ files:
 - lib/git_pretty_accept/version.rb
 - spec/git_pretty_accept/app_spec.rb
 - spec/spec_helper.rb
-- spec/support/test_repo.rb
-- spec/support/test_repo/local_repo.rb
+- spec/support/local_repo.rb
+- spec/support/remote_repo.rb
 homepage: https://github.com/gsmendoza/git_pretty_accept
 licenses:
 - MIT
@@ -205,5 +205,5 @@ summary: Accept pull requests, the pretty way
 test_files:
 - spec/git_pretty_accept/app_spec.rb
 - spec/spec_helper.rb
-- spec/support/test_repo.rb
-- spec/support/test_repo/local_repo.rb
+- spec/support/local_repo.rb
+- spec/support/remote_repo.rb

data/spec/support/test_repo.rb

@@ -1,38 +0,0 @@
-class TestRepo
-  attr_reader :project_path, :tmp_path
-
-  def initialize(project_path, tmp_path)
-    @project_path = project_path
-    @tmp_path = tmp_path
-  end
-
-  def build
-    Git.init remote_path, bare: true
-
-    # Add initial commit. Otherwise, `our.branch(pr_branch)`
-    # below won't be able to create a new branch.
-
-    our.add_initial_commit
-  end
-
-  def our
-    return @our if @our
-
-    Git.clone remote_path, our_path
-    @our = LocalRepo.new(Git.open(our_path))
-  end
-
-  def our_path
-    "#{tmp_path}/our"
-  end
-
-  def remote_path
-    "#{tmp_path}/remote"
-  end
-
-  def git_pretty_accept(branch)
-    FileUtils.cd(our_path) do
-      puts `bundle exec #{project_path}/bin/git-pretty-accept --no-edit #{branch}`
-    end
-  end
-end

data/spec/support/test_repo/local_repo.rb

@@ -1,32 +0,0 @@
-class TestRepo
-  class LocalRepo < SimpleDelegator
-    def add_initial_commit
-      File.open("#{path}/readme.txt", 'w') { |f| f.write('readme') }
-      File.open("#{path}/.gitignore", 'w') do |f|
-        f.write('.git-pretty-accept-template.txt')
-      end
-
-      add all: true
-      commit 'Initial commit.'
-      push
-    end
-
-    def add_branch(branch)
-      branch(branch).checkout
-      File.open("#{path}/changelog.txt", 'w') { |f| f.write('changelog') }
-      add all: true
-      commit 'Add changelog'
-      push remote('origin'), branch
-    end
-
-    def add_merge_message_template_file(message)
-      File.open("#{path}/.git-pretty-accept-template.txt", 'w') do |file|
-        file.write message
-      end
-    end
-
-    def path
-      @path ||= dir.path
-    end
-  end
-end