git-process 0.9.1.pre3 → 0.9.2

data/lib/git-process/{git-lib.rb → git_lib.rb}

@@ -1,10 +1,20 @@
-require "rubygems"
-require "bundler/setup"
+# 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'
 
 require 'logger'
-require 'git-branch'
-require 'git-branches'
-require 'git-status'
+require 'git-process/git_branch'
+require 'git-process/git_branches'
+require 'git-process/git_status'
+require 'git-process/git_process_error'
 
 
 class String
@@ -18,67 +28,51 @@ class String
 end
 
 
-module Git
+module GitProc
 
   class GitExecuteError < StandardError
   end
 
 
-  # @!attribute [r] logger
-  #   @return [Logger] a logger
-  # @!attribute [r] git
-  #   @return [Git] an instance of the Git library
-  class GitLib
-    attr_reader :logger
+  #
+  # Provides Git commands
+  #
+  # = Assumes =
+  # log_level
+  # workdir
+  #
+  module GitLib
 
-    def initialize(dir, options = {})
-      initialize_logger(options[:logger], options[:log_level])
-      initialize_git(dir)
-    end
-
-
-    def initialize_logger(logger, log_level)
-      if logger
-        @logger = logger
-      else
+    def logger
+      unless @logger
         @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|
           "#{msg}\n"
-          # "#{severity[0..0]}: #{datetime.strftime(@logger.datetime_format)}: #{msg}\n"
         end
       end
+      @logger
     end
 
 
-    def initialize_git(dir, git = nil)
-      if dir
-        @workdir = File.expand_path(dir)
-        unless File.directory?(File.join(workdir, '.git'))
-          logger.info { "Initializing new repository at #{workdir}" }
-          command(:init)
-        else
-          logger.debug { "Opening existing repository at #{workdir}" }
-        end
-      end
+    def server_name
+      @server_name ||= remote_name
     end
 
 
-    private :initialize_logger, :initialize_git
-
-
-    def workdir
-      @workdir
+    def master_branch
+      @master_branch ||= config('gitProcess.integrationBranch') || 'master'
     end
 
 
+    # @return [Boolean] does this have a remote defined?
     def has_a_remote?
-      if @remote == nil
-        @remote = (command('remote') != '')
+      if @has_remote == nil
+        @has_remote = (command(:remote) != '')
       end
-      @remote
+      @has_remote
     end
 
 
@@ -102,13 +96,13 @@ module Git
     end
 
 
-    def fetch
-      command(:fetch, ['-p', Process.server_name])
+    def fetch(name = remote_name)
+      command(:fetch, ['-p', name])
     end
 
 
     def branches
-      GitBranches.new(self)
+      GitProc::GitBranches.new(self)
     end
 
 
@@ -129,7 +123,7 @@ module Git
     def branch(branch_name, opts = {})
       args = []
       if opts[:delete]
-        logger.info { "Deleting local branch '#{branch_name}'."}
+        logger.info { "Deleting local branch '#{branch_name}'."} unless branch_name == '_parking_'
 
         args << (opts[:force] ? '-D' : '-d')
         args << branch_name
@@ -177,14 +171,22 @@ module Git
 
       if opts[:delete]
         if remote_branch
-          opts[:delete] = remote_branch
+          rb = remote_branch
         elsif local_branch
-          opts[:delete] = local_branch
+          rb = local_branch
+        elsif !(opts[:delete].is_a? TrueClass)
+          rb = opts[:delete]
         else
-          raise ArgumentError.new("Need a branch name to delete.") if opts[:delete].is_a? TrueClass
+          raise ArgumentError.new("Need a branch name to delete.")
         end
-        logger.info { "Deleting remote branch '#{opts[:delete]}' on '#{remote_name}'."}
-        args << '--delete' << opts[:delete]
+
+        int_branch = 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
@@ -239,7 +241,7 @@ module Git
       args = []
       args << '-f' if opts[:force]
       args << file
-      command('rm', args)
+      command(:rm, args)
     end
 
 
@@ -248,21 +250,24 @@ module Git
     end
 
 
-    def config(key = nil, value = nil)
+    def config(key = nil, value = nil, global = false)
       if key and value
