git-process 0.9.7 → 1.0.1

data/CHANGELOG.md

@@ -0,0 +1,20 @@
+# CHANGELOG - 1.0.1 #
+
+### Since 0.9.7 ###
+
+* Adds --keep option to git-to-master
+* Fixes problem trying to add/remove an empty list of files
+* Documentation updates
+
+### Since 0.9.6 ###
+
+* Cleans up Gem dependencies
+
+### Since 0.9.5 ###
+
+* Cleans up some error messages
+* Improved documentation
+* Adds support for spaces and renames in Status
+* No longer complains if it can't find _parking_
+* Prompts to remove the local version of the integration branch
+* Adds help for handling changed files

data/README.md

@@ -11,6 +11,8 @@ See the F.A.Q. for a much more complete explanation for the thoughts and assumpt
 
     $ sudo gem install git-process
 
+Some older operating systems (such as OSX 10.6) are using an old version of RubyGems, which can cause installation problems. Do "`sudo gem update --system`" to fix.
+
 
 # Overview #
 
@@ -82,14 +84,24 @@ $ git to-master              # 6
 ```
 
 
+## Configurables ##
+
+(See Notes for more details)
+
+* `gitProcess.integrationBranch` : The name of the integration branch. Defaults to `master`, but can be set to `develop` or other.
+* `gitProcess.keepLocalIntegrationBranch` : Controls asking about removing the local integration branch. Defaults to 'false' (i.e., do not assume the branch should be there).
+
+
 # Assumptions #
 
 * You should **_never_** do any work directly on "`master`" (or whatever you define the mainline branch as): everything is done on a feature branch.  This is a much safer and more flexible practice than doing everything on the same branch, but may seem odd to people used to old VCSs. In addition to being a much better way of working in general (see the F.A.Q. for more information), it is also a requirement to take advantage of Pull Request functionality.
 * When working on a branch, you should be integrating with "`master`" as often as possible.
-  * "`git sync`" makes it extremely easy for you to get any changes that are made in "`master`" into your branch so you can react to it immediately. "`git to-master`" then makes it easy to cleanly integrate the changes you have made, along with encouraging code-review/sign-off, and doing various house-keeping duties.
+  * "`git sync`" makes it extremely easy for you to get any changes that are made in "`master`" into your branch so you can react to it immediately.
+  * "`git to-master`" then makes it easy to cleanly integrate the changes you have made. If you need to keep the current branch open, use the `--keep` option. Otherwise it closes the branch along with various other house-keeping duties.
 * The process that you use should be essentially the same, regardless of whether you are working alone, or on a large distributed team.
   * The exception here is "`git pull-request`" since you do not use pull requests when working solo or when pair-programming.
 
+
 # Notes #
 
 * After publishing changes to the main integration branch (i.e., "`git to-master`") the old feature branch is removed as part of cleanup. Git is then "parked" on a "`_parking_`" branch until a new feature branch is created. Work is not expected to be done on this branch, but any that is done is brought over to a newly created feature branch (i.e., "`git new-fb`").
@@ -138,23 +150,24 @@ If you have ever seen an "active" project that uses a process like "git-flow" th
 This project is trying to promote clear communication about reality as it applies to the code, over micro-management over no-longer-relevant history. Thus rational for the judicious use of rebase.
 
 
-## Configurables ##
-See notes for more details
-
-* GitHub authentication token
-* The name of the integration branch (defaults to `origin/master`, but can be set to `develop` or other)
-
 # Contributing #
 
 ## Coding Setup ##
 
 1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
+2. Create your feature branch (`git checkout -b my-new-feature origin/master`)
+3. Commit your changes (`git commit`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-The tests are written for RSpec 2.
+or, if using these scripts:
+
+1. Fork it
+2. `git new-fb my-new-feature
+3. `git commit`
+4. `git sync`
+5. `git pull-request`
+
 
 ## License ##
 

data/bin/git-to-master

@@ -20,7 +20,8 @@ the integration branch, pushes to the integration branch, then does \
 housecleaning.
 
 If there is a problem, such as a merge conflict, this tries to \
-resolve it automatically. If it can not do so in an automated way, \
+resolve it automatically (including responding appropriately to
+"rerere" merges). If it can not do so in an automated way, \
 if tells you the steps involved for doing so manually.
 
 "Housecleaning" includes such things as closing any \
@@ -28,7 +29,7 @@ Pull Request that may exist for the branch, removing the (now obsolete) \
 local and remote feature branches, and then "parking" on the \
 special "_parking_" branch.
 
-Work is not expected to be done on the "parking" branch, but any that is \
+Work is not expected to be done on the "_parking_" branch, but any that is \
 done is brought over to a newly created feature branch when you do \
 "git new-fb".
 
@@ -46,10 +47,12 @@ for you:
   $ git rebase origin/master
   $ git push origin interesting_changes:master
   # close pull request
-  $ git co -b _parking_ origin/master
+  $ git checkout -b _parking_ origin/master
   $ git branch -d interesting_changes
   $ git push origin :interesting_changes
 
+If you use the --keep option, then the process stops after the first "push".
+
 NOTES
 
 * If you want to use a different integration branch other than "master",
@@ -59,6 +62,13 @@ NOTES
 DESC
   end
 
+
+  def extend_opts(parser)
+    parser.opt :keep,  "Don't do any \"cleanup.\" It keeps the current local "+
+                       "and remote branches, and does not close any "+
+                       "outstanding pull requests.", :short => :k, :default => false
+  end
+
 end
 
 GitProc::RebaseToMaster.new('.', ToMasterOptions.new.parse_cli(File.basename(__FILE__), ARGV)).run

data/lib/git-process/changed_file_helper.rb

@@ -54,8 +54,11 @@ module GitProc
       if not stat.modified.empty? or not stat.added.empty? or not stat.deleted.empty?
         resp = ask_how_to_handle_changed_files(stat)
         if resp == :commit
-          add((stat.added + stat.modified - stat.deleted).sort.uniq)
-          remove(stat.deleted)
+          changed_files = (stat.added + stat.modified - stat.deleted).sort.uniq
+
+          add(changed_files) unless changed_files.empty?
+          remove(stat.deleted) unless stat.deleted.empty?
+
           commit(nil)
         else
           stash_save

data/lib/git-process/rebase_to_master.rb

@@ -22,6 +22,12 @@ module GitProc
 
   class RebaseToMaster < Process
 
+    def initialize(dir, opts)
+      @keep = opts[:keep]
+      super
+    end
+
+
     def verify_preconditions
       super
 
@@ -35,8 +41,11 @@ module GitProc
         fetch(server_name)
         proc_rebase(integration_branch)
         push(server_name, branches.current, master_branch)
-        close_pull_request
-        remove_feature_branch
+
+        if not @keep
+          close_pull_request
+          remove_feature_branch
+        end
       else
         proc_rebase(integration_branch)
       end

data/lib/git-process/version.rb

@@ -12,9 +12,9 @@
 
 module GitProc
   module Version
-    MAJOR = 0
-    MINOR = 9
-    PATCH = 7
+    MAJOR = 1
+    MINOR = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/spec/changed_file_helper_spec.rb

@@ -88,6 +88,7 @@ describe GitProc::ChangeFileHelper do
         change_file_and_commit('modified file.txt', 'start')
         change_file_and_commit('modified file2.txt', 'start')
         change_file_and_commit('modified file3.txt', 'start')
+        change_file_and_commit('modified file4.txt', 'start')
         change_file_and_commit('removed file.txt', 'content')
         change_file_and_add('added file.txt', '')
         change_file('modified file.txt', 'modified')
@@ -95,6 +96,7 @@ describe GitProc::ChangeFileHelper do
         change_file_and_add('modified file3.txt', 'modified')
         change_file('modified file2.txt', 'modified again')
         change_file_and_add('removed file2.txt', 'content')
+        change_file_and_add('modified file4.txt', 'content')
         File.delete(File.join(gitprocess.workdir, 'removed file.txt'))
         File.delete(File.join(gitprocess.workdir, 'removed file2.txt'))
         File.delete(File.join(gitprocess.workdir, 'modified file3.txt'))
@@ -104,6 +106,7 @@ describe GitProc::ChangeFileHelper do
         #  M "modified file.txt"
         # MM "modified file2.txt"
         # MD "modified file3.txt"
+        # M  "modified file4.txt"
         #  D "removed file.txt"
         # AD "removed file2.txt"
 
@@ -113,7 +116,7 @@ describe GitProc::ChangeFileHelper do
 
       it 'should ask about modified files, then commit them' do
         gitprocess.stub(:ask).and_return('c')
-        gitprocess.should_receive(:add).with(["added file.txt", "modified file.txt", "modified file2.txt"])
+        gitprocess.should_receive(:add).with(["added file.txt", "modified file.txt", "modified file2.txt", "modified file4.txt"])
         gitprocess.should_receive(:remove).with(["modified file3.txt", "removed file.txt", "removed file2.txt"])
         gitprocess.should_receive(:commit).with(nil)
 
@@ -132,7 +135,7 @@ describe GitProc::ChangeFileHelper do
 
         stat = gitprocess.status
         stat.added.should == ["added file.txt", "removed file2.txt"]
-        stat.modified.should == ["modified file.txt", "modified file2.txt"]
+        stat.modified.should == ["modified file.txt", "modified file2.txt", "modified file4.txt"]
         stat.deleted.should == ["modified file3.txt", "removed file.txt"]
       end
 

data/spec/rebase_to_master_spec.rb

@@ -297,4 +297,19 @@ describe GitProc::RebaseToMaster do
 
   end
 
+
+  describe ":keep option" do
+
+    it "should not try to close a pull request or remove remote branch" do
+      gitprocess.branch('fb', :base_branch => 'master')
+
+      rtm = GitProc::RebaseToMaster.new(clone('fb').workdir, {:log_level => log_level, :keep => true})
+      rtm.should_receive(:fetch)
+      rtm.should_receive(:push).with('origin', rtm.branches.current, 'master')
+      rtm.should_not_receive(:push).with('origin', nil, nil, :delete => 'fb')
+      rtm.runner
+    end
+
+  end
+
 end

metadata

@@ -3,10 +3,10 @@ name: git-process
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 9
-  - 7
-  version: 0.9.7
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jim Moore
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-26 00:00:00 -06:00
+date: 2012-08-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency