git-webby 0.1.0 → 0.2.0

data/Rakefile

@@ -27,7 +27,7 @@ task :build => "#{spec.name}.gemspec" do
 end
 
 desc "Release #{spec.file_name}"
-task :release do
+task :release => :build do
   sh "gem push #{spec.file_name}"
 end
 
@@ -38,7 +38,7 @@ end
 
 desc "Uninstall gem #{spec.name} v#{spec.version}"
 task :uninstall do
-  sh "gem uninstall -l #{spec.name} -v #{spec.version}"
+  sh "gem uninstall #{spec.name} -v #{spec.version}"
 end
 
 task :default => :test

data/doc/releases/v0.2.0.rdoc

@@ -0,0 +1,24 @@
+== Git-Webby v0.2.0
+
+Implementation of viewer for browsing of source code:
+
+- Fixes in tasks.
+- Adding of classes for handle repositories.
+- Improvements in all helpers.
+- Base controller for shared settings
+- The project handler has been improved to find a repository and run the
+  command line for get files and informations.
+- The HTTP Backend class has been updated for use the new changes in project
+  handler.
+- Fixes in RPC service to POST git-upload-pack
+  - The repository was passed as current directory instead of the full path.
+- Adding of tree in project handler
+- Adding of viewer for browsing of source code
+  - The recursive tree has been removed for improve performance.
+  - Small improvements in helpers and tests.
+
+This is a beta version. For more informations about this release,
+please visit <http://github.com/codigorama/git-webby>.
+
+
+

data/lib/git/webby.rb

@@ -1,6 +1,9 @@
 # See <b>Git::Webby</b> for documentation.
 module Git
 
+  # 3rd part requirements
+  require "sinatra/base"
+
   # Internal requirements
   require "git/webby/version"
 
@@ -12,37 +15,111 @@ module Git
   # - API to get information about repository.
   module Webby
 
