git-process 1.0.11 → 1.1.0

data/lib/git-process/git_logger.rb

@@ -0,0 +1,84 @@
+# 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'
+
+module GitProc
+
+  #
+  # Provides a Logger for Git commands
+  #
+  class GitLogger
+
+    DEBUG = Logger::DEBUG
+    INFO = Logger::INFO
+    WARN = Logger::WARN
+    ERROR = Logger::ERROR
+
+
+    def initialize(log_level = nil, out = STDOUT)
+      if out.nil?
+        @logger = ::Logger.new(RUBY_PLATFORM =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+      else
+        @logger = ::Logger.new(out)
+      end
+      @logger.level = log_level.nil? ? GitLogger::WARN : log_level
+      @logger.datetime_format = '%Y-%m-%d %H:%M:%S'
+      @logger.formatter = proc do |_, _, _, msg|
+        "#{msg}\n"
+      end
+    end
+
+
+    def level
+      @logger.level
+    end
+
+
+    def debug(msg = nil, &block)
+      if msg.nil?
+        @logger.debug(&block)
+      else
+        @logger.debug(msg)
+      end
+    end
+
+
+    def info(msg = nil, &block)
+      if msg.nil?
+        @logger.info(&block)
+      else
+        @logger.info(msg)
+      end
+    end
+
+
+    def warn(msg = nil, &block)
+      if msg.nil?
+        @logger.send(:warn, &block)
+      else
+        @logger.send(:warn, msg)
+      end
+    end
+
+
+    def error(msg = nil, &block)
+      if msg.nil?
+        @logger.error(&block)
+      else
+        @logger.error(msg)
+      end
+    end
+
+  end
+
+end

data/lib/git-process/git_merge_error.rb

@@ -15,25 +15,14 @@ require 'git-process/git_abstract_merge_error_builder'
 module GitProc
 
   class MergeError < GitProcessError
-    include AbstractMergeErrorBuilder
 
-    attr_reader :error_message, :lib
-
-
-    def initialize(merge_error_message, lib)
-      @lib = lib
-      @error_message = merge_error_message
-
-      msg = build_message
+    def initialize(merge_error_message, gitlib)
+      @error_builder = GitProc::AbstractMergeErrorBuilder.new(gitlib, merge_error_message, 'git commit')
+      msg = error_builder.build_message
 
       super(msg)
     end
 
-
-    def continue_command
-      'git commit'
-    end
-
   end
 
 end

data/lib/git-process/git_process.rb

@@ -19,13 +19,15 @@ require 'highline/import'
 module GitProc
 
   class Process
-    include GitLib
 
+    # @param [GitLib] gitlib
+    def initialize(gitlib, opts = {})
+      @gitlib = gitlib
+    end
 
-    def initialize(dir, opts = {})
-      @log_level = Process.log_level(opts)
 
-      set_workdir(dir)
+    def gitlib
+      @gitlib
     end
 
 
@@ -48,51 +50,30 @@ module GitProc
     end
 
 
-    def set_workdir(dir)
-      unless dir.nil?
-        @workdir = find_workdir(dir)
-        if @workdir.nil?
-          @workdir = dir
-          logger.info { "Initializing new repository at #{workdir}" }
-          command(:init)
-        else
-          logger.debug { "Opening existing repository at #{workdir}" }
-        end
-      else
-        logger.debug "Process dir is nil"
-      end
-    end
-
-
     def workdir
-      @workdir
+      gitlib.workdir
     end
 
 
-    def log_level
-      @log_level
+    def logger
+      gitlib.logger
     end
 
 
-    def log_level=(ll)
-      @log_level = ll
+    def config
+      gitlib.config
     end
 
 
-    def remote_master_branch
-      "#{server_name}/#{master_branch}"
-    end
-
-
-    def integration_branch
-      has_a_remote? ? remote_master_branch : master_branch
+    def remote
+      gitlib.remote
     end
 
 
     def verify_preconditions
-      if should_remove_master
+      if should_remove_master?
         if ask_about_removing_master
-          branches[master_branch].delete!
+          delete_master_branch!
         end
       end
     end
@@ -103,46 +84,47 @@ module GitProc
     end
 
 
-    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)
+    def fetch_remote_changes(remote_name = nil)
+      if remote.exists?
+        gitlib.fetch(remote_name || remote.name)
+      else
+        logger.debug 'Can not fetch latest changes because there is no remote defined'
+      end
     end
 
 
-    def keep_local_integration_branch?
-      keep_local_integration_branch_config_value.to_boolean
+    def is_parked?
+      mybranches = gitlib.branches
+      mybranches.parking == mybranches.current
     end
 
 
-    def Process.log_level(opts)
-      if opts[:log_level]
-        opts[:log_level]
-      elsif opts[:quiet]
-        Logger::ERROR
-      elsif opts[:verbose]
-        Logger::DEBUG
-      else
-        Logger::INFO
-      end
+    private
+
+
+    def delete_master_branch!
+      gitlib.branches[config.master_branch].delete!
     end
 
 
-    def is_parked?
-      mybranches = branches
-      mybranches.parking == mybranches.current
+    def should_remove_master?
+      my_branches = gitlib.branches()
+      gitlib.has_a_remote? and
+          my_branches.include?(config.master_branch) and
+          my_branches.current.name != config.master_branch and
+          !keep_local_integration_branch? and
+          my_branches[config.integration_branch].contains_all_of(config.master_branch)
     end
 
 
-    private
+    def keep_local_integration_branch?
+      keep_local_integration_branch_config_value.to_boolean
+    end
 
 
     #noinspection RubyInstanceMethodNamingConvention
     def keep_local_integration_branch_config_value
-      config('gitProcess.keepLocalIntegrationBranch')
+      gitlib.config['gitProcess.keepLocalIntegrationBranch']
     end
 
 
@@ -163,31 +145,20 @@ module GitProc
     end
 
 
-    def find_workdir(dir)
-      if dir == File::SEPARATOR
-        nil
-      elsif File.directory?(File.join(dir, '.git'))
-        dir
-      else
-        find_workdir(File.expand_path("#{dir}/.."))
-      end
-    end
-
-
     def proc_rebase(base, opts = {})
       begin
-        rebase(base, opts)
+        gitlib.rebase(base, opts)
       rescue GitExecuteError => rebase_error
-        raise RebaseError.new(rebase_error.message, self)
+        raise RebaseError.new(rebase_error.message, gitlib)
       end
     end
 
 
     def proc_merge(base)
       begin
-        merge(base)
+        gitlib.merge(base)
       rescue GitExecuteError => merge_error
-        raise MergeError.new(merge_error.message, self)
+        raise MergeError.new(merge_error.message, gitlib)
       end
     end
 

data/lib/git-process/git_process_options.rb

@@ -53,18 +53,18 @@ module GitProc
 
 
     def standard_opts(parser)
-      parser.opt :info, "Informational messages; show the major things this is doing", :default => true, :short => :none
-      parser.opt :quiet, "Quiet messages; only show errors", :short => :q
-      parser.opt :verbose, "Verbose messages; show lots of details on what this is doing", :short => :v
+      parser.opt :info, 'Informational messages; show the major things this is doing', :default => true, :short => :none
+      parser.opt :quiet, 'Quiet messages; only show errors', :short => :q
+      parser.opt :verbose, 'Verbose messages; show lots of details on what this is doing', :short => :v
       parser.opt :version, "Print version (#{GitProc::Version::STRING}) and exit", :short => :none
-      parser.opt :help, "Show this message", :short => :h
+      parser.opt :help, 'Show this message', :short => :h
 
       parser.conflicts :verbose, :info, :quiet
     end
 
 
     def summary
-      "Default summary"
+      'Default summary'
     end
 
 
@@ -74,7 +74,7 @@ module GitProc
 
 
     def description
-      "Default description"
+      'Default description'
     end
 
 

data/lib/git-process/git_rebase_error.rb

@@ -15,25 +15,16 @@ require 'git-process/git_abstract_merge_error_builder'
 module GitProc
 
   class RebaseError < GitProcessError
-    include GitProc::AbstractMergeErrorBuilder
+    attr_reader :error_builder
 
-    attr_reader :error_message, :lib
 
-
-    def initialize(rebase_error_message, lib)
-      @lib = lib
-      @error_message = rebase_error_message
-
-      msg = build_message
+    def initialize(rebase_error_message, gitlib)
+      @error_builder = GitProc::AbstractMergeErrorBuilder.new(gitlib, rebase_error_message, 'git rebase --continue')
+      msg = error_builder.build_message
 
       super(msg)
     end
 
-
-    def continue_command
-      'git rebase --continue'
-    end
-
   end
 
 end

data/lib/git-process/git_remote.rb

@@ -0,0 +1,254 @@
+# 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_config'
+#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
+
+  #
+  # Git Remote configuration
+  #
+  class GitRemote
+
+    # @param [GitProc::GitConfig] gitconfig
+    def initialize(gitconfig)
+      @gitconfig = gitconfig
+    end
+
+
+    # @return [#info, #warn, #debug, #error]
+    def logger
+      @logger ||= @gitconfig.logger
+    end
+
+
+    # @return [GitProc::GitConfig]
+    def config
+      @gitconfig
+    end
+
+
+    # @deprecated
+    # TODO: Remove
+    def server_name
+      @server_name ||= self.remote_name
+    end
+
+
+    # @return [Boolean] does this have a remote defined?
+    def exists?
+      if @has_remote.nil?
+        @has_remote = (config.gitlib.command(:remote) != '')
+      end
+      logger.debug { "Does a remote exist? #{@has_remote}" }
+      @has_remote
+    end
+
+
+    def repo_name
+      unless @repo_name
+        url = config["remote.#{name}.url"]
+        raise GitProcessError.new("There is no #{name} url set up.") if url.nil? or url.empty?
+        @repo_name = url.sub(/^.*:(.*?)(.git)?$/, '\1')
+      end
+      @repo_name
+    end
+
+
+    def name
+      unless @remote_name
+        @remote_name = config['gitProcess.remoteName']
+        if @remote_name.nil? or @remote_name.empty?
+          remotes = self.remote_names
+          if remotes.empty?
+            @remote_name = nil
+          else
+            @remote_name = remotes[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
+
+
+    def master_branch_name
+      "#{self.name}/#{config.master_branch}"
+    end
+
+
+    def remote_names
+      remote_str = config.gitlib.command(:remote, [:show])
+      if remote_str.nil? or remote_str.empty?
+        []
+      else
+        remote_str.split(/\n/)
+      end
+    end
+
+
+    #
+    # Expands the git configuration server name to a url.
+    #
+    # Takes into account further expanding an SSH uri that uses SSH aliasing in .ssh/config
+    #
+    # @param [String] server_name the git configuration server name; defaults to 'origin'
+    #
+    # @option opts [String] :ssh_config_file the SSH config file to use; defaults to ~/.ssh/config
+    #
+    # @return the fully expanded URL; never nil
+    #
+    # @raise [GitHubService::NoRemoteRepository] there is not a URL set for the server name
+    # @raise [URI::InvalidURIError] the retrieved URL does not have a schema
+    # @raise [GitHubService::NoRemoteRepository] if could not figure out a host for the retrieved URL
+    # @raise [::ArgumentError] if a server name is not provided
+    def expanded_url(server_name = 'origin', raw_url = nil, opts = {})
+      if raw_url.nil?
+        raise ArgumentError.new('Need server_name') unless server_name
+
+        conf_key = "remote.#{server_name}.url"
+        url = config[conf_key]
+
+        raise GitHubService::NoRemoteRepository.new("There is no value set for '#{conf_key}'") if url.nil? or url.empty?
+      else
+        raise GitHubService::NoRemoteRepository.new("There is no value set for '#{raw_url}'") if raw_url.nil? or raw_url.empty?
+        url = raw_url
+      end
+
+      if /^\S+@/ =~ url
+        url.sub(/^(\S+@\S+?):(.*)$/, "ssh://\\1/\\2")
+      else
+        uri = URI.parse(url)
+        host = uri.host
+        scheme = uri.scheme
+
+        raise URI::InvalidURIError.new("Need a scheme in URI: '#{url}'") unless scheme
+
+        if scheme == 'file'
+          url
+        elsif host.nil?
+          # assume that the 'scheme' is the named configuration in ~/.ssh/config
+          rv = GitRemote.hostname_and_user_from_ssh_config(scheme, opts[:ssh_config_file] ||= "#{ENV['HOME']}/.ssh/config")
+
+          raise GitHubService::NoRemoteRepository.new("Could not determine a host from #{url}") if rv.nil?
+
+          host = rv[0]
+          user = rv[1]
+          url.sub(/^\S+:(\S+)$/, "ssh://#{user}@#{host}/\\1")
+        else
+          url
+        end
+      end
+    end
+
+
+    # @return [boolean]
+    def rerere_enabled?
+      re = config['rerere.enabled']
+      !re.nil? && re.to_boolean
+    end
+
+
+    # @return [void]
+    def rerere_enabled(re, global = true)
+      if global
+        config.set_global('rerere.enabled', re)
+      else
+        config['rerere.enabled'] = re
+      end
+    end
+
+
+    # @return [boolean]
+    def rerere_autoupdate?
+      re = config['rerere.autoupdate']
+      !re.nil? && re.to_boolean
+    end
+
+
+    # @return [void]
+    def rerere_autoupdate(re, global = true)
+      if global
+        config.set_global('rerere.autoupdate', re)
+      else
+        config['rerere.autoupdate'] = re
+      end
+    end
+
+
+    # @return [void]
+    def add_remote(remote_name, url)
+      config.gitlib.command(:remote, ['add', remote_name, url])
+    end
+
+
+    alias :add :add_remote
+
+
+    #noinspection RubyClassMethodNamingConvention
+    def self.hostname_and_user_from_ssh_config(host_alias, config_file)
+      if File.exists?(config_file)
+        config_lines = File.new(config_file).readlines
+
+        in_host_section = false
+        host_name = nil
+        user_name = nil
+
+        config_lines.each do |line|
+          line.chop!
+          if /^\s*Host\s+#{host_alias}\s*$/ =~ line
+            in_host_section = true
+            next
+          end
+
+          if in_host_section and (/^\s*HostName\s+\S+\s*$/ =~ line)
+            host_name = line.sub(/^\s*HostName\s+(\S+)\s*$/, '\1')
+            break unless user_name.nil?
+          elsif in_host_section and (/^\s*User\s+\S+\s*$/ =~ line)
+            user_name = line.sub(/^\s*User\s+(\S+)\s*$/, '\1')
+            break unless host_name.nil?
+          elsif in_host_section and (/^\s*Host\s+.*$/ =~ line)
+            break
+          end
+        end
+        host_name.nil? ? nil : [host_name, user_name]
+      else
+        nil
+      end
+    end
+
+  end
+
+end