git-process 1.1.4 → 2.0.0

data/git-process.gemspec

@@ -1,25 +0,0 @@
-require File.expand_path('../lib/git-process/version', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.authors = ["Jim Moore"]
-  gem.email = %w(moore.jim@gmail.com)
-  gem.description = %q{A set of scripts to make working with git easier and more consistent}
-  gem.summary = %q{A set of scripts for a good git process}
-  gem.homepage = "http://jdigger.github.com/git-process/"
-  gem.license = 'ASL2'
-
-  gem.add_dependency "octokit", "~> 1.24" # GitHub API
-  gem.add_dependency "json", "~> 1.7.3"
-  gem.add_dependency "trollop", "~> 1.16.2" # CLI options parser
-  gem.add_dependency "highline", "1.6.13" # user CLI interaction. There is a bug in 1.6.14
-  gem.add_dependency "addressable", "~> 2.3.4" # URI processing
-
-  gem.files = `git ls-files`.split($\).delete_if { |f| f =~ /^\./ }
-  gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
-  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name = "git-process"
-  gem.require_paths = %w(lib)
-  gem.version = GitProc::Version::STRING
-  gem.platform = Gem::Platform::RUBY
-  gem.required_ruby_version = '>= 1.8.7'
-end

data/lib/git-process/abstract_error_builder.rb

@@ -1,53 +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 'shellwords'
-
-module GitProc
-
-  module AbstractErrorBuilder
-
-    def commands
-      @commands ||= build_commands
-    end
-
-
-    def build_message
-      msg = human_message
-
-      msg << append_commands
-    end
-
-
-    def append_commands
-      commands.empty? ? '' : "\n\nCommands:\n\n  #{commands.join("\n  ")}"
-    end
-
-
-    def human_message
-      ''
-    end
-
-
-    def build_commands
-      []
-    end
-
-
-    def shell_escaped_files(files)
-      shell_escaped_files = files.map { |f| f.shellescape }
-      shell_escaped_files.join(' ')
-    end
-
-  end
-
-end

data/lib/git-process/changed_file_helper.rb

@@ -1,115 +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_lib'
-require 'highline/import'
-
-
-module GitProc
-
-  #
-  # Provides support for prompting the user when the dir/index is dirty.
-  #
-  #noinspection RubyControlFlowConversionInspection,RubyClassMethodNamingConvention,RubyInstanceMethodNamingConvention
-  class ChangeFileHelper
-
-    # @param [GitLib] gitlib
-    def initialize(gitlib)
-      @gitlib = gitlib
-    end
-
-
-    def offer_to_help_uncommitted_changes
-      stat = gitlib.status
-
-      if stat.unmerged.empty?
-        handle_unknown_files(stat)
-        handle_changed_files(gitlib.status) # refresh status in case it changed earlier
-      else
-        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 = ChangeFileHelper.ask_how_to_handle_unknown_files(stat)
-        if resp == :add
-          gitlib.add(stat.unknown)
-        end
-      end
-    end
-
-
-    def handle_changed_files(stat)
-      if not stat.modified.empty? or not stat.added.empty? or not stat.deleted.empty?
-        resp = ChangeFileHelper.ask_how_to_handle_changed_files(stat)
-        if resp == :commit
-          changed_files = (stat.added + stat.modified - stat.deleted).sort.uniq
-
-          gitlib.add(changed_files) unless changed_files.empty?
-          gitlib.remove(stat.deleted) unless stat.deleted.empty?
-
-          gitlib.commit(nil)
-        else
-          gitlib.stash_save
-        end
-      end
-    end
-
-
-    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.) '
-        q.case = :down
-        q.validate = /a|i/i
-      end
-
-      resp == 'a' ? :add : :ignore
-    end
-
-
-    def self.show_changes(type, stat)
-      files = stat.send(type)
-
-      if type != :deleted
-        files -= stat.deleted
-      end
-
-      if not files.empty?
-        say("You have <%= color('#{type}', [:underline]) %> files:\n  <%= color('#{files.join("\n  ")}', [:bold]) %>")
-      end
-    end
-
-
-    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.) '
-        q.case = :down
-        q.validate = /c|s/i
-      end
-
-      resp == 'c' ? :commit : :stash
-    end
-
-
-    def gitlib
-      @gitlib
-    end
-
-  end
-
-end

