ghoul 0.1.7 → 0.1.8

data/lib/ghoul/app.rb

@@ -97,7 +97,7 @@ module Ghoul
       
       if resource.is_a?(Grit::Tree) || params[:splat][0] == ""
         @resource = resource
-        @splat = params[:splat]
+        @splat = params[:splat][0]
         if @resource.contents.detect {|r| r.name.downcase =~ /readme/}
           @readme = @resource.contents.detect {|r| r.name.downcase =~ /readme/ }
           file_extension = @readme.name.split('.').last

data/lib/ghoul/lib/repository.rb

@@ -16,7 +16,8 @@ module Ghoul
     end
     
     def repositories
-      return Dir.entries(repos_path)
+      directory_entries = Dir.entries(repos_path)
+      return directory_entries.find_all { |r| File.directory?( File.join(repos_path, r) ) }
     end
     
     def commit_from_repository(repository, commit_id)

data/lib/ghoul/lib/url_helpers.rb

@@ -42,8 +42,9 @@ module Ghoul
     end
     alias_method :tree_for_commit_path, :blob_for_commit_path
     
-    def raw_blob_for_commit_path(repository, commit, splat)
-      url "/repository/#{repository}/#{commit}/raw/#{splat}"
+    def raw_blob_for_commit_path(repository, commit, splat="", name="")
+      parts = [repository, commit, "raw", splat, name].find_all { |i| i != ""}
+      url "/repository/#{parts.join("/")}"
     end
     
     def diff_for_commit_path(repository, commit)

data/lib/ghoul/public/css/coderay.css

@@ -31,6 +31,7 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 .CodeRay span.line-numbers { padding: 0px 4px; }
 .CodeRay .line { display: block; float: left; width: 100%; }
 .CodeRay .code { width: 100%; }
+.CodeRay pre { background:none !important; padding:none !important; border:none !important; }
 .CodeRay .code pre { overflow: auto; }
 
 .CodeRay .debug { color: white !important; background: blue !important; }

data/lib/ghoul/views/app.sass

@@ -63,9 +63,6 @@ body
   a
     :color #777
   
-h1
-  :float left
-  :margin 20px 0
 
 #commits
   :float left
@@ -235,15 +232,22 @@ h1
       :float left
       :width 100%
       :margin-top 10px
-    .message, .new_repo
+    .gravatar
+      :width 25px
+      :height 25px
+      :float left
+    .latest_commit, .new_repo
       :float left
       :margin-top 3px
-      :font-size 10px
-      :background #fff
-      :border 1px solid #ccc
-      :padding 4px
-      :border-radius 5px
-      :font-weight bold
+      :width 699px
+      p
+        :float left
+        :padding 0 0px 4px 0px
+        :width 100%
+        :font-size 10px
+        &.date
+          :color #999
+      
   
 #diffs
   .diff
@@ -252,40 +256,6 @@ h1
     :overflow none
     :margin-bottom 20px
 
-#guide
-  :float left
-  :width 100%
-  :overflow auto
-  &.bordered
-    :border 1px solid #ccc
-  code
-    :float left
-    :background #f6f9fe
-    :padding 5px
-    :border 1px solid #ccc
-    :width 100%
-    :margin 0 -5px 0 -5px
-    :margin 10px 0
-    :border-radius 5px
-  h1, h2, h3
-    :margin-top 40px
-    :float left
-    :width 100%
-  p
-    :float left
-    :margin-top 20px
-    :width 100%
-    :line-height 22px
-  ul, ol
-    :float left
-    :margin 10px -40px 10px 40px
-    :width 100%
-
-  li
-    :float left
-    :width 100%
-    :margin 10px 0
-
 form
   :float left
   :width 100%
@@ -328,7 +298,7 @@ form
   :font-size 26px
   
 a
-  :color dodgerblue
+  :color #3B5593
   
 #pagination
   :float left
@@ -338,16 +308,74 @@ a
   #left
     :float left
     
+h1
+  :margin-bottom 30px
+      
 #readme
   :float left
   :margin-top 30px
-  :width 758px
-  .bordered
+  :width 718px !important
+  :padding 20px
+  :border 1px solid #ccc
+  :overflow auto
+  table.CodeRay
+    :margin -30px -20px -20px -20px
+    :overflow auto
     :float left
-    :width 718px !important
-    :padding 20px
-    :border 1px solid #ccc
-    :border-top none
-  .CodeRay
+    :width 758px
+    :border none
+  .section_bar
     :margin -20px
+    :border none
+    :border-bottom 1px solid #ccc
+    :margin-bottom 30px
+    
+#guide
+  :float left
+  :width 100%
+  code
+    :padding 3px
+    :background #f6f9fe
+    :border 1px solid #eee
+    :color #555
+  pre
+    :float left
+    :background #f6f9fe
+    :border 1px solid #ccc
+    :width 100%
+    :margin-bottom 20px    
+    :border-radius 5px
+    code
+      :padding 10px
+      :float left
+      :border none
+      :border-radius none
+      :padding none
+      :background none
+
+  h2
+    :margin-top 10px
+    :margin-bottom 10px
+    :border-top 4px solid #f1f1f1   
+    :padding-top 5px
+
+  h1, h2, h3, h4, h5
+    :float left
+    :width 100%
+    :margin-bottom 10px
+  p
+    :float left
+    :margin-bottom 20px
+    :width 100%
+    :line-height 22px
+  ul, ol
+    :float left
+    :margin 0  !important
+    :width 100%
+
+  li
+    :width auto
+    :margin 0 30px 20px 30px
+    :clear both
+
     

