libdolt 0.7.0 → 0.8.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    libdolt (0.6.2)
+    libdolt (0.8.0)
       em_pessimistic (~> 0.1)
       em_rugged (~> 0.1.2)
       eventmachine (~> 1.0)

data/lib/libdolt/git/repository.rb

@@ -59,7 +59,7 @@ module Dolt
       end
 
       def blame(ref, path)
-        deferred_method("blame -l -t -p #{ref} #{path}") do |output, s|
+        deferred_method("blame -l -t -p #{ref} -- #{path}") do |output, s|
           Dolt::Git::Blame.parse_porcelain(output)
         end
       end
@@ -148,7 +148,7 @@ module Dolt
       end
 
       def git(cmd)
-        "git --git-dir #{subject.path} #{cmd}"
+        "git --git-dir #{path} #{cmd}"
       end
     end
   end

data/lib/libdolt/repo_actions.rb

@@ -60,7 +60,7 @@ module Dolt
       d.callback do |refs|
         names = refs.map(&:name)
         block.call(nil, {
-                     :repository => repo,
+                     :repository_slug => repo,
                      :tags => stripped_ref_names(names, :tags),
                      :heads => stripped_ref_names(names, :heads)
                    })
@@ -90,7 +90,7 @@ module Dolt
 
     def tpl_data(repo, ref, path, locals = {})
       {
-        :repository => repo,
+        :repository_slug => repo,
         :path => path,
         :ref => ref
       }.merge(locals)

data/lib/libdolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/test/libdolt/git/repository_test.rb

@@ -103,6 +103,14 @@ describe Dolt::Git::Repository do
       end
       wait!
     end
+
+    it "separates tree-like and path" do
+      def @repository.git(cmd); @cmd = cmd; end
+      def @repository.cmd; @cmd; end
+      @repository.blame("master", "Gemfile").callback
+
+      assert_equal "blame -l -t -p master -- Gemfile", @repository.cmd
+    end
   end
 
   describe "#log" do

data/test/libdolt/repo_actions_test.rb

@@ -78,7 +78,7 @@ describe Dolt::RepoActions do
 
       assert_equal({
                      :blob => "Blob",
-                     :repository => "gitorious",
+                     :repository_slug => "gitorious",
                      :ref =>  "babd120",
                      :path => "app"
                    }, data)
@@ -103,7 +103,7 @@ describe Dolt::RepoActions do
 
       expected = {
         :tree => "Tree",
-        :repository => "gitorious",
+        :repository_slug => "gitorious",
         :ref =>  "babd120",
         :path => "app"
       }
@@ -120,7 +120,7 @@ describe Dolt::RepoActions do
 
       expected = {
         :tree => "Tree",
-        :repository => "gitorious",
+        :repository_slug => "gitorious",
         :ref =>  "babd120",
         :path => "",
         :type => :tree
@@ -137,7 +137,7 @@ describe Dolt::RepoActions do
 
       expected = {
         :blob => blob,
-        :repository => "gitorious",
+        :repository_slug => "gitorious",
         :ref =>  "babd120",
         :path => "Gemfile",
         :type => :blob
@@ -164,7 +164,7 @@ describe Dolt::RepoActions do
 
       expected = {
         :blame => "Blame",
-        :repository => "gitorious",
+        :repository_slug => "gitorious",
         :ref =>  "babd120",
         :path => "app"
       }
@@ -190,7 +190,7 @@ describe Dolt::RepoActions do
 
       expected = {
         :commits => "History",
-        :repository => "gitorious",
+        :repository_slug => "gitorious",
         :ref =>  "babd120",
         :path => "app"
       }
@@ -216,7 +216,7 @@ describe Dolt::RepoActions do
       repo.resolve_promise(@refs)
 
       expected = {
-        :repository => "gitorious",
+        :repository_slug => "gitorious",
         :heads => ["libgit2", "master"],
         :tags => ["v0.2.1", "v0.2.0"]
       }
@@ -263,7 +263,7 @@ describe Dolt::RepoActions do
       repo.resolve_promise(@tree)
 
       expected = {
-        :repository => "gitorious",
+        :repository_slug => "gitorious",
         :ref => "master",
         :path => "",
         :tree => @tree

data/test/libdolt/templates/blame_test.rb

@@ -39,7 +39,7 @@ describe "blame template" do
     renderer = prepare_renderer(options)
     renderer.render(:blame, {
                       :blame => blame,
-                      :repository => @repo,
+                      :repository_slug => @repo,
                       :ref => options[:ref] || "master",
                       :path => path
                     })

data/test/libdolt/templates/blob_test.rb

@@ -34,7 +34,7 @@ describe "blob template" do
     renderer = prepare_renderer(options, helpers)
     renderer.render(:blob, {
                       :blob => blob,
-                      :repository => @repo,
+                      :repository_slug => @repo,
                       :ref => options[:ref] || "master",
                       :path => path
                     })

data/test/libdolt/templates/commits_test.rb

@@ -43,7 +43,7 @@ describe "commits template" do
     renderer = prepare_renderer(options)
     renderer.render(:commits, {
                       :commits => commits,
-                      :repository => @repo,
+                      :repository_slug => @repo,
                       :ref => options[:ref] || "master",
                       :path => path
                     })

data/test/libdolt/templates/tree_history_test.rb

@@ -83,7 +83,7 @@ describe "tree_history template" do
   end
 
   it "renders JSON" do
-    data = { "tree" => @tree, "repository" => @repo, "ref" => "master", "path" => "" }
+    data = { "tree" => @tree, "repository_slug" => @repo, "ref" => "master", "path" => "" }
     json = @renderer.render(:tree_history, data)
 
     assert_equal @tree_array, JSON.parse(json)

data/test/libdolt/templates/tree_test.rb

@@ -34,7 +34,7 @@ describe "tree template" do
     renderer = prepare_renderer(options)
     renderer.render(:tree, {
                       :tree => tree,
-                      :repository => @repo,
+                      :repository_slug => @repo,
                       :ref => options[:ref] || "master",
                       :path => path
                     })

data/views/500.erb

@@ -19,4 +19,4 @@
 %>
 <h1><%= @title = "An error occurred" %></h1>
 <h2><%= error.respond_to?(:message) ? error.message : error %></h2>
-<p><a href="<%= tree_url(repository, ref, "") %>">Go back</a></p>
+<p><a href="<%= tree_url(repository_slug, ref, "") %>">Go back</a></p>

data/views/blame.erb

@@ -17,17 +17,17 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 %>
-<% @title = "Blame #{path} in #{repository}:master" %>
+<% @title = "Blame #{path} in #{repository_slug}:master" %>
 
 <div class="gts-file gts-browser">
   <div id="gts-ref-selector-ph"></div>
   <ul class="pull-right gts-blob-view">
-    <li><a href="<%= blob_url(repository, ref, path) %>">Blob content</a></li>
+    <li><a href="<%= blob_url(repository_slug, ref, path) %>">Blob content</a></li>
     <li class="active">Blame</li>
-    <li><a href="<%= history_url(repository, ref, path) %>">History</a></li>
-    <li><a href="<%= raw_url(repository, ref, path) %>">Raw blob</a></li>
+    <li><a href="<%= history_url(repository_slug, ref, path) %>">History</a></li>
+    <li><a href="<%= raw_url(repository_slug, ref, path) %>">Raw blob</a></li>
   </ul>
-  <%= breadcrumb(repository, ref, path) %>
+  <%= breadcrumb(repository_slug, ref, path) %>
   <table class="gts-code-listing">
     <% annotations = blame_annotations(blame) %>
     <% lines = blame_lines(path, blame) %>

data/views/blob.erb

@@ -17,15 +17,15 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #++
 %>
-<% @title = "#{path} in #{repository}:master" %>
+<% @title = "#{path} in #{repository_slug}:master" %>
 <div class="gts-file gts-browser">
   <div id="gts-ref-selector-ph"></div>
   <ul class="pull-right gts-blob-view">
     <li class="active">Blob content</li>
-    <li><a href="<%= blame_url(repository, ref, path) %>">Blame</a></li>
-    <li><a href="<%= history_url(repository, ref, path) %>">History</a></li>
-    <li><a href="<%= raw_url(repository, ref, path) %>">Raw blob</a></li>
+    <li><a href="<%= blame_url(repository_slug, ref, path) %>">Blame</a></li>
+    <li><a href="<%= history_url(repository_slug, ref, path) %>">History</a></li>
+    <li><a href="<%= raw_url(repository_slug, ref, path) %>">Raw blob</a></li>
   </ul>
-  <%= breadcrumb(repository, ref, path) %>
-  <%= format_blob(path, blob.content, repository, ref) %>
+  <%= breadcrumb(repository_slug, ref, path) %>
+  <%= format_blob(path, blob.content, repository_slug, ref) %>
 </div>

data/views/commits.erb

@@ -2,12 +2,12 @@
 <div class="gts-browser">
   <div id="gts-ref-selector-ph"></div>
   <ul class="pull-right gts-blob-view">
-    <li><a href="<%= blob_url(repository, ref, path) %>">Blob content</a></li>
-    <li><a href="<%= blame_url(repository, ref, path) %>">Blame</a></li>
+    <li><a href="<%= blob_url(repository_slug, ref, path) %>">Blob content</a></li>
+    <li><a href="<%= blame_url(repository_slug, ref, path) %>">Blame</a></li>
     <li class="active">History</li>
-    <li><a href="<%= raw_url(repository, ref, path) %>">Raw blob</a></li>
+    <li><a href="<%= raw_url(repository_slug, ref, path) %>">Raw blob</a></li>
   </ul>
-  <%= breadcrumb(repository, ref, path) %>
+  <%= breadcrumb(repository_slug, ref, path) %>
   <% commits.each do |commit| %>
     <div class="gts-commit">
       <p class="gts-log-message">

data/views/tree.erb

@@ -22,7 +22,7 @@
 levels = accumulate_path(partition_path(path, respond_to?(:maxdepth) ? maxdepth : nil))
 %>
 <div id="gts-ref-selector-ph"></div>
-<table class="table table-striped gts-tree-explorer" data-gts-tree-history="<%= tree_history_url(repository, ref, path) %>">
+<table class="table table-striped gts-tree-explorer" data-gts-tree-history="<%= tree_history_url(repository_slug, ref, path) %>">
   <thead>
     <tr>
       <th colspan="<%= tree_table_padding_width(levels) + 1 %>">File</th>
@@ -31,12 +31,12 @@ levels = accumulate_path(partition_path(path, respond_to?(:maxdepth) ? maxdepth
     </tr>
   </thead>
   <tbody>
-    <%= tree_context(repository, ref, levels) %>
+    <%= tree_context(repository_slug, ref, levels) %>
     <% tree_entries(tree).each do |object| %>
       <tr>
         <%= tree_table_padding_td(levels) %>
         <td class="gts-name">
-          <a href="<%= object_url(repository, ref, path, object) %>">
+          <a href="<%= object_url(repository_slug, ref, path, object) %>">
             <i class="icon <%= object_icon_class(object) %>"></i>
             <%= object[:name] %>
           </a>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libdolt
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Christian Johansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-10 00:00:00 +02:00
+date: 2012-10-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency