multi_git 0.0.1.alpha2 → 0.0.1.beta1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8a8d438d8d1f815345a1c5cc77b3ce2b7689435d
+  data.tar.gz: 77b256666dcca0c97155d6e540104bc653a3b319
+SHA512:
+  metadata.gz: 7c075d5f6b65bc3f9ae092b617555db1870a01dd555a5b52375641208aaf87d14ba8f3889770c042763ec2d194c3d9ad405874bd24c39d808750744032c7cffb
+  data.tar.gz: 65134503f98f6fb7acea989182ea69fa9fde0d32c9396380f0b6b7cbb660ceddcf7fb62367ca594f7ce4450639fc4a4146b43b5efe18bcc12ff55aaa2d76bd66

data/lib/multi_git/config/default_schema.rb

@@ -0,0 +1,26 @@
+require 'multi_git/config/schema'
+module MultiGit
+  module Config
+
+    DEFAULT_SCHEMA = \
+Schema.build do
+
+section 'core' do
+  bool 'bare', false
+  bool 'filemode', true
+  bool 'logallrefupdates', false
+  int 'repositoryformatversion', 0
+end
+
+section 'remote' do
+  any_section do
+    array 'url'
+    array 'pushurl'
+    string 'fetch'
+  end
+end
+
+end
+
+  end
+end

data/lib/multi_git/config/schema.rb

@@ -0,0 +1,141 @@
+require 'forwardable'
+module MultiGit; module Config
+
+  class Schema
+
+    attr :default
+
+    def initialize(default = nil)
+      @default = default
+    end
+
+    def list?
+      false
+    end
+
+    def convert( plain_value )
+      plain_value
+    end
+
+    def unconvert( complex_value )
+      complex_value.to_s
+    end
+
+    NULL = self.new
+
+    class String < self
+    end
+
+    class Integer < self
+      def convert( plain_value )
+        plain_value.to_i
+      end
+    end
+
+    class Array < self
+      def list?
+        true
+      end
+      def unconvert( complex_value )
+        complex_value.map(&:to_s)
+      end
+    end
+
+    class Boolean < self
+      CONVERSIONS = {
+        'true'  => true,
+        'yes'   => true,
+        '1'     => true,
+        'false' => false,
+        'no'    => false,
+        '0'     => false
+      }
+      CONVERSIONS.default = true
+      def convert( plain_value )
+        CONVERSIONS[plain_value]
+      end
+    end
+
+    class Root
+
+      def initialize(hash = Hash.new(Hash.new(Hash.new(NULL))) )
+        @hash = hash
+      end
+
+      def schema
+        @hash
+      end
+
+      def section(key, &block)
+        sec = Section.new(@hash.fetch(key){ @hash[key] = Hash.new(Hash.new(NULL))})
+        sec.instance_eval(&block) if block_given?
+        return sec
+      end
+
+    end
+
+    class Section
+
+      extend Forwardable
+
+      def initialize(hash)
+        @hash = hash
+      end
+
+      def section(key, &block)
+        sec = Subsection.new(@hash.fetch(key){ @hash[key] = Hash.new(NULL)})
+        sec.instance_eval(&block) if block_given?
+        return sec
+      end
+
+      def nil_section
+        section(nil)
+      end
+
+      def any_section(&block)
+        sec = Subsection.new(@hash.default)
+        sec.instance_eval(&block) if block_given?
+        return sec
+      end
+
+      delegate [:integer, :string, :array, :bool] => :nil_section
+
+      alias int integer
+
+    end
+
+    class Subsection
+
+      def initialize(hash)
+        @hash = hash
+      end
+
+      def integer(name, default = nil)
+        @hash[name] = Integer.new(default)
+      end
+
+      def string(name, default = nil)
+        @hash[name] = String.new(default)
+      end
+
+      def array(name, default = [])
+        @hash[name] = Array.new(default)
+      end
+
+      def bool(name, default = nil)
+        @hash[name] = Boolean.new(default)
+      end
+
+      alias int integer
+
+    end
+
+    def self.build(&block)
+      ro = Root.new
+      ro.instance_eval(&block)
+      return ro.schema
+    end
+
+  end
+
+end; end

data/lib/multi_git/config.rb

@@ -0,0 +1,170 @@
+require 'multi_git/utils'
+require 'multi_git/config/default_schema'
+module MultiGit
+  module Config
+
+    class Section
+
+      include Enumerable
+
+      attr :section, :subsection
+      attr :schema
+
+      def initialize(config, section, subsection)
+        @config = config
+        @section = section
+        @subsection = subsection
+        @schema = config.schema[section][subsection]
+      end
+
+      def schema_for( key )
+        schema[key]
+      end
+
+      def default?( key )
+        config.get(section, subsection, key) == schema_for(key).default
+      end
+
+      def [](key)
+        config.get(section, subsection, key)
+      end
+
+      alias get []
+
+      def each_explicit_key
+        return to_enum(:each_explicit_key) unless block_given?
+        config.each_explicit_key do |sec, subsec, key|
+          yield(key) if sec == section && subsec == subsection
+        end
+      end
+
+      # Expensive. Use only for debug
+      def each
+        return to_enum unless block_given?
+        each_explicit_key do |key|
+          next if default?(key)
+          yield key, get(key)
+        end
+      end
+
+      # Expensive. Use only for debug.
+      def to_h
+        Hash[each.to_a]
+      end
+
+      # :nocov:
+      # @visibility private
+      def inspect
+        ["{config #{section} \"#{subsection}\"", *each.map{|key, value| " "+qualified_key(*key)+" => "+value.inspect },'}'].join("\n")
+      end
+      # :nocov:
+
+    protected
+
+      attr :config
+
+    end
+
+    extend Utils::AbstractMethods
+    include Enumerable
+
+    def schema
+      @schema ||= DEFAULT_SCHEMA
+    end
+
+    def schema_for( section, subsection, key )
+      schema[section][subsection][key]
+    end
+
+    def default?( section, subsection, key )
+      get(section, subsection, key) == schema_for(section, subsection, key).default
+    end
+
+    # @overload []( section, subsection = nil, key )
+    #  @param section [String]
+    #  @param subsection [String, nil]
+    #  @param key [String]
+    #  @return value
+    #
+    # @overload []( qualified_key )
+    #  @param qualified_key [String] the fully-qualified key, seperated by dots
+    #  @return value
+    #
+    def []( *args )
+      case( args.size )
+      when 3 then get( *args )
+      when 2 then get( args[0], nil, args[1] )
+      when 1 then
+        get( *split_key(args[0]) )
+      else
+        raise ArgumentError, 
+         "wrong number of arguments (#{args.size} for 1..3)"
+      end
+    end
+
+    # @!method get( section, subsection, key)
+    #   @api private
+    abstract :get
+
+    # @!method each_explicit_key
+    #   @yield [section, subsection, key]
+    abstract :each_explicit_key
+
+    # 
+    # @param section [String]
+    # @param subsection [String, nil]
+    # @return [Section]
+    def section(section, subsection = nil)
+      Section.new(self, section, subsection)
+    end
+
+    # @visibility private
+    DOT = '.'
+
+    def qualified_key( section, subsection = nil, key )
+      [section, DOT, subsection, subsection ? DOT : nil, key].join
+    end
+
+    def split_key( qualified_key )
+      split = qualified_key.split(DOT)
+      case(split.size)
+      when 2 then [ split[0], nil, split[1] ]
+      when 3 then split
+      else
+        raise ArgumentError, "Expected the qualified key to be formatted as 'section[.subsection].key' got #{qualified_key}"
+      end
+    end
+
+    # Expensive. Use only for debug
+    def each
+      return to_enum unless block_given?
+      each_explicit_key do |*key|
+        next if default?(*key)
+        yield key, get(*key)
+      end
+    end
+
+    # Expensive. Use only for debug.
+    def to_h
+      Hash[each.to_a]
+    end
+
+    # :nocov:
+    # @visibility private
+    def inspect
+      ['{config', *each.map{|key, value| " "+qualified_key(*key)+" => "+value.inspect },'}'].join("\n")
+    end
+    # :nocov:
+
+    # Dups the object with a different schema
+    # @api private
+    def with_schema(sch)
+      d = dup
+      d.instance_eval do
+        @schema = sch
+      end
+      return d
+    end
+
+  end
+end

data/lib/multi_git/error.rb

@@ -66,6 +66,10 @@ If this happens frequently, you may have want to run "git gc" to remove clobber.
       end
     end
 
+    class DuplicateConfigKey < Exception
+      include Error
+    end
+
   end
 
 end

data/lib/multi_git/git_backend/cmd.rb

@@ -20,9 +20,14 @@ module MultiGit::GitBackend
       end
     end
 
