ginatra 2.1.1 → 2.2.0

data/.gitignore

@@ -14,3 +14,4 @@ _layouts/
 .yardoc
 doc/*
 pkg/*
+ginatra.gemspec

data/README.md

@@ -31,7 +31,18 @@ Next, just do the following (your setup may require sudo):
 
     $ gem install ginatra
 
-This pulls down all the required dependencies too.
+This pulls down most of the required dependencies too.
+
+The last dependency you need is pygments, an awesome python syntax highlighter. 
+To check whether you have it, run:
+
+    $ which pygmentize
+
+If this returns a path pointing to a 'pygmentize' binary, then you're all set. 
+If not you'll need to install pygments. Look at the last section of the
+[jekyll wiki "install" page](http://wiki.github.com/mojombo/jekyll/install) 
+to see how to install it. Also make sure again that the `pygmentize` binary 
+is on your path.
 
 If you want to play around with the code, you can clone the repository. This also allows you
 to use a special rackup file to mount it where you wish. I am yet to sort out some of the

data/Rakefile

@@ -2,8 +2,9 @@ require 'rubygems'
 require 'cucumber/rake/task'
 require 'spec/rake/spectask'
 
-current_path = File.expand_path(File.dirname(__FILE__))
-require "#{current_path}/lib/ginatra"
+$:.unshift File.expand_path("#{File.dirname(__FILE__)}/lib")
+
+require "ginatra"
 
 task :default => ['rake:spec', 'rake:features']
 
@@ -54,7 +55,7 @@ namespace :setup do
 
   desc "Installs the Required Gems"
   task :gems do |t|
-    gems = %w(grit kematzy-sinatra-cache vegas)
+    gems = %w(grit kematzy-sinatra-cache)
     puts %x(gem install #{gems.join(" ")})
   end
 
@@ -75,10 +76,11 @@ begin
     gemspec.email = "sam@lenary.co.uk"
     gemspec.homepage = "http://lenary.github.com/ginatra"
     gemspec.authors = ["Sam Elliott", "Ryan Bigg"]
+    gemspec.version = Ginatra::VERSION
     gemspec.add_dependency('sinatra', '>=0.9.4')
     gemspec.add_dependency('grit', '>=1.1.1')
-    gemspec.add_dependency('coderay', '>=0.8.0')
-    gemspec.files.include 'vendor/**/*'
+    gemspec.add_dependency('vegas', '>=0.1.0')
+    gemspec.add_dependency('open4', '>= 0.9.6')
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"

data/bin/ginatra

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-current_path = File.expand_path(File.dirname(__FILE__))
+$:.unshift File.expand_path("#{File.dirname(__FILE__)}/../lib")
 
-require "#{current_path}/../lib/ginatra"
+require "ginatra"
 
 module Ginatra::Executable
   HELP = <<HELP

data/bin/ginatra-daemon

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-current_path = File.expand_path(File.dirname(__FILE__))
+$:.unshift File.expand_path("#{File.dirname(__FILE__)}/../lib")
 
-require "#{current_path}/../lib/ginatra"
+require "ginatra"
 require "logger"
 
 def logger

data/bin/ginatra-directory

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-current_path = File.expand_path(File.dirname(__FILE__))
+$:.unshift File.expand_path("#{File.dirname(__FILE__)}/../lib")
 
-require "#{current_path}/../lib/ginatra"
+require "ginatra"
 require "logger"
 
 def logger

data/bin/ginatra-server

@@ -1,10 +1,16 @@
 #!/usr/bin/env ruby
 
-current_path = File.expand_path(File.dirname(__FILE__))
+begin
+  require 'rubygems'
+rescue LoadError
+end
+require "vegas"
+
+$:.unshift File.expand_path("#{File.dirname(__FILE__)}/../lib")
+
+require "ginatra"
 
-require "#{current_path}/../lib/ginatra"
-require "#{current_path}/../vendor/vegas/lib/vegas"
-Vegas::Runner.new(Ginatra::App, 'ginatra-server', :port => Ginatra::Config.port) do |runner, opts, app|
+Vegas::Runner.new(Ginatra::App, 'ginatra-server', {:port => Ginatra::Config.port, :host => Ginatra::Config.host}) do |runner, opts, app|
   
   opts.banner = "Usage: ginatra-server [[options] start | stop | status]"
 

data/config.ru

@@ -1,6 +1,6 @@
-current_path = File.expand_path(File.dirname(__FILE__))
+$:.unshift File.expand_path("#{File.dirname(__FILE__)}/lib")
 
-require "#{current_path}/lib/ginatra"
+require "ginatra"
 
 map '/' do
   run Ginatra::App

data/lib/ginatra.rb

