git_pretty_accept 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bb08233347e08a6009b258782b3bb44798f530f
-  data.tar.gz: 224d416caa7722a452245b09fd3bd684addd3a84
+  metadata.gz: baed368a4681ba4cdc080936905f4ec5afdeac40
+  data.tar.gz: 9c0199114740ec78a142dd764b76fd140a29518d
 SHA512:
-  metadata.gz: 309b1c8978ec26fecb968dfce874f7cac64fd33ef3fb2662c125659f2b97a5ed558886692866c621c2ab430d3fa50c930231213bb570c190f367247cfc9a1bc5
-  data.tar.gz: e51b2679cd21202663a487eb937657b20f8db223a1e4d04f8bce32fb949fd7a505de5e1b09cad4b374b76d945e7923af73b5aa8bfb5484abce2833f6937ae7a0
+  metadata.gz: 3de4384cd754693b1d5d2c35db4d7560a1ebd9acf180fc02d9d80c95454597db3aa3ff7a461ff2f1e45f7f92dfba8278217cf1036739e99ecb394b55152bf9c2
+  data.tar.gz: a2f42af113a5733054f9bbc9f77ecf9f0961e3955856db40ba8d3b1a94b414c701c2b0a79dcf086502fc9b3848b988f7eeff7f8c621af6b9995c06495ec9f70a

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+## 0.2.0 - 2013-12-03
+
+* Fix: do not force-delete local PR branch.
+* Fix: fetch origin and rebase master instead of git pull.
+* Feature: be able to set merge message template.
+
 ## 0.1.3 - 2013-11-23
 
 * Specify branches when pulling and pushing to origin.

data/Guardfile

@@ -0,0 +1,5 @@
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/git_pretty_accept.gemspec

@@ -28,6 +28,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'methadone', '~> 1.3.1'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rdoc'
   spec.add_development_dependency 'rake'

data/lib/git_pretty_accept.rb

@@ -4,6 +4,8 @@ require 'methadone'
 
 require "git_pretty_accept/version"
 require "git_pretty_accept/app"
+require "git_pretty_accept/merge_command"
+require "git_pretty_accept/transaction"
 
 module GitPrettyAccept
   # Your code goes here...

data/lib/git_pretty_accept/app.rb

@@ -11,31 +11,7 @@ module GitPrettyAccept
         exit!
       else
         options[:edit] = true if options[:edit].nil?
-
-        our = Git.open('.')
-        source_branch = our.branches.find(&:current).to_s
-
-        commands = [
-          "git pull origin #{source_branch}",
-          "git checkout #{branch}",
-          "git rebase origin/#{source_branch}",
-          "git push --force origin #{branch}",
-          "git checkout #{source_branch}",
-          "git merge --no-ff #{options[:edit] ? '--edit' : '--no-edit'} #{branch}",
-          "git push origin #{source_branch}",
-          "git branch -D #{branch}",
-          "git push origin :#{branch}"
-        ]
-
-        commands.each_with_index do |command, i|
-          info "\n#{command}"
-          unless system(command)
-            error "\nDue to the error above, " +
-              "the following commands were not executed: " +
-              commands[i + 1, commands.size].join("\n")
-            exit!
-          end
-        end
+        Transaction.new(branch, options[:edit]).call
       end
     end
 

data/lib/git_pretty_accept/merge_command.rb

@@ -0,0 +1,33 @@
+module GitPrettyAccept
+  class MergeCommand
+    MESSAGE_TEMPLATE_FILENAME = '.git-pretty-accept-template.txt'
+
+    attr_reader :branch, :let_user_edit_message
+
+    def initialize(branch, let_user_edit_message)
+      @branch = branch
+      @let_user_edit_message = let_user_edit_message
+    end
+
+    def merge_message
+      if File.exists?(MESSAGE_TEMPLATE_FILENAME)
+        File.read(MESSAGE_TEMPLATE_FILENAME)
+      end
+    end
+
+    # http://www.seejohncode.com/2012/10/16/proper-escaping-of-single-quotes/
+    def merge_message_with_escaped_single_quote
+      merge_message.gsub("'") { %q{'\''} }
+    end
+
+    def to_s
+      [
+        "git merge",
+        "--no-ff",
+        let_user_edit_message ? '--edit' : '--no-edit',
+        branch,
+        merge_message && "--message '#{merge_message_with_escaped_single_quote}'"
+      ].join(' ')
+    end
+  end
+end

data/lib/git_pretty_accept/transaction.rb

@@ -0,0 +1,45 @@
+module GitPrettyAccept
+  class Transaction
+    include Methadone::CLILogging
+
+    attr_reader :branch, :let_user_edit_message
+
+    def initialize(branch, let_user_edit_message = true)
+      @branch = branch
+      @let_user_edit_message = let_user_edit_message
+    end
+
+    def commands
+      [
+        "git fetch origin",
+        "git rebase origin/#{source_branch}",
+        "git checkout #{branch}",
+        "git rebase origin/#{source_branch}",
+        "git push --force origin #{branch}",
+        "git checkout #{source_branch}",
+        MergeCommand.new(branch, let_user_edit_message).to_s,
+        "git push origin #{source_branch}",
+        "git branch -d #{branch}",
+        "git push origin :#{branch}"
+      ]
+    end
+
+    def call
+      commands.each_with_index do |command, i|
+        info "\n#{command}"
+        unless system(command)
+          error "\nDue to the error above, " +
+            "the following commands were not executed: " +
+            commands[i + 1, commands.size].join("\n")
+          exit!
+        end
+      end
+    end
+
+    def source_branch
+      return @source_branch if @source_branch
+      our = Git.open('.')
+      @source_branch = our.branches.find(&:current).to_s
+    end
+  end
+end

data/lib/git_pretty_accept/version.rb

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

data/spec/git_pretty_accept/app_spec.rb

@@ -67,10 +67,11 @@ describe GitPrettyAccept::App do
       expect(our.log[0].message).to eq("Merge branch 'pr_branch'")
       expect(our.log[0].parents.size).to eq(2)
 
-      expect(our.log[1].message).to eq('Update readme')
-      expect(our.log[1].parents.size).to eq(1)
+      # 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(our.log[2].message).to eq('Add changelog')
+      expect(our.log[1].parents.size).to eq(1)
       expect(our.log[2].parents.size).to eq(1)
 
       expect(our.log[3].message).to eq('Add readme')
@@ -109,4 +110,64 @@ describe GitPrettyAccept::App do
         'trying to accept master as a pull request branch')
     end
   end
+
+  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
+    end
+
+    And 'the local repo has a .git-pretty-accept-template.txt' do
+      repo.our.add_merge_message_template_file merge_message
+    end
+
+    And 'I have a PR branch' do
+      repo.our.add_branch pr_branch
+    end
+
+    And 'the current branch is master' do
+      repo.our.branch('master').checkout
+    end
+
+    When 'I run `git pretty-accept PR_BRANCH`' do
+      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)
+    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
+    end
+
+    And 'the local repo has a .git-pretty-accept-template.txt' do
+      repo.our.add_merge_message_template_file merge_message
+    end
+
+    And 'I have a PR branch' do
+      repo.our.add_branch pr_branch
+    end
+
+    And 'the current branch is master' do
+      repo.our.branch('master').checkout
+    end
+
+    When 'I run `git pretty-accept PR_BRANCH`' do
+      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)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -6,6 +6,10 @@ require 'git_pretty_accept'
 # loaded once.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+
+require 'support/test_repo'
+require 'support/test_repo/local_repo'
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true

data/spec/support/test_repo.rb

@@ -0,0 +1,38 @@
+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

@@ -0,0 +1,32 @@
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git_pretty_accept
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - George Mendoza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-23 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -52,6 +52,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +163,7 @@ files:
 - .gitignore
 - CHANGELOG.markdown
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -142,9 +171,13 @@ files:
 - git_pretty_accept.gemspec
 - lib/git_pretty_accept.rb
 - lib/git_pretty_accept/app.rb
+- lib/git_pretty_accept/merge_command.rb
+- lib/git_pretty_accept/transaction.rb
 - 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
 homepage: https://github.com/gsmendoza/git_pretty_accept
 licenses:
 - MIT
@@ -172,3 +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