-        command('config', [key, value])
-        config_hash[key] = value
+        args = global ? ['--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])
-          config_hash[key] = 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')
+          str = command(:config, '--list')
           lines = str.split("\n")
           lines.each do |line|
             (key, *values) = line.split('=')
@@ -276,14 +281,27 @@ module Git
 
     def repo_name
       unless @repo_name
-        origin_url = config['remote.origin.url']
-        raise Git::Process::GitProcessError.new("There is not origin url set up.") if origin_url.empty?
+        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_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
+        logger.debug {"Using remote name of '#{@remote_name}'"}
+      end
+      @remote_name
+    end
+
+
     #
     # Returns the status of the git repository.
     #
@@ -311,30 +329,24 @@ module Git
 
 
     def rerere_enabled?
-      re = command('config', ['--get', 'rerere.enabled'])
+      re = config('rerere.enabled')
       re && re.to_boolean
     end
 
 
     def rerere_enabled(re, global = true)
-      args = []
-      args << '--global' if global
-      args << 'rerere.enabled' << re
-      command(:config, args)
+      config('rerere.enabled', re, global)
     end
 
 
     def rerere_autoupdate?
-      re = command('config', ['--get', 'rerere.autoupdate'])
+      re = config('rerere.autoupdate')
       re && re.to_boolean
     end
 
 
     def rerere_autoupdate(re, global = true)
-      args = []
-      args << '--global' if global
-      args << 'rerere.autoupdate' << re
-      command(:config, args)
+      config('rerere.autoupdate', re, global)
     end
 
 
@@ -388,7 +400,7 @@ module Git
         if $?.exitstatus == 1 && out == ''
           return ''
         end
-        raise Git::GitExecuteError.new(git_cmd + ':' + out.to_s) 
+        raise GitProc::GitExecuteError.new(git_cmd + ':' + out.to_s) 
       end
       out
     end

data/lib/git-process/git_merge_error.rb

@@ -0,0 +1,38 @@
+# 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'
+
+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
+
+      super(msg)
+    end
+
+
+    def continue_command
+      'git commit'
+    end
+
+  end
+
+end

data/lib/git-process/git_process.rb

@@ -0,0 +1,124 @@
+# 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'
+
+require 'git-process/git_lib'
+require 'git-process/git_rebase_error'
+require 'git-process/git_merge_error'
+
+
+module GitProc
+
+  class Process
+    include GitLib
+
+    def initialize(dir, opts = {})
+      @log_level = Process.log_level(opts)
+
+      if dir
+        @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
+      end
+    end
+
+
+    def run
+      begin
+        runner
+      rescue GitProc::GitProcessError => exp
+        puts exp.message
+        exit(-1)
+      end
+    end
+
+
+    def runner
+      # extension point - does nothing by default
+    end
+
+
+    def workdir
+      @workdir
+    end
+
+
+    def log_level
+      @log_level
+    end
+
+
+    def log_level=(ll)
+      @log_level = ll
+    end
+
+
+    def remote_master_branch
+      "#{server_name}/#{master_branch}"
+    end
+
+
+    def Process.log_level(opts)
+      if opts[:quiet]
+        Logger::ERROR
+      elsif opts[:verbose]
+        Logger::DEBUG
+      else
+        Logger::INFO
+      end
+    end
+
+
+    def is_parked?
+      mybranches = branches
+      mybranches.parking == mybranches.current
+    end
+
+
+    private
+
+
+    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)
+      begin
+        rebase(base)
+      rescue GitExecuteError => rebase_error
+        raise RebaseError.new(rebase_error.message, self)
+      end
+    end
+
+
+    def proc_merge(base)
+      begin
+        merge(base)
+      rescue GitExecuteError => merge_error
+        raise MergeError.new(merge_error.message, self)
+      end
+    end
+
+  end
+
+end

data/lib/git-process/git_process_error.rb

@@ -0,0 +1,18 @@
+# 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
+
+  class GitProcessError < RuntimeError
+  end
+
+end

data/lib/git-process/git_process_options.rb

@@ -0,0 +1,101 @@
+# 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'
+
+require 'optparse'
+require 'trollop'
+require 'git-process/version'
+
+module GitProc
+
+  module GitProcessOptions
+
+    DEBUG = false
+
+    def parse_cli(filename, argv)
+      parser = Trollop::Parser.new
+      parser.version "#{filename} #{GitProc::Version::STRING}"
+
+      parser.banner "#{summary}\n\n"
+      parser.banner "\nUsage:\n    #{usage(filename)}\n\nWhere [options] are:"
+
+      extend_opts(parser)
+      standard_opts(parser)
+
+      parser.banner "\n#{description}"
+
+      opts = Trollop::with_standard_exception_handling parser do
+        raise Trollop::HelpNeeded if ARGV.empty? and !empty_argv_ok?
+        parser.parse argv
+      end
+
+      opts[:info] = false if opts[:verbose] || opts[:quiet]
+      opts[:info] = true if opts[:info_given]
+
+      post_parse(opts, argv)
+
+      if (DEBUG)
+        puts "\n\n#{opts.map{|k,v| "#{k}:#{v}"}.join(', ')}"
+        puts "\nargs: #{argv.join(', ')}"
+      end
+
+      opts
+    end
+
+
+    def standard_opts(parser)
+      parser.opt :info, "Informational messages; show the major things this is doing", :short => :i, :default => true
+      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.conflicts :verbose, :info, :quiet
+    end
+
+
+    def summary
+      "Default summary"
+    end
+
+
+    def usage(filename)
+      "#{filename} [options]"
+    end
+
+
+    def description
+      "Default description"
+    end
+
+
+    def empty_argv_ok?
+      true
+    end
+
+
+    def extend_opts(parser)
+      # extension point - does nothing by default
+    end
+
+
+    # def extend_args(argv)
+    #   # extension point - does nothing by default
+    # end
+
+
+    def post_parse(opts, argv)
+      # extension point - does nothing by default
+    end
+
+  end
+
+end

data/lib/git-process/git_rebase_error.rb

@@ -0,0 +1,38 @@
+# 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'
+
+require 'git-process/git_abstract_merge_error_builder'
+
+module GitProc
+
+  class RebaseError < GitProcessError
+    include GitProc::AbstractMergeErrorBuilder
+
+    attr_reader :error_message, :lib
+
+    def initialize(rebase_error_message, lib)
+      @lib = lib
+      @error_message = rebase_error_message
+
+      msg = build_message
+
+      super(msg)
+    end
+
+
+    def continue_command
+      'git rebase --continue'
+    end
+
+  end
+
+end

data/lib/git-process/{git-status.rb → git_status.rb}

@@ -1,4 +1,16 @@
-module Git
+# 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
 
   #
   # The status of the Git repository.

data/lib/git-process/{github-client.rb → github_client.rb}

@@ -1,3 +1,15 @@
+# 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'
+
 require 'octokit'
 
 module Octokit
@@ -65,7 +77,7 @@ class GitHubClient < Octokit::Client
 
   def request(method, path, options, version, authenticate, raw, force_urlencoded)
     if /api.github.com/ !~ site
-      path = "/api/v3#{path}"
+      path = "/api/v3/#{path}"
     end
     old_request(method, path, options, version, authenticate, raw, force_urlencoded)
   end