ddollar-git-db 0.0.2 → 0.1.2

data/spec/git-db/objects/entry_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "GitDB::Objects::Entry" do
+
+  before(:each) do
+    @sha   = "1111111111111111111111111111111111111111"
+    @perms = 100644
+    @name  = "test name"
+    @entry = GitDB::Objects::Entry.new(@sha, @perms, @name)
+  end
+
+  it "has properties" do
+    @entry.properties.should == [:permissions, :name]
+  end
+
+  it "converts to a hash" do
+    @entry.to_hash[:sha].should         == @sha
+    @entry.to_hash[:permissions].should == @perms
+    @entry.to_hash[:name].should        == @name
+  end
+
+  it "converts to json" do
+    @entry.to_json.should == @entry.to_hash.to_json
+  end
+end

data/spec/git-db/objects/tag_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "GitDB::Objects::Tag" do
+
+  before(:each) do
+    # TODO: real tag data
+    @data = "test-tag"
+    @tag  = GitDB::Objects::Tag.new(@data)
+  end
+
+  it "has a type" do
+    @tag.type.should == GitDB::OBJ_TAG
+  end
+end

data/spec/git-db/objects/tree_spec.rb

@@ -0,0 +1,42 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "GitDB::Objects::Tree" do
+
+  class TreeEntry
+    attr_reader :perms, :name, :sha
+
+    def initialize(perms, name, sha)
+      @perms = perms
+      @name  = name
+      @sha   = sha
+    end
+
+    def to_entry
+      "#{perms} #{name}\000#{GitDB.hex_to_sha1(sha)}"
+    end
+  end
+
+  before(:each) do
+    @entry1 = TreeEntry.new(100644, "entry1", "1111111111111111111111111111111111111111")
+    @entry2 = TreeEntry.new(100444, "entry2", "2222222222222222222222222222222222222222")
+    @data   = [ @entry1.to_entry, @entry2.to_entry ].join('')
+    @tree   = GitDB::Objects::Tree.new(@data)
+  end
+
+  it "has entries" do
+    @tree.entries.first.name.should == @entry1.name
+    @tree.entries.last.name.should  == @entry2.name
+  end
+
+  it "has properties" do
+    @tree.properties.should == [:entries]
+  end
+
+  it "has a raw value" do
+    @tree.raw.should == "tree #{@data.length}\000#{@data}"
+  end
+
+  it "has a type" do
+    @tree.type.should == GitDB::OBJ_TREE
+  end
+end

data/spec/git-db/utility/counting_io_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "GitDB::Utility::CountingIO" do
+
+  before(:each) do
+    @base = StringIO.new
+    @io   = GitDB::Utility::CountingIO.new(@base)
+  end
+
+  it "can flush" do
+    @base.should_receive(:flush)
+    @io.flush
+  end
+
+  it "can read" do
+    @data  = "00000"
+    @bytes = @data.length
+
+    @base.should_receive(:read).with(@bytes).and_return(@data)
+    @io.read(@bytes).should == @data
+  end
+
+  it "can write" do
+    @data = "00000"
+
+    @base.should_receive(:write).with(@data)
+    @io.write(@data)
+  end
+
+end

data/spec/git-db_spec.rb

@@ -1,7 +1,45 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "GitDb" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+describe "GitDB" do
+
+  describe "git utility" do
+    it "can convert shas to/from hex/binary representation" do
+      @hex = "6161616161616161616161616161616161616161"
+      @sha = "aaaaaaaaaaaaaaaaaaaa"
+
+      GitDB.hex_to_sha1(@hex.dup).should == @sha.dup
+      GitDB.sha1_to_hex(@sha.dup).should == @hex.dup
+    end
+
+    it "has a null sha" do
+      GitDB.null_sha1.should == "0000000000000000000000000000000000000000"
+    end
   end
+
+  describe "logging" do
+    it "has a logger that can respond to puts" do
+      GitDB.logger.should respond_to(:puts)
+    end
+
+    it "logs messages sent to log" do
+      @logger  = mock(Logger)
+      @message = "Log This"
+
+      GitDB.should_receive(:logger).and_return(@logger)
+      @logger.should_receive(:puts).with(@message)
+
+      GitDB.log(@message)
+    end
+  end
+
+  describe "database" do
+    it "returns a database for a repository" do
+      @repository = "Test Repository"
+
+      GitDB::Database.should_receive(:database).with(@repository)
+
+      GitDB.database(@repository)
+    end
+  end
+
 end

data/spec/rcov.opts

@@ -0,0 +1,2 @@
+--exclude "spec/*,gems/*" 
+--rails

data/spec/spec.opts

@@ -0,0 +1,4 @@
+--colour
+--format progress
+--loadby mtime
+--reverse

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'rubygems'
 require 'git-db'
 require 'spec'
 require 'spec/autorun'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ddollar-git-db
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.2
 platform: ruby
 authors: 
 - David Dollar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-13 00:00:00 -07:00
+date: 2009-09-14 00:00:00 -07:00
 default_executable: git-db
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,18 +23,8 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: cucumber
-  type: :development
+  name: couchrest
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -64,22 +54,30 @@ files:
 - features/support/env.rb
 - git-db.gemspec
 - lib/git-db.rb
-- lib/git.rb
-- lib/git/commands.rb
-- lib/git/commands/receive-pack.rb
-- lib/git/commands/upload-pack.rb
-- lib/git/objects.rb
-- lib/git/objects/base.rb
-- lib/git/objects/blob.rb
-- lib/git/objects/commit.rb
-- lib/git/objects/entry.rb
-- lib/git/objects/tag.rb
-- lib/git/objects/tree.rb
-- lib/git/pack.rb
-- lib/git/protocol.rb
-- lib/utility.rb
-- lib/utility/counting_io.rb
+- lib/git-db/commands.rb
+- lib/git-db/commands/receive-pack.rb
+- lib/git-db/commands/upload-pack.rb
+- lib/git-db/database.rb
+- lib/git-db/objects.rb
+- lib/git-db/objects/base.rb
+- lib/git-db/objects/blob.rb
+- lib/git-db/objects/commit.rb
+- lib/git-db/objects/entry.rb
+- lib/git-db/objects/tag.rb
+- lib/git-db/objects/tree.rb
+- lib/git-db/pack.rb
+- lib/git-db/protocol.rb
+- lib/git-db/utility.rb
+- lib/git-db/utility/counting_io.rb
+- spec/git-db/commands_spec.rb
+- spec/git-db/objects/base_spec.rb
+- spec/git-db/objects/entry_spec.rb
+- spec/git-db/objects/tag_spec.rb
+- spec/git-db/objects/tree_spec.rb
+- spec/git-db/utility/counting_io_spec.rb
 - spec/git-db_spec.rb
+- spec/rcov.opts
+- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://github.com/ddollar/git-db
@@ -109,5 +107,11 @@ signing_key:
 specification_version: 3
 summary: Database-based git server
 test_files: 
+- spec/git-db/commands_spec.rb
+- spec/git-db/objects/base_spec.rb
+- spec/git-db/objects/entry_spec.rb
+- spec/git-db/objects/tag_spec.rb
+- spec/git-db/objects/tree_spec.rb
+- spec/git-db/utility/counting_io_spec.rb
 - spec/git-db_spec.rb
 - spec/spec_helper.rb

data/lib/git.rb

@@ -1,39 +0,0 @@
-module GitDB::Git; 
-
-  # git constants
-  OBJ_NONE      = 0
-  OBJ_COMMIT    = 1
-  OBJ_TREE      = 2
-  OBJ_BLOB      = 3
-  OBJ_TAG       = 4
-  OBJ_OFS_DELTA = 6
-  OBJ_REF_DELTA = 7
-  
-  def self.sha1_to_hex(sha)
-    hex = ""
-    sha.split('').each do |char|
-      val = char[0]
-      hex << (val >>  4).to_s(16)
-      hex << (val & 0xf).to_s(16)
-    end
-    hex
-  end
-
-  def self.hex_to_sha1(hex)
-    sha = ""
-    len = 0
-    until (len == hex.length)
-      val = (hex[len,   1].to_i(16) << 4)
-      val += hex[len+1, 1].to_i(16)
-      sha << val.chr
-      len += 2
-    end
-    sha
-  end
-
-end
-
-require 'git/commands'
-require 'git/objects'
-require 'git/pack'
-require 'git/protocol'

data/lib/git/commands.rb

@@ -1,17 +0,0 @@
-module GitDB::Git::Commands
-
-  def self.execute(command, args=[])
-    return unless @commands
-    raise ArgumentError, "Unknown command: #{command}" unless @commands[command]
-    @commands[command].execute(args)
-  end
-
-  def self.register(command, klass)
-    @commands ||= {}
-    @commands[command] = klass.new
-  end
-
-end
-
-require 'git/commands/receive-pack'
-require 'git/commands/upload-pack'

data/lib/git/commands/receive-pack.rb

@@ -1,101 +0,0 @@
-require 'fileutils'
-require 'zlib'
-
-class GitDB::Git::Commands::ReceivePack
-
-  def execute(args)
-    repository = args.first
-    raise ArgumentError, "repository required" unless repository
-
-    needs_capabilities = true
-    each_git_ref do |ref, sha|
-      write_ref(ref, sha, needs_capabilities)
-      needs_capabilities = false
-    end
-    write_ref("capabilities^{}", null_sha1) if needs_capabilities
-    io.write_eof
-    
-    refs = []
-    new_shas = []
-    
-    while (data = io.read_command)
-      old_sha, new_sha, ref = data.split(' ')
-      ref, report = ref.split(0.chr)
-      refs << ref
-      new_shas << new_sha
-      if new_sha == null_sha1
-        delete_git_file(ref)
-      else
-        write_git_file(ref, new_sha)
-      end
-      # GitDB.log("OLDSHA: #{old_sha}")
-      # GitDB.log("NEWSHA: #{new_sha}")
-      # GitDB.log("REF: #{ref}")
-      # GitDB.log("REPORT: #{report}")
-    end
-    
-    unless new_shas.reject { |sha| sha == null_sha1 }.length.zero?
-      while (entries = io.read_pack)
-        GitDB.log("ENTRIES: #{entries.inspect}")
-        entries.each do |entry|
-          filename = "objects/#{entry.sha[0..1]}/#{entry.sha[2..-1]}"
-          write_git_file(filename, Zlib::Deflate.deflate(entry.raw))
-        end
-      end
-    end
-
-    io.write_command("unpack ok\n")
-    refs.each do |ref|
-      io.write_command("ok #{ref}\n")
-    end
-    io.write_eof
-  end
-
-private
-
-  def capabilities
-    " report-status delete-refs ofs-delta "
-  end
-
-  def io
-    @io ||= GitDB::Git::Protocol.new
-  end
-
-  def null_sha1
-    "0000000000000000000000000000000000000000"
-  end
-
-  def each_git_ref(&block)
-    Dir["/tmp/foo/.git/refs/*/*"].each do |ref|
-      sha = File.read(ref).strip
-      ref = ref.gsub('/tmp/foo/.git/', '')
-      yield ref, sha
-    end
-  end
-
-  def delete_git_file(filename)
-    filename = "/tmp/foo/.git/#{filename}"
-    GitDB.log("REMOVING: #{filename}")
-    FileUtils.rm_rf(filename)
-  end
-
-  def write_git_file(filename, data)
-    filename = "/tmp/foo/.git/#{filename}"
-    FileUtils.mkdir_p(File.dirname(filename))
-    File.open(filename, 'w') do |file|
-      file.print(data)
-    end
-  end
-
-  def write_ref(ref, sha, needs_capabilities=true)
-    if needs_capabilities
-      header = "%s %s\000%s\n" % [ sha, ref, capabilities ]
-      io.write_command(header)
-    else
-      header = "%s %s\n" % [ sha, ref ]
-    end
-  end
-
-end
-
-GitDB::Git::Commands.register 'receive-pack', GitDB::Git::Commands::ReceivePack

data/lib/git/commands/upload-pack.rb

