git-process 1.1.4 → 2.0.0

data/lib/git-process/git_branches.rb

@@ -1,73 +0,0 @@
-# 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 'set'
-require 'git-process/git_branch'
-
-module GitProc
-
-  class GitBranches
-    include Enumerable
-
-
-    def initialize(lib)
-      @lib = lib
-      branch_lines = lib.branch(nil, :all => true, :no_color => true).split("\n")
-      @items = SortedSet.new
-      branch_lines.each do |bl|
-        @items << GitBranch.new(bl[2..-1], bl[0..0] == '*', lib)
-      end
-    end
-
-
-    def <<(item)
-      @items << item
-    end
-
-
-    def each(&block)
-      @items.each { |b| block.call(b) }
-    end
-
-
-    def names
-      @items.map { |b| b.name }
-    end
-
-
-    def current
-      @items.find { |b| b.current? }
-    end
-
-
-    def parking
-      @items.find { |b| b.name == '_parking_' }
-    end
-
-
-    def include?(branch_name)
-      @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 }
-      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(',')}" }
-      end
-      br
-    end
-
-  end
-
-end

data/lib/git-process/git_config.rb

@@ -1,153 +0,0 @@
-# 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

@@ -1,512 +0,0 @@
-# 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 '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'
-
-
-module GitProc
-
-  class GitExecuteError < GitProcessError
-  end
-
-
-  #
-  # Provides Git commands
-  #
-  #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 = GitLogger.new(log_level)
-      end
-      @logger
-    end
-
-
-    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 remote
-      if @remote.nil?
-        @remote = GitProc::GitRemote.new(config)
-      end
-      @remote
-    end
-
-
-    # @return [Boolean] does this have a remote defined?
-    def has_a_remote?
-      remote.exists?
-    end
-
-
-    def add(file)
-      logger.info { "Adding #{[*file].join(', ')}" }
-      command(:add, ['--', file])
-    end
-
-
-    def commit(msg = nil)
-      logger.info 'Committing changes'
-      command(:commit, msg.nil? ? nil : ['-m', msg])
-    end
-
-
-    def rebase(base, opts = {})
-      args = []
-      if opts[:interactive]
-        logger.info { "Interactively rebasing #{branches.current.name} against #{base}" }
-        args << '-i'
-      else
-        logger.info { "Rebasing #{branches.current.name} against #{base}" }
-      end
-      args << base
-      command('rebase', args)
-    end
-
-
-    def merge(base)
-      logger.info { "Merging #{branches.current.name} with #{base}" }
-      command(:merge, [base])
-    end
-
-
-    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
-
-
-    def branches
-      GitProc::GitBranches.new(self)
-    end
-
-
-    #
-    # Does branch manipulation.
-    #
-    # @param [String] branch_name the name of the branch
-    #
-    # @option opts [Boolean] :delete delete the remote branch
-    # @option opts [Boolean] :force force the update
-    # @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 = {})
-      if opts[:delete]
-        delete_branch(branch_name, opts[:force])
-      elsif opts[:rename]
-        rename_branch(branch_name, opts[:rename])
-      elsif opts[:upstream]
-        set_upstream_branch(branch_name, opts[:upstream])
-      elsif branch_name
-        if opts[:force]
-          change_branch(branch_name, opts[:base_branch])
-        else
-          create_branch(branch_name, opts[:base_branch])
-        end
-      else
-        list_branches(opts[:all], opts[:no_color])
-      end
-    end
-
-
-    #
-    # Pushes the given branch to the server.
-    #
-    # @param [String] remote_name the repository name; nil -> 'origin'
-    # @param [String] local_branch the local branch to push; nil -> the current branch
-    # @param [String] remote_branch the name of the branch to push to; nil -> same as local_branch
-    #
-    # @option opts [Boolean, String] :delete delete the remote branch
-    # @option opts [Boolean] :force force the update, even if not a fast-forward
-    #
-    # @return [void]
-    #
-    # @raise [ArgumentError] if :delete is true, but no branch name is given
-    def push(remote_name, local_branch, remote_branch, opts = {})
-      remote_name ||= 'origin'
-
-      args = [remote_name]
-
-      if opts[:delete]
-        if remote_branch
-          rb = remote_branch
-        elsif local_branch
-          rb = local_branch
-        elsif !(opts[:delete].is_a? TrueClass)
-          rb = opts[:delete]
-        else
-          raise ArgumentError.new('Need a branch name to delete.')
-        end
-
-        int_branch = config.master_branch
-        if rb == int_branch
-          raise GitProc::GitProcessError.new("Can not delete the integration branch '#{int_branch}'")
-        end
-
-        logger.info { "Deleting remote branch '#{rb}' on '#{remote_name}'." }
-        args << '--delete' << rb
-      else
-        local_branch ||= branches.current
-        remote_branch ||= local_branch
-        args << '-f' if opts[:force]
-
-        logger.info do
-          if local_branch == remote_branch
-            "Pushing to '#{remote_branch}' on '#{remote_name}'."
-          else
-            "Pushing #{local_branch} to '#{remote_branch}' on '#{remote_name}'."
-          end
-        end
-
-        args << "#{local_branch}:#{remote_branch}"
-      end
-      command(:push, args)
-    end
-
-
-    def rebase_continue
-      command(:rebase, '--continue')
-    end
-
-
-    def stash_save
-      command(:stash, %w(save))
-    end
-
-
-    def stash_pop
-      command(:stash, %w(pop))
-    end
-
-
-    def show(refspec)
-      command(:show, refspec)
-    end
-
-
-    def checkout(branch_name, opts = {})
-      args = []
-      args << '--no-track' if opts[:no_track]
-      args << '-b' if opts[:new_branch]
-      args << branch_name
-      args << opts[:new_branch] if opts[:new_branch]
-      branches = branches()
-      command(:checkout, args)
-
-      branches << GitBranch.new(branch_name, opts[:new_branch] != nil, self)
-
-      if block_given?
-        yield
-        command(:checkout, branches.current.name)
-        branches.current
-      else
-        branches[branch_name]
-      end
-    end
-
-
-    def log_count
-      command(:log, '--oneline').split(/\n/).length
-    end
-
-
-    def remove(files, opts = {})
-      args = []
-      args << '-f' if opts[:force]
-      args << [*files]
-      command(:rm, args)
-    end
-
-
-    #
-    # Returns the status of the git repository.
-    #
-    # @return [Status]
-    def status
-      GitStatus.new(self)
-    end
-
-
-    # @return [String] the raw porcelain status string
-    def porcelain_status
-      command(:status, '--porcelain')
-    end
-
-
-    def reset(rev_name, opts = {})
-      args = []
-      args << '--hard' if opts[:hard]
-      args << rev_name
-
-      logger.info { "Resetting #{opts[:hard] ? '(hard)' : ''} to #{rev_name}" }
-
-      command(:reset, args)
-    end
-
-
-    def rev_list(start_revision, end_revision, opts ={})
-      args = []
-      args << "-#{opts[:num_revs]}" if opts[:num_revs]
-      args << '--oneline' if opts[:oneline]
-      args << "#{start_revision}..#{end_revision}"
-      command('rev-list', args)
-    end
-
-
-    def rev_parse(name)
-      command('rev-parse', name)
-    end
-
-
-    alias sha rev_parse
-
-
-    # @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 create_git_command(cmd, opts, redirect)
-      opts = [opts].flatten.map { |s| escape(s) }.join(' ')
-      "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
-
-
-    # @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
-      end
-      out
-    end
-
-
-    def run_command(git_cmd, &block)
-      if block_given?
-        IO.popen(git_cmd, &block)
-      else
-        `#{git_cmd}`.chomp
-      end
-    end
-
-
-    def escape(s)
-      escaped = s.to_s.gsub('\'', '\'\\\'\'')
-      %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