dolt 0.4.2 → 0.4.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dolt (0.4.1)
+    dolt (0.4.3)
       async_sinatra (~> 1.0)
       builder (~> 3.1)
       em_pessimistic (~> 0.1)

data/lib/dolt/git/repository.rb

@@ -20,11 +20,36 @@ require "em_pessimistic/deferrable_child_process"
 require "em/deferrable"
 require "dolt/git/blame"
 require "dolt/git/commit"
+require "dolt/git/submodule"
+require "dolt/git/tree"
 require "dolt/async/when"
 
 module Dolt
   module Git
     class Repository < EMRugged::Repository
+      def submodules(ref)
+        d = EventMachine::DefaultDeferrable.new
+        gm = rev_parse("#{ref}:.gitmodules")
+        gm.callback do |config|
+          d.succeed(Dolt::Git::Submodule.parse_config(config.content))
+        end
+        # Fails if .gitmodules cannot be found, which means no submodules
+        gm.errback { |err| d.succeed([]) }
+        d
+      end
+
+      def tree(ref, path)
+        d = EventMachine::DefaultDeferrable.new
+        rp = rev_parse("#{ref}:#{path}")
+        rp.callback do |tree|
+          break d.fail(StandardError.new("Not a tree")) unless tree.is_a?(Rugged::Tree)
+          break d.succeed(tree) if !tree.find { |e| e[:type].nil? }
+          annotate_submodules(ref, path, d, tree)
+        end
+        rp.errback { |err| d.fail(err) }
+        d
+      end
+
       def blame(ref, path)
         deferred_method("blame -l -t -p #{ref} #{path}") do |output, s|
           Dolt::Git::Blame.parse_porcelain(output)
@@ -72,6 +97,24 @@ module Dolt
         d
       end
 
+      def annotate_submodules(ref, path, deferrable, tree)
+        submodules(ref).callback do |submodules|
+          entries = tree.entries.map do |entry|
+            if entry[:type].nil?
+              mod = path == "" ? entry[:name] : File.join(path, entry[:name])
+              meta = submodules.find { |s| s[:path] == mod }
+              if meta
+                entry[:type] = :submodule
+                entry[:url] = meta[:url]
+              end
+            end
+            entry
+          end
+
+          deferrable.succeed(Dolt::Git::Tree.new(tree.oid, entries))
+        end
+      end
+
       def deferred_method(cmd, &block)
         d = EventMachine::DefaultDeferrable.new
         cmd = git(cmd)

data/lib/dolt/git/submodule.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2012 Gitorious AS
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#++
+
+module Dolt
+  module Git
+    class Submodule
+      def self.parse_config(config)
+        config.split("\n").inject([]) do |modules, line|
+          if line =~ /\[submodule ".*"\]/
+            modules << {}
+          else
+            _, key, val = *line.match(/\s([^\s]+) = ([^\s]+)/)
+            modules.last[key.to_sym] = val
+          end
+          modules
+        end
+      end
+    end
+  end
+end

data/lib/dolt/git/tree.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2012 Gitorious AS
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#++
+
+module Dolt
+  module Git
+    class Tree
+      attr_reader :oid, :entries
+      include Enumerable
+
+      def initialize(oid, entries)
+        @oid = oid
+        @entries = entries
+      end
+
+      def each(&block)
+        entries.each(&block)
+      end
+
+      # From Rugged::Tree
+      def inspect
+        data = "#<Dolt::Git::Tree:#{object_id} {oid: #{oid}}>\n"
+        self.each { |e| data << "  <\"#{e[:name]}\" #{e[:oid]}>\n" }
+        data
+      end
+    end
+  end
+end

data/lib/dolt/repo_actions.rb

@@ -29,7 +29,7 @@ module Dolt
     end
 
     def tree(repo, ref, path, &block)
-      repo_action(repo, ref, path, :tree, :rev_parse, "#{ref}:#{path}", &block)
+      repo_action(repo, ref, path, :tree, :tree, ref, path, &block)
     end
 
     def blame(repo, ref, path, &block)

data/lib/dolt/sinatra/actions.rb

@@ -60,7 +60,7 @@ module Dolt
         actions.tree(repo, ref, path) do |err, data|
           return error(err, repo, ref) if !err.nil?
           tree = data[:tree]
-          return redirect(blob_url(repo, ref, path)) if !tree.is_a?(Rugged::Tree)
+          return redirect(blob_url(repo, ref, path)) if tree.class.to_s !~ /\bTree/
           response["Content-Type"] = "text/html"
           body(renderer.render(:tree, data))
         end

data/lib/dolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/dolt/view/object.rb

@@ -20,6 +20,7 @@ module Dolt
   module View
     module Object
       def object_url(repository, ref, path, object)
+        return object[:url] if object[:type] == :submodule
         url = "/#{object[:type]}/#{ref}:#{object_path(path, object)}"
         repo_url(repository, url)
       end
@@ -29,7 +30,14 @@ module Dolt
       end
 
       def object_icon_class(entry)
-        entry[:type] == :blob ? "icon-file" : "icon-folder-close"
+        case entry[:type]
+        when :blob
+          "icon-file"
+        when :tree
+          "icon-folder-close"
+        when :submodule
+          "icon-hdd"
+        end
       end
     end
   end

data/lib/dolt/view/tree.rb

@@ -24,7 +24,7 @@ module Dolt
       end
 
       def tree_entries(tree)
-        sort(tree.entries.select { |e| e[:type] == :tree }) +
+        sort(tree.entries.select { |e| [:tree, :submodule].index(e[:type]) }) +
           sort(tree.entries.select { |e| e[:type] == :blob })
       end
 

data/test/dolt/git/repository_test.rb

@@ -21,10 +21,50 @@ require "time"
 
 describe Dolt::Git::Repository do
   include EM::MiniTest::Spec
+  before { @repository = Dolt::Git::Repository.new(".") }
 
-  describe "#blame" do
-    before { @repository = Dolt::Git::Repository.new(".") }
+  describe "#submodules" do
+    it "returns deferrable" do
+      deferrable = @repository.submodules("master")
+      assert deferrable.respond_to?(:callback)
+      assert deferrable.respond_to?(:errback)
+    end
 
+    it "yields list of submodules" do
+      @repository.submodules("c1f6cd9").callback do |submodules|
+        url = "git://gitorious.org/gitorious/ui3.git"
+        assert_equal [{ :path => "vendor/ui", :url => url }], submodules
+        done!
+      end
+    wait!
+    end
+
+    it "resolves with empty array if no submodules" do
+      @repository.submodules("26139a3").callback do |submodules|
+        assert_equal [], submodules
+        done!
+      end
+      wait!
+    end
+  end
+
+  describe "#tree" do
+    it "includes submodule data for trees" do
+      @repository.tree("master", "vendor").callback do |tree|
+        assert_equal({
+          :type => :submodule,
+          :filemode => 57344,
+          :name => "ui",
+          :oid => "2b05baa5a2e626cb1a4c4b30299c1db5490979b7",
+          :url => "git://gitorious.org/gitorious/ui3.git"
+        }, tree.entries.first)
+        done!
+      end
+      wait!
+    end
+  end
+
+  describe "#blame" do
     it "returns deferrable" do
       deferrable = @repository.blame("master", "Gemfile")
       assert deferrable.respond_to?(:callback)
@@ -41,8 +81,6 @@ describe Dolt::Git::Repository do
   end
 
   describe "#log" do
-    before { @repository = Dolt::Git::Repository.new(".") }
-
     it "returns deferrable" do
       deferrable = @repository.log("master", "Gemfile", 1)
       assert deferrable.respond_to?(:callback)
@@ -60,8 +98,6 @@ describe Dolt::Git::Repository do
   end
 
   describe "#tree_history" do
-    before { @repository = Dolt::Git::Repository.new(".") }
-
     it "returns deferrable" do
       deferrable = @repository.tree_history("master", "")
       assert deferrable.respond_to?(:callback)
@@ -97,13 +133,13 @@ describe Dolt::Git::Repository do
           :filemode => 33188,
           :name => ".gitmodules",
           :history => [{
-            :oid => "906d67b4f3e5de7364ba9b57d174d8998d53ced6",
-            :author => { :name => "Christian Johansen",
-                         :email => "christian@cjohansen.no" },
-            :summary => "Working Moron server for viewing blobs",
-            :date => Time.parse("Mon Sep 10 15:07:39 +0200 2012"),
-            :message => ""
-          }]
+                         :oid => "906d67b4f3e5de7364ba9b57d174d8998d53ced6",
+                         :author => { :name => "Christian Johansen",
+                           :email => "christian@cjohansen.no" },
+                         :summary => "Working Moron server for viewing blobs",
+                         :date => Time.parse("Mon Sep 10 15:07:39 +0200 2012"),
+                         :message => ""
+                       }]
         }
 
         assert_equal expected, log[0]
@@ -122,19 +158,19 @@ describe Dolt::Git::Repository do
 
       promise.callback do |log|
         expected = [{
-          :type => :tree,
-          :oid => "58f84405b588699b24c619aa4cd83669c5623f88",
-          :filemode => 16384,
-          :name => "dolt",
-          :history => [{
-            :oid => "8ab4f8c42511f727244a02aeee04824891610bbd",
-            :author => { :name => "Christian Johansen",
-                         :email => "christian@gitorious.com" },
-            :summary => "New version",
-            :date => Time.parse("Mon Oct 1 16:34:00 +0200 2012"),
-            :message => ""
-          }]
-        }]
+                      :type => :tree,
+                      :oid => "58f84405b588699b24c619aa4cd83669c5623f88",
+                      :filemode => 16384,
+                      :name => "dolt",
+                      :history => [{
+                                     :oid => "8ab4f8c42511f727244a02aeee04824891610bbd",
+                                     :author => { :name => "Christian Johansen",
+                                       :email => "christian@gitorious.com" },
+                                     :summary => "New version",
+                                     :date => Time.parse("Mon Oct 1 16:34:00 +0200 2012"),
+                                     :message => ""
+                                   }]
+                    }]
 
         assert_equal expected, log
         done!

data/test/dolt/repo_actions_test.rb

@@ -23,6 +23,7 @@ require "ostruct"
 class Repository
   attr_reader :name
   def initialize(name); @name = name; end
+  def tree(ref, path); stub; end
   def rev_parse(rev); stub; end
   def blame(ref, path); stub; end
   def log(ref, path, limit); stub; end

data/test/dolt/view/object_test.rb

@@ -61,11 +61,23 @@ describe Dolt::View::Object do
     end
   end
 
-  it "returns blob icon type" do
-    assert_equal "icon-file", object_icon_class({ :type => :blob })
+  describe "#object_icon_class" do
+    it "returns blob icon type" do
+      assert_equal "icon-file", object_icon_class({ :type => :blob })
+    end
+
+    it "returns tree icon type" do
+      assert_equal "icon-folder-close", object_icon_class({ :type => :tree })
+    end
+
+    it "returns submodule icon type" do
+      assert_equal "icon-hdd", object_icon_class({ :type => :submodule })
+    end
   end
 
-  it "returns tree icon type" do
-    assert_equal "icon-folder-close", object_icon_class({ :type => :tree })
+  it "links submodule object to submodule" do
+    url = "git://gitorious.org/gitorious/ui3.git"
+    object = { :type => :submodule, :url => url }
+    assert_equal url, object_url("gitorious", "master", "vendor", object)
   end
 end

data/test/dolt/view/tree_test.rb

@@ -70,6 +70,18 @@ describe Dolt::View::Tree do
       assert_equal "version.rb", entries[7][:name]
       assert_equal "view.rb", entries[8][:name]
     end
+
+    it "lumps submodules in with directories" do
+      async = { :name => "async", :type => :tree }
+      disk_repo_resolver = { :type => :blob, :name => "disk_repo_resolver.rb" }
+      git = { :type => :submodule, :name => "git" }
+      tree = OpenStruct.new({ :entries => [async, disk_repo_resolver, git] })
+      entries = tree_entries(tree)
+
+      assert_equal :tree, entries[0][:type]
+      assert_equal :submodule, entries[1][:type]
+      assert_equal :blob, entries[2][:type]
+    end
   end
 
   describe "#partition_path" do

data/vendor/ui/js/components/tree-history.js

@@ -4,7 +4,23 @@ this.gts = this.gts || {};
 this.gts.treeHistory = (function (c, $) {
     var th = function (table, url) {
         var cell = $(table).find("tbody tr:first td")[2];
-        var spinner = new Spinner().spin(cell);
+        var spinner = new Spinner({
+            lines: 13,
+            length: 1,
+            width: 2,
+            radius: 6,
+            corners: 1,
+            rotate: 0,
+            color: "#000",
+            speed: 1,
+            trail: 60,
+            shadow: false,
+            hwaccel: true,
+            className: "spinner",
+            zIndex: 2e9,
+            top: "auto",
+            left: "auto"
+        }).spin(cell);
         $.ajax({
             url: url,
             success: function (tree) {

metadata

@@ -1,233 +1,317 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: dolt
-version: !ruby/object:Gem::Version
-  version: 0.4.2
+version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 3
+  version: 0.4.3
 platform: ruby
-authors:
+authors: 
 - Christian Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-10-04 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: eventmachine
-  requirement: &8310500 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *8310500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: thin
-  requirement: &8309280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
   type: :runtime
-  prerelease: false
-  version_requirements: *8309280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: sinatra
-  requirement: &8308460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :runtime
-  prerelease: false
-  version_requirements: *8308460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: async_sinatra
-  requirement: &8307760 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *8307760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: tilt
-  requirement: &8306920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :runtime
-  prerelease: false
-  version_requirements: *8306920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: pygments.rb
-  requirement: &8306100 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 2
+        version: "0.2"
   type: :runtime
-  prerelease: false
-  version_requirements: *8306100
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: em_pessimistic
-  requirement: &8730940 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
   type: :runtime
-  prerelease: false
-  version_requirements: *8730940
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: builder
-  requirement: &8729300 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
   type: :runtime
-  prerelease: false
-  version_requirements: *8729300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: em_rugged
-  requirement: &8728260 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 1
+        - 2
         version: 0.1.2
   type: :runtime
-  prerelease: false
-  version_requirements: *8728260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: tzinfo
-  requirement: &8727020 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 3
+        version: "0.3"
   type: :runtime
-  prerelease: false
-  version_requirements: *8727020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: github-markup
-  requirement: &8725820 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.7'
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
+        version: "0.7"
   type: :runtime
-  prerelease: false
-  version_requirements: *8725820
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: htmlentities
-  requirement: &8724700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.3'
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 4
+        - 3
+        version: "4.3"
   type: :runtime
-  prerelease: false
-  version_requirements: *8724700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &8723460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.7'
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 7
+        version: "1.7"
   type: :runtime
-  prerelease: false
-  version_requirements: *8723460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
   name: mime-types
-  requirement: &8718680 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.19'
+      - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 1
+        - 19
+        version: "1.19"
   type: :runtime
-  prerelease: false
-  version_requirements: *8718680
-- !ruby/object:Gem::Dependency
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: &8717000 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :development
-  prerelease: false
-  version_requirements: *8717000
-- !ruby/object:Gem::Dependency
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
   name: em-minitest-spec
-  requirement: &8715020 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
   type: :development
-  prerelease: false
-  version_requirements: *8715020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &8713460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
   type: :development
-  prerelease: false
-  version_requirements: *8713460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &8711900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *8711900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
   name: redcarpet
-  requirement: &8707280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *8707280
+  version_requirements: *id019
 description: Dolt serves git trees and syntax highlighted blobs
-email:
+email: 
 - christian@gitorious.org
-executables:
+executables: 
 - dolt
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - ./.gitmodules
 - ./Gemfile
 - ./Gemfile.lock
@@ -240,6 +324,8 @@ files:
 - ./lib/dolt/git/blame.rb
 - ./lib/dolt/git/commit.rb
 - ./lib/dolt/git/repository.rb
+- ./lib/dolt/git/submodule.rb
+- ./lib/dolt/git/tree.rb
 - ./lib/dolt/repo_actions.rb
 - ./lib/dolt/sinatra/actions.rb
 - ./lib/dolt/sinatra/base.rb
@@ -329,28 +415,39 @@ files:
 - vendor/ui/test/tree-history-test.js
 - vendor/ui/test/url-template-test.js
 - bin/dolt
+has_rdoc: true
 homepage: http://gitorious.org/gitorious/dolt
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: dolt
-rubygems_version: 1.8.11
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Dolt serves git trees and syntax highlighted blobs
 test_files: []
+