libdolt 0.20.0 → 0.21.0

data/.travis.yml

@@ -1,11 +1,8 @@
 language: ruby
 rvm:
   - 1.9.3
-  - jruby-18mode
-  - jruby-19mode
   - rbx-18mode
   - rbx-19mode
   - ruby-head
-  - jruby-head
   - 1.8.7
   - ree

data/Gemfile.lock

@@ -45,5 +45,5 @@ DEPENDENCIES
   minitest (~> 2.0)
   mocha
   rake (~> 0.9)
-  redcarpet (= 2.2.0)
+  redcarpet (~> 2.2)
   tiltout (~> 1.4)

data/lib/libdolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.20.0"
+  VERSION = "0.21.0"
 end

data/libdolt.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "minitest", "~> 2.0"
   s.add_development_dependency "rake", "~> 0.9"
-  s.add_development_dependency "redcarpet", "2.2.0"
+  s.add_development_dependency "redcarpet", "~> 2.2"
   s.add_development_dependency "tiltout", "~>1.4"
   s.add_development_dependency "mocha"
 

data/test/fixtures/dolt-test-repo.git/objects/60/eebb9021a6ce7d582c2f2d4aa5bfb3672150ae

@@ -0,0 +1,2 @@
+x
��AJ�0�a�9����$}	<Dq�-&�	��D�����	�~��_Ǿo|H�0M��	5�%`S� ��54	���x��ܗ�'4�-���F����e���ZF	�N�����c;�&��*��w����ŧ>���F�S������N�gƽ�
+�U�Q�Os߄P�

data/test/fixtures/dolt-test-repo.git/objects/e8/d33ae69b8c4d3df1e8fad4733d69720b176849

@@ -0,0 +1 @@
+x
���J1�a�}��$MMg�&x�

data/test/fixtures/dolt-test-repo.git/refs/heads/master

@@ -1 +1 @@
-fc5f5fb50b435e183925b341909610aace90a413
+e8d33ae69b8c4d3df1e8fad4733d69720b176849

data/test/libdolt/git/repository_test.rb

@@ -22,31 +22,31 @@ require "ostruct"
 require "mocha/setup"
 
 describe Dolt::Git::Repository do
-  before { @repository = Dolt::Git::Repository.new(".") }
+  before { @repository = Dolt::Git::Repository.new(Dolt.fixture_repo_path) }
 
   describe "#submodules" do
     it "returns list of submodules" do
-      submodules = @repository.submodules("c1f6cd9")
+      submodules = @repository.submodules("60eebb9")
       url = "git://gitorious.org/gitorious/ui3.git"
 
       assert_equal [{ :path => "vendor/ui", :url => url }], submodules
     end
 
     it "returns empty array if no submodules" do
-      submodules = @repository.submodules("26139a3")
+      submodules = @repository.submodules("fc5f5fb")
       assert_equal [], submodules
     end
   end
 
   describe "#tree" do
     it "includes submodule data for trees" do
-      tree = @repository.tree("3dc532f", "vendor")
+      tree = @repository.tree("60eebb9", "vendor")
 
       assert_equal({
           :type => :submodule,
           :filemode => 57344,
           :name => "ui",
-          :oid => "d167e3e1c17a27e4cf459dd380670801b0659659",
+          :oid => "77c88454e83e59772e9bf460ef22251cc9d63f9f",
           :url => "git://gitorious.org/gitorious/ui3.git"
         }, tree.entries.first)
     end
@@ -54,82 +54,89 @@ describe Dolt::Git::Repository do
 
   describe "#tree_entry" do
     it "includes submodule data for trees" do
-      tree = @repository.tree_entry("3dc532f", "vendor")
+      tree = @repository.tree_entry("60eebb9", "vendor")
 
       assert_equal({
           :type => :submodule,
           :filemode => 57344,
           :name => "ui",
-          :oid => "d167e3e1c17a27e4cf459dd380670801b0659659",
+          :oid => "77c88454e83e59772e9bf460ef22251cc9d63f9f",
           :url => "git://gitorious.org/gitorious/ui3.git"
         }, tree.entries.first)
     end
 
     it "returns blob" do
-      blob = @repository.tree_entry("3dc532f", "Gemfile")
+      blob = @repository.tree_entry("fc5f5fb", "README.org")
 
       assert blob.is_a?(Rugged::Blob)
-      assert_equal "source \"http://rubygems.org\"\n\ngemspec\n", blob.content
+      assert_equal "* This is a readme\n  It even has some text in it\n", blob.content
     end
   end
 
   describe "#blame" do
     it "returns blame" do
-      blame = @repository.blame("master", "Gemfile")
+      blame = @repository.blame("master", "README.org")
       assert Dolt::Git::Blame === blame
     end
 
     it "separates tree-like and path" do
-      cmd = "git --git-dir #{@repository.path} blame -l -t -p master -- Gemfile"
+      cmd = "git --git-dir #{@repository.path} blame -l -t -p master -- README.org"
       Dolt::Git.expects(:shell).with(cmd).returns(Dolt::FakeProcess.new(0))
-      @repository.blame("master", "Gemfile")
+      @repository.blame("master", "README.org")
     end
 
     it "does not allow injecting evil commands" do
-      cmd = "git --git-dir #{@repository.path} blame -l -t -p master -- Gemfile\\; rm -fr /tmp"
+      cmd = "git --git-dir #{@repository.path} blame -l -t -p master -- README.org\\; rm -fr /tmp"
       Dolt::Git.expects(:shell).with(cmd).returns(Dolt::FakeProcess.new(0))
-      @repository.blame("master", "Gemfile; rm -fr /tmp")
+      @repository.blame("master", "README.org; rm -fr /tmp")
     end
   end
 
   describe "#log" do
     it "returns commits" do
-      log = @repository.log("master", "dolt.gemspec", 2)
+      log = @repository.log("master", "README.org", 2)
       assert_equal 2, log.length
       assert Hash === log[0]
+
+      log = @repository.log("master", "README.org", 1)
+      assert_equal 1, log.length
     end
   end
 
   describe "#tree_history" do
     it "fails if path is not a tree" do
-      assert_raises Exception do |err|
-        tree = @repository.tree_history("master", "Gemfile")
+      begin
+        tree = @repository.tree_history("master", "README.org")
+        raise "Should've raised an Exception"
+      rescue Exception => err
         assert_match /not a tree/, err.message
       end
     end
 
     it "fails if path does not exist in ref" do
-      assert_raises Rugged::IndexerError do |err|
-        tree = @repository.tree_history("26139a3", "test")
+      begin
+        tree = @repository.tree_history("fc5f5fb", "test")
+        raise "Should've raised an Rugged::IndexerError"
+      rescue Rugged::IndexerError => err
         assert_match /does not exist/, err.message
       end
     end
 
     it "returns tree with history" do
-      log = @repository.tree_history("48ffbf7", "")
+      log = @repository.tree_history("e8d33ae", "")
 
-      assert_equal 11, log.length
+      assert_equal 4, log.length
       expected = {
         :type => :blob,
         :oid => "e90021f89616ddf86855d05337c188408d3b417e",
         :filemode => 33188,
         :name => ".gitmodules",
         :history => [{
-            :oid => "906d67b4f3e5de7364ba9b57d174d8998d53ced6",
+            :oid => "60eebb9021a6ce7d582c2f2d4aa5bfb3672150ae",
             :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"),
+            :summary => "Add submodule",
+            :date => Time.parse("Tue Jun 18 09:01:48 +0200 2013"),
             :message => ""
           }]
       }
@@ -138,19 +145,19 @@ describe Dolt::Git::Repository do
     end
 
     it "returns nested tree with history" do
-      log = @repository.tree_history("48ffbf7", "lib")
+      log = @repository.tree_history("e8d33ae", "lib")
 
       expected = [{
-          :type => :tree,
-          :oid => "58f84405b588699b24c619aa4cd83669c5623f88",
-          :filemode => 16384,
-          :name => "dolt",
+          :type => :blob,
+          :oid => "85026eda8302b98fa54cc24445a118028865a2e2",
+          :filemode => 33188,
+          :name => "foo.rb",
           :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"),
+              :oid => "fc5f5fb50b435e183925b341909610aace90a413",
+              :author => { :name => "Marius Mathiesen",
+                :email => "marius@gitorious.com" },
+              :summary => "Stuff and stuff",
+              :date => Time.parse("Tue Jun 11 13:10:31 +0200 2013"),
               :message => ""
             }]
         }]

data/test/libdolt/repo_actions_test.rb

@@ -25,8 +25,7 @@ class Resolver
   def initialize; @resolved = []; end
 
   def resolve(repo)
-    dot_git = File.dirname(__FILE__) + "/../fixtures/dolt-test-repo.git"
-    repository = Dolt::Git::Repository.new(dot_git)
+    repository = Dolt::Git::Repository.new(Dolt.fixture_repo_path)
     @resolved << repository
     repository
   end

data/test/test_helper.rb

@@ -23,7 +23,14 @@ require "stringio"
 
 Bundler.require(:default, :test)
 
+# Ensure consistent timing
+ENV["TZ"] = "UTC-2"
+
 module Dolt
+  def self.fixture_repo_path
+    File.join(File.dirname(__FILE__), "fixtures/dolt-test-repo.git")
+  end
+
   module Html
     def select(html, tag_name)
       html.scan(/<#{tag_name}[^>]*>.*?<\/#{tag_name}>/m)

data/views/404.erb

@@ -19,6 +19,12 @@
 %>
 <div class="container gts-body">
   <h1><%= @title = "No such path" %></h1>
-  <h2><%= CGI::escapeElement(error.respond_to?(:message) ? error.message : error).gsub(/</, "&lt;") %></h2>
-  <p><a href="<%= tree_url(repository_slug, ref, "") %>">Go back</a></p>
+  <% if defined?(error) && !error.nil? %>
+    <h2><%= CGI::escapeElement(error.respond_to?(:message) ? error.message : error).gsub(/</, "&lt;") %></h2>
+  <% end %>
+  <% if defined?(repository_slug) %>
+    <p><a href="<%= tree_url(repository_slug, ref, "") %>">Go back</a></p>
+  <% else %>
+    <p><a href="/">Go back</a></p>
+  <% end %>
 </div>

data/views/blob.erb

@@ -28,6 +28,6 @@
       <li><a href="<%= raw_url(repository_slug, ref, path) %>">Raw blob</a></li>
     </ul>
     <%= breadcrumb(repository_slug, ref, path) %>
-    <%= format_blob(path, blob.text(nil, Encoding.default_external), repository_slug, ref) %>
+    <%= format_blob(path, blob.text(nil, defined?(Encoding) ? Encoding.default_external : nil), repository_slug, ref) %>
   </div>
 </div>

data/views/tree.erb

@@ -54,7 +54,7 @@
     <div class="gts-page-header">
       <h2><%= readme[:path] %></h2>
     </div>
-    <%= format_blob(readme[:path], readme[:blob].text(nil, Encoding.default_external), repository_slug, ref) %>
+    <%= format_blob(readme[:path], readme[:blob].text(nil, defined?(Encoding) ? Encoding.default_external : nil), repository_slug, ref) %>
   </div>
   <% end %>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libdolt
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -144,17 +144,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: tiltout
   requirement: !ruby/object:Gem::Requirement
@@ -234,10 +234,17 @@ files:
 - test/fixtures/dolt-test-repo.git/config
 - test/fixtures/dolt-test-repo.git/description
 - test/fixtures/dolt-test-repo.git/info/exclude
+- test/fixtures/dolt-test-repo.git/objects/12/67a0fbd3ec606c20f3f1dca1f53bb9505ba9b5
 - test/fixtures/dolt-test-repo.git/objects/26/4c348a80906538018616fa16fc35d04bdf38b0
+- test/fixtures/dolt-test-repo.git/objects/60/eebb9021a6ce7d582c2f2d4aa5bfb3672150ae
 - test/fixtures/dolt-test-repo.git/objects/85/026eda8302b98fa54cc24445a118028865a2e2
 - test/fixtures/dolt-test-repo.git/objects/89/cd7e9d4564928de6b803b36c6e3d081c8d9ca1
 - test/fixtures/dolt-test-repo.git/objects/b4/0c249db94476cac7fa91a9d6491c0faf21ec21
+- test/fixtures/dolt-test-repo.git/objects/c0/35ba24bb3bed31589bc6736ca9b116175eb723
+- test/fixtures/dolt-test-repo.git/objects/c8/cc83f1a1fc3640fce14ab73d4fa4b22b6211d8
+- test/fixtures/dolt-test-repo.git/objects/de/dbf2faa4f522716ab727e4325a3d75772e137b
+- test/fixtures/dolt-test-repo.git/objects/e8/d33ae69b8c4d3df1e8fad4733d69720b176849
+- test/fixtures/dolt-test-repo.git/objects/e9/0021f89616ddf86855d05337c188408d3b417e
 - test/fixtures/dolt-test-repo.git/objects/fc/5f5fb50b435e183925b341909610aace90a413
 - test/fixtures/dolt-test-repo.git/refs/heads/master
 - test/fixtures/dolt-test-repo.git/refs/tags/testable-tag