git-db 0.1.2 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/git-db.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-db}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Dollar"]
@@ -26,9 +26,6 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/git-db",
-     "features/git-db.feature",
-     "features/step_definitions/git-db_steps.rb",
-     "features/support/env.rb",
      "git-db.gemspec",
      "lib/git-db.rb",
      "lib/git-db/commands.rb",
@@ -48,9 +45,13 @@ Gem::Specification.new do |s|
      "lib/git-db/utility/counting_io.rb",
      "spec/git-db/commands_spec.rb",
      "spec/git-db/objects/base_spec.rb",
+     "spec/git-db/objects/blob_spec.rb",
+     "spec/git-db/objects/commit_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/objects_spec.rb",
+     "spec/git-db/protocol_spec.rb",
      "spec/git-db/utility/counting_io_spec.rb",
      "spec/git-db_spec.rb",
      "spec/rcov.opts",
@@ -65,9 +66,13 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/git-db/commands_spec.rb",
      "spec/git-db/objects/base_spec.rb",
+     "spec/git-db/objects/blob_spec.rb",
+     "spec/git-db/objects/commit_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/objects_spec.rb",
+     "spec/git-db/protocol_spec.rb",
      "spec/git-db/utility/counting_io_spec.rb",
      "spec/git-db_spec.rb",
      "spec/spec_helper.rb"

data/lib/git-db.rb

@@ -49,7 +49,7 @@ module GitDB;
   end
 
   def self.log(message)
-    logger.puts message
+    logger.puts message if ENV["DEBUG"]
   end
 
 ## database ##################################################################

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

@@ -37,7 +37,11 @@ class GitDB::Commands::ReceivePack
 
     unless new_shas.reject { |sha| sha == GitDB.null_sha1 }.length.zero?
       while (entries = io.read_pack)
-        database.write_objects(entries)
+
+        # bulk in 50 at a time
+        while (page = entries.shift(50)).length > 0
+          database.write_objects(page)
+        end
       end
     end
 

data/lib/git-db/objects/commit.rb

@@ -1,16 +1,4 @@
 class GitDB::Objects::Commit < GitDB::Objects::Base
-  
-  def raw
-    "commit #{data.length}\000#{data}"
-  end
-
-  def type
-    GitDB::OBJ_COMMIT
-  end
-
-  def message
-    data.split("\n\n", 2).last
-  end
 
   def author
     attributes['author'].first
@@ -20,8 +8,8 @@ class GitDB::Objects::Commit < GitDB::Objects::Base
     attributes['committer'].first
   end
 
-  def tree
-    attributes['tree'].first
+  def message
+    data.split("\n\n", 2).last
   end
 
   def parents
@@ -32,6 +20,18 @@ class GitDB::Objects::Commit < GitDB::Objects::Base
     [:tree, :parents, :author, :committer, :message]
   end
 
+  def raw
+    "commit #{data.length}\000#{data}"
+  end
+
+  def type
+    GitDB::OBJ_COMMIT
+  end
+
+  def tree
+    attributes['tree'].first
+  end
+
 private ######################################################################
 
   def attributes

data/lib/git-db/objects/tree.rb

@@ -2,18 +2,18 @@ require 'stringio'
 
 class GitDB::Objects::Tree < GitDB::Objects::Base
 
-  # TODO: memoize entries
-
   def entries
-    entries = []
-    stream = StringIO.new(data)
-    until stream.eof?
-      perms = read_until(stream, ' ').to_i
-      name  = read_until(stream, 0.chr)
-      sha   = GitDB.sha1_to_hex(stream.read(20))
-      entries << GitDB::Objects::Entry.new(sha, perms, name)
+    @entries ||= begin
+      entries = []
+      stream = StringIO.new(data)
+      until stream.eof?
+        perms = read_until(stream, ' ').to_i
+        name  = read_until(stream, 0.chr)
+        sha   = GitDB.sha1_to_hex(stream.read(20))
+        entries << GitDB::Objects::Entry.new(sha, perms, name)
+      end
+      entries
     end
-    entries
   end
 
   def properties

data/lib/git-db/protocol.rb

@@ -20,22 +20,30 @@ class GitDB::Protocol
   end
 
   def read_command
+    # length is stored in the first 4 bytes
     length = reader.read(4)
     return nil unless length
-    length = length.to_i(16) - 4
-    if (length == -4)
-      GitDB.log('GOT EOF')
-      return
-    end
+
+    # length is stored as hex, convert back to decimal and return if it's 0
+    length = length.to_i(16)
+    return if length.zero?
+
+    # length includes the 4 bytes of the length itself, subtract for data
+    length -= 4
+
+    # read and return the data
     data = reader.read(length)
-    GitDB.log("GOT DATA: #{data.inspect}")
+    GitDB.log("RECEIVED COMMAND: #{data.inspect}")
     data
   end
 
   def write_command(command)
-    raw_command = encode_command(command)
-    GitDB.log("WWRITING COMMAND: #{raw_command.inspect}")
-    writer.print raw_command
+    # output the length
+    writer.print length_as_hex(command)
+
+    # output the data
+    GitDB.log("SENDING COMMAND: #{command.inspect}")
+    writer.print command
     writer.flush
   end
 
@@ -45,7 +53,6 @@ class GitDB::Protocol
   end
 
   def write_eof
-    #GitDB.log("WRITING EOF")
     writer.print '0000'
     writer.flush
   end
@@ -62,10 +69,6 @@ class GitDB::Protocol
 
 private ######################################################################
 
-  def encode_command(command)
-    length_as_hex(command) << command
-  end
-
   def length_as_hex(command)
     hex = (command.length + 4).to_s(16).rjust(4, '0')
   end

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

@@ -0,0 +1,18 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "GitDB::Objects::Blob" do
+
+  before(:each) do
+    @data   = "test blob"
+    @blob = GitDB::Objects::Blob.new(@data)
+  end
+
+  it "has a raw value" do
+    @blob.raw.should == "blob #{@data.length}\000#{@data}"
+  end
+
+  it "has a type" do
+    @blob.type.should == GitDB::OBJ_BLOB
+  end
+
+end

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

@@ -0,0 +1,65 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe "GitDB::Objects::Commit" do
+
+  class CommitFactory
+    attr_accessor :tree, :parents, :author, :committer, :message
+
+    def to_data
+      raw  = ""
+      raw << "tree #{tree}\n"
+      parents.each do |parent|
+        raw << "parent #{parent}\n"
+      end
+      raw << "author #{author}\n"
+      raw << "committer #{committer}\n"
+      raw << "\n"
+      raw << message
+    end
+  end
+
+  before(:each) do
+    @raw_commit           = CommitFactory.new
+    @raw_commit.tree      = "12a3b4d6c8d95475e3faf0e4a7c431c9609057f5"
+    @raw_commit.parents   = ["45bef2e266991a468b02a82e7989aca680557f7b"]
+    @raw_commit.author    = "David Dollar <ddollar@gmail.com> 1252946959 -0400"
+    @raw_commit.committer = "David Dollar <ddollar@gmail.com> 1252946959 -0400"
+    @raw_commit.message   = "test message\n"
+    @data                 = @raw_commit.to_data
+
+    @commit = GitDB::Objects::Commit.new(@data)
+  end
+
+  it "has an author" do
+    @commit.author.should == @raw_commit.author
+  end
+
+  it "has a committer" do
+    @commit.committer.should == @raw_commit.committer
+  end
+
+  it "has a message" do
+    @commit.message.should == @raw_commit.message
+  end
+
+  it "has parents" do
+    @commit.parents.should == @raw_commit.parents
+  end
+
+  it "has properties" do
+    @commit.properties.should == [:tree, :parents, :author, :committer, :message]
+  end
+
+  it "has a raw value" do
+    @commit.raw.should == "commit #{@data.length}\000#{@data}"
+  end
+
+  it "has a tree" do
+    @commit.tree.should == @raw_commit.tree
+  end
+
+  it "has a type" do
+    @commit.type.should == GitDB::OBJ_COMMIT
+  end
+
+end

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

@@ -22,4 +22,5 @@ describe "GitDB::Objects::Entry" do
   it "converts to json" do
     @entry.to_json.should == @entry.to_hash.to_json
   end
+
 end

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

