git-process-lib 2.0.1 → 2.0.2

data/CHANGELOG.md

@@ -1,8 +1,14 @@
-# CHANGELOG - 1.2.0 #
+# CHANGELOG - 2.0.2 #
 
 ### Since 2.0.1 ###
 
-Changed git-pull-request to git-pull-req
+* Added "extra safe" code for deleting on Windows ([GH-121](https://github.com/jdigger/git-process/issues/121))
+* Unknown variable for handling uncommited changes for sync ([GH-123](https://github.com/jdigger/git-process/issues/123))
+* git-sync -r now keeps rebase on instead of acting as a switch ([GH-122](https://github.com/jdigger/git-process/issues/122))
+
+### Since 2.0.0 ###
+
+* Changed git-pull-request to git-pull-req
 
 ### Since 1.1.4 ###
 

data/bin/git-sync

@@ -14,10 +14,10 @@ class SyncOptions
 
 
   def extend_opts(parser)
-    parser.opt :rebase, "Rebase instead of merge against the integration branch", :default => true
-    parser.opt :merge, "Merge instead of rebase against the integration branch", :short => :none, :default => false
+    parser.opt :rebase, "Rebase instead of merge against the integration branch (default: on)", :short => :r
+    parser.opt :merge, "Merge instead of rebase against the integration branch", :short => :m
     parser.opt :force, "Force the push; defaults to true if --rebase is used", :short => :f, :default => false
-    parser.opt :local, "Do not do a push; gets remote changes, but does not update the server", :short => :l, :default => false
+    parser.opt :local, "Do not do a push; gets remote changes, but does not update the server", :short => :l
 
     parser.conflicts :rebase, :merge
     parser.conflicts :local, :force
@@ -26,8 +26,8 @@ class SyncOptions
 
   #noinspection RubyUnusedLocalVariable
   def post_parse(opts, argv)
+    opts[:rebase] = true unless opts[:merge]
     opts[:force] = true if opts[:rebase]
-    opts[:merge] = !opts[:rebase]
 
     opts[:branch_name] = argv.shift
   end

data/lib/git-process/changed_file_helper.rb

@@ -22,6 +22,8 @@ module GitProc
   #noinspection RubyControlFlowConversionInspection,RubyClassMethodNamingConvention,RubyInstanceMethodNamingConvention
   class ChangeFileHelper
 
+    attr_reader :gitlib
+
     # @param [GitLib] gitlib
     def initialize(gitlib)
       @gitlib = gitlib
@@ -105,11 +107,6 @@ module GitProc
       resp == 'c' ? :commit : :stash
     end
 
-
-    def gitlib
-      @gitlib
-    end
-
   end
 
 end

data/lib/git-process/git_lib.rb

@@ -523,7 +523,9 @@ module GitProc
     def read_sync_control_file(branch_name)
       filename = sync_control_filename(branch_name)
       if File.exists?(filename)
-        sha = File.new(filename).readline.chop
+        sha = File.open(filename) do |file|
+          file.readline.chop
+        end
         logger.debug "Read sync control file, #{filename}: #{sha}"
         sha
       else
@@ -536,7 +538,17 @@ module GitProc
     def delete_sync_control_file!(branch_name)
       filename = sync_control_filename(branch_name)
       logger.debug { "Deleting sync control file, #{filename}" }
-      File.delete(filename)
+
+      counter = 10
+      while counter > 0
+        begin
+          File.delete(filename)
+          counter = 0
+        rescue
+          counter = counter - 1
+          sleep(0.25)
+        end
+      end
     end
 
 

data/lib/git-process/sync_process.rb

@@ -34,7 +34,7 @@ module GitProc
       super
 
       if not gitlib.status.clean?
-        change_file_helper.offer_to_help_uncommitted_changes
+        GitProc::ChangeFileHelper.new(gitlib).offer_to_help_uncommitted_changes
       end
 
       raise ParkedChangesError.new(self) if gitlib.is_parked?

data/lib/git-process/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-process-lib
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Jim Moore
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-11 00:00:00 -06:00
+date: 2013-09-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency