ddollar-git-db 0.0.2 → 0.1.2

data/README.rdoc

@@ -4,33 +4,54 @@ CouchDB-based git server, avoids the filesystem. (VERY ALPHA)
 
 == Installation
 
+* Install CouchDB on <tt>localhost</tt>, and start it up.
+
 * Install the gem
 
-  $ gem install ddollar-git-db
+ $ gem install ddollar-git-db
 
 * Create a <tt>git</tt> user. (Name can be whatever you like)
+
 * Set a home directory for the user.
+
 * Set up the <tt>git</tt> user's authorized_keys2 file: (modify the command to match your gem particulars)
 
-  # ~/.git/.ssh/authorized_keys2
-  command="/usr/bin/git-db david",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty <your ssh public key>
+ # $HOME/git/.ssh/authorized_keys2
+ command="/usr/bin/git-db",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty <your ssh public key>
 
 * Add your localhost as a remote to an existing project and push
 
-  $ git remote add test-git-db git@localhost:my-repo.git
-  $ git push test-git-db master
+ $ git remote add test-git-db git@localhost:my-repo.git
+ $ git push test-git-db master
+
+* Go look at the data in CouchDB
+
+ http://127.0.0.1:5984/_utils/database.html?gitdb-my-repo
+
+* Clone your repository somewhere else and examine it
+
+ $ git clone git@localhost:my-repo.git /tmp/my-repo
 
 * Please report any problems on the issue tracker.
 
+== Links
+
+* Continuous Integration - http://runcoderun.com/ddollar/git-db
+* Documentation - http://rdoc.info/projects/ddollar/git-db
+
+== TODO
+
+* Tests
+* Refactor and clean up (experimenting with binary protocols can make things a bit messy)
+* Authentication tie-in
+* Never look at a raw git pack file again
+
 == Note on Patches/Pull Requests
 
 * Fork the project.
 * Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
+* Add tests for it. This is important so I don't break it in a future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Copyright

data/Rakefile

@@ -10,10 +10,12 @@ begin
     gem.email = "<ddollar@gmail.com>"
     gem.homepage = "http://github.com/ddollar/git-db"
     gem.authors = ["David Dollar"]
+
+    # development dependencies
     gem.add_development_dependency "rspec"
-    gem.add_development_dependency "yard"
-    gem.add_development_dependency "cucumber"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+
+    # runtime dependencies
+    gem.add_dependency "couchrest"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -24,34 +26,18 @@ require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']
+  spec.spec_opts << '--colour --format specdoc'
 end
 
 Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
+  spec.rcov_opts = lambda do
+    IO.readlines("#{File.dirname(__FILE__)}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+  end
 end
 
 task :spec => :check_dependencies
 
-begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-
-  task :features => :check_dependencies
-rescue LoadError
-  task :features do
-    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
-  end
-end
-
 task :default => :spec
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
-end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.2

data/bin/git-db

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-$:.unshift('/Users/david/Code/git-db/lib')
 require 'git-db'
 include GitDB
 
@@ -12,5 +11,7 @@ if git_command
   command    = git_command[1]
   repository = git_command[2]
 
-  Git::Commands.execute(command, [repository])
+  repository = repository.gsub(/\.git$/, '')
+
+  GitDB::Commands.execute(command, [repository])
 end

data/git-db.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-db}
-  s.version = "0.0.2"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Dollar"]
-  s.date = %q{2009-09-13}
+  s.date = %q{2009-09-14}
   s.default_executable = %q{git-db}
   s.description = %q{Database-based git server}
   s.email = %q{<ddollar@gmail.com>}
@@ -31,22 +31,30 @@ Gem::Specification.new do |s|
      "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"
   ]
   s.homepage = %q{http://github.com/ddollar/git-db}
@@ -55,7 +63,13 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Database-based git server}
   s.test_files = [
-    "spec/git-db_spec.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/spec_helper.rb"
   ]
 