-    def initialize(command, options = {})
-      @cmd = command
-      @opts = options
+    def initialize(*args)
+      if args.first.kind_of? Hash
+        @env = args.shift
+      else
+        @env = {}
+      end
+      @cmd = args.shift
+      @opts = args.any? ? args.shift.dup : {}
     end
 
     READ_BLOCK = lambda{|io|
@@ -34,7 +39,7 @@ module MultiGit::GitBackend
       block ||= READ_BLOCK
       result = nil
       message = nil
-      status = popen_foo(env, s.join(' ')) do | stdin, stdout, stderr |
+      status = popen_foo(@env.merge(env), s.join(' ')) do | stdin, stdout, stderr |
         if block.arity == 1
           stdin.close
           result = block.call(stdout)

data/lib/multi_git/git_backend/commit.rb

@@ -66,7 +66,7 @@ module MultiGit
 
       def parse_signature(content)
         match = SIGNATURE_RX.match(content)
-        return MultiGit::Handle.new(match[1],match[2]), Time.at(match[3].to_i).localtime(match[4]+':'+match[5])
+        return MultiGit::Handle.new(match[1],match[2]), Time.at(match[3].to_i).getlocal(match[4]+':'+match[5])
       end
 
     end

data/lib/multi_git/git_backend/config.rb

@@ -0,0 +1,47 @@
+require 'forwardable'
+require 'set'
+require 'multi_git/config'
+module MultiGit
+  module GitBackend
+    class Config
+
+      include MultiGit::Config
+
+      def initialize(cmd)
+        @cmd = cmd
+      end
+
+      def get( section, subsection, key )
+        s = schema_for(section, subsection, key)
+        begin
+          # git < 1.8.0 barfs when using --get on a multiply defined 
+          #  value, but uses the last value internally.
+          # git >= 1.8.0 simply returns the last value
+          value = @cmd['config', '--get-all', qualified_key(section, subsection, key)].lines.map(&:chomp)
+          value = value.last unless s.list?
+          return s.convert(value)
+        rescue Cmd::Error::ExitCode1
+          return s.default
+        rescue Cmd::Error::ExitCode2
+          raise Error::DuplicateConfigKey, qualified_key(section, subsection, key)
+        end
+      end
+
+      def each_explicit_key
+        return to_enum(:each_explicit_key) unless block_given?
+        seen = Set.new
+        @cmd.('config','--list') do |io|
+          io.each_line do |line|
+            name, _ = line.split('=',2)
+            next if seen.include? name
+            seen << name
+            yield *split_key(name)
+          end
+        end
+        return self
+      end
+
+
+    end
+  end
+end

data/lib/multi_git/git_backend/ref.rb

@@ -15,19 +15,20 @@ module MultiGit
 
     private
 
-      SHOW_REF_LINE = /\A(\h{40}) ([^\n]+)\Z/.freeze
+      SYMBOLIC_REF_LINE = /\Aref: ([a-z0-9_]+(?:\/[a-z0-9_]+)*)\Z/i.freeze
+      OID_REF_LINE = /\A(\h{40})\Z/i.freeze
 
       def read!
         begin
-          if symbolic?
-            content = repository.__backend__['symbolic-ref', name]
-            @target = repository.ref(content.chomp)
+          content = IO.read(::File.join(repository.git_dir,name))
+          if content =~ SYMBOLIC_REF_LINE
+            @target = repository.ref($1)
+          elsif content =~ OID_REF_LINE
+            @target = repository.read($1)
           else
-            lines = repository.__backend__['show-ref', name].lines
-            match = SHOW_REF_LINE.match(lines.first)
-            @target = repository.read(match[1])
+            raise content.inspect
           end
-        rescue Cmd::Error::ExitCode1
+        rescue Errno::ENOENT
           # doesn't exists
         end
       end

data/lib/multi_git/git_backend/remote.rb

@@ -0,0 +1,47 @@
+require 'multi_git/remote'
+module MultiGit
+  module GitBackend
+    class Remote
+      include MultiGit::Remote
+
+      attr :repository
+
+      class Persistent < self
+        include MultiGit::Remote::Persistent
+
+        attr :repository
+        attr :name
+
+        def initialize( repo, name )
+          @name = name
+          @repository = repo
+        end
+
+        def fetch_urls
+          return repository.config['remote',name,'url']
+        end
+
+        def push_urls
+          pu = repository.config['remote',name,'pushurl']
+          return pu.any? ? pu : fetch_urls
+        end
+
+      end
+
+      attr :fetch_urls
+      attr :push_urls
+
+      def initialize( repo, url, push_url = url )
+        @repository = repo
+        @fetch_urls = Array(url)
+        @push_urls  = Array(push_url)
+      end
+
+      def fetch(*refspecs)
+        rs = parse_fetch_refspec(*refspecs)
+        repository.__backend__['fetch',fetch_urls.first,*rs.map(&:to_s)]
+      end
+
+    end
+  end
+end

data/lib/multi_git/git_backend/repository.rb

@@ -6,6 +6,8 @@ require 'multi_git/git_backend/blob'
 require 'multi_git/git_backend/tree'
 require 'multi_git/git_backend/commit'
 require 'multi_git/git_backend/ref'
+require 'multi_git/git_backend/config'
+require 'multi_git/git_backend/remote'
 module MultiGit::GitBackend
 
   class Repository < MultiGit::Repository
@@ -35,7 +37,7 @@ module MultiGit::GitBackend
       @git_binary = `which git`.chomp
       options = initialize_options(path, options)
       git_dir = options[:repository]
-      @git = Cmd.new(git_binary, :git_dir => git_dir )
+      @git = Cmd.new({'GIT_CONFIG_NOSYSTEM'=>'1'}, git_binary, :git_dir => git_dir )
       if !::File.exists?(git_dir) || MultiGit::Utils.empty_dir?(git_dir)
         if options[:init]
           if options[:bare]
@@ -130,6 +132,19 @@ module MultiGit::GitBackend
       MultiGit::GitBackend::Ref.new(self, name)
     end
 
+    def config
+      @config ||= Config.new(@git)
+    end
+
+    def remote( name_or_url )
+      if looks_like_remote_url? name_or_url
+        remote = Remote.new(self, name_or_url)
+      else
+        remote = Remote::Persistent.new(self, name_or_url)
+      end
+      return remote
+    end
+
   private
     TRUE_LAMBDA = proc{ true }
   public 

data/lib/multi_git/jgit_backend/config.rb

@@ -0,0 +1,52 @@
+require 'multi_git/config'
+module MultiGit
+  module JGitBackend
+    class Config
+
+      include MultiGit::Config
+
+      def initialize(java_config)
+        @java_config = java_config
+      end
+
+      def get(section, subsection, name)
+        s = schema_for(section, subsection, name)
+        if s.list?
+          value = java_config.getStringList(section, subsection, name).to_a
+          if value.any?
+            return s.convert(value)
+          else
+            return s.default
+          end
+        else
+          value = java_config.getString(section, subsection, name)
+          if value.nil?
+            return s.default
+          else
+            return s.convert( value )
+          end
+        end
+      end
+
+      def each_explicit_key
+        return to_enum(:each_explicit_key) unless block_given?
+        java_config.sections.map do |sec|
+          java_config.getNames(sec.to_java, nil.to_java).each do |name|
+            yield sec, nil, name
+          end
+          java_config.getSubsections(sec.to_java).each do |subsec|
+            java_config.getNames(sec.to_java, subsec.to_java).each do |name|
+              yield sec, subsec, name
+            end
+          end
+        end
+      end
+
+      attr :java_config
+
+      alias to_java java_config
+
+    end
+  end
+end
+

data/lib/multi_git/jgit_backend/remote.rb

@@ -0,0 +1,74 @@
+require 'multi_git/remote'
+module MultiGit
+  module JGitBackend
+    class Remote
+
+      include MultiGit::Remote
+
+      attr :repository
+
+      class Persistent < self
+
+        include MultiGit::Remote::Persistent
+
+        def initialize( repository, name )
+          @repository = repository
+          @java_config = Java::OrgEclipseJgitTransport::RemoteConfig.new(repository.config.to_java, name)
+        end
+
+        def name
+          java_config.getName
+        end
+
+      end
+
+      REMOTE_SECTION = 'remote'.to_java
+      TEMPORARY_SECTION = 'tmp'.to_java
+      FETCH_URL_KEY = 'url'.to_java
+      PUSH_URL_KEY = 'pushurl'.to_java
+
+      FETCH = Java::OrgEclipseJgitTransport::Transport::Operation::FETCH
+      PUSH  = Java::OrgEclipseJgitTransport::Transport::Operation::PUSH
+
+      def initialize( repository, url, push_url = url )
+        @repository = repository
+        conf = Java::OrgEclipseJgitLib::Config.new
+        conf.setStringList(REMOTE_SECTION, TEMPORARY_SECTION, FETCH_URL_KEY, Array(url))
+        conf.setStringList(REMOTE_SECTION, TEMPORARY_SECTION, PUSH_URL_KEY, Array(push_url))
+        @java_config = Java::OrgEclipseJgitTransport::RemoteConfig.new(conf, TEMPORARY_SECTION)
+      end
+
+      def fetch_urls
+        java_config.getURIs.map(&:to_s)
+      end
+
+      def push_urls
+        pu = java_config.getPushURIs.map(&:to_s)
+        pu.any? ? pu : fetch_urls
+      end
+
+      def fetch( *refspecs )
+        rs = parse_fetch_refspec(*refspecs).map{|refspec| Java::OrgEclipseJgitTransport::RefSpec.new(refspec.to_s) }
+        use_transport( FETCH ) do | transport |
+          transport.fetch( transport_monitor, rs )
+        end
+      end
+
+    private
+
+      attr :java_config
+
+      def use_transport( op )
+        tr = Java::OrgEclipseJgitTransport::Transport.open(repository.__backend__, java_config, op)
+        yield tr
+      ensure
+        tr.close
+      end
+
+      def transport_monitor
+        Java::OrgEclipseJgitLib::NullProgressMonitor::INSTANCE
+      end
+
+    end
+  end
+end