@@ -11,4 +11,5 @@ describe "GitDB::Objects::Tag" do
   it "has a type" do
     @tag.type.should == GitDB::OBJ_TAG
   end
+
 end

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

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe "GitDB::Objects::Tree" do
 
-  class TreeEntry
+  class TreeEntryFactory
     attr_reader :perms, :name, :sha
 
     def initialize(perms, name, sha)
@@ -11,15 +11,15 @@ describe "GitDB::Objects::Tree" do
       @sha   = sha
     end
 
-    def to_entry
+    def to_data
       "#{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('')
+    @entry1 = TreeEntryFactory.new(100644, "entry1", "1111111111111111111111111111111111111111")
+    @entry2 = TreeEntryFactory.new(100444, "entry2", "2222222222222222222222222222222222222222")
+    @data   = [ @entry1.to_data, @entry2.to_data ].join('')
     @tree   = GitDB::Objects::Tree.new(@data)
   end
 
@@ -39,4 +39,5 @@ describe "GitDB::Objects::Tree" do
   it "has a type" do
     @tree.type.should == GitDB::OBJ_TREE
   end
+
 end

data/spec/git-db/objects_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "GitDB::Objects" do
+
+  describe "new_from_type" do
+
+    it "can create a commit" do
+      GitDB::Objects.new_from_type(GitDB::OBJ_COMMIT, '').should be_a(GitDB::Objects::Commit)
+    end
+
+    it "can create a tree" do
+      GitDB::Objects.new_from_type(GitDB::OBJ_TREE, '').should be_a(GitDB::Objects::Tree)
+    end
+
+    it "can create a blob" do
+      GitDB::Objects.new_from_type(GitDB::OBJ_BLOB, '').should be_a(GitDB::Objects::Blob)
+    end
+
+    it "can create a tag" do
+      GitDB::Objects.new_from_type(GitDB::OBJ_TAG, '').should be_a(GitDB::Objects::Tag)
+    end
+
+    it "raises on unknown types" do
+      lambda { GitDB::Objects.new_from_type(-1, '') }.should raise_error
+    end
+  end
+
+end

data/spec/git-db/protocol_spec.rb

@@ -0,0 +1,135 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "GitDB::Protocol" do
+
+  describe "initialize with defaults" do
+    before(:each) do
+      @protocol = GitDB::Protocol.new
+    end
+
+    it "uses STDIN and STDOUT when no io is specified" do
+      @protocol.reader.should == STDIN
+      @protocol.writer.should == STDOUT
+    end
+  end
+
+  describe "initialize with io" do
+    before(:each) do
+      @io       = StringIO.new
+      @protocol = GitDB::Protocol.new(@io)
+    end
+
+    it "sets both reader and writer to the io" do
+      @protocol.reader.should == @io
+      @protocol.writer.should == @io
+    end
+  end
+
+  describe "flush" do
+    before(:each) do
+      @io       = StringIO.new
+      @protocol = GitDB::Protocol.new(@io)
+    end
+
+    it "can flush the writer" do
+      @io.should_receive(:flush)
+      @protocol.flush
+    end
+  end
+
+  describe "read_command" do
+    describe "valid command" do
+      before(:each) do
+        @io       = StringIO.new("000bcommand")
+        @protocol = GitDB::Protocol.new(@io)
+      end
+
+      it "reads the command" do
+        @protocol.read_command.should == 'command'
+      end
+    end
+
+    describe "eof" do
+      before(:each) do
+        @io       = StringIO.new("0000")
+        @protocol = GitDB::Protocol.new(@io)
+      end
+
+      it "returns nil" do
+        @protocol.read_command.should be_nil
+      end
+    end
+  end
+
+  describe "write_command" do
+    before(:each) do
+      @io       = StringIO.new
+      @protocol = GitDB::Protocol.new(@io)
+    end
+
+    it "writes a command" do
+      @protocol.write_command('command')
+      @io.string.should == '000bcommand'
+    end
+  end
+
+  describe "write" do
+    before(:each) do
+      @io       = StringIO.new
+      @protocol = GitDB::Protocol.new(@io)
+      @data     = "test data"
+    end
+
+    it "can write" do
+      @io.should_receive(:write).with(@data)
+      @protocol.write(@data)
+    end
+
+    it "flushes after write" do
+      @io.should_receive(:flush)
+      @protocol.write(@data)
+    end
+  end
+
+  describe "write_eof" do
+    before(:each) do
+      @io       = StringIO.new
+      @protocol = GitDB::Protocol.new(@io)
+    end
+
+    it "writes eof" do
+      @io.should_receive(:write).with("0000")
+      @protocol.write_eof
+    end
+  end
+
+  describe "read_pack" do
+    before(:each) do
+      @io       = StringIO.new
+      @protocol = GitDB::Protocol.new(@io)
+      @pack     = mock(GitDB::Pack)
+    end
+
+    it "uses GitDB::Pack to read a pack object" do
+      GitDB::Pack.should_receive(:new).with(@io).and_return(@pack)
+      @pack.should_receive(:read)
+      @protocol.read_pack
+    end
+  end
+
+  describe "write_pack" do
+    before(:each) do
+      @io       = StringIO.new
+      @protocol = GitDB::Protocol.new(@io)
+      @pack     = mock(GitDB::Pack)
+      @entries  = []
+    end
+
+    it "uses GitDB::Pack to write a pack object" do
+      GitDB::Pack.should_receive(:new).with(@io).and_return(@pack)
+      @pack.should_receive(:write).with(@entries)
+      @protocol.write_pack(@entries)
+    end
+  end
+
+end

