git_pretty_accept 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 301fb377312331048a8fbc82097fb708ebbccae1
-  data.tar.gz: e39af5ebd744e927e3ae52893c5857e1018ba705
+  metadata.gz: 2469b255e1c0e2d603c2b8f4e887635aa8ea1e8a
+  data.tar.gz: 56f5aae9dbbffdde6787fd106013bb216c02ae7e
 SHA512:
-  metadata.gz: 43d47927d2a8b3657efc1827d4e6f87d3975b66cc345662fc081363d6aaea07c1e39eda586de33b10e4084d2bf61f55a281bb74c9740707de9e91f6a78f12658
-  data.tar.gz: fa5da0797101ef3d8990234e842f8968df95b8f3d103ee0b5de03530f7ce33142975b571e1c26e25ec47abfbb03c298b5641c9204e04a2d4eb2ad8f1b7193d9f
+  metadata.gz: a9281aba1323f9126f53cbe01292edd744aa64d53c0b48d9b2df2d23dabb8a7e5012d56d62b239d52f41c9839d0ed86467cdfb4224df86915315db08dbcdf934
+  data.tar.gz: 7d140366f1643b73d0f163b48b47a3addfaa5c0009265bbbbdbae205f71f30c6ce046ef2cf0ad37f97e974daef4494bfaac5161c6b02f50cdf86d0fdc2c5d697

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+## Master (unreleased)
+
+## 0.5.0 - 2015-03-20
+
+* Enable autosquash mode when rebasing by default.
+
 ## 0.4.0 - 2014-02-20
 
 * Prevent merging when the target branch is different from origin. Prevents

data/README.md

@@ -12,8 +12,7 @@ For more information, check out
 * [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.
+of the pull request once it's merged to master.
 
 ## Installation
 
@@ -53,10 +52,12 @@ script
    once the pull request is merged.
 1. Complains if you accidentally try to accept the master branch to a feature
    branch.
+1. Rebases the local branch in interactive mode so that it can run
+  autosquash(See `--autosquash` under http://git-scm.com/docs/git-rebase#_options).
 
 ## Known to be working on
 
-* git 1.7.9
+* git 2.3.3
 * ruby 2.0.0
 
 ## Contributing

data/git_pretty_accept.gemspec

@@ -33,6 +33,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rdoc'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rspec-example_steps'
+  spec.add_development_dependency 'rspec', '~> 2.14.0'
+  spec.add_development_dependency 'rspec-example_steps', '~> 0.2.5'
 end

data/lib/git_pretty_accept/app.rb

@@ -11,13 +11,16 @@ module GitPrettyAccept
         exit!
       else
         options[:edit] = true if options[:edit].nil?
-        Transaction.new(branch, options[:edit]).call
+        options[:autosquash] = true if options[:autosquash].nil?
+
+        Transaction.new(branch, options).call
       end
     end
 
     description "Accept pull requests, the pretty way"
 
     on "--[no-]edit", "Edit merge message before committing. (Default: --edit)"
+    on "--[no-]autosquash", "Toggle autosquash when rebasing. (Default: --autosquash)"
 
     arg :branch
 

data/lib/git_pretty_accept/transaction.rb

@@ -2,11 +2,12 @@ module GitPrettyAccept
   class Transaction
     include Methadone::CLILogging
 
-    attr_reader :branch, :let_user_edit_message
+    attr_reader :branch, :let_user_edit_message, :enable_autosquash
 
-    def initialize(branch, let_user_edit_message = true)
+    def initialize(branch, options = {})
       @branch = branch
-      @let_user_edit_message = let_user_edit_message
+      @let_user_edit_message = options[:edit]
+      @enable_autosquash = options[:autosquash]
     end
 
     def commands
@@ -17,7 +18,7 @@ module GitPrettyAccept
         "test `git rev-parse HEAD` = `git rev-parse origin/#{source_branch}`",
         "git checkout #{branch}",
         "git rebase origin/#{branch}",
-        "git rebase origin/#{source_branch}",
+        "git rebase origin/#{source_branch} #{autosquash_params}",
         "git push --force origin #{branch}",
         "git checkout #{source_branch}",
         MergeCommand.new(branch, let_user_edit_message).to_s,
@@ -44,5 +45,11 @@ module GitPrettyAccept
       our = Git.open('.')
       @source_branch = our.branches.find(&:current).to_s
     end
+
+    private
+
+    def autosquash_params
+      enable_autosquash ? '-i --autosquash' : ''
+    end
   end
 end

data/lib/git_pretty_accept/version.rb

@@ -1,3 +1,3 @@
 module GitPrettyAccept
-  VERSION = "0.4.0"
+  VERSION = '0.5.0'
 end

data/spec/git_pretty_accept/app_spec.rb

@@ -98,7 +98,7 @@ describe GitPrettyAccept::App do
     end
 
     When 'I run `git pretty-accept master`' do
-      command = "bundle exec #{project_path}/bin/git-pretty-accept --no-edit master"
+      command = "bundle exec #{project_path}/bin/git-pretty-accept --no-edit --no-autosquash master"
       FileUtils.cd(our_path) do
         @result = system(command, err: '/tmp/err.log')
       end
@@ -238,7 +238,7 @@ describe GitPrettyAccept::App do
 
     When 'I run `git pretty-accept PR_BRANCH`' do
       command =
-        "bundle exec #{project_path}/bin/git-pretty-accept --no-edit #{pr_branch}"
+        "bundle exec #{project_path}/bin/git-pretty-accept --no-edit --no-autosquash #{pr_branch}"
 
       FileUtils.cd(our_path) do
         @result = system(command, err: '/tmp/err.log')

data/spec/support/local_repo.rb

@@ -44,7 +44,7 @@ class LocalRepo
 
   def git_pretty_accept(branch)
     FileUtils.cd(path) do
-      puts `bundle exec #{project_path}/bin/git-pretty-accept --no-edit #{branch}`
+      puts `bundle exec #{project_path}/bin/git-pretty-accept --no-edit --no-autosquash #{branch}`
     end
   end
 

metadata

@@ -1,158 +1,158 @@
 --- !ruby/object:Gem::Specification
 name: git_pretty_accept
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Love With Food, George Mendoza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !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
     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: rdoc
   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: rake
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-example_steps
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: ' `git-pretty-accept` is a script that rebases a pull request before
+        version: 0.2.5
+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. '
+  a linear history with merge bubbles indicating pull requests. In short, pretty. "
 email:
 - george@lovewithfood.com
 executables:
@@ -160,8 +160,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.markdown
 - Gemfile
 - Guardfile
@@ -189,12 +189,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []