git-process 1.0.4 → 1.0.5

data/CHANGELOG.md

@@ -1,4 +1,14 @@
-# CHANGELOG - 1.0.3 #
+# CHANGELOG - 1.0.5 #
+
+### Since 1.0.4 ###
+
+* Do not try to fetch/push when doing sync if there is not remote. (GH-70)
+* git-sync now merges in upstream changes. (GH-79)
+* Simplified Windows installation instructions. (GH-76 GH-77)
+
+### Since 1.0.3 ###
+
+* Gets rid of infinate loop in Highline library. (GH-72)
 
 ### Since 1.0.2 ###
 

data/README.md

@@ -17,14 +17,8 @@ Some older operating systems (such as OSX 10.6) are using an old version of Ruby
 
 ## Windows Installation ##
 
-1. Run http://cygwin.com/setup.exe
-2. Go through the various prompts and then select to install "git", "curl", "ruby" and "openssh" (along with their dependencies)
-3. Open a Cygwin terminal
-4. `curl -L -O http://production.cf.rubygems.org/rubygems/rubygems-1.8.24.tgz`
-5. `tar xfz rubygems-1.8.24.tgz`
-6. `cd rubygems-1.8.24`
-7. `ruby setup.rb`
-8. `gem install git-process`
+1. Install Ruby (if you have not sone so already) from http://rubyinstaller.org/
+2. Open a command prompt and type `gem install git-process`
 
 
 # Overview #

data/lib/git-process/abstract_error_builder.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'shellwords'
 
@@ -47,7 +47,7 @@ module GitProc
 
 
     def shell_escaped_files(files)
-      shell_escaped_files = files.map{|f| f.shellescape}
+      shell_escaped_files = files.map { |f| f.shellescape }
       shell_escaped_files.join(' ')
     end
 

data/lib/git-process/changed_file_helper.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'git-process/git_lib'
 require 'highline/import'

data/lib/git-process/git_abstract_merge_error_builder.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'git-process/abstract_error_builder'
 require 'shellwords'
@@ -21,6 +21,7 @@ module GitProc
   module AbstractMergeErrorBuilder
     include GitProc::AbstractErrorBuilder
 
+
     def resolved_files
       @resolved_files ||= find_resolved_files
     end

data/lib/git-process/git_branch.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 module GitProc
 
@@ -17,8 +17,9 @@ module GitProc
 
     attr_reader :name
 
+
     def initialize(name, current, lib)