-    module RepositoryUtils # :nodoc:
-      def project_path_to(*args)
-        File.join(settings.project_root.to_s, *(args.map(&:to_s)))
+    class ProjectHandler #:nodoc:
+
+      # Path to git comamnd
+      attr_reader :path
+
+      attr_reader :project_root
+
+      attr_reader :repository
+
+      def initialize(project_root, path = "/usr/bin/git", options = {})
+        @config       = {
+          :get_any_file => true,
+          :upload_pack  => true,
+          :receive_pack => false
+        }.update(options)
+        @repository   = nil
+        @path         = File.expand_path(path)
+        @project_root = File.expand_path(project_root)
+        check_path @path
+        check_path @project_root
+      end
+
+      def path_to(*args)
+        File.join(@repository || @project_root, *(args.compact.map(&:to_s)))
+      end
+
+      def repository=(name)
+        @repository = check_path(path_to(name))
+      end
+
+      def cli(command, *args)
+        %Q[#{@path} #{args.unshift(command.to_s.gsub("_","-")).compact.join(" ")}]
+      end
+
+      def run(command, *args)
+        chdir{ %x[#{cli command, *args}] }
+      end
+
+      def read_file(*file)
+        File.read(path_to(*file))
+      end
+
+      def loose_object_path(*hash)
+        path_to(:objects, *hash)
+      end
+
+      def pack_idx_path(pack)
+        path_to(:objects, :pack, pack)
+      end
+
+      def info_packs_path
+        path_to(:objects, :info, :packs)
       end
 
-      def git_dir(name)
-        unless name =~ /\w\.git/ # not bare directory
-          File.join(name, ".git")
+      def tree(ref = "HEAD", path = "")
+        list = run("ls-tree --abbrev=6 --full-tree --long #{ref}:#{path}")
+        if list
+          tree = []
+          list.scan %r{^(\d{3})(\d)(\d)(\d) (\w.*?) (.{6})[ \t]{0,}(.*?)\t(.*?)\n}m do
+            tree << {
+              :ftype => ftype[$1],
+              :fperm => "#{fperm[$2.to_i]}#{fperm[$3.to_i]}#{fperm[$4.to_i]}",
+              :otype => $5,
+              :ohash => $6,
+              :fsize => fsize($7, 2),
+              :fname => $8
+            }
+          end
+          tree
         else
-          name
+          nil
         end
       end
 
-      def path_to(name, *args)
-        project_path_to(git_dir(name), *args)
+      private
+
+      def repository_path(name)
+        bare = name =~ /\w\.git/ ? name : %W[#{name} .git]
+        check_path(path_to(*bare))
+      end
+
+      def check_path(path)
+        path && !path.empty? && File.ftype(path) && path
       end
 
-      def read_file(dirname, *file)
-        File.read(path_to(dirname, *file))
+      def chdir(&block)
+        Dir.chdir(@repository || @project_root, &block)
       end
 
-      def chdir(dirname, &block)
-        Dir.chdir(path_to(dirname), &block)
+      def ftype
+        { "120" => "l", "100" => "-", "040" => "d" }
       end
 
-      def git_cli(command, *args)
-        %Q[#{settings.git_path} #{args.unshift(command.to_s.gsub("_","-")).compact.join(" ")}]
+      def fperm
+        [ "---", "--x", "-w-", "-wx", "r--", "r-x", "rw-", "rwx"  ]
       end
 
-      def git_run(command, *args)
-        %x[#{git_cli command, *args}]
+      def fsize(str, scale = 1)
+        units = [ :b, :kb, :mb, :gb, :tb ]
+        value = str.to_f
+        size  = 0.0
+        units.each_index do |i|
+          size = value / 1024**i
+          return [format("%.#{scale}f", size).to_f, units[i].to_s.upcase] if size <= 10
+        end
       end
 
     end
@@ -78,18 +155,18 @@ module Git
     end
 
     class Htgroup #:nodoc:
-      require "webrick/httpauth/htgroup"
 
       def initialize(file)
+        require "webrick/httpauth/htgroup"
         @handler = WEBrick::HTTPAuth::Htgroup.new(file)
         yield self if block_given?
       end
     end
 
     class Htpasswd #:nodoc:
-      require "webrick/httpauth/htpasswd"
 
       def initialize(file)
+        require "webrick/httpauth/htpasswd"
         @handler = WEBrick::HTTPAuth::Htpasswd.new(file)
         yield self if block_given?
       end
@@ -137,8 +214,38 @@ module Git
       end
     end
 
+    module GitHelpers
+
+      def git
+        @git ||= ProjectHandler.new(settings.project_root, settings.git_path)
+      end
+
+      def repository
+        git.repository ||= (params[:repository] || params[:captures].first)
+        git
+      end
+
+      def content_type_for_git(name, *suffixes)
+        content_type("application/x-git-#{name}-#{suffixes.compact.join("-")}")
+      end
+
+    end
+
+    class Controller < Sinatra::Base
+
+      set :project_root, "/home/git"
+      set :git_path,     "/usr/bin/git"
+      set :authenticate, false
+
+      def self.configure(*envs, &block)
+        super(*envs, &block)
+        self
+      end
+    end
+
     # Applications
     autoload :HttpBackend, "git/webby/http_backend"
+    autoload :Viewer,      "git/webby/viewer"
 
   end
 

data/lib/git/webby/http_backend.rb

@@ -1,16 +1,8 @@
 module Git::Webby
 
-  module HttpBackendUtils #:nodoc:
+  module HttpBackendHelpers #:nodoc:
 
-    include RepositoryUtils
-
-    def repository
-      params[:repository]
-    end
-
-    def content_type_for_git(name, *suffixes)
-      content_type("application/x-git-#{name}-#{suffixes.compact.join("-")}")
-    end
+    include GitHelpers
 
     def service_request?
       not params[:service].nil?
@@ -57,72 +49,68 @@ module Git::Webby
     end
 
     # get_text_file feature
-    def read_text_file(repository, *file)
+    def read_text_file(*file)
       read_any_file
       header_nocache
       content_type "text/plain"
-      read_file(repository, *file)
+      repository.read_file(*file)
     end
 
     # get_loose_object feature
-    def send_loose_object(repository, hash_prefix, hash_suffix)
+    def send_loose_object(prefix, suffix)
       read_any_file
       header_cache_forever
       content_type_for_git :loose, :object
-      send_file(path_to(repository, "objects", hash_prefix, hash_suffix))
+      send_file(repository.loose_object_path(prefix, suffix))
     end
 
     # get_pack_file and get_idx_file
-    def send_pack_idx_file(repository, pack, idx = false)
+    def send_pack_idx_file(pack, idx = false)
       read_any_file
       header_cache_forever
       content_type_for_git :packed, :objects, (idx ? :toc : nil)
-      send_file(path_to(repository, "objects", "pack", pack))
+      send_file(repository.pack_idx_path(pack))
     end
 
-    def send_info_packs(repository)
+    def send_info_packs
       read_any_file
       header_nocache
       content_type "text/plain; charset=utf-8"
-      send_file(path_to(repository, "objects", "info", "packs"))
+      send_file(repository.info_packs_path)
     end
 
     # run_service feature
-    def run_advertisement(repository, service)
+    def run_advertisement(service)
       header_nocache
       content_type_for_git service, :advertisement
-      chdir repository do
-        response.body  = ""
-        response.body += packet_write("# service=git-#{service}\n")
-        response.body += packet_flush
-        response.body += git_run(service, "--stateless-rpc --advertise-refs .")
-        response.finish
-      end
+      response.body  = ""
+      response.body += packet_write("# service=git-#{service}\n")
+      response.body += packet_flush
+      response.body += repository.run(service, "--stateless-rpc --advertise-refs .")
+      response.finish
     end
 
-    def run_process(repository, service)
+    def run_process(service)
       content_type_for_git service, :result
       input   = request.body.read
-      command = git_cli(service, "--stateless-rpc .")
-      chdir repository do
-        # This source has extracted from Grack written by Scott Chacon.
-        IO.popen(command, File::RDWR) do |pipe|
-          pipe.write(input)
-          while !pipe.eof?
-            block = pipe.read(8192) # 8M at a time
-            response.write block    # steam it to the client
-          end
-        end # IO
-        response.finish
-      end
+      command = repository.cli(service, "--stateless-rpc #{git.repository}")
+      # This source has extracted from Grack written by Scott Chacon.
+      IO.popen(command, File::RDWR) do |pipe|
+        pipe.write(input)
+        while !pipe.eof?
+          block = pipe.read(8192) # 8M at a time
+          response.write block    # steam it to the client
+        end
+      end # IO
+      response.finish
     end
 
-  end # HttpBackendUtils
+  end # HttpBackendHelpers
 
   module HttpBackendAuthentication #:nodoc:
 
     def htpasswd
-      @htpasswd ||= Htpasswd.new(project_path_to("htpasswd"))
+      @htpasswd ||= Htpasswd.new(git.path_to("htpasswd"))
     end
 
     def authentication
@@ -168,8 +156,6 @@ module Git::Webby
 
   end
 
-  require "sinatra/base"
-
   # The Smart HTTP handler server. This is the main Web application which respond to following requests:
   #
   # <repo.git>/HEAD           :: HEAD contents
@@ -180,62 +166,54 @@ module Git::Webby
   # <repo.git>/receive-pack   :: Post a receive packets.
   #
   # See ::configure for more details.
-  class HttpBackend < Sinatra::Base
+  class HttpBackend < Controller
 
-    helpers HttpBackendUtils
+    helpers HttpBackendHelpers
 
-    set :project_root, File.expand_path("#{File.dirname(__FILE__)}/git")
-    set :git_path,     "/usr/bin/git"
     set :get_any_file, true
     set :upload_pack,  true
     set :receive_pack, false
-    set :authenticate, false
-
-    def self.configure(*envs, &block)
-      super(*envs, &block)
-      self
-    end
 
     before do
       authenticate! if settings.authenticate
     end
 
     # implements the get_text_file function
-    get "/:repository/HEAD" do |repository|
-      read_text_file(repository, "HEAD")
+    get "/:repository/HEAD" do
+      read_text_file("HEAD")
     end
 
     # implements the get_info_refs function
-    get "/:repository/info/refs" do |repository|
+    get "/:repository/info/refs" do
       if service_request? # by URL query parameters
-        run_advertisement repository, service
+        run_advertisement service
       else
-        read_text_file(repository, :info, :refs)
+        read_text_file(:info, :refs)
       end
     end
 
     # implements the get_text_file and get_info_packs functions
     get %r{/(.*?)/objects/info/(packs|alternates|http-alternates)$} do |repository, file|
       if file == "packs"
-        send_info_packs(repository)
+        send_info_packs
       else
-        read_text_file(repository, :objects, :info, file)
+        read_text_file(:objects, :info, file)
       end
     end
 
     # implements the get_loose_object function
     get %r{/(.*?)/objects/([0-9a-f]{2})/([0-9a-f]{38})$} do |repository, prefix, suffix|
-      send_loose_object(repository, prefix, suffix)
+      send_loose_object(prefix, suffix)
     end
 
     # implements the get_pack_file and get_idx_file functions
     get %r{/(.*?)/objects/pack/(pack-[0-9a-f]{40}.(pack|idx))$} do |repository, pack, ext|
-      send_pack_idx_file(repository, pack, ext == "idx")
+      send_pack_idx_file(pack, ext == "idx")
     end
 
     # implements the service_rpc function
-    post "/:repository/:service" do |repository, rpc|
-      run_process repository, service
+    post "/:repository/:service" do
+      run_process service
     end
 
   private

data/lib/git/webby/version.rb

@@ -2,8 +2,8 @@
 # Semantic Versioning Specification (see reference[http://semver.org/]).
 module Git::Webby #:nodoc:
 
-  VERSION   = "0.1.0"
-  RELEASE   = "2011-07-13"
+  VERSION   = "0.2.0"
+  RELEASE   = "2011-07-16"
   TIMESTAMP = "2011-07-05 12:32:36 -04:00"
 
   def self.info

data/lib/git/webby/viewer.rb

@@ -0,0 +1,30 @@
+module Git::Webby
+
+  module ViewerHelpers
+
+    include GitHelpers
+
+  end
+
+  class Viewer < Controller
+
+    require "json"
+
+    helpers ViewerHelpers
+
+    set :project_root, File.expand_path("#{File.dirname(__FILE__)}/git")
+
+    mime_type :json, "application/json"
+
+    get %r{/(.*?)/(.*?/{0,1}.*)$} do |name, path|
+      content_type :json
+      path = path.split("/")
+      ref  = path.shift
+      tree = repository.tree(ref, path.join("/"))
+      tree.to_json(:max_nesting => tree.size*6)
+    end
+
+  end
+
+end
+

data/test/fixtures/mycode.git/objects/0d/eed0a56fa8f5f2a788d58b3ea235afd547b828

@@ -0,0 +1,2 @@
+x
��M� F]s���
+�][npp֪֝�z���!5���$ʘ���jR�

data/test/fixtures/mycode.git/refs/heads/master

@@ -1 +1 @@
-5e54a0767e0c380f3baab17938d68c7f464cf171
+0deed0a56fa8f5f2a788d58b3ea235afd547b828

data/test/project_handler_test.rb

@@ -0,0 +1,51 @@
+require "test/unit"
+require "test/helpers"
+require "git/webby"
+
+class ProjectHandlerTest < Test::Unit::TestCase
+
+  def setup
+    @git = Git::Webby::ProjectHandler.new(fixtures, "/usr/bin/git")
+    @objects = [
+      "HEAD",
+      "info/refs",
+      "objects/info/packs",
+      "objects/02/83eb96425444e17b97182e1ba9f216cc67c132",
+      "objects/03/9927042df267a1bc606fc4485b7a79b6a9e3cd",
+      "objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904",
+      "objects/5e/54a0767e0c380f3baab17938d68c7f464cf171",
+      "objects/71/6e9568eed27d5ee4378b3ecf6dd095a547bde9",
+      "objects/be/118435b9d908fd4a689cd8b0cc98059911a31a",
+      "objects/db/aefcb5bde664671c73b99515c386dcbc7f22b6",
+      "objects/eb/669b878d2013ac70aa5dee75e6357ea81d16ea",
+      "objects/ed/10cfcf72862e140c97fe899cba2a55f4cb4c20",
+      "objects/pack/pack-40a8636b62258fffd78ec1e8d254116e72d385a9.idx",
+      "objects/pack/pack-40a8636b62258fffd78ec1e8d254116e72d385a9.pack"
+    ]
+    @git.repository = "mycode.git"
+  end
+
+  should "check basic attributes" do
+    assert_equal fixtures, @git.project_root
+    assert_equal "/usr/bin/git", @git.path
+  end
+
+  should "config repository path" do
+    assert_equal fixtures("mycode.git"), @git.repository
+  end
+
+  should "find repository objects" do
+    @objects.each do |object|
+      assert_equal fixtures("mycode.git", object), @git.path_to(object)
+      assert File.exist?(@git.path_to(object))
+    end
+  end
+
+  should "list tree files" do
+    assert_equal 3, @git.tree.size
+    assert_equal "README.txt", @git.tree[1][:fname]
+    assert_equal "lib", @git.tree.last[:fname]
+    assert_equal "mycode.rb", @git.tree("HEAD", "lib").first[:fname]
+  end
+
+end

data/test/viewer_test.rb

@@ -0,0 +1,46 @@
+require "test/unit"
+require "test/helpers"
+require "rack"
+require "rack/test"
+require "git/webby"
+require "json"
+
+class ViewerTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  def setup
+  end
+
+  def app
+    @app = Git::Webby::Viewer.configure do |server|
+      server.project_root = fixtures
+    end
+    @app
+  end
+
+  should "get tree of project from reference" do
+    get "/mycode.git/HEAD" do
+      assert_equal 200, response.status, request.env["sinatra.error"]
+      assert_equal "application/json", response.content_type
+      assert_match "README.txt", response.body
+      assert_equal 3, JSON.parse(response.body).size
+    end
+  end
+
+  should "get tree of project from reference and path" do
+    get "/mycode.git/HEAD/lib" do
+      assert_equal 200, response.status, request.env["sinatra.error"]
+      assert_equal "application/json", response.content_type
+      assert_match "mycode.rb", response.body
+      assert_equal "mycode.rb", JSON.parse(response.body).first["fname"]
+      assert_equal 1, JSON.parse(response.body).size
+    end
+  end
+
+  private
+
+  alias request last_request
+
+  alias response last_response
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-webby
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Hallison Batista
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 -04:00
+date: 2011-07-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,10 +49,12 @@ files:
 - README.rdoc
 - Rakefile
 - doc/releases/v0.1.0.rdoc
+- doc/releases/v0.2.0.rdoc
 - git-webby.gemspec
 - lib/git/webby.rb
 - lib/git/webby/http_backend.rb
 - lib/git/webby/version.rb
+- lib/git/webby/viewer.rb
 - test/config_test.rb
 - test/fixtures/config.yml
 - test/fixtures/htpasswd
@@ -73,13 +75,17 @@ files:
 - test/fixtures/mycode.git/info/refs
 - test/fixtures/mycode.git/objects/02/83eb96425444e17b97182e1ba9f216cc67c132
 - test/fixtures/mycode.git/objects/03/9927042df267a1bc606fc4485b7a79b6a9e3cd
+- test/fixtures/mycode.git/objects/0d/eed0a56fa8f5f2a788d58b3ea235afd547b828
 - test/fixtures/mycode.git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904
 - test/fixtures/mycode.git/objects/5e/54a0767e0c380f3baab17938d68c7f464cf171
+- test/fixtures/mycode.git/objects/63/9b96262e7e19ca2169575e797b234098b8a72e
 - test/fixtures/mycode.git/objects/71/6e9568eed27d5ee4378b3ecf6dd095a547bde9
+- test/fixtures/mycode.git/objects/b6/f3f0fabeaaaaf2db22b8ef98f59115baec7ef9
 - test/fixtures/mycode.git/objects/be/118435b9d908fd4a689cd8b0cc98059911a31a
 - test/fixtures/mycode.git/objects/db/aefcb5bde664671c73b99515c386dcbc7f22b6
 - test/fixtures/mycode.git/objects/eb/669b878d2013ac70aa5dee75e6357ea81d16ea
 - test/fixtures/mycode.git/objects/ed/10cfcf72862e140c97fe899cba2a55f4cb4c20
+- test/fixtures/mycode.git/objects/ed/1c3a255ab3fce056dc31cd82df9f61a4d9fa22
 - test/fixtures/mycode.git/objects/info/packs
 - test/fixtures/mycode.git/objects/pack/pack-40a8636b62258fffd78ec1e8d254116e72d385a9.idx
 - test/fixtures/mycode.git/objects/pack/pack-40a8636b62258fffd78ec1e8d254116e72d385a9.pack
@@ -90,13 +96,15 @@ files:
 - test/htpasswd_test.rb
 - test/http_backend_authentication_test.rb
 - test/http_backend_test.rb
+- test/project_handler_test.rb
+- test/viewer_test.rb
 has_rdoc: true
 homepage: http://github.com/codigorama/git-webby
 licenses: []
 
 post_install_message: |
   ------------------------------------------------------------------------------
-  Git::Webby v0.1.0
+  Git::Webby v0.2.0
   
   Thanks for use Git::Webby.
   ------------------------------------------------------------------------------