ghoul 0.1.3 → 0.1.4

data/ghoul.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Ghoul::VERSION
   s.authors     = ["George Drummond"]
   s.email       = ["george@accountsapp.com"]
-  s.homepage    = ""
+  s.homepage    = "http://georgedrummond.github.com/ghoul"
   s.summary     = %q{Ghoul is a simple yet good looking interface for your git repositories written in sinatra. It is currently only for demonstration purposes and use on your secure local machine as it does not enforce any authentication as of yet.}
   s.description = %q{Ghoul is a simple yet good looking interface for your git repositories written in sinatra. It is currently only for demonstration purposes and use on your secure local machine as it does not enforce any authentication as of yet.}
 

data/lib/ghoul/app.rb

@@ -12,7 +12,6 @@ module Ghoul
     
     before '/*' do
       if !repos_path_exists? && params[:splat][0] != "css/app.css"
-        puts "splat=#{params[:splat]}"
         halt erb(:setup_repos_path)
       end
     end
@@ -61,9 +60,12 @@ module Ghoul
       erb :diff
     end
     
-    get "/repository/:repository/commits/?" do
+    get "/repository/:repository/commits/*" do
+      @page = params[:splat][0].to_i
+      @offset = @page*10-10
       @repository = params[:repository]
-      @commits = repository(@repository).commits
+      @commits = repository(@repository).commits('master', 10, @offset)
+      @max_commits = repository(@repository).commits('master', false, 0).count
       @commit = commit_from_repository @repository, "trunk"
       @newest_commit = commit_from_repository(@repository, "trunk")
       @hide_breadcrumbs = true
@@ -98,8 +100,9 @@ module Ghoul
         @splat = params[:splat]
         erb :tree
       else
-        @blob = resource  
-        @syntaxer = CodeRay.scan(@blob.data, :plain).div(:line_numbers => :table)
+        @blob = resource
+        language = CodeRay::FileType[@blob.name]
+        @syntaxer = CodeRay.scan(@blob.data, language).div(:line_numbers => :table)
         erb :blob
       end
     end

data/lib/ghoul/lib/url_helpers.rb

@@ -28,8 +28,8 @@ module Ghoul
       return "http://#{@request.host_with_port}/repo/#{repository}"
     end
     
-    def commits_path(repository)
-      url "/repository/#{repository}/commits"
+    def commits_path(repository, page=1)
+      url "/repository/#{repository}/commits/#{page}"
     end
     
     def commit_path(repository, commit)

data/lib/ghoul/views/app.sass

@@ -142,7 +142,6 @@ h1
     :border 1px solid #ccc
     :border-top none
     :text-indent 20px
-    :background -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(47%,#f6f6f6), color-stop(100%,#ededed))
     .name
       :float left
       :padding-left 10px
@@ -172,7 +171,6 @@ h1
   :width 758px
   :border 1px solid #ccc
   :border-bottom none
-  :background -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(47%,#f6f6f6), color-stop(100%,#ededed))
   a, .title
     :color #333
     :text-decoration none
@@ -213,6 +211,12 @@ h1
   #clippy
     :float left
     :margin-top 8px
+  p
+    :float left
+    :width 718px
+    :padding 20px
+    :background #fffccc
+    :border-top 1px solid #ccc
   
 #repositories
   :float left
@@ -228,7 +232,6 @@ h1
     :border-top none
     :float left
     :width 738px
-    :background -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(47%,#f6f6f6), color-stop(100%,#ededed))
     .data
       :float left
       :width 100%
@@ -305,6 +308,15 @@ form
     :border 1px solid #ccc
   a
     :margin-top 20px
+  
+.gradient
+  :background #ffffff
+  :background -moz-linear-gradient(top, white 0%, #e5e5e5 100%)
+  :background -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #e5e5e5))
+  :background -webkit-linear-gradient(top, white 0%, #e5e5e5 100%)
+  :background -o-linear-gradient(top, white 0%, #e5e5e5 100%)
+  :background -ms-linear-gradient(top, white 0%, #e5e5e5 100%)
+  :background linear-gradient(top, white 0%, #e5e5e5 100%)
 
 #big_link
   :float left
@@ -313,4 +325,12 @@ form
   :font-size 26px
   
 a
-  :color dodgerblue
+  :color dodgerblue
+  
+#pagination
+  :float left
+  :width 100%
+  #next
+    :float right
+  #left
+    :float left

data/lib/ghoul/views/blob.erb

@@ -2,7 +2,7 @@
 
 <%=partial(:repo_header) %>
 
-<div class="section_bar">
+<div class="section_bar gradient">
   <%=link_to "Raw", raw_blob_for_commit_path(@repository, params[:commit], params[:splat][0]) %>
 </div>
 

data/lib/ghoul/views/commits.erb

@@ -9,3 +9,12 @@
     </div>
   <% end %>
 </div>
+
+<div id="pagination">
+  <% if @offset+10 < @max_commits %>
+  <a href="<%= commits_path(@repository, @page+1) %>" class="button" id="next">Next</a>
+  <% end %>
+  <% if @page > 1 %>
+  <a href="<%= commits_path(@repository, @page-1) %>" class="button" id="previous">Previous</a>
+  <% end %>
+</div>

data/lib/ghoul/views/partials/_repo_header.erb

@@ -1,8 +1,12 @@
 <%= partial :repo_top_bar %>
 
+
 <div id="repo_info">
   <div id="git_url"><%= repository_git_url(@repository) %></div>
   <div id="clippy"><%= clippy(repository_git_url(@repository), '#f1f1f1') %></div>
+  <% unless repository(@repository).bare %>
+  <p>Push is not enabled for this repository, you will need to setup a <b>--bare</b> repository directly from ghoul for push to be enabled</p>
+  <% end %>
 </div>
 
 <div id="commits">

data/lib/ghoul/views/repositories.erb

@@ -5,7 +5,7 @@
 <div id="repositories">
   <% @repositories.each do |repo| %>
     <% unless repo == "." || repo == ".." %>
-      <div class="repository">
+      <div class="repository gradient">
         <div class="name"><%= link_to repo, repository_path(repo) %></div>
         <div class="data">
           <% begin %>

data/lib/ghoul/views/tree.erb

@@ -5,11 +5,11 @@
 <div id="tree">
   <% @resource.contents.sort { |a, b| [b.class.name, a.name.downcase] <=> [a.class.name, b.name.downcase] }.each do |f| %>
     <% if f.is_a?(Grit::Tree) %>
-      <div class="tree">
+      <div class="tree gradient">
         <div class="name"><%= link_to "#{f.name}/", tree_for_commit_path(@repository, params[:commit], params[:splat][0], f.name) %></div>
       </div>
     <% else %>
-      <div class="blob">
+      <div class="blob gradient">
         <div class="name"><%= link_to f.name, blob_for_commit_path(@repository, params[:commit], params[:splat][0], f.name) %></div>
       </div>
     <% end %>

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ghoul
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghoul
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000Z
+date: 2011-10-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70137089892740 !ruby/object:Gem::Requirement
+  requirement: &70095112075640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70137089892740
+  version_requirements: *70095112075640
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70137089892020 !ruby/object:Gem::Requirement
+  requirement: &70095112073780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70137089892020
+  version_requirements: *70095112073780
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70137089891480 !ruby/object:Gem::Requirement
+  requirement: &70095112071340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137089891480
+  version_requirements: *70095112071340
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70137089890640 !ruby/object:Gem::Requirement
+  requirement: &70095112069860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137089890640
+  version_requirements: *70095112069860
 - !ruby/object:Gem::Dependency
   name: georgedrummond_sinatra_helpers
-  requirement: &70137089890160 !ruby/object:Gem::Requirement
+  requirement: &70095112068800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137089890160
+  version_requirements: *70095112068800
 - !ruby/object:Gem::Dependency
   name: ghoul_grack
-  requirement: &70137089889300 !ruby/object:Gem::Requirement
+  requirement: &70095112067580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70137089889300
+  version_requirements: *70095112067580
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70137089888400 !ruby/object:Gem::Requirement
+  requirement: &70095112066520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137089888400
+  version_requirements: *70095112066520
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70137089886800 !ruby/object:Gem::Requirement
+  requirement: &70095112065640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70137089886800
+  version_requirements: *70095112065640
 description: Ghoul is a simple yet good looking interface for your git repositories
   written in sinatra. It is currently only for demonstration purposes and use on your
   secure local machine as it does not enforce any authentication as of yet.
@@ -158,7 +158,7 @@ files:
 - spec/ghoul_helpers_spec.rb
 - spec/spec_helper.rb
 - spec/url_helper_spec.rb
-homepage: ''
+homepage: http://georgedrummond.github.com/ghoul
 licenses: []
 post_install_message: ! "  \n#################################################\n#\n#
   Thanks for installing Ghoul and giving it a go!\n#\n# This is a proof of concept