git-object-browser 0.0.4 → 0.0.6

data/htdocs/js/main.js

@@ -157,16 +157,15 @@ function GitCtrl($scope, $location, $routeParams, GitResource, PackedObjectResou
       'assume_valid_flag',
       'extended_flag',
       'stage',
-      'path'
+      'name_length'
     ]
-
-    if (version == 3) {
+    if (version > 2) {
       keys = keys.concat([
         'skip_worktree',
         'intent_to_add',
       ]);
     }
-    keys.push('name_length');
+    keys.push('path')
 
     return keys;
   };

data/lib/git-object-browser.rb

@@ -30,8 +30,10 @@ require "git-object-browser/models/plain_file"
 require "git-object-browser/server/main"
 require "git-object-browser/server/git_servlet"
 
-require "git-object-browser/dumper"
-require "git-object-browser/object_dumper"
-require "git-object-browser/index_dumper"
+require "git-object-browser/dumper/main"
+require "git-object-browser/dumper/object_dumper"
+require "git-object-browser/dumper/index_dumper"
+require "git-object-browser/dumper/pack_index_dumper"
+require "git-object-browser/dumper/packed_object_dumper"
 
 GitObjectBrowser::Main.new().execute if __FILE__ == $0

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

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+module GitObjectBrowser
+
+  module Dumper
+
+    class IndexDumper
+
+      def initialize(input, output)
+        @index = GitObjectBrowser::Models::Index.new(input)
+        @out = output
+      end
+
+      def dump
+        @out << JSON.pretty_generate(@index.parse.to_hash)
+
+        # template = File.join(GitObjectBrowser::Dumper::TEMPLATES_DIR, 'index.txt.erb')
+        # index = @index.parse.to_hash
+        # @out << ERB.new(File.read(template), nil, '-').result(binding)
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,124 @@
+module GitObjectBrowser
+  module Dumper
+
+    # TEMPLATES_DIR = File.join(File.dirname(__FILE__), '../../../templates/dumper')
+
+    class Main
+
+      def self.execute(target)
+        new(target).dump
+      end
+
+      def initialize(target)
+        @target = target
+        @outdir = File.join(target, "dump")
+      end
+
+      def dump
+        Dir.mkdir(@outdir) unless File.exist?(@outdir)
+        dump_index
+        dump_objects
+        dump_packed
+      end
+
+      def dump_index
+        index_file = File.join(@target, "index")
+        out_file   = File.join(@outdir, "index")
+
+        return unless File.exist?(index_file)
+
+        STDERR << "Write: .git/dump/index\n"
+        File.open(index_file) do |input|
+          File.open(out_file, "w") do |output|
+            dumper = GitObjectBrowser::Dumper::IndexDumper.new(input, output)
+            dumper.dump
+          end
+        end
+      end
+
+      def dump_objects
+        obj_files = []
+        Dir.chdir(@target) do
+          Dir.glob("objects/**/*") do |path|
+            obj_files << path if File.file?(path) && path =~ %r{/[a-z0-9]{38}$}
+          end
+        end
+        return if obj_files.empty?
+
+        obj_dir = File.join(@outdir, "objects")
+        Dir.mkdir(obj_dir) unless File.exist?(obj_dir)
+
+        obj_files.each do |path|
+          outfile = File.join(@outdir, path)
+          next if File.exist?(outfile)
+
+          parent = File.dirname(outfile)
+          Dir.mkdir(parent) unless File.exist?(parent)
+
+          STDERR << "Write: .git/dump/objects/#{path}\n"
+          obj_file = File.join(@target, path)
+          File.open(obj_file) do |input|
+            File.open(outfile, "w") do |output|
+              dumper = GitObjectBrowser::Dumper::ObjectDumper.new(input, output)
+              dumper.dump
+            end
+          end
+        end
+
+      end
+
+      def dump_packed
+        files = []
+        Dir.chdir(@target) do
+          Dir.glob("objects/pack/*.idx") do |path|
+            files << path
+          end
+        end
+        return if files.empty?
+
+        obj_dir = File.join(@outdir, "objects")
+        Dir.mkdir(obj_dir) unless File.exist?(obj_dir)
+        pack_dir = File.join(@outdir, "objects/pack")
+        Dir.mkdir(pack_dir) unless File.exist?(pack_dir)
+
+        files.each do |path|
+          outfile = File.join(@outdir, path)
+          packpath = path.gsub(/\.idx\z/, '.pack')
+
+          STDERR << "Write: .git/dump/#{path}\n"
+          index_file = File.join(@target, path)
+          File.open(index_file) do |input|
+            File.open(outfile, "w") do |output|
+              dumper = GitObjectBrowser::Dumper::PackIndexDumper.new(input, output)
+              dumper.dump
+              index = dumper.pack_index
+              entries = index.to_hash[:entries]
+
+              File.open(File.join(@target, packpath)) do |pack_input|
+                object_dumper = GitObjectBrowser::Dumper::PackedObjectDumper.new(pack_input, index)
+                entries.each do |entry|
+                  dump_packed_object(object_dumper, entry)
+                end
+              end
+            end
+          end
+        end
+      end
+
+      def dump_packed_object(dumper, entry)
+        sha1_1 = entry[:sha1][0..1]
+        sha1_2 = entry[:sha1][2..-1]
+        obj_dir = File.join(@outdir, "objects", sha1_1)
+        Dir.mkdir(obj_dir) unless File.exist?(obj_dir)
+
+        outfile = File.join(obj_dir,  sha1_2)
+        STDERR << "Write: .git/dump/objects/#{sha1_1}/#{sha1_2}\n"
+
+        File.open(outfile, "w") do |output|
+          dumper.dump(output, entry[:offset])
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+module GitObjectBrowser
+
+  module Dumper
+
+    class ObjectDumper
+
+      def initialize(input, output)
+        @object = GitObjectBrowser::Models::GitObject.new(input)
+        @out = output
+      end
+
+      def dump
+        @out << JSON.pretty_generate(@object.parse.to_hash)
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+
+module GitObjectBrowser
+
+  module Dumper
+
+    class PackIndexDumper
+      attr_reader :pack_index
+
+      def initialize(input, output)
+        @pack_index = GitObjectBrowser::Models::PackIndex.new(input)
+        @out = output
+      end
+
+      def dump
+        @out << JSON.pretty_generate(@pack_index.parse.to_hash)
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+module GitObjectBrowser
+
+  module Dumper
+
+    class PackedObjectDumper
+
+      def initialize(input, index)
+        @object = GitObjectBrowser::Models::PackedObject.new(index, input)
+      end
+
+      def dump(output, offset)
+        output << JSON.pretty_generate(@object.parse(offset).to_hash)
+      end
+
+    end
+  end
+end

data/lib/git-object-browser/main.rb

@@ -4,16 +4,16 @@ module GitObjectBrowser
     def execute
       host = '127.0.0.1'
       port = 8080
+      dump = false
       opts = OptionParser.new do |opts|
-        opts.on('-p', '--port=PORT', 'port number') do |value|
+        opts.on('-p', '--port PORT', 'port number') do |value|
           port = value.to_i if 0 < value.to_i
         end
-        opts.on('-b', '--bind=HOST', 'address to bind') do |value|
+        opts.on('-b', '--bind HOST', 'address to bind') do |value|
           host = value
         end
-        opts.on('-d', '--dump', 'dump objects') do
-          puts 'not implemented yet'
-          exit
+        opts.on('-d', '--dump', 'dump objects') do |value|
+          dump = true
         end
         opts.on_tail("-h", "--help", "show this help.") do
           puts opts
@@ -25,9 +25,12 @@ module GitObjectBrowser
         end
         opts.parse!(ARGV)
       end
-
       target = find_target(ARGV[0])
-      Server::Main.execute(target, host, port)
+      if dump
+        GitObjectBrowser::Dumper::Main.execute(target)
+      else
+        GitObjectBrowser::Server::Main.execute(target, host, port)
+      end
     end
 
     def find_target(target = nil, git_dir_name = '.git')

data/lib/git-object-browser/models/git_object.rb

@@ -36,15 +36,13 @@ module GitObjectBrowser
             (@properties, @message) = parse_contents
           end
 
-          @content = @content.force_encoding('UTF-8')
-          @content = '(not UTF-8)' unless @content.valid_encoding?
+          @content = force_utf8(@content)
           @content = @content[0, 3000] + "\n..." if @content.length > 3000
         end
 
         self
       end
 
-
       def to_hash
         return {
           :type       => @type,
@@ -71,7 +69,7 @@ module GitObjectBrowser
           entry = {}
           entry[:mode]     = find_char ' '
           break if entry[:mode].empty?
-          entry[:filename] = find_char "\0"
+          entry[:filename] = force_utf8(find_char("\0"))
           entry[:sha1]     = hex(20)
           @content += "#{entry[:mode]} #{entry[:filename]}\\0\\#{entry[:sha1]}\n"
           entries << entry
@@ -96,20 +94,19 @@ module GitObjectBrowser
               # couldn't find the spec...
               prop[:value].to_s =~ /\A(.*) <(.*)> (\d+)(?: ((?:(?:\+|-)(?:\d{4}|\d{2}:\d{2}))|Z))?\z/
             prop[:type]  = 'user'
-            prop[:name]  = $1.force_encoding("UTF-8")
-            prop[:name]  = '(not UTF-8)' unless prop[:name].valid_encoding?
-            prop[:email] = $2.force_encoding("UTF-8")
-            prop[:email] = '(not UTF-8)' unless prop[:email].valid_encoding?
+            prop[:name]  = force_utf8($1)
+            prop[:email] = force_utf8($2)
             prop[:unixtime] = $3
             prop[:timezone] = $4
             prop[:date] = epoch($3.to_i, $4).iso8601
+
+            prop[:value] = force_utf8(prop[:value])
           else
             prop[:type] = 'text'
           end
           properties << prop
         end
-        message = lines.join("\n").force_encoding("UTF-8")
-        message = '(not UTF-8)' unless message.valid_encoding?
+        message = force_utf8(lines.join("\n"))
 
         [properties, message]
       end
@@ -124,6 +121,12 @@ module GitObjectBrowser
         Rational($2.to_i, 24) + Rational($3, 60) * (($1 == '-') ? -1 : 1)
       end
 
+      def force_utf8(str)
+        str = str.force_encoding('UTF-8')
+        str.valid_encoding? ? str : '(not UTF-8)'
+      end
+      private :force_utf8
+
     end
   end
 end

data/lib/git-object-browser/models/index_entry.rb

@@ -30,7 +30,7 @@ module GitObjectBrowser
         @gid   = int       # 36
         @size  = int       # 40
         @sha1  = hex(20)   # 60
-        parse_flags        # 62
+        parse_flags        # 62 (+2)
         parse_path
       end
 
@@ -48,8 +48,8 @@ module GitObjectBrowser
         @extended_flag     = flags[1..1].to_i
         @stage             = flags[2..3]
         @name_length = ["0000" + flags[4..15]].pack("B*").unpack("n")[0]
-        if @version == 3 && @extended_flag == 1
-          exended          = binstr(2)
+        if @version > 2 && @extended_flag == 1
+          extended         = binstr(2)
           reserved         = extended[0..0]
           @skip_worktree   = extended[1..1]
           @intent_to_add   = extended[2..2]
@@ -68,7 +68,7 @@ module GitObjectBrowser
 
       # path: 2 + 8 * n bytes (nul pannding)
       def parse_path_v2
-        token = raw(2) # 64 bytes
+        token = raw(@extended_flag == 1 ? 8 : 2)
         @path = ""
         begin
           @path += token.unpack("Z*").first

data/lib/git-object-browser/version.rb

@@ -1,3 +1,3 @@
 module GitObjectBrowser
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

data/spec/git-object-browser/models/index_spec.rb

@@ -53,6 +53,20 @@ module GitObjectBrowser::Models
         expect = ['test.txt', 'test2.txt', 'test3.txt']
         entries.map {|entry| entry[:path]}.should eq expect
       end
+
+      it 'should parse extended data' do
+        index = subject.parse.to_hash
+
+        entry = index[:entries][1]
+        entry[:extended_flag].should eq 0
+        entry[:skip_worktree] = nil
+        entry[:intent_to_add] = nil
+
+        entry = index[:entries][2]
+        entry[:extended_flag].should eq 1
+        entry[:skip_worktree] = 0
+        entry[:intent_to_add] = 1
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-object-browser
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies: []
 description: Browse git raw objects.
 email:
@@ -74,8 +74,11 @@ files:
 - htdocs/templates/packed_refs.html
 - htdocs/templates/ref.html
 - lib/git-object-browser.rb
-- lib/git-object-browser/dumper.rb
-- lib/git-object-browser/index_dumper.rb
+- lib/git-object-browser/dumper/index_dumper.rb
+- lib/git-object-browser/dumper/main.rb
+- lib/git-object-browser/dumper/object_dumper.rb
+- lib/git-object-browser/dumper/pack_index_dumper.rb
+- lib/git-object-browser/dumper/packed_object_dumper.rb
 - lib/git-object-browser/main.rb
 - lib/git-object-browser/models/bindata.rb
 - lib/git-object-browser/models/directory.rb
@@ -91,7 +94,6 @@ files:
 - lib/git-object-browser/models/packed_refs.rb
 - lib/git-object-browser/models/plain_file.rb
 - lib/git-object-browser/models/ref.rb
-- lib/git-object-browser/object_dumper.rb
 - lib/git-object-browser/server/git_servlet.rb
 - lib/git-object-browser/server/main.rb
 - lib/git-object-browser/version.rb
@@ -185,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2893578660749395643
+      hash: 144653815734182267
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

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

@@ -1,62 +0,0 @@
-module GitObjectBrowser
-
-  class Dumper
-
-    def initialize(target)
-      @target = target
-      @outdir = File.join(@target, "plain")
-    end
-
-    def dump
-      Dir.mkdir(@outdir) unless File.exist?(@outdir)
-      dump_index
-      dump_objects
-    end
-
-    def dump_index
-      index_file = File.join(@target, "index")
-      out_file   = File.join(@outdir, "index")
-
-      return unless File.exist?(index_file)
-
-      STDERR << "Write: .git/plain/index\n"
-      File.open(index_file) do |input|
-        File.open(out_file, "w") do |output|
-          dumper = GitObjectBrowser::IndexDumper.new(input, output)
-          dumper.dump
-        end
-      end
-    end
-
-    def dump_objects
-      obj_files = []
-      Dir.chdir(@target) do
-        Dir.glob("objects/**/*") do |path|
-          obj_files << path if File.file?(path) && path =~ %r{/[a-z0-9]{38}$}
-        end
-      end
-      return if obj_files.empty?
-
-      obj_dir = File.join(@outdir, "objects")
-      Dir.mkdir(obj_dir) unless File.exist?(obj_dir)
-
-      obj_files.each do |path|
-        outfile = File.join(@outdir, path)
-        next if File.exist?(outfile)
-
-        parent = File.dirname(outfile)
-        Dir.mkdir(parent) unless File.exist?(parent)
-
-        STDERR << "Write: .git/plain/#{path}\n"
-        obj_file = File.join(@target, path)
-        File.open(obj_file) do |input|
-          File.open(outfile, "w") do |output|
-            dumper = GitObjectBrowser::ObjectDumper.new(input, output)
-            dumper.dump
-          end
-        end
-      end
-
-    end
-  end
-end

data/lib/git-object-browser/index_dumper.rb

@@ -1,77 +0,0 @@
-# -*- coding: utf-8 -*-
-
-module GitObjectBrowser
-
-  class IndexDumper
-
-    def initialize(input, output)
-      @index = Models::Index.new(input)
-      @out = output
-    end
-
-    def dump
-      @out << "----------------------------------------------------------------\n"
-      @out << "header\n"
-      @out << "----------------------------------------------------------------\n"
-      @out << "version: #{@index.version}\n"
-      @out << "entries: #{@index.entry_count}\n"
-      @out << "\n"
-
-      @index.entries.each_with_index do |entry, i|
-        @out << "----------------------------------------------------------------\n"
-        @out << "entry: #{i+1}\n"
-        @out << "----------------------------------------------------------------\n"
-        @out << "            ctime: #{entry.ctime}\n"
-        @out << "       ctime nano: #{entry.cnano}\n"
-        @out << "            mtime: #{entry.mtime}\n"
-        @out << "       mtime nano: #{entry.mnano}\n"
-        @out << "              dev: #{entry.dev}\n"
-        @out << "              ino: #{entry.ino}\n"
-        @out << "      object_type: #{entry.object_type}\n"
-        @out << "  unix_permission: #{entry.unix_permission}\n"
-        @out << "              uid: #{entry.uid}\n"
-        @out << "              gid: #{entry.gid}\n"
-        @out << "             size: #{entry.size}\n"
-        @out << "             sha1: #{entry.sha1}\n"
-        if @version == 2
-          @out << "assume_valid_flag: #{entry.assume_valid_flag}\n"
-          @out << "    extended_flag: #{entry.extended_flag}\n"
-          @out << "            stage: #{entry.stage}\n"
-        elsif @version == 3
-          @out << "    skip_worktree: #{entry.skip_worktree}\n"
-          @out << "    intent_to_add: #{entry.intent_to_add}\n"
-        end
-        @out << "      name_length: #{entry.name_length}\n"
-        @out << "             path: #{entry.path}\n"
-        @out << "\n"
-      end
-
-      @index.extensions.each do |extension|
-        @out << "----------------------------------------------------------------\n"
-        @out << "extension: #{extension.signature}\n"
-        @out << "----------------------------------------------------------------\n"
-        if extension.signature == "TREE"
-          dump_tree_extension(extension)
-        elsif extension.signature == "REUC"
-          dump_reuc_extension
-        end
-      end
-      
-      @out << "----------------------------------------------------------------\n"
-      @out << "checksum\n"
-      @out << "----------------------------------------------------------------\n"
-      @out << "sha1: #{@index.sha1}\n"
-    end
-
-    def dump_tree_extension(tree_extension)
-      tree_extension.entries.each do |entry|
-        @out << "   path_component: #{entry[:path_component]}\n"
-        @out << "      entry_count: #{entry[:entry_count]}\n"
-        @out << "    subtree_count: #{entry[:subtree_count]}\n"
-        @out << "             sha1: #{entry[:sha1]}\n\n"
-      end
-    end
-
-  end
-
-end

data/lib/git-object-browser/object_dumper.rb

@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-
-module GitObjectBrowser
-
-  class ObjectDumper
-
-    def initialize(input, output)
-      @object = Models::GitObject.new(input)
-      @out = output
-    end
-
-    def dump
-      @out << "type: #{@object.type}\n"
-      @out << "size: #{@object.size}\n"
-      @out << "sha1: #{@object.sha1}\n"
-      @out << "\n"
-      if @object.type == "tree"
-        dump_tree_entries
-      else
-        @out << @object.contents
-      end
-    end
-
-    # man git-ls-tree
-    def dump_tree_entries
-      @object.entries.each do |entry|
-        @out << "#{entry[:mode]} #{entry[:sha1]} #{entry[:filename]}\n"
-      end
-    end
-  end
-end