git-object-browser 0.0.6 → 0.0.7

data/htdocs/{templates → common/templates}/directory.html

@@ -8,8 +8,8 @@
 <th>mtime</th>
 </thead>
 <tbody>
-<tr data-ng-repeat="entry in object.entries">
-<td><i data-entry-icon="entry.type"></i> <a href="/#/{{$parent.path}}/{{entry.basename}}">{{entry.basename}}</a>
+<tr data-ng-repeat="entry in object.entries" data-ng-class="{error: diff[path + '/' + entry.basename]}">
+<td><i data-entry-icon="entry.type"></i> <a href="#{{basedir}}/{{path}}/{{entry.basename}}">{{entry.basename}}</a>
 </td>
 <td>
 {{entry.size}}

data/htdocs/common/templates/error.html

@@ -0,0 +1,6 @@
+<article>
+<h1>Error</h1>
+
+<p>status: {{status}}</p>
+<p>path: <a href="{{path}}">{{path}}</a></p>
+</article>

data/htdocs/{templates → common/templates}/index.html

@@ -30,7 +30,7 @@
 </thead>
 <tbody>
 <tr data-ng-repeat="entry in object.entries">
-<td><i class="icon-file"></i> <a href="#/.git/index?sha1={{entry.sha1}}">{{entry.path}}</a></td>
+<td><i class="icon-file"></i> <a href="#{{basedir}}/.git/index?sha1={{entry.sha1}}">{{entry.path}}</a></td>
 <td><a href="#" data-ref-href="entry">{{entry.sha1}}</a></td>
 </tr>
 </tbody>

data/htdocs/{templates → common/templates}/info_refs.html

@@ -18,10 +18,10 @@
 <i data-entry-icon="'commit'"></i> <a data-ref-href="entry.tag_sha1">{{entry.tag_sha1}}</a>
 </span>
 </td>
-<td><a href="#/.git/{{entry.ref}}">{{entry.ref}}</a></td>
+<td><a href="#{{basedir}}/.git/{{entry.ref}}">{{entry.ref}}</a></td>
 </tr>
 </tbody>
 </table>
 
-<a href="#/.git/packed-refs" data-ng-show="limited">Show All</a>
+<a href="#{{basedir}}/.git/packed-refs" data-ng-show="limited">Show All</a>
 </article>

data/htdocs/{templates → common/templates}/notfound.html

@@ -1,7 +1,6 @@
 <article>
 <h1>Not Found</h1>
 
-<p>.git/{{path}}</p>
-
+<p><a href="{{path}}">{{path}}</a></p>
 
 </article>

data/htdocs/{templates → common/templates}/object.html

@@ -26,7 +26,7 @@
     <tr data-ng-repeat="prop in object.properties">
       <th>{{prop.key}}</th>
       <td data-ng-switch="prop.type">
-        <span data-ng-switch-when="sha1"><a href="#/.git/{{prop.path}}">{{prop.value}}</a></span>
+        <span data-ng-switch-when="sha1"><a href="#{{basedir}}/.git/{{prop.path}}">{{prop.value}}</a></span>
         <span data-ng-switch-when="user">{{prop.value}} <small style="color:#aaa">{{prop.date}}</small></span>
         <span data-ng-switch-default>{{prop.value}}</span>
       </td>

data/htdocs/{templates → common/templates}/objects.html

@@ -1,14 +1,14 @@
 <h1><i class="icon-folder-open"></i> {{path}} <small>Directory</small></h1>
 
-<p><i class="icon-folder-open"></i> <a href="#/.git/objects/pack">pack</a></p>
+<p><i class="icon-folder-open"></i> <a href="#{{basedir}}/.git/objects/pack">pack</a></p>
 
 <table class="table table-bordered table-hover">
 <tbody>
 <tr data-ng-repeat="rows in objectTable">
-<td data-ng-repeat="cel in rows">
+<td data-ng-repeat="cel in rows" data-ng-style="{background: diff['.git/objects/' + cel.basename]}">
   <span data-ng-switch="cel.type">
     <span data-ng-switch-when="empty"><span style="color:#eee">{{cel.basename}}</span></span>
-    <span data-ng-switch-default><a href="/#/.git/objects/{{cel.basename}}">{{cel.basename}}</a></span>
+    <span data-ng-switch-default><a href="#{{basedir}}/.git/objects/{{cel.basename}}">{{cel.basename}}</a></span>
   </span>
 </td>
 </tr>

data/htdocs/{templates → common/templates}/pack_file.html

@@ -9,7 +9,7 @@
 <th>number of objects</th><td>{{object.object_number}}</a></td>
 </tr>
 <tr>
-<th>object entries</th><td><a href="#/{{indexUrl}}">see index</a></a></td>
+<th>object entries</th><td><a href="#{{basedir}}/{{indexUrl}}">see index</a></a></td>
 </tr>
 </table>
 </article>

data/htdocs/common/templates/pack_index.html

@@ -0,0 +1,39 @@
+<article  data-ng-controller="PackIndexCtrl" data-scroll-bottom="scrollBottom()">
+<h1 style="font-size:1.8em;"><i data-entry-icon="'index'"></i> {{path}} <small>Pack Index</small></h1>
+
+<table class="table table-striped">
+<thead>
+<tr>
+<th><a href="#{{basedir}}/{{path}}?order=sha1">#</a></th>
+<th>fanout</th>
+<th>sha1</th>
+<th>crc32</th>
+<th><a href="#{{basedir}}/{{path}}?order=offset">offset</a></th>
+<th>type</th>
+<th>size</th>
+</tr>
+</thead>
+<tbody>
+<tr data-ng-repeat="(i, entry) in object.entries">
+<td>{{entry.index}}</td>
+
+<td>
+<span data-ng-show="entry.fanout_max"><i class="icon-arrow-up"></i> {{entry.fanout_min}} - {{entry.fanout_max}}</span>
+<span data-ng-show="entry.fanout_min && ! entry.fanout_max"><i class="icon-arrow-up"></i> {{entry.fanout_min}}</span>
+</td>
+<td>{{entry.sha1}}</td>
+<td>{{entry.crc32}}</td>
+<td><a href="#{{basedir}}/{{packUrl}}?offset={{entry.offset}}">{{entry.offset}}</a></td>
+<td><i data-entry-icon="entry.type"></i> {{entry.type}}
+<span data-ng-show="entry.base_offset"><a href="#{{basedir}}/{{packUrl}}?offset={{entry.base_offset}}">{{entry.base_offset}}</a></span>
+<span data-ng-show="entry.base_sha1"><a data-ref-href="entry.base_sha1">{{entry.base_sha1.substr(0,6)}}</a></span>
+</td>
+<td>{{entry.size}}</td>
+</tr>
+</tbody>
+</table>
+
+<p data-ng-show="loading">Loading...</p>
+
+</article>
+

data/htdocs/{templates → common/templates}/packed_object.html

@@ -6,7 +6,7 @@
       <li class="active"><a href="#parsed" data-toggle="tab">Parsed</a></li>
       <li data-ng-show="object.object.content"><a href="#plain" data-toggle="tab">Plain</a></li>
       <li data-ng-show="object.delta_commands"><a href="#deltas" data-toggle="tab">Deltas</a></li>
-      <li><a href="#/{{path.replace('.pack', '.idx')}}"><i class="icon-list"></i> Index</a></li>
+      <li><a href="#{{basedir}}/{{path.replace('.pack', '.idx')}}"><i class="icon-list"></i> Index</a></li>
     </ul>
 
     <div class="tab-content">
@@ -20,11 +20,11 @@
     </tr>
     <tr>
       <th>offset</th>
-      <td><a href="#/{{path}}?offset={{object.offset}}">{{object.offset}}</a></td>
+      <td><a href="#{{basedir}}/{{path}}?offset={{object.offset}}">{{object.offset}}</a></td>
     </tr>
     <tr data-ng-show="object.base_offset">
       <th>base offset</th>
-      <td><a href="#/{{path}}?offset={{object.base_offset}}">{{object.base_offset}}</a></td>
+      <td><a href="#{{basedir}}/{{path}}?offset={{object.base_offset}}">{{object.base_offset}}</a></td>
     </tr>
     <tr data-ng-show="object.base_offset">
       <th>delta type</th>
@@ -47,7 +47,7 @@
     <tr data-ng-repeat="prop in object.object.properties">
       <th>{{prop.key}}</th>
       <td data-ng-switch="prop.type">
-        <span data-ng-switch-when="sha1"><a href="#/.git/{{prop.path}}">{{prop.value}}</a></span>
+        <span data-ng-switch-when="sha1"><a href="#{{basedir}}/.git/{{prop.path}}">{{prop.value}}</a></span>
         <span data-ng-switch-when="user">{{prop.value}} <small style="color:#aaa">{{prop.date}}</small></span>
         <span data-ng-switch-default>{{prop.value}}</span>
       </td>

data/htdocs/{templates → common/templates}/packed_refs.html

@@ -26,11 +26,11 @@
           <i data-entry-icon="'commit'"></i> <a data-ref-href="entry.tag_sha1">{{entry.tag_sha1}}</a>
         </span>
       </td>
-      <td><a href="#/.git/packed-refs?ref={{entry.ref}}">{{entry.ref}}</a></td>
+      <td><a href="#{{basedir}}/.git/packed-refs?ref={{entry.ref}}">{{entry.ref}}</a></td>
     </tr>
   </tbody>
 </table>
-<a href="#/.git/packed-refs" data-ng-show="limited">Show All</a>
+<a href="#{{basedir}}/.git/packed-refs" data-ng-show="limited">Show All</a>
 
       </div>
       <div class="tab-pane" id="plain">

data/htdocs/common/templates/reflog.html

@@ -0,0 +1,29 @@
+<article>
+<h1><i data-entry-icon="'reflog'"></i> {{path}} <small>Reflog</small></h1>
+
+<div class="tabbable">
+  <ul class="nav nav-tabs">
+    <li class="active"><a href="#parsed" data-toggle="tab">Parsed</a></li>
+    <li><a href="#plain" data-toggle="tab">Plain</a></li>
+  </ul>
+  <div class="tab-content">
+    <div class="tab-pane active" id="parsed">
+
+<pre data-ng-repeat="entry in object.entries">
+<a data-ref-href="entry.sha1_from">{{entry.sha1_from}}</a> <a data-ref-href="entry.sha1_to">{{entry.sha1_to}}</a>
+{{entry.name}} &lt;{{entry.email}}&gt; {{entry.date}}
+
+{{entry.message}}
+</pre>
+
+    </div>
+    <div class="tab-pane" id="plain">
+
+<pre>{{object.content}}</pre>
+
+    </div>
+  </div>
+</div>
+
+
+</article>

data/htdocs/config.js

@@ -0,0 +1,6 @@
+/*
+config.steps = [
+  { name: 'step1', label: 'step 1 - git init' },
+  { name: 'step2', label: 'step 2 - git add foo.txt' }
+};
+*/

data/htdocs/default.js

@@ -0,0 +1,7 @@
+// Edit config.js instead of this file.
+// This file will be rewritten by git object-browser command.
+var config = {
+  "loadNote": false,
+  "loadDiff": false,
+  "steps" : []
+};

data/htdocs/index.html

@@ -10,21 +10,38 @@
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width">
 
-        <link rel="stylesheet" href="css/bootstrap.min.css">
+        <link rel="stylesheet" href="common/css/bootstrap.min.css">
         <style>
             body {
                 padding-top: 60px;
                 padding-bottom: 40px;
             }
+
+            .sidenote {
+              margin-top: 10px;
+              margin-left: 10px;
+              border: solid 1px #ccc;
+              padding: 18px;
+              -webkit-border-radius: 5px;
+                 -moz-border-radius: 5px;
+                      border-radius: 5px;
+            }
+
+            .sidenote h3 {
+              margin: 0;
+              margin-bottom: 10px;
+              line-height: 20px;
+              font-size: 1em;
+            }
         </style>
-        <link rel="stylesheet" href="css/bootstrap-responsive.min.css">
-        <link rel="stylesheet" href="css/main.css">
-        <link rel="stylesheet" href="css/angular-ui.min.css">
-        <link rel="stylesheet" href="css/font-awesome.css">
+        <link rel="stylesheet" href="common/css/bootstrap-responsive.min.css">
+        <link rel="stylesheet" href="common/css/main.css">
+        <link rel="stylesheet" href="common/css/angular-ui.min.css">
+        <link rel="stylesheet" href="common/css/font-awesome.css">
 
         <!--[if lt IE 9]>
             <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-            <script>window.html5 || document.write('<script src="js/vendor/html5shiv.js"><\/script>')</script>
+            <script>window.html5 || document.write('<script src="common/js/vendor/html5shiv.js"><\/script>')</script>
         <![endif]-->
     </head>
     <body data-ng-app="GitObjectBrowser">
@@ -43,9 +60,19 @@
                         <span class="icon-bar"></span>
                     </a>
                     <a class="brand" href="/"><i class="icon-comment icon-white"></i> GOB</a>
-                    <div class="nav-collapse collapse">
+                    <div class="nav-collapse collapse" data-ng-controller="MenuCtrl">
                         <ul class="nav">
-                            <li class="active"><a href="/">Home</a></li>
+                            <li class="active" data-ng-show="steps.length == 0" style="display:none"><a href="/">Home</a></li>
+
+                            <li class="dropdown" data-ng-show="steps.length > 0" style="display:none">
+                                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Steps <b class="caret"></b></a>
+                                <ul class="dropdown-menu">
+                                    <li data-ng-repeat="step in steps"><a data-ng-href="#/{{step.name}}/.git/" data-ng-click="">{{step.label}}</a></li>
+                                </ul>
+                            </li>
+                            <li data-ng-show="steps.length > 0" style="display:none"><a data-ng-click="stepPrev()" href=""><i class="icon-chevron-left"></i>Prev</a></li>
+                            <li data-ng-show="steps.length > 0" style="display:none"><a data-ng-click="stepNext()" href="">Next<i class="icon-chevron-right"></i></a></li>
+
                             <li class="dropdown">
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documents <b class="caret"></b></a>
                                 <ul class="dropdown-menu">
@@ -82,13 +109,16 @@
   <div class="span3">
     <ul class="nav nav-list">
       <li class="nav-header">Git Object Browser</li>
-      <li class=""><a href="/#/.git/"><i data-entry-icon="'directory'"></i>.git</a></li>
-      <li class=""><a href="/#/.git/objects"><i data-entry-icon="'directory'"></i> objects</a></li>
-      <li class=""><a href="/#/.git/objects/pack"><i data-entry-icon="'directory'"></i> pack</a></li>
-      <li class=""><a href="/#/.git/refs"><i data-entry-icon="'directory'"></i> refs</a></li>
-      <li class=""><a href="/#/.git/HEAD"><i data-entry-icon="'ref'"></i> HEAD</a></li>
-      <li class=""><a href="/#/.git/index"><i data-entry-icon="'index'"></i> index</a></li>
+      <li class=""><a href="#{{basedir}}/.git/"><i data-entry-icon="'directory'"></i>.git</a></li>
+      <li class=""><a href="#{{basedir}}/.git/objects"><i data-entry-icon="'directory'"></i> objects</a></li>
+      <li class=""><a href="#{{basedir}}/.git/objects/pack"><i data-entry-icon="'directory'"></i> pack</a></li>
+      <li class=""><a href="#{{basedir}}/.git/refs"><i data-entry-icon="'directory'"></i> refs</a></li>
+      <li class=""><a href="#{{basedir}}/.git/HEAD"><i data-entry-icon="'ref'"></i> HEAD</a></li>
+      <li class=""><a href="#{{basedir}}/.git/index"><i data-entry-icon="'index'"></i> index</a></li>
     </ul>
+
+    <article class="sidenote" data-ng-bind-html-unsafe="note" style="display:none" data-ng-show="note">
+    </article>
   </div>
 
   <div class="span9">
@@ -103,12 +133,14 @@
         </div> <!-- /container -->
 
         <script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
-        <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.8.2.min.js"><\/script>')</script>
-        <script src="js/vendor/bootstrap.min.js"></script>
-        <script src="js/vendor/angular.js"></script>
-        <script src="js/vendor/angular-resource.min.js"></script>
-        <script src="js/vendor/angular-ui.min.js"></script>
+        <script>window.jQuery || document.write('<script src="common/js/vendor/jquery-1.8.2.min.js"><\/script>')</script>
+        <script src="common/js/vendor/bootstrap.min.js"></script>
+        <script src="common/js/vendor/angular.js"></script>
+        <script src="common/js/vendor/angular-resource.min.js"></script>
+        <script src="common/js/vendor/angular-ui.min.js"></script>
 
-        <script src="js/main.js"></script>
+        <script src="default.js"></script>
+        <script src="config.js"></script>
+        <script src="common/js/main.js"></script>
     </body>
 </html>

data/lib/git-object-browser.rb

@@ -13,9 +13,9 @@ require 'stringio'
 require 'optparse'
 
 require "git-object-browser/main"
-require "git-object-browser/models/ref"
 require "git-object-browser/models/bindata"
 require "git-object-browser/models/directory"
+require "git-object-browser/models/git_date"
 require "git-object-browser/models/git_object"
 require "git-object-browser/models/index"
 require "git-object-browser/models/index_entry"
@@ -27,13 +27,21 @@ require "git-object-browser/models/pack_index"
 require "git-object-browser/models/packed_object"
 require "git-object-browser/models/packed_refs"
 require "git-object-browser/models/plain_file"
+require "git-object-browser/models/ref"
+require "git-object-browser/models/reflog"
+require "git-object-browser/models/wrapped_object"
 require "git-object-browser/server/main"
 require "git-object-browser/server/git_servlet"
 
 require "git-object-browser/dumper/main"
-require "git-object-browser/dumper/object_dumper"
+require "git-object-browser/dumper/objects_dumper"
 require "git-object-browser/dumper/index_dumper"
-require "git-object-browser/dumper/pack_index_dumper"
-require "git-object-browser/dumper/packed_object_dumper"
+require "git-object-browser/dumper/directories_dumper"
+require "git-object-browser/dumper/plain_files_dumper"
+require "git-object-browser/dumper/refs_dumper"
+require "git-object-browser/dumper/packed_refs_dumper"
+require "git-object-browser/dumper/pack_indexes_dumper"
+require "git-object-browser/dumper/packed_objects_dumper"
+require "git-object-browser/dumper/info_refs_dumper"
 
 GitObjectBrowser::Main.new().execute if __FILE__ == $0

data/lib/git-object-browser/dumper/directories_dumper.rb

@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+
+module GitObjectBrowser
+
+  module Dumper
+
+    class DirectoriesDumper
+
+      def initialize(root, outdir)
+        @root   = root
+        @outdir = outdir
+      end
+
+      def dump
+        dirs = ['']
+        Dir.chdir(@root) do
+          Dir.glob("**/*") do |path|
+            next if path == 'dump' # FIXME
+            dirs << path if File.directory?(path)
+          end
+        end
+
+        dirs.each do |path|
+          outfile = File.join(@outdir, (path == '') ? '_git.json' : "#{ path }.json")
+          FileUtils.mkdir_p(File.dirname(outfile))
+
+          puts "Write: #{path}\n"
+          obj_file = File.join(@root, path)
+          File.open(outfile, "w") do |output|
+            dump_object(path, output)
+          end
+        end
+      end
+
+      def dump_object(path, output)
+        obj =  GitObjectBrowser::Models::Directory.new(@root, path)
+        wrapped = GitObjectBrowser::Models::WrappedObject.new(nil, path, obj)
+        output << JSON.pretty_generate(wrapped.to_hash)
+      end
+    end
+  end
+end