@@ -5,28 +5,33 @@ rescue LoadError
 end
 require 'sinatra/base'
 require 'grit'
-require 'coderay'
-
-current_path = File.expand_path(File.dirname(__FILE__))
 
 # The Ginatra Namespace Module
 module Ginatra; end
 
-# Loading in reverse because RepoList needs to be loaded before MultiRepoList
-Dir.glob("#{current_path}/ginatra/*.rb").reverse.each { |f| require f }
+# i feel this is cleaner than the #{current_path} shenanigans ($: is the load path)
+$:.unshift File.dirname(__FILE__)
+
+# Loading in whichever order
+require "ginatra/repo"
+require "ginatra/repo_list"
+require "ginatra/config"
+require "ginatra/helpers"
 
-require "#{current_path}/sinatra/partials"
+require "sinatra/partials"
 
 # Written myself. i know, what the hell?!
 module Ginatra
 
   # A standard error class for inheritance.
-  # @todo Look for a refactor.
   class Error < StandardError; end
 
   # An error related to a commit somewhere.
-  # @todo Look for a refactor.
-  class CommitsError < Error; end
+  class CommitsError < Error
+    def initialize(repo)
+      super("Something went wrong looking for the commits for #{repo}")
+    end
+  end
 
   # Error raised when commit ref passed in parameters
   # does not exist in repository
@@ -36,9 +41,7 @@ module Ginatra
     end
   end
 
-  current_path = File.expand_path(File.dirname(__FILE__))
-  # @todo look for a refactor that is rip compatible
-  VERSION = File.new("#{current_path}/../VERSION").read
+  VERSION = "2.2.0"
 
   # The main application class.
   #
@@ -46,15 +49,21 @@ module Ginatra
   # and is what is mounted by the +rackup.ru+ files.
   class App < Sinatra::Base
 
+    # logger that can be used with the Sinatra code
+    def logger
+      Ginatra::Config.logger
+    end
+
     configure do
-      current_path = File.expand_path(File.dirname(__FILE__))
       Config.load!
+      set :host, Ginatra::Config[:host]
       set :port, Ginatra::Config[:port]
       set :raise_errors, Proc.new { test? }
       set :show_exceptions, Proc.new { development? }
       set :dump_errors, true
       set :logging, Proc.new { !test? }
       set :static, true
+      current_path = File.expand_path(File.dirname(__FILE__))
       set :public, "#{current_path}/../public"
       set :views, "#{current_path}/../views"
     end
@@ -79,8 +88,7 @@ module Ginatra
     end
 
     # The root route
-    #
-    # @todo how does this work?
+    # This works by interacting with the Ginatra::Repolist singleton.
     get '/' do
       erb :index
     end
@@ -175,6 +183,7 @@ module Ginatra
     get '/:repo/tree/:tree' do
       @repo = RepoList.find(params[:repo])
 
+      # this might look silly but it's needed to pass the --verify.
       if (tag = @repo.git.method_missing('rev_parse', {}, '--verify', "#{params[:tree]}^{tree}")).empty?
         # we don't have a tree.
         not_found
@@ -184,8 +193,8 @@ module Ginatra
 
       @tree = @repo.tree(params[:tree]) # can also be a ref (i think)
       @path = {}
-      @path[:tree] = "/#{params[:repo]}/tree/#{params[:tree]}"
-      @path[:blob] = "/#{params[:repo]}/blob/#{params[:tree]}"
+      @path[:tree] = "#{params[:repo]}/tree/#{params[:tree]}"
+      @path[:blob] = "#{params[:repo]}/blob/#{params[:tree]}"
       erb(:tree)
     end
 
@@ -202,12 +211,12 @@ module Ginatra
       if @tree.is_a?(Grit::Blob)
         # we need @tree to be a tree. if it's a blob, send it to the blob page
         # this allows people to put in the remaining part of the path to the file, rather than endless clicks like you need in github
-        redirect "/#{params[:repo]}/blob/#{params[:tree]}/#{params[:splat].first}"
+        redirect "#{params[:repo]}/blob/#{params[:tree]}/#{params[:splat].first}"
       else
         etag(@tree.id)
         @path = {}
-        @path[:tree] = "/#{params[:repo]}/tree/#{params[:tree]}/#{params[:splat].first}"
-        @path[:blob] = "/#{params[:repo]}/blob/#{params[:tree]}/#{params[:splat].first}"
+        @path[:tree] = "#{params[:repo]}/tree/#{params[:tree]}/#{params[:splat].first}"
+        @path[:blob] = "#{params[:repo]}/blob/#{params[:tree]}/#{params[:splat].first}"
         erb(:tree)
       end
     end