data/lib/ghoul/views/new_repo.erb

@@ -3,14 +3,17 @@
   <input name="name" placeholder="Repository name"/>
 </form>
 
-<div id="guide">
-  <h2>Creating A Repository</h2>
+<div id="readme">
+  <div id="guide">
+    <h1>Creating A Repository</h1>
 
-  <p>Please bear in mind when you create a repository that:</p>
+    <p>Please bear in mind when you create a repository that:</p>
 
-  <p>There is currently no authentication built into Ghoul. This first version is a proof of concept and I hope that something will be able to be built into future versions of this software.</p>
-  
-  <p>If you change ports you will need to change add the remote repository again on your local repository.</p>
+    <p>There is currently no authentication built into Ghoul. This first version is a proof of concept and I hope that something will be able to be built into future versions of this software.</p>
 
+    <p>If you change ports you will need to change add the remote repository again on your local repository.</p>
+
+  </div>
 </div>
 
+

data/lib/ghoul/views/no_commits.erb

@@ -1,34 +1,30 @@
 <% title "Setting up your repository" %>
 
-<div id="guide">
-<h2>Global Setup:</h2>
-<pre><code>
-git config --global user.name "Your Name"
-git config --global user.email author@accountsapp.com
-</code>
-</pre>
 
-<h2>Next Steps:</h2>
-<pre><code>
-mkdir <%=@repository%>
+<div id="readme">
+  <div id="guide">
+  <h1>Setting Up Your Repo</h1>
+  <h2>Global Setup:</h2>
+  <pre><code>git config --global user.name "Your Name"
+git config --global user.email author@accountsapp.com</code></pre>
+
+  <h2>Next Steps:</h2>
+  <pre><code>mkdir <%=@repository%>
 cd <%=@repository%>
 touch README
 git init
 git add README
 git commit -m 'first commit'
 git remote add origin <%=repository_git_url(@repository)%>
-git push -u origin master
-</code>
-</pre>
+git push -u origin master</code></pre>
 
-<h2>Existing Repository:</h2>
-<pre><code>
-cd existing_repository
+  <h2>Existing Repository:</h2>
+  <pre><code>cd existing_repository
 git remote add origin <%=repository_git_url(@repository)%>
-git push -u origin master    
-</code>
-</pre>
+git push -u origin master</code></pre>
 
-<p>When you're done, <%= link_to "click here", repository_path(@repository) %></p>
+  <p>When you're done, <%= link_to "click here", repository_path(@repository) %></p>
+  </div>
 </div>
 
+

data/lib/ghoul/views/repositories.erb

@@ -10,11 +10,13 @@
         <div class="data">
           <% begin %>
             <% last_commit = commit_from_repository(repo, "trunk") %>
-            <div class="message">
-              Last updated by <%= last_commit.author.name %> on <%= date_format(last_commit.committed_date) %>
+            <%=gravatar_image(last_commit.author.email, 25)%>
+            <div class="latest_commit">
+              <p><%=last_commit.message%></p>
+              <p class="date">Last updated by <%= last_commit.author.name %> on <%= date_format(last_commit.committed_date) %></p>
             </div>
           <% rescue %>
-            <div class="message">New repository</div>
+            <!-- No commits in this repository -->
           <% end %>
         </div>        
       </div>
@@ -22,52 +24,52 @@
   <% end %>
 </div>
 <% else %>
+<div id="readme">
+  <div id="guide">
+  <h1>Ghoul - Prettier Git For Everyone :)</h1>
+  <p><a href="http://github.com/georgedrummond/ghoul">Ghoul</a> is a simple yet good looking interface for your git repositories written in <a href="http://sinatrarb.com">sinatra</a>. It is currently only for demonstration purposes and use on your secure local machine as it does not enforce any authentication as of yet.</p>
 
-<div id="guide">
-<h1>Ghoul - Prettier Git For Everyone :)</h1>
-<p><a href="http://github.com/georgedrummond/ghoul">Ghoul</a> is a simple yet good looking interface for your git repositories written in <a href="http://sinatrarb.com">sinatra</a>. It is currently only for demonstration purposes and use on your secure local machine as it does not enforce any authentication as of yet.</p>
+  <h2>Installation</h2>
+  <p>Ghoul can be run either using the ghoul gem or by downloading the git repository and running through the rackup command.</p>
+  <pre><code># Installing via rubygems
 