data/lib/git-process/git_abstract_merge_error_builder.rb

@@ -1,146 +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/abstract_error_builder'
-require 'shellwords'
-
-module GitProc
-
-  #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
-    end
-
-
-    def unresolved_files
-      @unresolved_files ||= (unmerged - resolved_files)
-    end
-
-
-    def find_resolved_files
-      resolved_files = []
-
-      unmerged.each do |file|
-        resolved_file = (/Resolved '#{file}' using previous resolution./m =~ error_message)
-        resolved_files << file if resolved_file
-      end
-
-      resolved_files.sort
-    end
-
-
-    def human_message
-      msg = 'There was a problem merging.'
-
-      resolved_files.each do |file|
-        if modified.include? file
-          msg << "\n'#{file}' was modified in both branches, and 'rerere' automatically resolved it."
-        end
-      end
-
-      unless config.rerere_enabled?
-        msg << "\n\nConsider turning on 'rerere'.\nSee http://git-scm.com/2010/03/08/rerere.html for more information."
-      end
-
-      unresolved_files.each do |file|
-        if modified.include? file
-          msg << "\n'#{file}' was modified in both branches."
-        end
-      end
-
-      msg
-    end
-
-
-    def build_commands
-      commands = []
-
-      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 config.rerere_autoupdate?
-        escaped_files = shell_escaped_files(resolved_files)
-        commands << "git add #{escaped_files}"
-      end
-
-      unless unresolved_files.empty?
-        mergeable = unresolved_files & modified
-        commands << "git mergetool #{shell_escaped_files(mergeable)}" unless mergeable.empty?
-        mergeable.each do |f|
-          commands << "# Verify '#{f}' merged correctly."
-        end
-        (unresolved_files & added).each do |f|
-          commands << "# '#{f}' was added in both branches; Fix the conflict."
-        end
-        commands << "git add #{shell_escaped_files(unresolved_files)}"
-      end
-
-      commands << continue_command if continue_command
-
-      commands
-    end
-
-
-    attr_writer :unmerged, :added, :deleted, :modified
-
-
-    def unmerged
-      @unmerged ||= status.unmerged
-    end
-
-
-    def added
-      @added ||= status.added
-    end
-
-
-    def deleted
-      @deleted ||= status.deleted
-    end
-
-
-    def modified
-      @modified ||= status.modified
-    end
-
-
-    private
-
-
-    def config
-      gitlib.config
-    end
-
-
-    def status
-      @status ||= gitlib.status
-    end
-
-  end
-
-end

data/lib/git-process/git_branch.rb

@@ -1,105 +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.
-
-module GitProc
-
-  class GitBranch
-    include Comparable
-
-    attr_reader :name
-
-
-    def initialize(name, current, lib)
-      if /^remotes\// =~ name
-        @name = name[8..-1]
-        @remote = true
-      else
-        @name = name
-        @remote = false
-      end
-      @current = current
-      @lib = lib
-    end
-
-
-    def current?
-      @current
-    end
-
-
-    def remote?
-      @remote
-    end
-
-
-    def local?
-      !@remote
-    end
-
-
-    def to_s
-      name
-    end
-
-
-    def logger
-      @lib.logger
-    end
-
-
-    def sha
-      @sha ||= @lib.sha(name)
-    end
-
-
-    def <=>(other)
-      self.name <=> other.name
-    end
-
-
-    def is_ahead_of(base_branch_name)
-      contains_all_of(base_branch_name) and
-          (@lib.rev_list(base_branch_name, @name, :oneline => true, :num_revs => 1) != '')
-    end
-
-
-    def delete!(force = false)
-      if local?
-        @lib.branch(@name, :force => force, :delete => true)
-      else
-        @lib.push(Process.server_name, nil, nil, :delete => @name)
-      end
-    end
-
-
-    def rename(new_name)
-      @lib.branch(@name, :rename => new_name)
-    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
-
-
-    def checkout_to_new(new_branch, opts = {})
-      @lib.checkout(new_branch, :new_branch => @name, :no_track => opts[:no_track])
-    end
-
-  end
-
-end