@@ -239,16 +248,6 @@ module Ginatra
         redirect "/#{params[:repo]}/tree/#{params[:tree]}/#{params[:splat].first}"
       else
         etag(@blob.id)
-        extension = params[:splat].first.split(".").last
-        @highlighter = case extension
-          when 'js'
-            'javascript'
-          when 'css'
-            'css'
-        end
-
-        @highlighter ||= 'ruby'
-
         erb(:blob)
       end
     end

data/lib/ginatra/config.rb

@@ -15,9 +15,44 @@ module Ginatra
       :git_dirs => [File.expand_path("#{current_path}/../../repos/*")],
       :ignored_files => ['README.md'],
       :description => "View My Git Repositories",
-      :port => 9797
+      :port => 9797,
+      :host => "0.0.0.0",
+      :prefix => "/"
     }
 
+    def self.logger
+      return @logger if @logger
+
+      log_file = Ginatra::Config[:log_file].to_s || STDOUT
+
+      # create log_file location
+      # The log_file config option should be an absolute file system path
+      # It doesn't have to exist, but ginatra should have the proper file system privileges to create the directories 
+      # and files along the specified path
+      unless log_file == STDOUT
+        parent_dir, separator, file_component = log_file.rpartition("/")
+        FileUtils.mkdir_p parent_dir
+        FileUtils.touch log_file
+      end
+
+      # determine log level from config file
+      # The log_level config option should be one of the Logger::Severity constant names (case doesn't matter)
+      # example: :log_level: debug
+      log_level = Ginatra::Config[:log_level]
+
+      if log_level.nil?
+        log_level = Logger::WARN
+      else
+        log_level = Logger.const_get(log_level.to_s.upcase.to_sym)
+        log_level = Logger::WARN if log_level.nil?
+      end
+
+      @logger = Logger.new(log_file)
+      @logger.level     = log_level
+      @logger.formatter = Proc.new {|s, t, n, msg| "[#{t}] #{msg}\n"}
+      @logger
+    end
+
     # Dumps the Default configuration to +CONFIG_PATH+,
     # WITHOUT regard for what's already there.
     #

data/lib/ginatra/helpers.rb

@@ -1,10 +1,22 @@
 require "digest/md5"
+require "open4"
 
 module Ginatra
   # Helpers used in the views usually,
   # but not exclusively.
   module Helpers
 
+    # constructs the URL used in the layout's base tag
+    def prefix_url(rest_of_url="")
+      prefix = Ginatra::Config[:prefix].to_s
+
+      if prefix.length > 0 && prefix[-1].chr == "/"
+        prefix.chop!
+      end
+
+      "#{prefix}/#{rest_of_url}"
+    end
+
     # takes an email and returns a url to a secure gravatar
     #
     # @param [String] email the email address
@@ -59,7 +71,7 @@ module Ginatra
     # @return [String] HTML link to the given ref with class attached.
     def commit_ref(ref, repo_param)
       ref_class = ref.class.to_s.split("::")[1].to_s
-      "<a class=\"ref #{ref_class}\" href=\"/#{repo_param}/#{ref.name}\">#{ref.name}</a>"
+      "<a class=\"ref #{ref_class}\" href=\"" + prefix_url("#{repo_param}/#{ref.name}") + "\">#{ref.name}</a>"
     end
 
     # calls +Ginatra::Helpers#commit_ref+ for each ref in the commit
@@ -84,7 +96,7 @@ module Ginatra
     #
     # @return [String] the HTML link to the archive.
     def archive_link(tree, repo_param)
-      "<a class=\"download\" href=\"/#{repo_param}/archive/#{tree.id}.tar.gz\" title=\"Download a tar.gz snapshot of this Tree\">Download Archive</a>"
+      "<a class=\"download\" href=\"" + prefix_url("#{repo_param}/archive/#{tree.id}.tar.gz") + "\" title=\"Download a tar.gz snapshot of this Tree\">Download Archive</a>"
     end
 
     # returns a string including the link to download a patch for a certain
@@ -96,7 +108,7 @@ module Ginatra
     #
     # @return [String] the HTML link to the patch
     def patch_link(commit, repo_param)
-      "<a class=\"download\" href=\"/#{repo_param}/commit/#{commit.id}.patch\" title=\"Download a patch file of this Commit\">Download Patch</a>"
+      "<a class=\"download\" href=\"" + prefix_url("#{repo_param}/commit/#{commit.id}.patch") + "\" title=\"Download a patch file of this Commit\">Download Patch</a>"
     end
 
     # returns a HTML (+<ul>+) list of the files altered in a given commit.
@@ -123,14 +135,6 @@ module Ginatra
       "<ul id='files'>#{out.join}</ul>"
     end
 
-    # returns some html containing the Coderay'd diff files.
-    #
-    # @param [String] diff the diff you want highlighted
-    # @return [String] the highlighted diff
-    def diff(diff)
-      diff = CodeRay.scan(diff, :diff).div(:line_numbers => :table, :css => :class)
-    end
-
     # Formats the text to remove multiple spaces and newlines, and then inserts
     # HTML linebreaks.
     #
@@ -209,8 +213,7 @@ module Ginatra
     end
 
     # Returns the Hostname of the given install. 
-    #
-    # @todo Where is this used?
+    # used in the atom feeds.
     #
     # stolen from Marley
     # 
@@ -226,8 +229,28 @@ module Ginatra
     #
     # @return [String] the HTML containing the link to the feed.
     def atom_feed_link(repo_param, ref=nil)
-      "<a href=\"/#{repo_param}#{"/#{ref}" if !ref.nil?}.atom\" title=\"Atom Feed\" class=\"atom\">Feed</a>"
+      "<a href=\"" + prefix_url("#{repo_param}#{"/#{ref}" if !ref.nil?}.atom") + "\" title=\"Atom Feed\" class=\"atom\">Feed</a>"
     end
 
+    def pygmentize(content, filename=nil)
+      type = !filename ? "diff" : pygmentize_type(filename)
+      html_output = ''
+      Open4.popen4("pygmentize -l #{type} -f html") do |pid, stdin, stdout, stderr|
+        stdin.puts content
+        stdin.close
+        html_output = stdout.read.strip
+        [stdout, stderr].each {|io| io.close }
+      end
+      html_output
+    end
+
+    def pygmentize_type(filename)
+      type =''
+      Open4.popen4("pygmentize -N #{filename}") do |pid, stdin, stdout, stderr|
+        type = stdout.read.strip
+        [stdin, stdout, stderr].each {|io| io.close }
+      end
+      type
+    end
   end
 end

data/lib/ginatra/repo.rb

@@ -82,5 +82,14 @@ module Ginatra
       @repo.send(sym, *args, &block)
     end
 
+    # to correspond to the #method_missing definition
+    def respond_to?(sym)
+      @repo.respond_to?(sym) || super
+    end
+
+    # not sure why we need this but whatever.
+    def to_s
+      @name.to_s
+    end
   end
 end

data/lib/ginatra/repo_list.rb

@@ -26,13 +26,13 @@ module Ginatra
 
     # searches through the configured directory globs to find all the repositories
     # and adds them if they're not already there.
-    #
-    # @todo Docs: what the hell does this return?
     def refresh
-      Ginatra::Config.git_dirs.map! do |git_dir|
+      list.clear
+      Ginatra::Config.git_dirs.map do |git_dir|
         files = Dir.glob(git_dir)
         files.each { |e| add(e) unless Ginatra::Config.ignored_files.include?(File.split(e).last) }
       end
+      list
     end
 
     # adds a Repo corresponding to the path it found a git repo at in the configured
@@ -41,12 +41,18 @@ module Ginatra
     # @param [String] path the path of the git repo
     # @param [String] param the param of the repo if it differs, 
     #   for looking to see if it's already on the list
-    #
-    # @todo Docs: what does this return?
     def add(path, param = File.split(path).last)
       unless self.has_repo?(param)
-        list << Repo.new(path)
+        begin
+          list << Repo.new(path)
+        rescue Grit::InvalidGitRepositoryError
+          # If the path is not a git repository, then this error is raised
+          # and causes an error page to result.
+          # Is it preferable to just log that the error happened and not show the error page?
+          Ginatra::Config.logger.info "Invalid git repository at #{path}.  Did you create the directory and forget to run 'git init' inside that directory?"
+        end
       end
+      list
     end
 
     # checks to see if the list contains a repo with a param 
@@ -83,12 +89,14 @@ module Ginatra
 
     # allows missing methods to cascade to the instance,
     #
-    # @todo do we need this?
-    # @todo update the respond_to? method if we do.
-    #
     # Caution! contains: Magic
     def self.method_missing(sym, *args, &block)
       instance.send(sym, *args, &block)
     end
+
+    # updated to correspond to the method_missing definition
+    def self.respond_to?(sym)
+      instance.respond_to?(sym) || super
+    end
   end
 end

data/rackup.ru

@@ -1,6 +1,6 @@
-current_path = File.expand_path(File.dirname(__FILE__))
+$:.unshift File.expand_path("#{File.dirname(__FILE__)}/lib")
 
-require "#{current_path}/lib/ginatra"
+require "ginatra"
 
 map '/' do
   run Ginatra::App

data/spec/repo_list_spec.rb

@@ -2,7 +2,7 @@ current_path = File.expand_path(File.dirname(__FILE__))
 require File.join(current_path, "spec_helper")
 
 describe "Ginatra" do
-  
+
   describe "RepoList" do
 
     before do
@@ -18,5 +18,64 @@ describe "Ginatra" do
       @repo_list.include?(@repo)
     end
 
+    it "has_repo? works for existing repo" do
+      Ginatra::RepoList.instance.has_repo?("test").should == true
+    end
+
+    it "has_repo? works for non-existant repo" do
+      Ginatra::RepoList.instance.has_repo?("bad-test").should == false
+    end
+
+    describe "New repos added to repo directory" do
+
+      NEW_REPO_NAME = "temp-new-repo"
+      REPO_DIR = File.join(current_path, "..", "repos")
+
+      def print_repos_found
+        Ginatra::Config.git_dirs.map! do |git_dir|
+          files = Dir.glob(git_dir)
+          files.each { |e| STDOUT.puts(e) unless Ginatra::Config.ignored_files.include?(File.split(e).last) }
+        end
+      end
+
+      before(:each) do
+        FileUtils.cd(REPO_DIR) do |dir|
+          FileUtils.mkdir(NEW_REPO_NAME)
+          FileUtils.cd(NEW_REPO_NAME) do |dir|
+            `git init`
+          end
+        end
+      end
+
+      it "should detect new repo after refresh" do
+        repo_list = Ginatra::RepoList.list # calling this should refresh the list
+
+        Ginatra::RepoList.instance.has_repo?(NEW_REPO_NAME).should == true
+
+        new_repo = Ginatra::RepoList.find(NEW_REPO_NAME)
+        repo_list.should include(new_repo)
+      end
+
+      it "should detect when a repo has been removed after refresh" do
+        repo_list = Ginatra::RepoList.list # calling this should refresh the list
+
+        Ginatra::RepoList.instance.has_repo?(NEW_REPO_NAME).should == true
+
+        new_repo = Ginatra::RepoList.find(NEW_REPO_NAME)
+        repo_list.should include(new_repo)
+
+        # remove the new repository from the file system
+        FileUtils.rm_rf File.join(REPO_DIR, NEW_REPO_NAME), :secure => true
+
+        repo_list = Ginatra::RepoList.list # refresh the repo list
+
+        Ginatra::RepoList.instance.has_repo?(NEW_REPO_NAME).should == false
+        repo_list.should_not include(new_repo)
+      end
+
+      after(:each) do
+        FileUtils.rm_rf File.join(REPO_DIR, NEW_REPO_NAME), :secure => true
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -7,7 +7,16 @@ current_path = File.expand_path(File.dirname(__FILE__))
 require "#{current_path}/../lib/ginatra"
 
 gem 'webrat', '>=0.4.4'
-require 'webrat/sinatra'
+begin
+  # When using webrat 0.6.0, there is no webrat/sinatra.rb file.
+  # Looking at the gem's code, it looks like it autoloads the sinatra adapter at webrat/adapters/sinatra.rb.
+  # So requiring just 'webrat' will also load the sinatra adapater, which is done in the rescue clause.
+  require 'webrat/sinatra'
+rescue LoadError
+  STDERR.puts "WARNING: could not load webrat/sinatra: #{__FILE__}:#{__LINE__}"
+  require 'webrat'
+end
+
 gem 'rack-test', '>=0.3.0'
 require 'rack/test'
 

data/views/_commit_info_box.erb

@@ -3,21 +3,21 @@
     <dl>
       <dt>commit:</dt>
       <dd>
-        <a href='/<%= repo.param %>/commit/<%= commit.id_abbrev %>'>
+        <a href='<%= prefix_url(repo.param) %>/commit/<%= commit.id_abbrev %>'>
           <code><%= commit.id %></code>
         </a>
       </dd><br>
       
       <dt>tree:</dt>
       <dd>
-        <a href='/<%= repo.param %>/tree/<%= commit.tree.id[0..7] %>'>
+        <a href='<%= prefix_url(repo.param) %>/tree/<%= commit.tree.id[0..7] %>'>
           <code><%= commit.tree.id %></code>
         </a>
       </dd><br>
       <% commit.parents.each do |parent| %>
         <dt>parent:</dt>
         <dd>
-          <a href='/<%= repo.param %>/commit/<%= parent.id_abbrev %>'>
+          <a href='<%= prefix_url(repo.param) %>/commit/<%= parent.id_abbrev %>'>
             <code><%= parent.id %></code>
           </a>
         </dd>

data/views/_header.erb

@@ -1,5 +1,5 @@
 <h2>
-  <a href='/<%= repo.param %>'><%= repo.name %></a>
+  <a href='<%= prefix_url(repo.param) %>'><%= repo.name %></a>
 </h2>
 <div class='repo-info'>
   <%= repo.description.split("\n").first %>

data/views/_tree_part.erb

@@ -5,7 +5,7 @@
       <%= partial(:tree_part, :locals => {:current_tree => next_tree, :tree_path => new_path, :path => path }) %>
     <% end %>
     <% current_tree.blobs.each do |next_blob| %>
-      <li class="blob"><a href="<%= path[:blob] %><%= tree_path %>/<%= next_blob.basename %>"><%= next_blob.basename %></a></li>
+      <li class="blob"><a href="<%= prefix_url(path[:blob]) %><%= tree_path %>/<%= next_blob.basename %>"><%= next_blob.basename %></a></li>
     <% end %>
   </ul>
 </li>

data/views/atom.builder

@@ -1,7 +1,7 @@
 xml.instruct! :xml, :version => '1.0', :encoding => 'utf-8'
 xml.feed :'xml:lang' => 'en-US', :xmlns => 'http://www.w3.org/2005/Atom' do
   base_title = "#{@repo.name}: "
-  base_url = "http://#{hostname}/#{@repo.param}"
+  base_url = "http://#{hostname}" + prefix_url("#{@repo.param}")
   if params[:ref]
     url = base_url + "/#{params[:ref]}"
     title = base_title + params[:ref]

data/views/blob.erb

@@ -2,8 +2,8 @@
 <h3>Blob: <%= params[:splat].first %></h3>
 <div class="active">
   <div class="blob">
-    <h4><img src="/img/doc.png" /><%= @blob.name %></h4>
-    <%= CodeRay.scan(@blob.data, @highlighter).div(:line_numbers => :table, :css => :class) %>
+    <h4><img src="<%= prefix_url("img/doc.png") %>" /><%= @blob.name %></h4>
+    <%= pygmentize(@blob.data, @blob.name) %>
   </div>
   <div class="clearfix">&nbsp;</div>
 </div>

data/views/commit.erb

@@ -12,8 +12,8 @@
       <% count = 0 %>
       <% @commit.diffs.select { |d| !d.deleted_file && !d.new_file }.each do |diff| %>
         <% count += 1 %>    
-        <h4><img src="/img/doc.png" /><a name='file_<%= count %>'><code><%= diff.b_path %></code></a></h4>
-        <div class="diff"><%= diff((diff.diff)) %></div>
+        <h4><img src="<%= prefix_url("img/doc.png") %>" /><a name='file_<%= count %>'><code><%= diff.b_path %></code></a></h4>
+        <div class="diff"><%= pygmentize(diff.diff) %></div>
       <% end %>
     </div>
   </div>

data/views/index.erb

@@ -5,7 +5,7 @@
   </div>
   <dl>
     <% Ginatra::RepoList.list.each do |repo| %>
-      <dt><a href="/<%= repo.param %>"><%= repo.name %></a></dt>
+      <dt><a href="<%= prefix_url(repo.param) %>"><%= repo.name %></a></dt>
       <dd><%=h repo.description %></dd>
     <% end %>
   </dl>

data/views/layout.erb

@@ -4,26 +4,27 @@
 	<head>
 	  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<title>Ginatra</title>
-		<link rel="stylesheet" href="/src/index.css" type="text/css" media="screen" />
-		<link rel="stylesheet" href="/src/default.css" type="text/css" media="screen" />
-		
-		<script type="text/javascript" src="/src/highlight.pack.js"></script>
+		<link rel="stylesheet" href="<%= prefix_url("src/index.css") %>" type="text/css" media="screen" />
+		<link rel="stylesheet" href="<%= prefix_url("src/default.css") %>" type="text/css" media="screen" />
+
+		<script type="text/javascript" src="<%= prefix_url("src/highlight.pack.js") %>"></script>
     <script type="text/javascript">
       hljs.initHighlightingOnLoad();
     </script>
-    <script src="/src/jquery-1.3.2.min.js" type="text/javascript"></script>
-		<script src="/src/ginatra.js" type="text/javascript"></script>
+    <script src="<%= prefix_url("src/jquery-1.3.2.min.js") %>" type="text/javascript"></script>
+		<script src="<%= prefix_url("src/ginatra.js") %>" type="text/javascript"></script>
+		
 		<!--[if lt IE 8]>
       <script src="http://ie7-js.googlecode.com/svn/version/2.0(beta3)/IE8.js" type="text/javascript"></script>
       <style type="text/css" media="screen">
-        * { behavior: url("/src/iepngfix.htc") }
+        * { behavior: url("<%= prefix_url("src/iepngfix.htc") %>") }
       </style>
     <![endif]-->
 	</head>
 	<body>
 		<div id="content">
 		  <div id="inner">
-		    <h1><a href="/">Ginatra</a></h1>
+		    <h1><a href="<%= prefix_url %>">Ginatra</a></h1>
 		    <%= yield %> 
 		  </div>
 		  <div id="footer-spacer">&nbsp;</div>

data/views/log.erb

@@ -2,7 +2,7 @@
 <h3>Commits<% if params[:ref] %>: <%= params[:ref] %><% end %> <%= atom_feed_link(@repo.param, params[:ref]) %></h3>
 <div class="active">
   <% if @previous_commits %>
-    <a href='/<%= params[:repo] %>/<%= params[:ref] %>/<%= params[:page] - 1 %>'>Previous</a>
+    <a href='<%= prefix_url(params[:repo]) %>/<%= params[:ref] %>/<%= params[:page] - 1 %>'>Previous</a>
   <% end %>
 
   <% if @separator %>
@@ -10,7 +10,7 @@
   <% end %>
 
   <% if @next_commits %>
-    <a href='/<%= params[:repo] %>/<%= params[:ref] %>/<%= params[:page] + 1 %>'>Next</a>
+    <a href='<%= prefix_url(params[:repo]) %>/<%= params[:ref] %>/<%= params[:page] + 1 %>'>Next</a>
   <% end %>
   <div class='list'>
     <div id='heads'>
@@ -18,7 +18,7 @@
       <ul>
         <% @repo.heads.each do |head| %>
           <li>
-            <a href="/<%=h @repo.param %>/<%=h head.name %>">
+            <a href="<%=h prefix_url(@repo.param) %>/<%=h head.name %>">
               <%=h head.name %>
             </a>
           </li>
@@ -32,7 +32,7 @@
         <ul>
           <% @repo.tags.each do |tag| %>
             <li>
-              <a href="/<%=h @repo.param %>/commit/<%=h tag.name %>">
+              <a href="<%=h prefix_url(@repo.param) %>/commit/<%=h tag.name %>">
                 <%=h tag.name %>
               </a>
             </li>
@@ -45,7 +45,7 @@
   </div>
   <div id='commit-log'>
     <% @commits.each do |commit| %>
-    <% url = "/#{@repo.param}/commit/#{commit.id_abbrev}" %>
+    <% url = prefix_url("#{@repo.param}/commit/#{commit.id_abbrev}") %>
       <div id='commit_<%= commit.id_abbrev %>' class='commit' onclick="location.href='<%= url %>'">
         <div class='right'>
           <span class='id'>

data/views/tree.erb

@@ -3,21 +3,21 @@
 <div class="active">
   <ul class="commit-tree">
     <% @tree.trees.each do |tree| %>
-      <% tree_path = "/#{tree.name}"%>
-      <li class="tree"><a href="<%= @path[:tree] %><%= tree_path %>"><%= tree.basename %></a>
+      <% tree_path = "#{tree.name}"%>
+      <li class="tree"><a href="<%= prefix_url(@path[:tree]) %><%= tree_path %>"><%= tree.basename %></a>
         <ul>
           <% tree.trees.each do |next_tree| %>
             <% new_path = tree_path + "/#{next_tree.name}" %>
             <%= partial(:tree_part, :locals => {:current_tree => next_tree, :tree_path => new_path, :path => @path }) %>
           <% end %>
           <% tree.blobs.each do |next_blob| %>
-            <li class="blob"><a href="<%= @path[:blob] %><%= tree_path %>/<%= next_blob.basename %>"><%= next_blob.basename %></a></li>
+            <li class="blob"><a href="<%= prefix_url(@path[:blob]) %>/<%= tree_path %>/<%= next_blob.basename %>"><%= next_blob.basename %></a></li>
           <% end %>
         </ul>
       </li>
     <% end %>
     <% @tree.blobs.each do |blob| %>
-      <li class="blob"><a href="<%= @path[:blob] %>/<%= blob.basename %>"><%= blob.basename %></a></li>
+      <li class="blob"><a href="<%= prefix_url(@path[:blob]) %>/<%= blob.basename %>"><%= blob.basename %></a></li>
     <% end %>
   </ul>
   <div class="clearfix">&nbsp;</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ginatra
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors: 
 - Sam Elliott
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-28 00:00:00 +01:00
+date: 2010-01-06 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,14 +34,24 @@ dependencies:
         version: 1.1.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: coderay
+  name: vegas
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.0
+        version: 0.1.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: open4
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.6
     version: 
 description: Host your own git repository browser through the power of Sinatra and Grit
 email: sam@lenary.co.uk
@@ -57,11 +67,8 @@ extra_rdoc_files:
 files: 
 - .gitattributes
 - .gitignore
-- .gitmodules
 - README.md
 - Rakefile
-- TODO.md
-- VERSION
 - bin/ginatra
 - bin/ginatra-daemon
 - bin/ginatra-directory
@@ -70,7 +77,6 @@ files:
 - features/pages.feature
 - features/step_definitions/page_steps.rb
 - features/support/env.rb
-- ginatra.gemspec
 - lib/ginatra.rb
 - lib/ginatra/config.rb
 - lib/ginatra/helpers.rb
@@ -86,9 +92,7 @@ files:
 - public/src/blank.gif
 - public/src/colour.css
 - public/src/commit.css
-- public/src/default.css
 - public/src/ginatra.js
-- public/src/highlight.pack.js
 - public/src/iepngfix.htc
 - public/src/index.css
 - public/src/jquery-1.3.2.min.js

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "vendor/vegas"]
-	path = vendor/vegas
-	url = git://github.com/quirkey/vegas.git

data/TODO.md

@@ -1,10 +0,0 @@
-TODO
-====
-
-Suggestions
------------
-
-- Multiple directory or glob-based repo paths [raggi]
-- Rake tasks for demo [raggi]
-- Rake tasks for adding repos [lenary]
-- A New Name [qrush]

data/VERSION

@@ -1 +0,0 @@
-2.1.1

data/ginatra.gemspec

@@ -1,108 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{ginatra}
-  s.version = "2.1.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Sam Elliott", "Ryan Bigg"]
-  s.date = %q{2009-12-28}
-  s.description = %q{Host your own git repository browser through the power of Sinatra and Grit}
-  s.email = %q{sam@lenary.co.uk}
-  s.executables = ["ginatra", "ginatra-daemon", "ginatra-directory", "ginatra-server"]
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    ".gitattributes",
-     ".gitignore",
-     ".gitmodules",
-     "README.md",
-     "Rakefile",
-     "TODO.md",
-     "VERSION",
-     "bin/ginatra",
-     "bin/ginatra-daemon",
-     "bin/ginatra-directory",
-     "bin/ginatra-server",
-     "config.ru",
-     "features/pages.feature",
-     "features/step_definitions/page_steps.rb",
-     "features/support/env.rb",
-     "ginatra.gemspec",
-     "lib/ginatra.rb",
-     "lib/ginatra/config.rb",
-     "lib/ginatra/helpers.rb",
-     "lib/ginatra/repo.rb",
-     "lib/ginatra/repo_list.rb",
-     "lib/sinatra/partials.rb",
-     "public/favicon.ico",
-     "public/img/add.png",
-     "public/img/diff.png",
-     "public/img/doc.png",
-     "public/img/rm.png",
-     "public/img/tree.png",
-     "public/src/blank.gif",
-     "public/src/colour.css",
-     "public/src/commit.css",
-     "public/src/default.css",
-     "public/src/ginatra.js",
-     "public/src/highlight.pack.js",
-     "public/src/iepngfix.htc",
-     "public/src/index.css",
-     "public/src/jquery-1.3.2.min.js",
-     "public/src/lists.css",
-     "public/src/reset.css",
-     "public/src/table.css",
-     "public/src/type.css",
-     "rackup.ru",
-     "repos/README.md",
-     "spec/repo_list_spec.rb",
-     "spec/repo_spec.rb",
-     "spec/spec_helper.rb",
-     "views/_actor_box.erb",
-     "views/_commit_info_box.erb",
-     "views/_header.erb",
-     "views/_tree_part.erb",
-     "views/atom.builder",
-     "views/blob.erb",
-     "views/commit.erb",
-     "views/index.erb",
-     "views/layout.erb",
-     "views/log.erb",
-     "views/tree.erb"
-  ]
-  s.homepage = %q{http://lenary.github.com/ginatra}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{A Gitweb Clone in Sinatra and Grit}
-  s.test_files = [
-    "spec/repo_list_spec.rb",
-     "spec/repo_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
-      s.add_runtime_dependency(%q<grit>, [">= 1.1.1"])
-      s.add_runtime_dependency(%q<coderay>, [">= 0.8.0"])
-    else
-      s.add_dependency(%q<sinatra>, [">= 0.9.4"])
-      s.add_dependency(%q<grit>, [">= 1.1.1"])
-      s.add_dependency(%q<coderay>, [">= 0.8.0"])
-    end
-  else
-    s.add_dependency(%q<sinatra>, [">= 0.9.4"])
-    s.add_dependency(%q<grit>, [">= 1.1.1"])
-    s.add_dependency(%q<coderay>, [">= 0.8.0"])
-  end
-end
-