dolt 0.7.0 → 0.7.1

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    dolt (0.6.2)
-      async_sinatra (~> 1)
-      json (~> 1)
-      libdolt (~> 0)
-      sinatra (~> 1)
+    dolt (0.7.1)
+      async_sinatra (~> 1.0)
+      json (~> 1.5)
+      libdolt (~> 0.8)
+      sinatra (~> 1.0)
       thin (~> 1.4)
-      tiltout (~> 1)
+      tiltout (~> 1.1)
 
 GEM
   remote: http://rubygems.org/
@@ -20,30 +20,31 @@ GEM
       eventmachine
     em_pessimistic (0.1.2)
       eventmachine (~> 1.0)
-    em_rugged (0.1.3)
+    em_rugged (0.3.0)
       eventmachine (~> 1.0)
       rugged (= 0.17.0.b6)
     eventmachine (1.0.0)
     github-markup (0.7.4)
     htmlentities (4.3.1)
     json (1.7.5)
-    libdolt (0.6.0)
+    libdolt (0.10.0)
       em_pessimistic (~> 0.1)
-      em_rugged (~> 0.1.2)
+      em_rugged (~> 0.3)
       eventmachine (~> 1.0)
       htmlentities (~> 4.3)
       json (~> 1.7)
-      makeup (~> 0)
+      makeup (~> 0.2)
       mime-types (~> 1.19)
       tzinfo (~> 0.3)
-    makeup (0.1.1)
+      when (~> 0)
+    makeup (0.2.0)
       github-markup (~> 0.7)
       htmlentities (~> 4.3)
       pygments.rb (~> 0.2)
     metaclass (0.0.1)
     mime-types (1.19)
     minitest (2.12.1)
-    mocha (0.12.6)
+    mocha (0.12.7)
       metaclass (~> 0.0.1)
     posix-spawn (0.3.6)
     pygments.rb (0.3.1)
@@ -63,9 +64,10 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     tilt (1.3.3)
-    tiltout (1.0.0)
+    tiltout (1.2.0)
       tilt (~> 1.3)
     tzinfo (0.3.33)
+    when (0.1.0)
     yajl-ruby (1.1.0)
 
 PLATFORMS

data/dolt.gemspec

@@ -11,7 +11,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = "dolt"
-  s.version     = "0.7.0"
+  s.version     = "0.7.1"
   s.authors     = ["Christian Johansen"]
   s.email       = ["christian@gitorious.org"]
   s.homepage    = "http://gitorious.org/gitorious/dolt"

data/vendor/ui/.gitmodules

@@ -13,3 +13,6 @@
 [submodule "lib/spin.js"]
         path = lib/spin.js
         url = https://github.com/fgnass/spin.js.git
+[submodule "lib/showdown"]
+	path = lib/showdown
+	url = https://github.com/coreyti/showdown.git

data/vendor/ui/css/gitorious.css

@@ -332,7 +332,7 @@ input[type=url].gts-current-repo-url {
     border-color: #222;
 }
 
-.gts-com-plug {
+.gts-footer-blurb {
     border-top: 1px solid #f5f5f5;
     margin-top: 12px;
     padding-top: 12px;
@@ -533,8 +533,9 @@ input[type=url].gts-current-repo-url {
     width: auto;
 }
 
-.gts-mr-status,
-.gts-mr-age {
+.gts-item-author,
+.gts-item-status,
+.gts-item-age {
     white-space: nowrap;
 }
 

data/vendor/ui/js/components/ref-selector.js

@@ -8,26 +8,37 @@ this.gts.refSelector = (function () {
         return (template || "#{ref}").replace(/#\{ref\}/g, ref);
     }
 
-    function isType(type, refName, refs) {
-        return cull.some(function (ref) {
-            return ref === refName;
-        }, refs[type] || []);
+    function getCurrent(type, refName, refs) {
+        return cull.select(function (ref) {
+            return ref[0] === refName || ref[1] === refName;
+        }, refs[type] || [])[0];
     }
 
     function currentRefLink(refs, current) {
-        var type = isType("heads", current, refs) ? "branch" :
-                (isType("tags", current, refs) ? "tag" : "ref");
+        var currentRef = getCurrent("heads", current, refs);
+        var type = "branch";
+
+        if (!currentRef) {
+            currentRef = getCurrent("tags", current, refs);
+            type = "tag";
+        }
+
+        if (!currentRef) {
+            type = "ref";
+        }
+
         return e.a({
             href: "#",
             className: "dropdown-toggle",
             innerHTML: "<span class=\"caret\"></span> <em>" +
-                type + ":</em> " + current
+                type + ":</em> " + (currentRef && currentRef[0] || current)
         });
     }
 
     function refInput(url) {
         var input = e.input({ type: "text", className: "gts-ref-input" });
         var form = e.form({
+            className: "gts-ref-input",
             events: {
                 submit: function (e) {
                     e.preventDefault();
@@ -43,10 +54,11 @@ this.gts.refSelector = (function () {
     }
 
     function refItems(label, refs, urlTemplate) {
+        var initial = [e.li({ className: "dropdown-label" }, [e.strong(label)])];
         return cull.reduce(function (elements, ref) {
-            elements.push(e.li(e.a({ href: tpl(urlTemplate, ref) }, ref)));
+            elements.push(e.li(e.a({ href: tpl(urlTemplate, ref[1]) }, ref[0])));
             return elements;
-        }, [e.li({ className: "dropdown-label" }, [e.strong(label)])], refs);
+        }, initial, refs.sort());
     }
 
     function refsList(refs, urlTemplate) {

data/vendor/ui/js/components/url.js

@@ -20,7 +20,7 @@ this.gts.url = (function () {
     }
 
     function currentRef(url) {
-        var refPath = url.split(/(blame|blob|tree|history|raw)\//)[2];
+        var refPath = url.split(/(blame|blob|tree|history|raw|source|readme)\//)[2];
         return refPath && refPath.split(":")[0] || null;
     }
 

data/vendor/ui/js/gitorious.js

@@ -2,14 +2,14 @@
 //     this.select();
 // });
 
-// $(".gts-repo-url").click(function (e) {
-//     e.preventDefault();
-//     var btn = $(this);
-//     var parent  = btn.parent();
-//     parent.find(".gts-repo-url").removeClass("active");
-//     btn.addClass("active");
-//     parent.find(".gts-current-repo-url").val(btn.attr("href")).focus();
-// });
+$(".gts-repo-url").click(function (e) {
+    e.preventDefault();
+    var btn = $(this);
+    var parent  = btn.parent();
+    parent.find(".gts-repo-url").removeClass("active");
+    btn.addClass("active");
+    parent.find(".gts-current-repo-url").val(btn.attr("href")).focus();
+});
 
 // $(".linenums li").mouseenter(function () {
 //     $(this).addClass("focus");
@@ -31,47 +31,47 @@
 //     }
 // }());
 
-// jQuery("[rel=tooltip]").tooltip();
+jQuery("[rel=tooltip]").tooltip();
 
-// jQuery("[data-preview-target]").each(function () {
-//     var textarea = this;
-//     var target = document.getElementById(this.getAttribute("data-preview-target"));
-//     if (!target || !Showdown) { return; }
-//     var converter = new Showdown.converter();
-//     var previous, content;
+jQuery("[data-preview-target]").each(function () {
+    var textarea = this;
+    var target = document.getElementById(this.getAttribute("data-preview-target"));
+    if (!target || !Showdown) { return; }
+    var converter = new Showdown.converter();
+    var previous, content;
 
-//     var cageSeed = new Date().getTime();
+    var cageSeed = new Date().getTime();
 
-//     function zeroPad(num) {
-//         return num < 10 ? "0" + num : num;
-//     }
+    function zeroPad(num) {
+        return num < 10 ? "0" + num : num;
+    }
 
-//     function signature() {
-//         var now = new Date();
-//         return "<p>" +
-//             "<img width=\"24\" height=\"24\" class=\"gts-avatar\" alt=\"avatar\" src=\"http://cageme.herokuapp.com/24/24?" +
-//             cageSeed + "\">" +
-//             "<a href=\"/~zmalltalker\">Marius Mathiesen</a>" +
-//             zeroPad(now.getHours()) + ":" + zeroPad(now.getMinutes()) +
-//             ". <a href=\"#\">Edit comment</a></p>";
-//     }
+    function signature() {
+        var now = new Date();
+        return "<p>" +
+            "<img width=\"24\" height=\"24\" class=\"gts-avatar\" alt=\"avatar\" src=\"http://cageme.herokuapp.com/24/24?" +
+            cageSeed + "\">" +
+            "<a href=\"/~zmalltalker\">Marius Mathiesen</a>" +
+            zeroPad(now.getHours()) + ":" + zeroPad(now.getMinutes()) +
+            ". <a href=\"#\">Edit comment</a></p>";
+    }
 
-//     function setPreview(preview) {
-//         target.style.display = preview ? "block" : "none";
-//         target.getElementsByTagName("div")[0].innerHTML = preview;
-//     }
+    function setPreview(preview) {
+        target.style.display = preview ? "block" : "none";
+        target.getElementsByTagName("div")[0].innerHTML = preview;
+    }
 
-//     function updatePreview() {
-//         content = textarea.value;
-//         if (content !== previous) {
-//             previous = content;
-//             setPreview(converter.makeHtml(content));
-//         }
-//         setTimeout(updatePreview, 20);
-//     }
+    function updatePreview() {
+        content = textarea.value;
+        if (content !== previous) {
+            previous = content;
+            setPreview(converter.makeHtml(content));
+        }
+        setTimeout(updatePreview, 20);
+    }
 
-//     updatePreview();
-// });
+    updatePreview();
+});
 
 // Lest ye forget
 /*
@@ -123,7 +123,7 @@ gts.run = function (env) {
     var ref = gts.url.currentRef(window.location.href);
 
     gts.run({
-        repository: "",
+        repository: gts.repository || "",
         ref: ref,
         refUrlTemplate: gts.url.templatize(window.location.href, { ref: ref })
     });

data/vendor/ui/test/ref-selector-test.js

@@ -7,8 +7,23 @@ buster.testCase("Ref selector", {
         assert.className(element, "gts-branch-selector");
     },
 
-    "includes link to current branch": function () {
-        var element = gts.refSelector({ heads: ["master"] }, "master");
+    "includes link to current branch by ref": function () {
+        var element = gts.refSelector({
+            heads: [["master", "0123456"]]
+        }, "0123456");
+        var a = element.firstChild;
+
+        assert.tagName(a, "a");
+        assert.className(a, "dropdown-toggle");
+        assert.match(a.innerHTML, "caret");
+        assert.match(a.innerHTML, "branch:");
+        assert.match(a.innerHTML, "master");
+    },
+
+    "includes link to current branch by name": function () {
+        var element = gts.refSelector({
+            heads: [["master", "0123456"]]
+        }, "master");
         var a = element.firstChild;
 
         assert.tagName(a, "a");
@@ -19,13 +34,17 @@ buster.testCase("Ref selector", {
     },
 
     "includes link to current tag": function () {
-        var element = gts.refSelector({ tags: ["v2.1.0"] }, "v2.1.0");
+        var element = gts.refSelector({
+            tags: [["v2.1.0", "1234567"]]
+        }, "1234567");
 
         assert.match(element.firstChild.innerHTML, "tag:");
     },
 
     "includes link to current ref": function () {
-        var element = gts.refSelector({ tags: ["v2.1.0"] }, "aabbcc4");
+        var element = gts.refSelector({
+            tags: [["v2.1.0", "1234567"]]
+        }, "aabbcc4");
 
         assert.match(element.firstChild.innerHTML, "ref:");
     },
@@ -46,9 +65,9 @@ buster.testCase("Ref selector", {
 
     "links all heads": function () {
         var element = gts.refSelector({
-            heads: ["libgit2", "master"],
-            tags: ["v2.1.0", "v2.1.1"]
-        }, "master");
+            heads: [["libgit2", "1234567"], ["master", "2345678"]],
+            tags: [["v2.1.0", "34565789"], ["v2.1.1", "45657890"]]
+        }, "2345678");
 
         var list = element.childNodes[1];
         assert.className(list.childNodes[1], "dropdown-label");
@@ -60,8 +79,8 @@ buster.testCase("Ref selector", {
     "links all tags": function () {
         var element = gts.refSelector({
             heads: ["libgit2", "master"],
-            tags: ["v2.1.0", "v2.1.1"]
-        }, "master");
+            tags: [["v2.1.0", "1234567"], ["v2.1.1", "2345678"]]
+        }, "2345678");
 
         var list = element.childNodes[1];
         assert.className(list.childNodes[4], "dropdown-label");
@@ -70,11 +89,32 @@ buster.testCase("Ref selector", {
         assert.match(list.childNodes[6].innerHTML, "v2.1.1");
     },
 
+    "sorts refs alpha-numerically": function () {
+        var element = gts.refSelector({
+            "heads": [["feature-B", "1234567"],
+                      ["master", "2345678"],
+                      ["feature-A", "3456789"]],
+            "tags": [["0.7.0", "4567890"],
+                     ["0.7.1", "5678901"],
+                     ["1.3.1", "6789012"],
+                     ["1.0.0", "7890123"]]
+        });
+
+        var list = element.childNodes[1];
+        assert.match(list.childNodes[2].innerHTML, "feature-A");
+        assert.match(list.childNodes[3].innerHTML, "feature-B");
+        assert.match(list.childNodes[4].innerHTML, "master");
+        assert.match(list.childNodes[6].innerHTML, "0.7.0");
+        assert.match(list.childNodes[7].innerHTML, "0.7.1");
+        assert.match(list.childNodes[8].innerHTML, "1.0.0");
+        assert.match(list.childNodes[9].innerHTML, "1.3.1");
+    },
+
     "does not propagate clicks on input": function () {
         var element = gts.refSelector({
-            heads: ["libgit2", "master"],
-            tags: ["v2.1.0", "v2.1.1"]
-        }, "master");
+            heads: [["libgit2", "1234567"], ["master", "2345678"]],
+            tags: [["v2.1.0", "34565789"], ["v2.1.1", "45657890"]]
+        }, "2345678");
 
         var event = jQuery.Event("click");
         event.stopPropagation = this.spy();
@@ -85,11 +125,12 @@ buster.testCase("Ref selector", {
 
     "uses URL template to generate links": function () {
         var element = gts.refSelector({
-            heads: ["libgit2", "master"],
-            tags: ["v2.1.0", "v2.1.1"]
-        }, "master", "/dolt/#{ref}:");
+            heads: [["libgit2", "1234567"], ["master", "2345678"]],
+            tags: [["v2.1.0", "34565789"], ["v2.1.1", "45657890"]]
+        }, "2345678", "/dolt/#{ref}:");
 
         var list = element.childNodes[1];
-        assert.match(list.childNodes[2].firstChild.href, "/dolt/libgit2:");
+        assert.match(list.childNodes[2].firstChild.href, "/dolt/1234567:");
+        assert.equals(list.childNodes[2].firstChild.innerHTML, "libgit2");
     }
 });

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dolt
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Christian Johansen
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-12 00:00:00 +02:00
-default_executable: 
+date: 2012-10-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libdolt
@@ -218,7 +217,6 @@ 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: []
 
@@ -248,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dolt
-rubygems_version: 1.4.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Dolt serves git trees and syntax highlighted blobs