-<h2>Installation</h2>
-<p>Ghoul can be run either using the ghoul gem or by downloading the git repository and running through the rackup command.</p>
-<pre><code># Installing via rubygems
+  gem install ghoul
+  ghoul server</code></pre>
+  <pre><code># Installing from the git repository
 
-gem install ghoul
-ghoul server</code></pre>
-<pre><code># Installing from the git repository
-  
-git clone http://github.com/georgedrummond/ghoul
-cd ghoul
-bundle install
-rackup
-</code></pre>
+  git clone http://github.com/georgedrummond/ghoul
+  cd ghoul
+  bundle install
+  rackup
+  </code></pre>
 
-<h2>How it works</h2>
-<p>Ghoul uses the grit, written by the guys at github for parsing your repositories which are located in a folder named "repos" within your
-  home folder e.g. /Users/georgedrummond/repos. For git push, ghoul uses grack. Grack has no authentication so ghoul should only be used
-  on your local machine.</p>
+  <h2>How it works</h2>
+  <p>Ghoul uses the grit, written by the guys at github for parsing your repositories which are located in a folder named "repos" within your
+    home folder e.g. /Users/georgedrummond/repos. For git push, ghoul uses grack. Grack has no authentication so ghoul should only be used
+    on your local machine.</p>
 
-<h2>License</h2>
-<pre><code>Copyright (c) 2011 George Drummond, george@accountsapp.com
+  <h2>License</h2>
+  <pre><code>Copyright (c) 2011 George Drummond, george@accountsapp.com
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</code></pre>
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</code></pre>
+  </div>
 </div>
-
 <% end %>
 

data/lib/ghoul/views/setup_repos_path.erb

@@ -1,8 +1,11 @@
 <% title "Please set up the repos path"%>
-<div id="guide">
-  <h2>Please Set Up The Repos Path</h2>
-  <p>Before you can run <b>Ghoul</b> you must setup the home for your ghoul repositories. This is where we will store our bare repositories and its where you will push to.</p>
-  <p>To continue please create an empty folder in <b><%= repos_path %></b></p>
-  <pre><code>$ mkdir <%= repos_path %></code></pre>
-  <p>When you have done that please <a href="<%= repositories_path %>">click here</a></p>
-</div>
+
+<div id="readme">
+  <div id="guide">
+    <h1>Please Set Up The Repos Path</h1>
+    <p>Before you can run <b>Ghoul</b> you must setup the home for your ghoul repositories. This is where we will store our bare repositories and its where you will push to.</p>
+    <p>To continue please create an empty folder in <b><%= repos_path %></b></p>
+    <pre><code>$ mkdir <%= repos_path %></code></pre>
+    <p>When you have done that please <a href="<%= repositories_path %>">click here</a></p>
+  </div>  
+</div>

data/lib/ghoul/views/tree.erb

@@ -6,11 +6,11 @@
   <% @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 gradient">
-        <div class="name"><%= link_to "#{f.name}/", tree_for_commit_path(@repository, params[:commit], params[:splat][0], f.name) %></div>
+        <div class="name"><%= link_to "#{f.name}/", tree_for_commit_path(@repository, params[:commit], @splat, f.name) %></div>
       </div>
     <% else %>
       <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 class="name"><%= link_to f.name, blob_for_commit_path(@repository, params[:commit], @splat, f.name) %></div>
       </div>
     <% end %>
   <% end %>
@@ -19,9 +19,9 @@
 <% if @readme %>
   <div id="readme">
     <div class="section_bar gradient">
-      <%=link_to @readme.name, "#" %>
+      <%=link_to @readme.name, raw_blob_for_commit_path(@repository, params[:commit], @splat, @readme.name) %>
     </div>
-    <div id="guide" class="bordered">
+    <div id="guide">
       <%=@readme_contents %>
     </div>
   </div>

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Ghoul
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghoul
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70361372280140 !ruby/object:Gem::Requirement
+  requirement: &70155838986120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70361372280140
+  version_requirements: *70155838986120
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70361372279540 !ruby/object:Gem::Requirement
+  requirement: &70155838985520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70361372279540
+  version_requirements: *70155838985520
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70361372279080 !ruby/object:Gem::Requirement
+  requirement: &70155838985080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361372279080
+  version_requirements: *70155838985080
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70361372278460 !ruby/object:Gem::Requirement
+  requirement: &70155838980900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361372278460
+  version_requirements: *70155838980900
 - !ruby/object:Gem::Dependency
   name: georgedrummond_sinatra_helpers
-  requirement: &70361372277880 !ruby/object:Gem::Requirement
+  requirement: &70155838980300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361372277880
+  version_requirements: *70155838980300
 - !ruby/object:Gem::Dependency
   name: ghoul_grack
-  requirement: &70361372276360 !ruby/object:Gem::Requirement
+  requirement: &70155838978100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70361372276360
+  version_requirements: *70155838978100
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70361372275940 !ruby/object:Gem::Requirement
+  requirement: &70155838977640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361372275940
+  version_requirements: *70155838977640
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70361372268960 !ruby/object:Gem::Requirement
+  requirement: &70155838977060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361372268960
+  version_requirements: *70155838977060
 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.