@@ -1,204 +0,0 @@
-require 'fileutils'
-require 'zlib'
-
-class GitDB::Git::Commands::UploadPack
-
-  def execute(args)
-    repository = args.first
-    raise ArgumentError, "repository required" unless repository
-
-    #execute_transcript
-    execute_real
-  end
-
-  def execute_transcript
-    cmd = GitDB::Git::Protocol.new(IO.popen("/opt/local/bin/git-upload-pack '/tmp/foo'", 'r+'))
-
-    while (data = cmd.read_command)
-      GitDB.log("CMD COMMAND: #{data}")
-      io.write_command(data)
-    end
-    io.write_eof
-
-    while (data = io.read_command)
-      GitDB.log("IO COMMAND: #{data}")
-      cmd.write_command(data)
-    end
-    cmd.write_eof
-
-    while (data = io.read_command)
-      cmd.write_command(data)
-      data = data.strip
-      break if data == 'done'
-      GitDB.log("READ FROM IO #{data}")
-    end
-    
-    while (data = cmd.read_command)
-      GitDB.log("GOT COMMAND DATA: #{data.inspect}")
-    end
-
-    # data = io.reader.read(9)
-    # GitDB.log("READ FROM IO: #{data.inspect}")
-    # cmd.writer.write(data)
-
-    # while (data = cmd.read_command)
-    #   GitDB.log("CMD COMMAND: #{data.inspect}")
-    #   io.write_command(data)
-    #   GitDB.log('weee')
-    #   if data[0] == 1
-    #     GitDB.log("ITS A PACK!")
-    #     pack = data[1..-1]
-    #     unpacker = GitDB::Git::Pack.new(StringIO.new(pack))
-    #     unpacker.read
-    #   end
-    # end
-    # io.write_eof
-
-    # while (data = cmd.read_command)
-    #   GitDB.log("CMD COMMAND: #{data}")
-    #   io.write_command(data)
-    # end
-    # io.write_eof
-  end
-
-  def execute_real
-    head_ref do |ref, sha|
-      write_ref(ref, sha)
-    end
-    each_git_ref do |ref, sha|
-      write_ref(ref, sha)
-      #write_ref(ref, sha.gsub('9', '1'))
-    end
-    io.write_eof
-
-    shas_to_read   = []
-    shas_to_ignore = []
-
-    while (data = io.read_command)
-      GitDB.log("GOT COMMAND: #{data.inspect}")
-      command, sha, options = data.split(' ', 3)
-      shas_to_read << sha
-    end
-
-    while (data = io.read_command)
-      data = data.strip
-      break if data == 'done'
-      command, sha = data.split(" ", 2)
-      case command
-        when 'have' then 
-          shas_to_ignore << sha
-        else
-          raise "Unknown SHA command: #{command}"
-      end
-    end
-
-    if shas_to_ignore.length.zero?
-      io.write_command("NAK\n")
-    else
-      io.write_command("ACK #{shas_to_ignore.last}\n")
-    end
-
-    shas_to_ignore, _ = load_entries(shas_to_ignore, false)
-    # GitDB.log("SHAS_TO_READ: #{shas_to_read.inspect}")
-    # GitDB.log("SHAS_READ: #{shas_read.inspect}")
-
-    shas, entries = load_entries(shas_to_read, true, shas_to_ignore)
-
-    GitDB.log(entries.map { |e| e.inspect })
-
-    io.write_pack(entries)
-  end
-
-private
-
-  def load_entries(shas_to_read, keep_entries, shas_to_ignore=[])
-    entries = []
-    shas    = []
-
-    while sha = shas_to_read.shift
-      next if shas_to_ignore.include?(sha)
-      shas_to_ignore << sha
-
-      shas << sha
-
-      raw_data = read_git_object(sha)
-      type = raw_data.split(" ").first
-      data = raw_data.split("\000", 2).last
-
-      #GitDB.log("SHADATA: #{data.inspect}")
-      case type
-        when 'commit' then
-          commit = GitDB::Git::Objects::Commit.new(data)
-          shas_to_read << commit.tree
-          shas_to_read += commit.parents if commit.parents
-          entries << commit if keep_entries
-        when 'tree' then
-          tree = GitDB::Git::Objects::Tree.new(data)
-          shas_to_read += tree.entries.map { |e| e.sha }
-          entries << tree if keep_entries
-        when 'blob' then
-          blob = GitDB::Git::Objects::Blob.new(data)
-          entries << blob if keep_entries
-        else
-          raise "UNKNOWN TYPE!! #{type}"
-      end
-    end
-
-    [shas, entries]
-  end
-
-  def capabilities
-    " shallow include-tag"
-  end
-
-  def io
-    @io ||= GitDB::Git::Protocol.new
-  end
-
-  def null_sha1
-    "0000000000000000000000000000000000000000"
-  end
-
-  def each_git_ref(&block)
-    Dir["/tmp/foo/.git/refs/*/*"].each do |ref|
-      sha = File.read(ref).strip
-      ref = ref.gsub('/tmp/foo/.git/', '')
-      yield ref, sha
-    end
-  end
-
-  def head_ref(&block)
-    sha = File.read("/tmp/foo/.git/HEAD").strip
-    if sha =~ /ref: (.+)/
-      sha = File.read("/tmp/foo/.git/#{$1}")
-    end
-    yield "HEAD", sha
-  end
-
-  def delete_git_file(filename)
-    filename = "/tmp/foo/.git/#{filename}"
-    GitDB.log("REMOVING: #{filename}")
-    FileUtils.rm_rf(filename)
-  end
-
-  def read_git_object(sha)
-    filename = "/tmp/foo/.git/objects/#{sha[0..1]}/#{sha[2..-1]}"
-    data = Zlib::Inflate.inflate(File.read(filename))
-  end
-
-  def write_git_file(filename, data)
-    filename = "/tmp/foo/.git/#{filename}"
-    FileUtils.mkdir_p(File.dirname(filename))
-    File.open(filename, 'w') do |file|
-      file.print(data)
-    end
-  end
-
-  def write_ref(ref, sha, needs_capabilities=true)
-    header = "%s %s\000%s\n" % [ sha, ref, capabilities ]
-    io.write_command(header)
-  end
-
-end
-
-GitDB::Git::Commands.register 'upload-pack', GitDB::Git::Commands::UploadPack