data/spec/git-db_spec.rb

@@ -21,14 +21,45 @@ describe "GitDB" do
       GitDB.logger.should respond_to(:puts)
     end
 
-    it "logs messages sent to log" do
-      @logger  = mock(Logger)
-      @message = "Log This"
+    describe "with DEBUG" do
+      before(:each) do
+        @old_debug = ENV["DEBUG"]
+        ENV["DEBUG"] = "1"
+      end
 
-      GitDB.should_receive(:logger).and_return(@logger)
-      @logger.should_receive(:puts).with(@message)
+      after(:each) do
+        ENV["DEBUG"] = @old_debug
+      end
 
-      GitDB.log(@message)
+      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 "without DEBUG" do
+      before(:each) do
+        @old_debug = ENV["DEBUG"]
+        ENV["DEBUG"] = nil
+      end
+
+      after(:each) do
+        ENV["DEBUG"] = @old_debug
+      end
+
+      it "should not log messages sent to log" do
+        @logger  = mock(Logger)
+        @message = "Log This"
+
+        GitDB.should_not_receive(:logger)
+
+        GitDB.log(@message)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: git-db
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - David Dollar
@@ -49,9 +49,6 @@ files:
 - Rakefile
 - VERSION
 - bin/git-db
-- features/git-db.feature
-- features/step_definitions/git-db_steps.rb
-- features/support/env.rb
 - git-db.gemspec
 - lib/git-db.rb
 - lib/git-db/commands.rb
@@ -71,9 +68,13 @@ files:
 - lib/git-db/utility/counting_io.rb
 - spec/git-db/commands_spec.rb
 - spec/git-db/objects/base_spec.rb
+- spec/git-db/objects/blob_spec.rb
+- spec/git-db/objects/commit_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/objects_spec.rb
+- spec/git-db/protocol_spec.rb
 - spec/git-db/utility/counting_io_spec.rb
 - spec/git-db_spec.rb
 - spec/rcov.opts
@@ -110,9 +111,13 @@ summary: Database-based git server
 test_files: 
 - spec/git-db/commands_spec.rb
 - spec/git-db/objects/base_spec.rb
+- spec/git-db/objects/blob_spec.rb
+- spec/git-db/objects/commit_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/objects_spec.rb
+- spec/git-db/protocol_spec.rb
 - spec/git-db/utility/counting_io_spec.rb
 - spec/git-db_spec.rb
 - spec/spec_helper.rb

data/features/git-db.feature

@@ -1,9 +0,0 @@
-Feature: something something
-  In order to something something
-  A user something something
-  something something something
-
-  Scenario: something something
-    Given inspiration
-    When I create a sweet new gem
-    Then everyone should see how awesome I am

data/features/support/env.rb

@@ -1,4 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
-require 'git-db'
-
-require 'spec/expectations'