git-process 1.0.11 → 1.1.0

data/lib/git-process/abstract_error_builder.rb

@@ -14,9 +14,6 @@ require 'shellwords'
 
 module GitProc
 
-  #
-  # Assumes that there are two attributes defined: error_message, lib
-  #
   module AbstractErrorBuilder
 
     def commands

data/lib/git-process/changed_file_helper.rb

@@ -19,32 +19,34 @@ module GitProc
   #
   # Provides support for prompting the user when the dir/index is dirty.
   #
-  # = Assumes =
-  # log_level
-  # workdir
-  #
-  module ChangeFileHelper
-    include GitLib
+  #noinspection RubyControlFlowConversionInspection,RubyClassMethodNamingConvention,RubyInstanceMethodNamingConvention
+  class ChangeFileHelper
+
+    # @param [GitLib] gitlib
+    def initialize(gitlib)
+      @gitlib = gitlib
+    end
 
 
     def offer_to_help_uncommitted_changes
-      stat = status
+      stat = gitlib.status
 
       if stat.unmerged.empty?
         handle_unknown_files(stat)
-        handle_changed_files(status) # refresh status in case it changed earlier
+        handle_changed_files(gitlib.status) # refresh status in case it changed earlier
       else
-        logger.info { "Can not offer to auto-add unmerged files: #{stat.unmerged.inspect}" }
+        gitlib.logger.info { "Can not offer to auto-add unmerged files: #{stat.unmerged.inspect}" }
         raise UncommittedChangesError.new
       end
     end
 
 
+    #noinspection RubyControlFlowConversionInspection
     def handle_unknown_files(stat)
       if not stat.unknown.empty?
-        resp = ask_how_to_handle_unknown_files(stat)
+        resp = ChangeFileHelper.ask_how_to_handle_unknown_files(stat)
         if resp == :add
-          add(stat.unknown)
+          gitlib.add(stat.unknown)
         end
       end
     end
@@ -52,26 +54,25 @@ module GitProc
 
     def handle_changed_files(stat)
       if not stat.modified.empty? or not stat.added.empty? or not stat.deleted.empty?
-        resp = ask_how_to_handle_changed_files(stat)
+        resp = ChangeFileHelper.ask_how_to_handle_changed_files(stat)
         if resp == :commit
           changed_files = (stat.added + stat.modified - stat.deleted).sort.uniq
 
-          add(changed_files) unless changed_files.empty?
-          remove(stat.deleted) unless stat.deleted.empty?
+          gitlib.add(changed_files) unless changed_files.empty?
+          gitlib.remove(stat.deleted) unless stat.deleted.empty?
 
-          commit(nil)
+          gitlib.commit(nil)
         else
-          stash_save
-          @stash_pushed = true
+          gitlib.stash_save
         end
       end
     end
 
 
-    def ask_how_to_handle_unknown_files(stat)
+    def self.ask_how_to_handle_unknown_files(stat)
       show_changes(:unknown, stat)
-      resp = ask("Would you like to (a)dd them or (i)gnore them? ") do |q|
-        q.responses[:not_valid] = "Please respond with either (a)dd or (i)gnore. (Ctl-C to abort.) "
+      resp = ask('Would you like to (a)dd them or (i)gnore them? ') do |q|
+        q.responses[:not_valid] = 'Please respond with either (a)dd or (i)gnore. (Ctl-C to abort.) '
         q.case = :down
         q.validate = /a|i/i
       end
@@ -80,7 +81,7 @@ module GitProc
     end
 
 
-    def show_changes(type, stat)
+    def self.show_changes(type, stat)
       files = stat.send(type)
 
       if type != :deleted
@@ -93,10 +94,10 @@ module GitProc
     end
 
 
-    def ask_how_to_handle_changed_files(stat)
+    def self.ask_how_to_handle_changed_files(stat)
       [:added, :modified, :deleted].each { |t| show_changes(t, stat) }
-      resp = ask("Would you like to (c)ommit them or (s)tash them? ") do |q|
-        q.responses[:not_valid] = "Please respond with either (c)ommit or (s)tash. (Ctl-C to abort.) "
+      resp = ask('Would you like to (c)ommit them or (s)tash them? ') do |q|
+        q.responses[:not_valid] = 'Please respond with either (c)ommit or (s)tash. (Ctl-C to abort.) '
         q.case = :down
         q.validate = /c|s/i
       end
@@ -104,6 +105,11 @@ module GitProc
       resp == 'c' ? :commit : :stash
     end
 
+
+    def gitlib
+      @gitlib
+    end
+
   end
 
 end

data/lib/git-process/git_abstract_merge_error_builder.rb

@@ -15,12 +15,19 @@ require 'shellwords'
 
 module GitProc
 
-  #
-  # Assumes that there are three attributes defined: error_message, lib, continue_command
-  #
-  module AbstractMergeErrorBuilder
+  #noinspection RubyTooManyInstanceVariablesInspection
+  class AbstractMergeErrorBuilder
     include GitProc::AbstractErrorBuilder
 
+    attr_reader :gitlib, :error_message, :continue_command
+
+
+    def initialize(gitlib, error_message, continue_command)
+      @gitlib = gitlib
+      @error_message = error_message
+      @continue_command = continue_command
+    end
+
 
     def resolved_files
       @resolved_files ||= find_resolved_files
@@ -53,7 +60,7 @@ module GitProc
         end
       end
 
-      unless lib.rerere_enabled?
+      unless config.rerere_enabled?
         msg << "\n\nConsider turning on 'rerere'.\nSee http://git-scm.com/2010/03/08/rerere.html for more information."
       end
 
@@ -70,13 +77,13 @@ module GitProc
     def build_commands
       commands = []
 
-      commands << 'git config --global rerere.enabled true' unless lib.rerere_enabled?
+      commands << 'git config --global rerere.enabled true' unless config.rerere_enabled?
 
       resolved_files.each do |file|
         commands << "# Verify that 'rerere' did the right thing for '#{file}'."
       end
 
-      unless resolved_files.empty? or lib.rerere_autoupdate?
+      unless resolved_files.empty? or config.rerere_autoupdate?
         escaped_files = shell_escaped_files(resolved_files)
         commands << "git add #{escaped_files}"
       end
@@ -103,22 +110,35 @@ module GitProc
 
 
     def unmerged
-      @unmerged ||= lib.status.unmerged
+      @unmerged ||= status.unmerged
     end
 
 
     def added
-      @added ||= lib.status.added
+      @added ||= status.added
     end
 
 
     def deleted
-      @deleted ||= lib.status.deleted
+      @deleted ||= status.deleted
     end
 
 
     def modified
-      @modified ||= lib.status.modified
+      @modified ||= status.modified
+    end
+
+
+    private
+
+
+    def config
+      gitlib.config
+    end
+
+
+    def status
+      @status ||= gitlib.status
     end
 
   end

data/lib/git-process/git_branch.rb

@@ -86,6 +86,11 @@ module GitProc
     end
 
 
+    def upstream(upstream_name)
+      @lib.branch(@name, :upstream => upstream_name)
+    end
+
+
     def contains_all_of(branch_name)
       @lib.rev_list(@name, branch_name, :oneline => true, :num_revs => 1) == ''
     end

data/lib/git-process/git_config.rb

@@ -0,0 +1,153 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# 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 'git-process/git_logger'
+require 'git-process/git_branch'
+require 'git-process/git_branches'
+require 'git-process/git_status'
+require 'git-process/git_process_error'
+
+
+class String
+
+  def to_boolean
+    return false if self == false || self.nil? || self =~ (/(false|f|no|n|0)$/i)
+    return true if self == true || self =~ (/(true|t|yes|y|1)$/i)
+    raise ArgumentError.new("invalid value for Boolean: \"#{self}\"")
+  end
+
+end
+
+
+class NilClass
+  def to_boolean
+    false
+  end
+end
+
+
+module GitProc
+
+  #
+  # Provides Git configuration
+  #
+  class GitConfig
+
+    def initialize(lib)
+      @lib = lib
+    end
+
+
+    def [](key)
+      value = config_hash[key]
+      unless value
+        value = @lib.command(:config, ['--get', key])
+        value = nil if value.empty?
+        config_hash[key] = value unless config_hash.empty?
+      end
+      value
+    end
+
+
+    def []=(key, value)
+      @lib.command(:config, [key, value])
+      config_hash[key] = value unless config_hash.empty?
+      value
+    end
+
+
+    def set_global(key, value)
+      @lib.command(:config, ['--global', key, value])
+      config_hash[key] = value unless config_hash.empty?
+      value
+    end
+
+
+    def gitlib
+      @lib
+    end
+
+
+    def logger
+      gitlib.logger
+    end
+
+
+    def master_branch
+      @master_branch ||= self['gitProcess.integrationBranch'] || 'master'
+    end
+
+
+    def remote_master_branch
+      remote.master_branch_name
+    end
+
+
+    def integration_branch
+      remote.exists? ? remote_master_branch : self.master_branch
+    end
+
+
+    def rerere_enabled?
+      re = self['rerere.enabled']
+      re && re.to_boolean
+    end
+
+
+    def rerere_enabled(re, global = true)
+      if global
+        set_global('rerere.enabled', re)
+      else
+        self['rerere.enabled'] = re
+      end
+    end
+
+
+    def rerere_enabled=(re)
+      rerere_enabled(re, false)
+    end
+
+
+    def rerere_autoupdate?
+      re = self['rerere.autoupdate']
+      re && re.to_boolean
+    end
+
+
+    def rerere_autoupdate(re, global = true)
+      if global
+        set_global('rerere.autoupdate', re)
+      else
+        self['rerere.autoupdate'] = re
+      end
+    end
+
+
+    def rerere_autoupdate=(re)
+      rerere_autoupdate(re, false)
+    end
+
+
+    private
+
+    def remote
+      gitlib.remote
+    end
+
+
+    def config_hash
+      @config_hash ||= {}
+    end
+
+  end
+
+end

data/lib/git-process/git_lib.rb

@@ -13,28 +13,11 @@
 require 'logger'
 require 'git-process/git_branch'
 require 'git-process/git_branches'
+require 'git-process/git_remote'
 require 'git-process/git_status'
 require 'git-process/git_process_error'
 
 
-class String
-
-  def to_boolean
-    return false if self == false || self.nil? || self =~ (/(false|f|no|n|0)$/i)
-    return true if self == true || self =~ (/(true|t|yes|y|1)$/i)
-    raise ArgumentError.new("invalid value for Boolean: \"#{self}\"")
-  end
-
-end
-
-
-class NilClass
-  def to_boolean
-    false
-  end
-end
-
-
 module GitProc
 
   class GitExecuteError < GitProcessError
@@ -44,41 +27,95 @@ module GitProc
   #
   # Provides Git commands
   #
-  # = Assumes =
-  # log_level
-  # workdir
-  #
-  module GitLib
+  #noinspection RubyTooManyMethodsInspection
+  class GitLib
+
+    # @param [Dir] dir
+    def initialize(dir, opts)
+      self.log_level = GitLib.log_level(opts)
+      self.workdir = dir
+    end
+
 
     def logger
       if @logger.nil?
-        @logger = Logger.new(STDOUT)
-        @logger.level = log_level || Logger::WARN
-        @logger.datetime_format = "%Y-%m-%d %H:%M:%S"
-        @logger.formatter = proc do |_, _, _, msg|
-          "#{msg}\n"
-        end
+        @logger = GitLogger.new(log_level)
       end
       @logger
     end
 
 
-    def server_name
-      @server_name ||= remote_name
+    def self.log_level(opts)
+      if opts[:log_level]
+        opts[:log_level]
+      elsif opts[:quiet]
+        Logger::ERROR
+      elsif opts[:verbose]
+        Logger::DEBUG
+      else
+        Logger::INFO
+      end
+    end
+
+
+    def log_level
+      @log_level || Logger::WARN
+    end
+
+
+    def log_level=(lvl)
+      @log_level = lvl
+    end
+
+
+    def workdir
+      @workdir
+    end
+
+
+    def workdir=(dir)
+      workdir = GitLib.find_workdir(dir)
+      if workdir.nil?
+        @workdir = dir
+        logger.info { "Initializing new repository at #{dir}" }
+        command(:init)
+      else
+        @workdir = workdir
+        logger.debug { "Opening existing repository at #{dir}" }
+      end
+    end
+
+
+    def self.find_workdir(dir)
+      if dir == File::SEPARATOR
+        nil
+      elsif File.directory?(File.join(dir, '.git'))
+        dir
+      else
+        find_workdir(File.expand_path("#{dir}#{File::SEPARATOR}.."))
+      end
+    end
+
+
+    def config
+      if @config.nil?
+        @config = GitConfig.new(self)
+      end
+      @config
     end
 
 
-    def master_branch
-      @master_branch ||= config('gitProcess.integrationBranch') || 'master'
+    def remote
+      if @remote.nil?
+        @remote = GitProc::GitRemote.new(config)
+      end
+      @remote
     end
 
 
     # @return [Boolean] does this have a remote defined?
     def has_a_remote?
-      if @has_remote == nil
-        @has_remote = (command(:remote) != '')
-      end
-      @has_remote
+      remote.exists?
     end
 
 
@@ -89,7 +126,7 @@ module GitProc
 
 
     def commit(msg = nil)
-      logger.info "Committing changes"
+      logger.info 'Committing changes'
       command(:commit, msg.nil? ? nil : ['-m', msg])
     end
 
@@ -113,9 +150,60 @@ module GitProc
     end
 
 
-    def fetch(name = remote_name)
-      logger.info "Fetching the latest changes from the server"
-      command(:fetch, ['-p', name])
+    def fetch(name = remote.name)
+      logger.info 'Fetching the latest changes from the server'
+      output = self.command(:fetch, ['-p', name])
+
+      log_fetch_changes(fetch_changes(output))
+
+      output
+    end
+
+
+    # @param [Hash] changes a hash of the changes that were made
+    #
+    # @return [void]
+    def log_fetch_changes(changes)
+      changes.each do |key, v|
+        unless v.empty?
+          logger.info { "  #{key.to_s.sub(/_/, ' ')}: #{v.join(', ')}" }
+        end
+      end
+    end
+
+
+    # @return [Hash]
+    def fetch_changes(output)
+      changed = output.split("\n")
+
+      changes = {:new_branch => [], :new_tag => [], :force_updated => [], :deleted => [], :updated => []}
+
+      line = changed.shift
+
+      until line.nil? do
+        case line
+          when /^\s\s\s/
+            m = /^\s\s\s(\S+)\s+(\S+)\s/.match(line)
+            changes[:updated] << "#{m[2]} (#{m[1]})"
+          when /^\s\*\s\[new branch\]/
+            m = /^\s\*\s\[new branch\]\s+(\S+)\s/.match(line)
+            changes[:new_branch] << m[1]
+          when /^\s\*\s\[new tag\]/
+            m = /^\s\*\s\[new tag\]\s+(\S+)\s/.match(line)
+            changes[:new_tag] << m[1]
+          when /^\sx\s/
+            m = /^\sx\s\[deleted\]\s+\(none\)\s+->\s+[^\/]+\/(\S+)/.match(line)
+            changes[:deleted] << m[1]
+          when /^\s\+\s/
+            m = /^\s\+\s(\S+)\s+(\S+)\s/.match(line)
+            changes[:force_updated] << "#{m[2]} (#{m[1]})"
+          else
+            # ignore the line
+        end
+        line = changed.shift
+      end
+
+      changes
     end
 
 
@@ -134,38 +222,27 @@ module GitProc
     # @option opts [Boolean] :all list all branches, local and remote
     # @option opts [Boolean] :no_color force not using any ANSI color codes
     # @option opts [String]  :rename the new name for the branch
+    # @option opts [String]  :upstream the new branch to track
     # @option opts [String]  :base_branch the branch to base the new branch off of;
     #   defaults to 'master'
     #
     # @return [String] the output of running the git command
     def branch(branch_name, opts = {})
-      args = []
       if opts[:delete]
-        logger.info { "Deleting local branch '#{branch_name}'." } unless branch_name == '_parking_'
-
-        args << (opts[:force] ? '-D' : '-d')
-        args << branch_name
+        delete_branch(branch_name, opts[:force])
       elsif opts[:rename]
-        logger.info { "Renaming branch '#{branch_name}' to '#{opts[:rename]}'." }
-
-        args << '-m' << branch_name << opts[:rename]
+        rename_branch(branch_name, opts[:rename])
+      elsif opts[:upstream]
+        set_upstream_branch(branch_name, opts[:upstream])
       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]}'." }
-
-          args << '-f' << branch_name << opts[:base_branch]
+          change_branch(branch_name, opts[:base_branch])
         else
-          logger.info { "Creating new branch '#{branch_name}' based on '#{opts[:base_branch]}'." }
-
-          args << branch_name
-          args << (opts[:base_branch] ? opts[:base_branch] : 'master')
+          create_branch(branch_name, opts[:base_branch])
         end
       else
-        args << '-a' if opts[:all]
-        args << '--no-color' if opts[:no_color]
+        list_branches(opts[:all], opts[:no_color])
       end
-      command(:branch, args)
     end
 
 
@@ -195,10 +272,10 @@ module GitProc
         elsif !(opts[:delete].is_a? TrueClass)
           rb = opts[:delete]
         else
-          raise ArgumentError.new("Need a branch name to delete.")
+          raise ArgumentError.new('Need a branch name to delete.')
         end
 
-        int_branch = master_branch
+        int_branch = config.master_branch
         if rb == int_branch
           raise GitProc::GitProcessError.new("Can not delete the integration branch '#{int_branch}'")
         end
@@ -278,69 +355,6 @@ module GitProc
     end
 
 
-    def config_hash
-      @config_hash ||= {}
-    end
-
-
-    private :config_hash
-
-
-    def config(key = nil, value = nil, global = false)
-      if key and value
-        args = global ? %w(--global) : []
-        args << key << value
-        command(:config, args)
-        config_hash[key] = value unless config_hash.empty?
-        value
-      elsif key
-        value = config_hash[key]
-        unless value
-          value = command(:config, ['--get', key])
-          value = nil if value.empty?
-          config_hash[key] = value unless config_hash.empty?
-        end
-        value
-      else
-        if config_hash.empty?
-          str = command(:config, '--list')
-          lines = str.split("\n")
-          lines.each do |line|
-            (key, *values) = line.split('=')
-            config_hash[key] = values.join('=')
-          end
-        end
-        config_hash
-      end
-    end
-
-
-    def repo_name
-      unless @repo_name
-        origin_url = config("remote.#{remote_name}.url")
-        raise GitProc::Process::GitProcessError.new("There is no #{remote_name} url set up.") if origin_url.empty?
-        @repo_name = origin_url.sub(/^.*:(.*?)(.git)?$/, '\1')
-      end
-      @repo_name
-    end
-
-
-    def remote_name
-      unless @remote_name
-        @remote_name = config('gitProcess.remoteName')
-        if @remote_name.nil? or @remote_name.empty?
-          remote_str = command(:remote)
-          unless remote_str == nil or remote_str.empty?
-            @remote_name = remote_str.split(/\n/)[0]
-            raise "!@remote_name.is_a? String" unless @remote_name.is_a? String
-          end
-        end
-        logger.debug { "Using remote name of '#@remote_name'" }
-      end
-      @remote_name
-    end
-
-
     #
     # Returns the status of the git repository.
     #
@@ -367,28 +381,6 @@ module GitProc
     end
 
 
-    def rerere_enabled?
-      re = config('rerere.enabled')
-      re && re.to_boolean
-    end
-
-
-    def rerere_enabled(re, global = true)
-      config('rerere.enabled', re, global)
-    end
-
-
-    def rerere_autoupdate?
-      re = config('rerere.autoupdate')
-      re && re.to_boolean
-    end
-
-
-    def rerere_autoupdate(re, global = true)
-      config('rerere.autoupdate', re, global)
-    end
-
-
     def rev_list(start_revision, end_revision, opts ={})
       args = []
       args << "-#{opts[:num_revs]}" if opts[:num_revs]
@@ -406,40 +398,52 @@ module GitProc
     alias sha rev_parse
 
 
-    def add_remote(remote_name, url)
-      command(:remote, ['add', remote_name, url])
+    # @return [String]
+    def command(cmd, opts = [], chdir = true, redirect = '', &block)
+      ENV['GIT_INDEX_FILE'] = File.join(workdir, '.git', 'index')
+      ENV['GIT_DIR'] = File.join(workdir, '.git')
+      ENV['GIT_WORK_TREE'] = workdir
+      path = workdir
+
+      git_cmd = create_git_command(cmd, opts, redirect)
+
+      out = command_git_cmd(path, git_cmd, chdir, block)
+
+      if logger
+        logger.debug(git_cmd)
+        logger.debug(out)
+      end
+
+      handle_exitstatus($?, git_cmd, out)
     end
 
 
     private
 
 
-    def command(cmd, opts = [], chdir = true, redirect = '', &block)
-      ENV['GIT_DIR'] = File.join(workdir, '.git')
-      ENV['GIT_INDEX_FILE'] = File.join(workdir, '.git', 'index')
-      ENV['GIT_WORK_TREE'] = workdir
-      path = workdir
-
+    def create_git_command(cmd, opts, redirect)
       opts = [opts].flatten.map { |s| escape(s) }.join(' ')
-      git_cmd = "git #{cmd} #{opts} #{redirect} 2>&1"
+      "git #{cmd} #{opts} #{redirect} 2>&1"
+    end
 
+
+    def command_git_cmd(path, git_cmd, chdir, block)
       out = nil
       if chdir and (Dir.getwd != path)
         Dir.chdir(path) { out = run_command(git_cmd, &block) }
       else
         out = run_command(git_cmd, &block)
       end
+      out
+    end
 
-      if logger
-        logger.debug(git_cmd)
-        logger.debug(out)
-      end
 
-      if $?.exitstatus > 0
-        if $?.exitstatus == 1 && out == ''
-          return ''
+    # @return [String]
+    def handle_exitstatus(proc_status, git_cmd, out)
+      if proc_status.exitstatus > 0
+        unless proc_status.exitstatus == 1 && out == ''
+          raise GitProc::GitExecuteError.new(git_cmd + ':' + out.to_s)
         end
-        raise GitProc::GitExecuteError.new(git_cmd + ':' + out.to_s)
       end
       out
     end
@@ -459,6 +463,50 @@ module GitProc
       %Q{"#{escaped}"}
     end
 
+
+    def change_branch(branch_name, base_branch)
+      raise ArgumentError.new('Need :base_branch when using :force for a branch.') unless base_branch
+      logger.info { "Changing branch '#{branch_name}' to point to '#{base_branch}'." }
+
+      command(:branch, ['-f', branch_name, base_branch])
+    end
+
+
+    def create_branch(branch_name, base_branch)
+      logger.info { "Creating new branch '#{branch_name}' based on '#{base_branch}'." }
+
+      command(:branch, [branch_name, (base_branch || 'master')])
+    end
+
+
+    def list_branches(all_branches, no_color)
+      args = []
+      args << '-a' if all_branches
+      args << '--no-color' if no_color
+      command(:branch, args)
+    end
+
+
+    def delete_branch(branch_name, force)
+      logger.info { "Deleting local branch '#{branch_name}'." } unless branch_name == '_parking_'
+
+      command(:branch, [force ? '-D' : '-d', branch_name])
+    end
+
+
+    def rename_branch(branch_name, new_name)
+      logger.info { "Renaming branch '#{branch_name}' to '#{new_name}'." }
+
+      command(:branch, ['-m', branch_name, new_name])
+    end
+
+
+    def set_upstream_branch(branch_name, upstream)
+      logger.info { "Setting upstream/tracking for branch '#{branch_name}' to '#{upstream}'." }
+
+      command(:branch, ['--set-upstream-to', upstream, branch_name])
+    end
+
   end
 
 end