ginatra 2.2.1 → 2.2.3

data/.gitignore

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

data/Gemfile

@@ -0,0 +1,11 @@
+source :rubygems
+
+gemspec
+
+group :development, :test do
+  gem "rake"
+  gem "rspec"
+  gem "webrat"
+  gem "rack-test"
+  gem "cucumber"
+end

data/README.md

@@ -1,5 +1,6 @@
-Ginatra
-=======
+# Ginatra
+[![](http://stillmaintained.com/lenary/ginatra.png)](http://stillmaintained.com/lenary/ginatra)
+
 
 This project  is to make a  clone of gitweb in  Ruby and Sinatra. It  serves git
 repositories out of a set of  specified directories using an array of glob-based
@@ -96,6 +97,9 @@ Attribution
 - Elia Schito (elia)
 - Scott Wisely (Syd)
 - Jonathan Stott (namelessjon)
+- Michael James (umjames)
+
+In a new spirit of openness, all those who submit a patch that gets applied will gain commit access to the main (lenary/ginatra) repository.
 
 **Thanks**
 

data/Rakefile

@@ -1,88 +1,39 @@
-require 'rubygems'
+require "bundler"
+Bundler.setup(:default, :development)
 require 'cucumber/rake/task'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
-$:.unshift File.expand_path("#{File.dirname(__FILE__)}/lib")
+task :default => ['rake:spec', 'rake:features']
 
-require "ginatra"
 
-task :default => ['rake:spec', 'rake:features']
+desc "Clones the Test Repository"
+task :repo do |t|
+  FileUtils.cd(File.join(File.dirname(__FILE__), "repos")) do
+    puts `git clone git://github.com/atmos/hancock-client.git test`
+  end
+end
 
 desc "Runs the Cucumber Feature Suite"
 Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "--format pretty"
+  t.cucumber_opts = ["--format pretty", "features"]
 end
-
 namespace :features do
-
   desc "Runs the `@current` feature(s) or scenario(s)"
   Cucumber::Rake::Task.new(:current) do |c|
-    c.cucumber_opts = "--format pretty -t current"
+    c.cucumber_opts = ["--format pretty", "-t current", "features"]
   end
-
 end
 
 desc "Runs the RSpec Test Suite"
-Spec::Rake::SpecTask.new(:spec) do |r|
-  r.spec_files = FileList['spec/*_spec.rb']
-  r.spec_opts = ['--color']
+RSpec::Core::RakeTask.new(:spec) do |r|
+  r.pattern = 'spec/*_spec.rb'
+  r.rspec_opts = ['--color']
 end
-
 namespace :spec do
-
   desc "RSpec Test Suite with pretty output"
-  Spec::Rake::SpecTask.new(:long) do |r|
-    r.spec_files = FileList['spec/*_spec.rb']
-    r.spec_opts = ['--color', '--format specdoc']
-  end
-
-  desc "RSpec Test Suite with html output"
-  Spec::Rake::SpecTask.new(:html) do |r|
-    r.spec_files = FileList['spec/*_spec.rb']
-    r.spec_opts = ['--color', '--format html:spec/html_spec.html']
-  end
-
-end
-
-namespace :setup do
-
-  desc "Clones the Test Repository"
-  task :repo do |t|
-    FileUtils.cd(File.join(Dir.pwd, "repos")) do
-      puts `git clone git://github.com/atmos/hancock-client.git test`
-    end
-  end
-
-  desc "Installs the Required Gems"
-  task :gems do |t|
-    gems = %w(grit kematzy-sinatra-cache)
-    puts %x(gem install #{gems.join(" ")})
-  end
-
-  desc "Installs the Test Gems"
-  task :test do |t|
-    gems = %w(rspec webrat rack-test cucumber)
-    puts %x(gem install #{gems.join(" ")})
-  end
-
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "ginatra"
-    gemspec.summary = "A Gitweb Clone in Sinatra and Grit"
-    gemspec.description = "Host your own git repository browser through the power of Sinatra and Grit"
-    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('vegas', '>=0.1.0')
-    gemspec.add_dependency('open4', '>= 0.9.6')
+  RSpec::Core::RakeTask.new(:long) do |r|
+    r.pattern = 'spec/*_spec.rb'
+    r.rspec_opts = ['--color', '--format documentation']
   end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
 

data/bin/ginatra

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.expand_path("#{File.dirname(__FILE__)}/../lib")
-
+require "bundler"
+Bundler.setup(:default)
 require "ginatra"
 
 module Ginatra::Executable

data/bin/ginatra-daemon

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.expand_path("#{File.dirname(__FILE__)}/../lib")
-
+require "bundler"
+Bundler.setup(:default)
 require "ginatra"
 require "logger"
 

data/bin/ginatra-directory

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.expand_path("#{File.dirname(__FILE__)}/../lib")
-
+require "bundler"
+Bundler.setup(:default)
 require "ginatra"
 require "logger"
 
@@ -19,7 +19,7 @@ module Ginatra::Directory
 Usage: ginatra-directory [ list | add <globs> | remove <globs> ]
 
 Commands:
-  add    - Adds the <globs> to the array of dirs that Ginatra 
+  add    - Adds the <globs> to the array of dirs that Ginatra
              looks in for repositories.
   remove - Removes the <globs> from the aforementioned array.
   list   - Lists the globs Ginatra looks in for repositories

data/bin/ginatra-server

@@ -1,17 +1,12 @@
 #!/usr/bin/env ruby
 
-begin
-  require 'rubygems'
-rescue LoadError
-end
-require "vegas"
-
-$:.unshift File.expand_path("#{File.dirname(__FILE__)}/../lib")
-
+require "bundler"
+Bundler.setup(:default)
 require "ginatra"
+require "vegas"
 
 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]"
 
   opts.separator "  start  - Start the Ginatra HTTP Server"
@@ -29,6 +24,6 @@ Vegas::Runner.new(Ginatra::App, 'ginatra-server', {:port => Ginatra::Config.port
     runner.options[:start] = false
     at_exit { puts opts }
   end
-  
+
 end
 

data/config.ru

@@ -1,9 +1,7 @@
-$:.unshift File.expand_path("#{File.dirname(__FILE__)}/lib")
-
+require "bundler"
+Bundler.setup(:default)
 require "ginatra"
 
-
-
 map '/' do
   run Ginatra::App
 end

data/features/pages.feature

@@ -2,32 +2,34 @@ Feature: Page
   In order to use multiple repositories 
   As a browser
   I want to see the home page
+  
+  Background:
+    Given I am on the homepage
 
-  Scenario:
-    When I open '/'
+  Scenario: Viewing all the repositories
     Then I should see "Ginatra"
     And I should see "View My Git Repositories"
     And I should see "test"
     And I should see "description file for this repository and set the description for it."
-  Scenario:
-    When I open '/test'
-    Then I should see "Ginatra"
-    And I should see "test"
+    
+  Scenario: Viewing a single repository
+    When I follow "test"
     And I should see "description file for this repository and set the description for it."
     And I should see "Commits"
+    # Perhaps "And I should see xxxxxx as the latest commit"
     And I should see "(author)"
-  Scenario:
-    When I open '/test/commit/eefb4c3'
-    Then I should see "Ginatra"
-    And I should see "test"
+    
+  Scenario: Viewing a commit
+    When I follow "test"
     And I should see "description file for this repository and set the description for it."
-    And I should see "Commit: eefb4c3"
-    And I should see "doh, thanks lenary for reminding me of the files i'd forgotten"
-  Scenario:
-    When I open '/test/tree/24f701fd'
-    Then I should see "Ginatra" 
+    When I follow "095955b6402c30ef24520bafdb8a8687df0a98d3"
+    And I should see "Commit: 095955b"
+    And I should see "first pass at having the hancock client"
+    
+  Scenario: Viewing a file on a commit
+    When I open '/test/tree/6f27ba2f'
     And I should see "test"
     And I should see "description file for this repository and set the description for it."
-    And I should see "Tree: 24f701fd"
+    And I should see "Tree: 6f27ba2f"
     And I should see "README.md"
     And I should see ".gitignore"

data/features/step_definitions/app_steps.rb

@@ -0,0 +1,7 @@
+Given /^I am on the homepage$/ do
+  visit '/'
+end
+
+Then /^show me the page$/ do
+  save_and_open_page
+end

data/ginatra.gemspec

@@ -0,0 +1,18 @@
+Gem::Specification.new do |s|
+  s.name = "ginatra"
+  s.version = "2.2.3"
+  s.summary = "A Gitweb Clone in Sinatra and Grit"
+  s.description = "Host your own git repository browser through the power of Sinatra and Grit"
+  s.email = "sam@lenary.co.uk"
+  s.homepage = "http://lenary.co.uk/ginatra"
+  s.authors = ["Sam Elliott", "Ryan Bigg"]
+  s.add_dependency('bundler', '~> 1.0.15')
+  s.add_dependency('sinatra', '~> 1.2.6')
+  s.add_dependency('grit', '~> 2.4.1')
+  s.add_dependency('vegas', '~> 0.1.8')
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- spec`.split("\n")
+  s.executables   = `git ls-files -- bin`.split("\n").map {|f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/lib/ginatra.rb

@@ -1,28 +1,19 @@
-# We only want Rubygems if it exists. Else, we assume they know what they're doing.
-begin
-  require 'rubygems'
-rescue LoadError
-end
-require 'sinatra/base'
-require 'grit'
-
-# The Ginatra Namespace Module
-module Ginatra; end
 
-# i feel this is cleaner than the #{current_path} shenanigans ($: is the load path)
-$:.unshift File.dirname(__FILE__)
+require "bundler"
+Bundler.setup(:default)
+require 'sinatra/base'
 
-# Loading in whichever order
-require "ginatra/repo"
-require "ginatra/repo_list"
-require "ginatra/config"
-require "ginatra/helpers"
 
 require "sinatra/partials"
 
 # Written myself. i know, what the hell?!
 module Ginatra
 
+  autoload :Config, "ginatra/config"
+  autoload :Helpers, "ginatra/helpers"
+  autoload :Repo, "ginatra/repo"
+  autoload :RepoList, "ginatra/repo_list"
+
   # A standard error class for inheritance.
   class Error < StandardError; end
 
@@ -41,8 +32,6 @@ module Ginatra
     end
   end
 
-  VERSION = "2.2.1"
-
   # The main application class.
   #
   # This class contains all the core application logic
@@ -68,17 +57,7 @@ module Ginatra
       set :views, "#{current_path}/../views"
     end
 
-    helpers do
-
-      # Ginatra::Helpers module full of goodness
-      include Helpers
-
-      # My Sinatra Partials implementation.
-      #
-      # check out http://gist.github.com/119874
-      # for more details
-      include ::Sinatra::Partials
-    end
+    helpers Helpers, Sinatra::Partials
 
     # Let's handle a CommitsError.
     #
@@ -102,7 +81,7 @@ module Ginatra
       @repo = RepoList.find(params[:repo])
       @commits = @repo.commits
       return "" if @commits.empty?
-      etag(@commits.first.id)
+      etag(@commits.first.id) if Ginatra::App.environment?(:production)
       builder :atom, :layout => nil
     end
 
@@ -114,7 +93,7 @@ module Ginatra
     get '/:repo' do
       @repo = RepoList.find(params[:repo])
       @commits = @repo.commits
-      etag(@commits.first.id)
+      etag(@commits.first.id) if Ginatra::App.environment?(:production)
       erb :log
     end
 
@@ -126,7 +105,7 @@ module Ginatra
       @repo = RepoList.find(params[:repo])
       @commits = @repo.commits(params[:ref])
       return "" if @commits.empty?
-      etag(@commits.first.id)
+      etag(@commits.first.id) if Ginatra::App.environment?(:production)
       builder :atom, :layout => nil
     end
 
@@ -140,7 +119,7 @@ module Ginatra
       params[:page] = 1
       @repo = RepoList.find(params[:repo])
       @commits = @repo.commits(params[:ref])
-      etag(@commits.first.id)
+      etag(@commits.first.id) if Ginatra::App.environment?(:production)
       erb :log
     end
 
@@ -161,7 +140,7 @@ module Ginatra
     get '/:repo/commit/:commit' do
       @repo = RepoList.find(params[:repo])
       @commit = @repo.commit(params[:commit]) # can also be a ref
-      etag(@commit.id)
+      etag(@commit.id) if Ginatra::App.environment?(:production)
       erb(:commit)
     end
 
@@ -183,12 +162,11 @@ 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?
+      if (tag = @repo.git.rev_parse({'--verify' => ''}, "#{params[:tree]}^{tree}")).empty?
         # we don't have a tree.
         not_found
       else
-        etag(tag)
+        etag(tag) if Ginatra::App.environment?(:production)
       end
 
       @tree = @repo.tree(params[:tree]) # can also be a ref (i think)
@@ -213,7 +191,7 @@ module Ginatra
         # 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}"
       else
-        etag(@tree.id)
+        etag(@tree.id) if Ginatra::App.environment?(:production)
         @path = {}
         @path[:tree] = "#{params[:repo]}/tree/#{params[:tree]}/#{params[:splat].first}"
         @path[:blob] = "#{params[:repo]}/blob/#{params[:tree]}/#{params[:splat].first}"
@@ -228,7 +206,7 @@ module Ginatra
     get '/:repo/blob/:blob' do
       @repo = RepoList.find(params[:repo])
       @blob = @repo.blob(params[:blob])
-      etag(@blob.id)
+      etag(@blob.id) if Ginatra::App.environment?(:production)
       erb(:blob)
     end
 
@@ -247,7 +225,7 @@ module Ginatra
         # this allows people to put in the remaining part of the path to the folder, rather than endless clicks like you need in github
         redirect "/#{params[:repo]}/tree/#{params[:tree]}/#{params[:splat].first}"
       else
-        etag(@blob.id)
+        etag(@blob.id) if Ginatra::App.environment?(:production)
         erb(:blob)
       end
     end

data/lib/ginatra/config.rb

@@ -1,3 +1,6 @@
+require "yaml"
+require 'fileutils'
+
 module Ginatra
 
   # A Wrapper for the ginatra configuration variables,
@@ -27,7 +30,7 @@ module Ginatra
 
       # 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 
+      # 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("/")
@@ -53,33 +56,27 @@ module Ginatra
       @logger
     end
 
-    # Dumps the Default configuration to +CONFIG_PATH+,
-    # WITHOUT regard for what's already there.
-    #
-    # Very Destructive Method. Use with care!
-    def self.setup!
+    unless File.exist?(CONFIG_PATH)
+      FileUtils.mkdir_p(File.dirname(CONFIG_PATH))
       File.open(CONFIG_PATH, 'w') do |f|
         YAML.dump(DEFAULT_CONFIG, f)
       end
     end
 
-    unless File.exist?(CONFIG_PATH)
-      require 'fileutils'
-      FileUtils.mkdir_p(File.dirname(CONFIG_PATH))
-      setup!
-    end
-    
     # Loads the configuration and merges it with
     # the default configuration.
     #
     # @return [Hash] config a hash of the configuration options
     def self.load!
-      @config = {}
-      begin
-        @config = YAML.load_file(CONFIG_PATH)
-      rescue Errno::ENOENT
+      loaded_config = {}
+      @config = DEFAULT_CONFIG.dup
+      if File.size(CONFIG_PATH) == 0
+        dump!
+      else
+        loaded_config = YAML.load_file(CONFIG_PATH)
+        @config.merge!(loaded_config)
       end
-      @config = DEFAULT_CONFIG.merge(@config)
+      @config
     end
 
     # Dumps the _current_ configuration to +CONFIG_PATH+

data/lib/ginatra/helpers.rb

@@ -1,5 +1,4 @@
 require "digest/md5"
-require "open4"
 
 module Ginatra
   # Helpers used in the views usually,
@@ -231,30 +230,5 @@ module Ginatra
     def atom_feed_link(repo_param, ref=nil)
       "<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
-    rescue Errno::ENOENT
-      return "<div class=\"highlight\"><pre>#{content}</pre></div>"
-    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
-    rescue Errno::ENOENT
-      return "text"
-    end
   end
 end

data/lib/ginatra/repo.rb

@@ -1,3 +1,5 @@
+require "grit"
+
 module Grit
   class Commit
     # this lets us add a link between commits and refs directly
@@ -30,7 +32,7 @@ module Ginatra
 
     # Return a commit corresponding to the commit to the repo,
     # but with the refs already attached.
-    # 
+    #
     # @see Ginatra::Repo#add_refs
     #
     # @raise [Ginatra::InvalidCommit] if the commit doesn't exist.
@@ -56,10 +58,10 @@ module Ginatra
     def commits(start = 'master', max_count = 10, skip = 0)
       raise(Ginatra::Error.new("max_count cannot be less than 0")) if max_count < 0
       @repo.commits(start, max_count, skip).each do |commit|
-        add_refs(commit) 
+        add_refs(commit)
       end
     end
-    
+
     # Adds the refs corresponding to Grit::Commit objects to the respective Commit objects.
     #
     # @todo Perhaps move into commit class.
@@ -67,10 +69,7 @@ module Ginatra
     # @param [Grit::Commit] commit the commit you want refs added to
     # @return [Array] the array of refs added to the commit. they are also on the commit object.
     def add_refs(commit)
-      commit.refs = []
-      refs = @repo.refs.select { |ref| ref.commit.id == commit.id }
-      commit.refs << refs
-      commit.refs.flatten!
+      commit.refs = @repo.refs.select {|ref| ref.commit.id == commit.id }
     end
 
     # Catch all

data/rackup.ru

@@ -1,9 +1,7 @@
-$:.unshift File.expand_path("#{File.dirname(__FILE__)}/lib")
-
+require "bundler"
+Bundler.setup(:default)
 require "ginatra"
 
-
-
 map '/' do
   run Ginatra::App
 end

data/spec/repo_list_spec.rb

@@ -1,4 +1,3 @@
-$:.unshift File.dirname(__FILE__)
 require "spec_helper"
 
 describe "Ginatra" do

data/spec/repo_spec.rb

@@ -1,4 +1,3 @@
-$:.unshift File.dirname(__FILE__)
 require "spec_helper"
 
 describe "Ginatra" do
@@ -12,7 +11,7 @@ describe "Ginatra" do
       @repo_list = Ginatra::RepoList
       @ginatra_repo = @repo_list.find("test")
       @grit_repo = Grit::Repo.new(File.join(current_path, "..", "repos", "test"), {})
-      @commit = @ginatra_repo.commit("910ff56f585bcdfc3ba105c8846b1df0a6abf069")
+      @commit = @ginatra_repo.commit("095955b6402c30ef24520bafdb8a8687df0a98d3")
     end
 
     it "should have a name" do

data/spec/spec_helper.rb

@@ -1,27 +1,13 @@
-require 'rubygems'
 
-#gem 'rspec'
-require 'spec'
-
-$:.unshift File.expand_path("#{File.dirname(__FILE__)}/../lib")
+require 'bundler'
+Bundler.setup(:default, :test)
+require 'rspec'
 require "ginatra"
-
-#gem 'webrat', '>=0.4.4'
-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 'webrat'
 require 'rack/test'
 
 Webrat.configure do |config|
-  config.mode = :sinatra
+  config.mode = :rack
 end
 
 current_path = File.expand_path(File.dirname(__FILE__))
@@ -29,7 +15,7 @@ current_path = File.expand_path(File.dirname(__FILE__))
 Ginatra::App.set :environment, :test
 Ginatra::Config[:git_dirs] = ["#{current_path}/../repos/*"]
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   def app
     Ginatra::App
   end

data/views/blob.erb

@@ -3,7 +3,7 @@
 <div class="active">
   <div class="blob">
     <h4><img src="<%= prefix_url("img/doc.png") %>" /><%= @blob.name %></h4>
-    <%= pygmentize(@blob.data, @blob.name) %>
+    <pre><code><%= @blob.data %></code></pre>
   </div>
   <div class="clearfix">&nbsp;</div>
-</div>
+</div>

data/views/commit.erb

@@ -13,7 +13,7 @@
       <% @commit.diffs.select { |d| !d.deleted_file && !d.new_file }.each do |diff| %>
         <% count += 1 %>    
         <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>
+        <pre><code class="diff"><%= diff.diff %></code></pre>
       <% end %>
     </div>
   </div>

data/views/layout.erb

@@ -1,36 +1,28 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-	<head>
-	  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>Ginatra</title>
-		<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>
+<htm
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Ginatra</title>
+    <link rel="stylesheet" href="<%= prefix_url("src/index.css") %>" type="text/css" media="screen" />
+    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" type="text/javascript"></script>
+    <script src="<%= prefix_url("src/ginatra.js") %>" type="text/javascript"></script>
+    <script type="text/javascript" src="<%= prefix_url("src/highlight.pack.js") %>"></script>
     <script type="text/javascript">
       hljs.initHighlightingOnLoad();
     </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("<%= prefix_url("src/iepngfix.htc") %>") }
-      </style>
-    <![endif]-->
-	</head>
-	<body>
-		<div id="content">
-		  <div id="inner">
-		    <h1><a href="<%= prefix_url %>">Ginatra</a></h1>
-		    <%= yield %> 
-		  </div>
-		  <div id="footer-spacer">&nbsp;</div>
-		</div>
-		<div id="footer">
-			Ginatra &mdash; &copy; 2009 Samuel Elliott &mdash; <a href="http://www.opensource.org/licenses/mit-license.php">MIT Licence</a>
-		</div>
-	</body>
+    <link rel="stylesheet" href="<%= prefix_url("src/github.css") %>" type="text/css" media="screen" />
+  </head>
+  <body>
+    <div id="content">
+      <div id="inner">
+        <h1><a href="<%= prefix_url %>">Ginatra</a></h1>
+        <%= yield %>
+      </div>
+      <div id="footer-spacer">&nbsp;</div>
+    </div>
+    <div id="footer">
+      Ginatra &mdash; &copy; 2009 Samuel Elliott &mdash; <a href="http://www.opensource.org/licenses/mit-license.php">MIT Licence</a>
+    </div>
+  </body>
 </html>

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ginatra
 version: !ruby/object:Gem::Version 
-  version: 2.2.1
+  hash: 1
+  prerelease: false
+  segments: 
+  - 2
+  - 2
+  - 3
+  version: 2.2.3
 platform: ruby
 authors: 
 - Sam Elliott
@@ -10,49 +16,73 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 +00:00
+date: 2011-07-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: bundler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 0
+        - 15
+        version: 1.0.15
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.4
-    version: 
+        hash: 19
+        segments: 
+        - 1
+        - 2
+        - 6
+        version: 1.2.6
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: grit
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.1
-    version: 
+        hash: 29
+        segments: 
+        - 2
+        - 4
+        - 1
+        version: 2.4.1
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: vegas
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: open4
+        hash: 11
+        segments: 
+        - 0
+        - 1
+        - 8
+        version: 0.1.8
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.6
-    version: 
+  version_requirements: *id004
 description: Host your own git repository browser through the power of Sinatra and Grit
 email: sam@lenary.co.uk
 executables: 
@@ -62,11 +92,11 @@ executables:
 - ginatra-server
 extensions: []
 
-extra_rdoc_files: 
-- README.md
+extra_rdoc_files: []
+
 files: 
-- .gitattributes
 - .gitignore
+- Gemfile
 - README.md
 - Rakefile
 - bin/ginatra
@@ -75,8 +105,10 @@ files:
 - bin/ginatra-server
 - config.ru
 - features/pages.feature
+- features/step_definitions/app_steps.rb
 - features/step_definitions/page_steps.rb
 - features/support/env.rb
+- ginatra.gemspec
 - lib/ginatra.rb
 - lib/ginatra/config.rb
 - lib/ginatra/helpers.rb
@@ -89,13 +121,10 @@ files:
 - 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/ginatra.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
@@ -117,30 +146,36 @@ files:
 - views/log.erb
 - views/tree.erb
 has_rdoc: true
-homepage: http://lenary.github.com/ginatra
+homepage: http://lenary.co.uk/ginatra
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Gitweb Clone in Sinatra and Grit

data/.gitattributes

@@ -1,2 +0,0 @@
-*.doc diff=doc
-*.png diff=exif