-      if (/^remotes\// =~ name)
+      if /^remotes\// =~ name
         @name = name[8..-1]
         @remote = true
       else

data/lib/git-process/git_branches.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'set'
 require 'git-process/git_branch'
@@ -18,6 +18,7 @@ module GitProc
   class GitBranches
     include Enumerable
 
+
     def initialize(lib)
       @lib = lib
       branch_lines = lib.branch(nil, :all => true, :no_color => true).split("\n")
@@ -34,35 +35,35 @@ module GitProc
 
 
     def each(&block)
-      @items.each {|b| block.call(b)}
+      @items.each { |b| block.call(b) }
     end
 
 
     def names
-      @items.map {|b| b.name}
+      @items.map { |b| b.name }
     end
 
 
     def current
-      @items.find {|b| b.current? }
+      @items.find { |b| b.current? }
     end
 
 
     def parking
-      @items.find {|b| b.name == '_parking_' }
+      @items.find { |b| b.name == '_parking_' }
     end
 
 
     def include?(branch_name)
-      @items.find {|b| b.name == branch_name} != nil
+      @items.find { |b| b.name == branch_name } != nil
     end
 
 
     def [](branch_name)
       branch_name = current.name if branch_name == 'HEAD'
-      br = @items.find {|b| b.name == branch_name}
+      br = @items.find { |b| b.name == branch_name }
       if br.nil? and branch_name !~ /origin\// and branch_name != '_parking_'
-        @lib.logger.warn {"Could not find '#{branch_name}' in #{@items.map{|i|i.name}.join(',')}"}
+        @lib.logger.warn { "Could not find '#{branch_name}' in #{@items.map { |i| i.name }.join(',')}" }
       end
       br
     end

data/lib/git-process/git_lib.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'logger'
 require 'git-process/git_branch'
@@ -55,8 +55,7 @@ module GitProc
         @logger = Logger.new(STDOUT)
         @logger.level = log_level || Logger::WARN
         @logger.datetime_format = "%Y-%m-%d %H:%M:%S"
-        f = Logger::Formatter.new
-        @logger.formatter = proc do |severity, datetime, progname, msg|
+        @logger.formatter = proc do |_, _, _, msg|
           "#{msg}\n"
         end
       end
@@ -135,22 +134,22 @@ module GitProc
     def branch(branch_name, opts = {})
       args = []
       if opts[:delete]
-        logger.info { "Deleting local branch '#{branch_name}'."} unless branch_name == '_parking_'
+        logger.info { "Deleting local branch '#{branch_name}'." } unless branch_name == '_parking_'
 
         args << (opts[:force] ? '-D' : '-d')
         args << branch_name
       elsif opts[:rename]
-        logger.info { "Renaming branch '#{branch_name}' to '#{opts[:rename]}'."}
+        logger.info { "Renaming branch '#{branch_name}' to '#{opts[:rename]}'." }
 
         args << '-m' << branch_name << opts[:rename]
       elsif branch_name
         if opts[:force]
           raise ArgumentError.new("Need :base_branch when using :force for a branch.") unless opts[:base_branch]
-          logger.info { "Changing branch '#{branch_name}' to point to '#{opts[:base_branch]}'."}
+          logger.info { "Changing branch '#{branch_name}' to point to '#{opts[:base_branch]}'." }
 
           args << '-f' << branch_name << opts[:base_branch]
         else
-          logger.info { "Creating new branch '#{branch_name}' based on '#{opts[:base_branch]}'."}
+          logger.info { "Creating new branch '#{branch_name}' based on '#{opts[:base_branch]}'." }
 
           args << branch_name
           args << (opts[:base_branch] ? opts[:base_branch] : 'master')
@@ -197,7 +196,7 @@ module GitProc
           raise GitProc::GitProcessError.new("Can not delete the integration branch '#{int_branch}'")
         end
 
-        logger.info { "Deleting remote branch '#{rb}' on '#{remote_name}'."}
+        logger.info { "Deleting remote branch '#{rb}' on '#{remote_name}'." }
         args << '--delete' << rb
       else
         local_branch ||= branches.current
@@ -224,12 +223,12 @@ module GitProc
 
 
     def stash_save
-      command(:stash, ['save'])
+      command(:stash, %w(save))
     end
 
 
     def stash_pop
-      command(:stash, ['pop'])
+      command(:stash, %w(pop))
     end
 
 
@@ -238,7 +237,7 @@ module GitProc
     end
 
 
-    def checkout(branch_name, opts = {}, &block)
+    def checkout(branch_name, opts = {})
       args = []
       args << '--no-track' if opts[:no_track]
       args << '-b' if opts[:new_branch]
@@ -282,7 +281,7 @@ module GitProc
 
     def config(key = nil, value = nil, global = false)
       if key and value
-        args = global ? ['--global'] : []
+        args = global ? %w(--global) : []
         args << key << value
         command(:config, args)
         config_hash[key] = value unless config_hash.empty?
@@ -329,7 +328,7 @@ module GitProc
             raise "!@remote_name.is_a? String" unless @remote_name.is_a? String
           end
         end
-        logger.debug {"Using remote name of '#{@remote_name}'"}
+        logger.debug { "Using remote name of '#@remote_name'" }
       end
       @remote_name
     end
@@ -414,30 +413,30 @@ module GitProc
       ENV['GIT_WORK_TREE'] = workdir
       path = workdir
 
-      opts = [opts].flatten.map {|s| escape(s) }.join(' ')
+      opts = [opts].flatten.map { |s| escape(s) }.join(' ')
       git_cmd = "git #{cmd} #{opts} #{redirect} 2>&1"
 
       out = nil
       if chdir and (Dir.getwd != path)
-        Dir.chdir(path) { out = run_command(git_cmd, &block) } 
+        Dir.chdir(path) { out = run_command(git_cmd, &block) }
       else
         out = run_command(git_cmd, &block)
       end
-      
+
       if logger
         logger.debug(git_cmd)
         logger.debug(out)
       end
-            
+
       if $?.exitstatus > 0
         if $?.exitstatus == 1 && out == ''
           return ''
         end
-        raise GitProc::GitExecuteError.new(git_cmd + ':' + out.to_s) 
+        raise GitProc::GitExecuteError.new(git_cmd + ':' + out.to_s)
       end
       out
     end
-    
+
 
     def run_command(git_cmd, &block)
       if block_given?

data/lib/git-process/git_merge_error.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'git-process/git_abstract_merge_error_builder'
 
@@ -19,6 +19,7 @@ module GitProc
 
     attr_reader :error_message, :lib
 
+
     def initialize(merge_error_message, lib)
       @lib = lib
       @error_message = merge_error_message

data/lib/git-process/git_process.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'git-process/git_lib'
 require 'git-process/git_rebase_error'
@@ -21,6 +21,7 @@ module GitProc
   class Process
     include GitLib
 
+
     def initialize(dir, opts = {})
       @log_level = Process.log_level(opts)
 
@@ -48,7 +49,7 @@ module GitProc
 
 
     def set_workdir(dir)
-      if !dir.nil?
+      unless dir.nil?
         @workdir = find_workdir(dir)
         if @workdir.nil?
           @workdir = dir
@@ -105,10 +106,10 @@ module GitProc
     def should_remove_master
       my_branches = branches()
       has_a_remote? and
-      my_branches.include?(master_branch) and
-      my_branches.current.name != master_branch and
-      !keep_local_integration_branch? and
-      my_branches[integration_branch].contains_all_of(master_branch)
+          my_branches.include?(master_branch) and
+          my_branches.current.name != master_branch and
+          !keep_local_integration_branch? and
+          my_branches[integration_branch].contains_all_of(master_branch)
     end
 
 
@@ -139,6 +140,7 @@ module GitProc
     private
 
 
+    #noinspection RubyInstanceMethodNamingConvention
     def keep_local_integration_branch_config_value
       config('gitProcess.keepLocalIntegrationBranch')
     end

data/lib/git-process/git_process_error.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 module GitProc
 

data/lib/git-process/git_process_options.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'optparse'
 require 'trollop'
@@ -20,6 +20,7 @@ module GitProc
 
     DEBUG = false
 
+
     def parse_cli(filename, argv)
       parser = Trollop::Parser.new
       parser.version "#{filename} #{GitProc::Version::STRING}"
@@ -42,8 +43,8 @@ module GitProc
 
       post_parse(opts, argv)
 
-      if (DEBUG)
-        puts "\n\n#{opts.map{|k,v| "#{k}:#{v}"}.join(', ')}"
+      if DEBUG
+        puts "\n\n#{opts.map { |k, v| "#{k}:#{v}" }.join(', ')}"
         puts "\nargs: #{argv.join(', ')}"
       end
 
@@ -82,16 +83,13 @@ module GitProc
     end
 
 
+    #noinspection RubyUnusedLocalVariable
     def extend_opts(parser)
       # extension point - does nothing by default
     end
 
 
-    # def extend_args(argv)
-    #   # extension point - does nothing by default
-    # end
-
-
+    #noinspection RubyUnusedLocalVariable
     def post_parse(opts, argv)
       # extension point - does nothing by default
     end

data/lib/git-process/git_rebase_error.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 require 'git-process/git_abstract_merge_error_builder'
 
@@ -19,6 +19,7 @@ module GitProc
 
     attr_reader :error_message, :lib
 
+
     def initialize(rebase_error_message, lib)
       @lib = lib
       @error_message = rebase_error_message

data/lib/git-process/git_status.rb

@@ -8,7 +8,7 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.require 'shellwords'
+# limitations under the License.
 
 module GitProc
 
@@ -28,6 +28,7 @@ module GitProc
   class GitStatus
     attr_reader :unmerged, :modified, :deleted, :added, :unknown
 
+
     def initialize(lib)
       unmerged = []
       modified = []
@@ -43,41 +44,41 @@ module GitProc
         #puts "stat #{stat} - #{file}"
         f = unquote(file)
         case stat
-        when 'U ', ' U'
-          unmerged << f
-        when 'UU'
-          unmerged << f
-          modified << f
-        when 'M ', ' M', 'MM'
-          modified << f
-        when 'MD'
-          modified << f
-          deleted << f
-        when 'D ', ' D'
-          deleted << f
-        when 'DU', 'UD'
-          deleted << f
-          unmerged << f
-        when 'A ', ' A'
-          added << f
-        when 'AD'
-          added << f
-          deleted << f
-        when 'AA'
-          added << f
-          unmerged << f
-        when '??'
-          unknown << f
-        when 'R '
-          old_file, new_file = file.split(' -> ')
-          deleted << unquote(old_file)
-          added << unquote(new_file)
-        when 'C '
-          old_file, new_file = file.split(' -> ')
-          added << unquote(old_file)
-          added << unquote(new_file)
-        else
-          raise "Do not know what to do with status #{stat} - #{file}"
+          when 'U ', ' U'
+            unmerged << f
+          when 'UU'
+            unmerged << f
+            modified << f
+          when 'M ', ' M', 'MM'
+            modified << f
+          when 'MD'
+            modified << f
+            deleted << f
+          when 'D ', ' D'
+            deleted << f
+          when 'DU', 'UD'
+            deleted << f
+            unmerged << f
+          when 'A ', ' A'
+            added << f
+          when 'AD'
+            added << f
+            deleted << f
+          when 'AA'
+            added << f
+            unmerged << f
+          when '??'
+            unknown << f
+          when 'R '
+            old_file, new_file = file.split(' -> ')
+            deleted << unquote(old_file)
+            added << unquote(new_file)
+          when 'C '
+            old_file, new_file = file.split(' -> ')
+            added << unquote(old_file)
+            added << unquote(new_file)
+          else
+            raise "Do not know what to do with status #{stat} - #{file}"
         end
       end