git_pretty_accept 0.1.0

data/.gitignore

@@ -0,0 +1,9 @@
+Gemfile.lock
+pkg
+html
+tmp
+results.html
+.githooks
+.DS_Store
+.rspec
+.rubocop.yml

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in git_pretty_accept.gemspec
+gemspec

data/LICENSE.txt

@@ -0,0 +1,7 @@
+Copyright (c) 2013 YOUR NAME 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,40 @@
+# git-pretty-accept
+
+`git-pretty-accept` is a script that rebases a pull request before merging
+to master. Pull requests are _always_ merged recursively. The result is a
+linear history with merge bubbles indicating pull requests. In short, pretty.
+
+For more information, check out
+
+* [A simple git branching model](https://gist.github.com/jbenet/ee6c9ac48068889b0912)
+* [Best Way To Merge A (GitHub) Pull Request](http://differential.io/blog/best-way-to-merge-a-github-pull-request)
+
+`git-pretty-accept` also automatically deletes the local and remote branch
+of the pull request once it's merged to master. I may add an option later on
+to disable this by default.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'git_pretty_accept'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install git_pretty_accept
+
+## Usage
+
+    $ git pretty-accept BRANCH
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/bin/git-pretty-accept

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'git_pretty_accept'
+
+GitPrettyAccept::App.go!

data/git_pretty_accept.gemspec

@@ -0,0 +1,36 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'git_pretty_accept/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "git_pretty_accept"
+  spec.version       = GitPrettyAccept::VERSION
+  spec.authors       = ["George Mendoza"]
+  spec.email         = ["gsmendoza@gmail.com"]
+  spec.description   = %q{
+    `git-pretty-accept` is a script that rebases a pull request before
+    merging to master. Pull requests are _always_ merged recursively. The
+    result is a linear history with merge bubbles indicating pull requests.
+    In short, pretty.
+  }.gsub(/\s+/, ' ')
+
+  spec.summary       = %q{Accept pull requests, the pretty way}
+  spec.homepage      = "https://github.com/gsmendoza/git_pretty_accept"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'git'
+  spec.add_dependency('methadone', '~> 1.3.1')
+
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency('rdoc')
+  spec.add_development_dependency('debugger')
+  spec.add_development_dependency('rake', '~> 0.9.2')
+  spec.add_development_dependency('rspec')
+  spec.add_development_dependency('rspec-example_steps')
+end

data/lib/git_pretty_accept/app.rb

@@ -0,0 +1,43 @@
+module GitPrettyAccept
+  class App
+    include Methadone::Main
+    include Methadone::CLILogging
+
+    main do |branch|
+      options[:edit] = true if options[:edit].nil?
+
+      our = Git.open('.')
+      source_branch = our.branches.find(&:current).to_s
+
+      commands = [
+        "git pull",
+        "git checkout #{branch}",
+        "git rebase #{source_branch}",
+        "git checkout #{source_branch}",
+        "git merge --no-ff #{options[:edit] ? '--edit' : '--no-edit'} #{branch}",
+        "git push",
+        "git branch -d #{branch}",
+        "git push origin :#{branch}"
+      ]
+
+      commands.each_with_index do |command, i|
+        puts "\n#{command}"
+        unless system(command)
+          puts "\nDue to the error above, the following commands were not executed: "
+          puts commands[i + 1, commands.size].join("\n")
+          exit!
+        end
+      end
+    end
+
+    description "Accept pull requests, the pretty way"
+
+    on "--[no-]edit", "Edit merge message before committing. (Default: --edit)"
+
+    arg :branch
+
+    version GitPrettyAccept::VERSION
+
+    use_log_level_option
+  end
+end

data/lib/git_pretty_accept/version.rb

@@ -0,0 +1,3 @@
+module GitPrettyAccept
+  VERSION = "0.1.0"
+end

data/lib/git_pretty_accept.rb

@@ -0,0 +1,11 @@
+require 'git'
+require 'optparse'
+require 'methadone'
+
+require "git_pretty_accept/app"
+require "git_pretty_accept/version"
+
+module GitPrettyAccept
+  # Your code goes here...
+end
+

data/spec/git_pretty_accept/app_spec.rb

@@ -0,0 +1,93 @@
+require 'English'
+require 'spec_helper'
+require 'rspec/example_steps'
+
+describe GitPrettyAccept::App do
+  let!(:project_path) { FileUtils.pwd }
+  let(:tmp_path) { "tmp/git_pretty_accept" }
+
+  let(:remote_path) { "#{tmp_path}/remote" }
+  let(:our_path) { "#{tmp_path}/our" }
+  let(:their_path) { "#{tmp_path}/their" }
+
+  let(:pr_branch) { 'pr_branch' }
+
+  before do
+    FileUtils.rm_rf tmp_path
+  end
+
+  Steps "I can accept a pull request... prettily" do
+    our = nil
+
+    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
+    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
+
+      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
+    end
+
+    And 'the current branch is master' do
+      our.branch('master').checkout
+    end
+
+    When 'I run `git pretty-accept PR_BRANCH`' do
+      FileUtils.cd(our_path) do
+        `#{project_path}/bin/git-pretty-accept --no-edit #{pr_branch}`
+        expect($CHILD_STATUS.exitstatus).to eq(0)
+      end
+    end
+
+    Then 'it should rebase the PR_BRANCH before merging to master' do
+      expect(our.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(our.log[1].message).to eq('Add changelog')
+      expect(our.log[1].parents.size).to eq(1)
+
+      expect(our.log[2].message).to eq('Update readme')
+      expect(our.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)
+    end
+
+    And 'it should push the PR_BRANCH commits' do
+      expect(our.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
+    end
+
+    And 'it should delete the remote PR_BRANCH' do
+      expect(our.branches["origin/#{pr_branch}"]).to be_nil
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,19 @@
+require 'debugger'
+require 'git_pretty_accept'
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

metadata

@@ -0,0 +1,197 @@
+--- !ruby/object:Gem::Specification
+name: git_pretty_accept
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+  prerelease: 
+platform: ruby
+authors:
+- George Mendoza
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2013-11-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  name: git
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+    none: false
+  prerelease: false
+  name: methadone
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    none: false
+  prerelease: false
+  name: bundler
+  type: :development
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  name: rdoc
+  type: :development
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  name: debugger
+  type: :development
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+    none: false
+  prerelease: false
+  name: rake
+  type: :development
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  name: rspec
+  type: :development
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  prerelease: false
+  name: rspec-example_steps
+  type: :development
+description: ! ' `git-pretty-accept` is a script that rebases a pull request before
+  merging to master. Pull requests are _always_ merged recursively. The result is
+  a linear history with merge bubbles indicating pull requests. In short, pretty. '
+email:
+- gsmendoza@gmail.com
+executables:
+- git-pretty-accept
+extensions: []
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/git-pretty-accept
+- git_pretty_accept.gemspec
+- lib/git_pretty_accept.rb
+- lib/git_pretty_accept/app.rb
+- lib/git_pretty_accept/version.rb
+- spec/git_pretty_accept/app_spec.rb
+- spec/spec_helper.rb
+homepage: https://github.com/gsmendoza/git_pretty_accept
+licenses:
+- MIT
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      hash: -399594131
+      version: '0'
+      segments:
+      - 0
+  none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      hash: -399594131
+      version: '0'
+      segments:
+      - 0
+  none: false
+requirements: []
+rubyforge_project: 
+rubygems_version: 1.8.24
+signing_key: 
+specification_version: 3
+summary: Accept pull requests, the pretty way
+test_files:
+- spec/git_pretty_accept/app_spec.rb
+- spec/spec_helper.rb