@@ -65,16 +79,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
+      s.add_runtime_dependency(%q<couchrest>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
+      s.add_dependency(%q<couchrest>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
+    s.add_dependency(%q<couchrest>, [">= 0"])
   end
 end

data/lib/git-db.rb

@@ -1,16 +1,68 @@
+require 'base64'
+require 'couchrest'
 require 'logger'
 
 module GitDB;
 
+## 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
+  
+## git utility ###############################################################
+
+  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
+
+  def self.null_sha1
+    "0000000000000000000000000000000000000000"
+  end
+
+## logging ###################################################################
+
   def self.logger
-    @logger ||= File.open("/tmp/git-db.log", "w")
-    #@logger ||= STDERR
+    @logger ||= STDERR
   end
 
   def self.log(message)
     logger.puts message
   end
+
+## database ##################################################################
+
+  def self.database(repository)
+    GitDB::Database.database(repository)
+  end
+    
 end
 
-require 'git'
-require 'utility'
+require 'git-db/commands'
+require 'git-db/database'
+require 'git-db/objects'
+require 'git-db/pack'
+require 'git-db/protocol'
+require 'git-db/utility'

data/lib/git-db/commands.rb

@@ -0,0 +1,21 @@
+module GitDB::Commands
+
+  def self.commands
+    @commands
+  end
+
+  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-db/commands/receive-pack'
+require 'git-db/commands/upload-pack'

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

@@ -0,0 +1,73 @@
+require 'fileutils'
+require 'zlib'
+
+class GitDB::Commands::ReceivePack
+
+  def execute(args)
+    repository = args.first
+    raise ArgumentError, "repository required" unless repository
+
+    database = GitDB.database(repository)
+
+    needs_capabilities = true
+    database.get_refs.each do |ref, sha|
+      GitDB.log("ISAERF #{ref} #{sha}")
+      write_ref(ref, sha, needs_capabilities)
+      needs_capabilities = false
+    end
+    write_ref("capabilities^{}", GitDB.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 == GitDB.null_sha1
+        database.delete_ref(ref)
+      else
+        database.write_ref(ref, new_sha)
+      end
+    end
+
+    unless new_shas.reject { |sha| sha == GitDB.null_sha1 }.length.zero?
+      while (entries = io.read_pack)
+        database.write_objects(entries)
+      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::Protocol.new
+  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 ]
+      io.write_command(header)
+    end
+  end
+
+end
+
+GitDB::Commands.register 'receive-pack', GitDB::Commands::ReceivePack

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

@@ -0,0 +1,140 @@
+require 'fileutils'
+require 'zlib'
+
+class GitDB::Commands::UploadPack
+
+  def execute(args)
+    repository = args.first
+    raise ArgumentError, "repository required" unless repository
+
+    database = GitDB.database(repository)
+
+    #execute_transcript(database)
+    execute_real(database)
+  end
+
+  def execute_transcript(database)
+    cmd = GitDB::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
+  end
+
+  def execute_real(database)
+    write_ref 'HEAD', database.get_ref('refs/heads/master')['sha']
+
+    database.get_refs.each do |ref, sha|
+      write_ref(ref, sha)
+    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(database, shas_to_ignore, false)
+    shas, entries     = load_entries(database, shas_to_read, true, shas_to_ignore)
+
+    GitDB.log(entries.map { |e| e.inspect })
+
+    io.write_pack(entries)
+  end
+
+private
+
+  def load_entries(database, shas_to_read, keep_entries, shas_to_ignore=[])
+    entries = []
+    shas    = []
+
+    while sha = shas_to_read.shift
+      next if shas_to_ignore.include?(sha)
+      GitDB.log("SHAS_TO_IGNORE: #{shas_to_ignore.sort.inspect}")
+      GitDB.log("READING SHA: #{sha}")
+      shas_to_ignore << sha
+
+      shas << sha
+
+      object = database.get_object(sha)
+      GitDB.log("OBJECT: #{object.inspect}")
+      data = object.data
+
+      case object
+        when GitDB::Objects::Commit then
+          commit = GitDB::Objects::Commit.new(data)
+          shas_to_read << commit.tree
+          shas_to_read += commit.parents if commit.parents
+          entries << commit if keep_entries
+        when GitDB::Objects::Tree then
+          tree = GitDB::Objects::Tree.new(data)
+          shas_to_read += tree.entries.map { |e| e.sha }
+          entries << tree if keep_entries
+        when GitDB::Objects::Blob then
+          blob = GitDB::Objects::Blob.new(data)
+          entries << blob if keep_entries
+        else
+          raise "UNKNOWN TYPE!! #{object.class}"
+      end
+    end
+
+    [shas, entries]
+  end
+
+  def capabilities
+    " shallow include-tag"
+  end
+
+  def io
+    @io ||= GitDB::Protocol.new
+  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::Commands.register 'upload-pack', GitDB::Commands::UploadPack