ginatra 4.0.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7486b2e308bef06b35966a5b283ed57583769b56
-  data.tar.gz: 595c3170a2f8cd8633a4bd036fe81bd599c8fd1e
+  metadata.gz: 5f2109eb19ee364f25ded4abeb264b2398b74c99
+  data.tar.gz: 341a3c3c640d790bfdb185122ebf32ce45acc3aa
 SHA512:
-  metadata.gz: aeef96eb4c2bc7ea2b6130dbd8000beb76d7ef70f7181787dcfdb98dd3cf5850b1281e224cb667e42d7ba7df522589c37548201c27ae4fc77f65be2b8aac8bf7
-  data.tar.gz: 16af836e42d6d06c25783311e1dc332a9a6ea4f4e3d60cc7a417fa0a4a31826347dbb988fe32327f43887e893a0a9ad68c42a6cfcaa3e1dfff06394005f98ff4
+  metadata.gz: 0bceaa52a1f6b49c0ab81ade0dc316277d9959232aa8f322ff72ae00e2dc2c9a3ca1b48c3ded00a8d79dc2b00f3136abe570e92ae52c260cbf962cc49980abc4
+  data.tar.gz: a6c703be9047fb390d65e3130b2b315e95ce2aa89618facd46ee0d3df56e1b9bb2e2684a10ec1d7fc036f1e613974f1a08e6527a9b036b8cbe3a61b9fed4a951

data/.travis.yml

@@ -1,7 +1,8 @@
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.0
+  - 2.1
+  - 2.2
 notifications:
   email:
     on_success: never # default: change

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
   * Your contribution here.
 
+## 4.1.0 (2015-04-19)
+
+  * Log warnings and errors. Add a new setting: `log_file` to customize log file
+    location.
+  * Fix server startup when using Ruby 1.9
+  * Upgrade to Twitter Bootstrap 3. Make interface mobile-friendly and
+    responsive.
+  * Introduce a new setting: `sitename` to customize title.
+  * Improve error handling for invalid custom configuration. (@rogermarlow)
+
 ## 4.0.2 (2015-01-15)
 
   * Ignore files in `git_dirs` by default and remove `ignored_files` setting.

data/README.md

@@ -1,18 +1,19 @@
 # Ginatra
 
-[![Build Status](https://img.shields.io/travis/NARKOZ/ginatra/master.svg?style=flat)](https://travis-ci.org/NARKOZ/ginatra)
-[![Code Climate](https://img.shields.io/codeclimate/github/NARKOZ/ginatra.svg?style=flat)](https://codeclimate.com/github/NARKOZ/ginatra)
-[![Gem Version](https://img.shields.io/gem/v/ginatra.svg?style=flat)](https://rubygems.org/gems/ginatra)
-[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/NARKOZ/ginatra/blob/master/LICENSE.txt)
+[![Build Status](https://img.shields.io/travis/NARKOZ/ginatra/master.svg)](https://travis-ci.org/NARKOZ/ginatra)
+[![Code Climate](https://img.shields.io/codeclimate/github/NARKOZ/ginatra.svg)](https://codeclimate.com/github/NARKOZ/ginatra)
+[![Gem Version](https://img.shields.io/gem/v/ginatra.svg)](https://rubygems.org/gems/ginatra)
+[![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/NARKOZ/ginatra/blob/master/LICENSE.txt)
 
 **Ginatra** is a simple web-based git repository browser built on Ruby Sinatra.
 
 [ [website](http://narkoz.github.io/ginatra) |
-[screenshots](http://narkoz.github.io/ginatra/screenshots) ]
+[screenshots](http://narkoz.github.io/ginatra/screenshots) |
+[demo](http://narkoz.github.io/ginatra/demo) ]
 
 ## Features
 
-+ Hassle free installation
++ Easy installation
 + Multiple repository support
 + Multiple branch/tag support
 + Commit history, diff, patch
@@ -32,7 +33,7 @@ It's recommended to install it as a ruby gem, unless you know what you're doing.
 Run the following command to install Ginatra from RubyGems:
 
 ```sh
-gem install ginatra -v 4.0.1
+gem install ginatra -v 4.1.0
 ```
 
 Create config file (see [Configuration](#configuration) section in README).
@@ -52,7 +53,7 @@ Run the following commands to install Ginatra from source:
 ```sh
 git clone git://github.com/NARKOZ/ginatra.git
 cd ginatra/
-git checkout v4.0.1
+git checkout v4.1.0
 bundle
 ```
 
@@ -74,6 +75,8 @@ Create `~/.ginatra/config.yml` file with your own settings. See
 `git_dirs` - Ginatra will look into these folders for git repositories. It's
 required to append `*` at the end of path. Example: `/home/Development/repos/*`
 
+`sitename` - name of the site. Used in the page title and header.
+
 `description` - description of web interface. Used in index page.
 
 `port` - port that Ginatra server will run at.
@@ -84,7 +87,11 @@ required to append `*` at the end of path. Example: `/home/Development/repos/*`
 in subdirectory.
 
 `git_clone_enabled?` - enables smart HTTP support and allows to clone git
-repopsitories.
+repositories.
+
+`log_file` - location of the log file where Ginatra will log warnings and
+errors. If this setting doesn't present Ginatra will log out to the standard
+output (stdout).
 
 If you installed Ginatra as an app, you can change settings by editing
 `config.yml` file in root folder.

data/bin/ginatra

@@ -4,7 +4,7 @@ $:.unshift File.expand_path('../../lib', __FILE__)
 
 ENV['RACK_ENV'] ||= 'production'
 
-require 'ginatra'
+require 'ginatra/config'
 require 'optparse'
 
 options = {

data/config.ru

@@ -1,11 +1,18 @@
 require 'ginatra'
 require 'sprockets'
+require 'bootstrap-sass'
 
 map '/assets' do
   environment = Sprockets::Environment.new
   root_path   = File.dirname __FILE__
   environment.append_path "#{root_path}/public/js"
   environment.append_path "#{root_path}/public/css"
+
+  environment.context_class.class_eval do
+    def asset_path(path, options = {})
+    end
+  end
+
   run environment
 end
 
@@ -13,8 +20,12 @@ if Ginatra.config.git_clone_enabled?
   require 'mkmf'
   require 'git/webby'
 
-  # Make the MakeMakefile logger write file output to null
-  module MakeMakefile::Logging; @logfile = File::NULL; end
+  # Make the mkmf logger write file output to null
+  if RUBY_VERSION[0] == '1'
+    module Logging; @logfile = File::NULL; end
+  else
+    module MakeMakefile::Logging; @logfile = File::NULL; end
+  end
 
   git_executable = find_executable 'git'
   raise 'Git executable not found in PATH' if git_executable.nil?

data/ginatra.gemspec

@@ -18,10 +18,13 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 1.9"
 
-  gem.add_dependency 'sinatra',   '~> 1.4.5'
-  gem.add_dependency 'rugged',    '~> 0.21.3'
-  gem.add_dependency 'rouge',     '~> 1.7.7'
-  gem.add_dependency 'sprockets', '~> 2.0'
+  gem.add_dependency 'sinatra',   '~> 1.4.6'
+  gem.add_dependency 'rugged',    '~> 0.21.4'
+  gem.add_dependency 'rouge',     '~> 1.8.0'
+  gem.add_dependency 'sprockets', '~> 3.0'
+
+  # Assets
+  gem.add_dependency 'bootstrap-sass', '3.3.3'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

data/lib/ginatra.rb

@@ -3,6 +3,7 @@ require 'sinatra/partials'
 require 'rouge'
 require 'ginatra/config'
 require 'ginatra/errors'
+require 'ginatra/logger'
 require 'ginatra/helpers'
 require 'ginatra/repo'
 require 'ginatra/repo_list'
@@ -12,6 +13,7 @@ module Ginatra
   # The main application class.
   # Contains all the core application logic and mounted in +config.ru+ file.
   class App < Sinatra::Base
+    include Logger
     helpers Helpers, Sinatra::Partials
 
     configure do

data/lib/ginatra/config.rb

@@ -15,13 +15,23 @@ module Ginatra
     custom_config_file  = File.expand_path("~/.ginatra/config.yml")
     default_config_file = File.expand_path("#{current_path}/../../config.yml")
 
-    config = YAML.load_file(default_config_file)
+    # Our own file should be there and we don't need to check its syntax
+    abort 'ginatra config file #{default_config_file} is missing.' unless File.exists?(default_config_file)
+    final_config = YAML.load_file(default_config_file)
 
-    if File.exist?(custom_config_file)
-      custom_config = YAML.load_file(custom_config_file)
-      config.merge!(custom_config)
+    # User config file may not exist or be broken
+    if File.exists?(custom_config_file)
+      begin
+        custom_config = YAML.load_file(custom_config_file)
+      rescue Psych::SyntaxError => ex
+        puts "Cannot parse your config file #{ex.message}."
+        custom_config = {}
+      end
+      final_config.merge!(custom_config)
+    else
+      puts "User config file #{custom_config_file} absent. Will only see repos in #{final_config["git_dirs"].join(", ")}."
     end
 
-    config
+    final_config
   end
 end

data/lib/ginatra/helpers.rb

@@ -16,7 +16,7 @@ module Ginatra
     # Sets title for pages
     def title(*args)
       @title ||= []
-      @title_options ||= { headline: nil, sitename: nil }
+      @title_options ||= { headline: nil, sitename: h(Ginatra.config.sitename) }
       options = args.last.is_a?(Hash) ? args.pop : {}
 
       @title += args
@@ -43,17 +43,17 @@ module Ginatra
     def empty_description_hint_for(repo)
       return '' unless repo.description.empty?
       hint_text = "Edit `#{repo.path}description` file to set the repository description."
-      "<span class='icon-exclamation-sign' title='#{hint_text}'></span>"
+      "<img src='/img/exclamation-circle.svg' title='#{hint_text}' alt='hint' class='icon'>"
     end
 
     # Returns file icon depending on filemode
     def file_icon(filemode)
       case filemode
         # symbolic link (120000)
-        when 40960 then "<span class='icon-share-alt'></span>"
+        when 40960 then "<img src='/img/mail-forward.svg' alt='symbolic link' class='icon'>"
         # executable file (100755)
-        when 33261 then "<span class='icon-asterisk'></span>"
-        else "<span class='icon-file'></span>"
+        when 33261 then "<img src='/img/asterisk.svg' alt='executable file' class='icon'>"
+        else "<img src='/img/file.svg' alt='file' class='icon'>"
       end
     end
 
@@ -138,14 +138,14 @@ module Ginatra
       list = []
       diff.deltas.each_with_index do |delta, index|
         if delta.deleted?
-          list << "<li class='deleted'><span class='icon-remove' title='deleted'></span> <a href='#file-#{index + 1}'>#{delta.new_file[:path]}</a></li>"
+          list << "<li class='deleted'><img src='/img/minus-square.svg' alt='deleted' class='icon'> <a href='#file-#{index + 1}'>#{delta.new_file[:path]}</a></li>"
         elsif delta.added?
-          list << "<li class='added'><span class='icon-ok' title='added'></span> <a href='#file-#{index + 1}'>#{delta.new_file[:path]}</a></li>"
+          list << "<li class='added'><img src='/img/plus-square.svg' alt='added' class='icon'> <a href='#file-#{index + 1}'>#{delta.new_file[:path]}</a></li>"
         elsif delta.modified?
-          list << "<li class='changed'><span class='icon-edit' title='modified'></span> <a href='#file-#{index + 1}'>#{delta.new_file[:path]}</a></li>"
+          list << "<li class='changed'><img src='/img/edit.svg' alt='modified' class='icon'> <a href='#file-#{index + 1}'>#{delta.new_file[:path]}</a></li>"
         end
       end
-      "<ul class='unstyled'>#{list.join}</ul>"
+      "<ul class='list-unstyled'>#{list.join}</ul>"
     end
 
     # Highlights commit diff

data/lib/ginatra/logger.rb

@@ -0,0 +1,33 @@
+require 'logger'
+require 'fileutils'
+
+module Ginatra
+  module Logger
+    def logger
+      Logger.logger
+    end
+
+    def self.logger
+      return @logger if @logger
+
+      if Ginatra.config.log_file
+        log_file = File.expand_path(Ginatra.config.log_file)
+      else
+        log_file = STDOUT
+      end
+
+      unless log_file == STDOUT
+        parent_dir, _separator, _filename = log_file.rpartition('/')
+        FileUtils.mkdir_p parent_dir
+        FileUtils.touch log_file
+      end
+
+      @logger = ::Logger.new log_file
+      @logger.level = ::Logger::WARN
+      @logger.formatter = proc do |severity, datetime, progname, msg|
+        "[#{datetime} ##{Process.pid}] #{severity}: #{msg}\n"
+      end
+      @logger
+    end
+  end
+end

data/lib/ginatra/repo.rb

@@ -13,8 +13,11 @@ module Ginatra
       @repo = Rugged::Repository.new(path)
       @param = File.split(path).last
       @name = @param
-      @description = File.read("#{@repo.path}description").strip
-      @description = '' if @description.match(/\AUnnamed repository;/)
+      @description = ''
+      if File.exists?("#{@repo.path}description")
+        @description = File.read("#{@repo.path}description").strip
+        @description = '' if @description.match(/\AUnnamed repository;/)
+      end
     end
 
     # Return a commit corresponding to sha in the repo.

data/lib/ginatra/repo_list.rb

@@ -4,6 +4,7 @@ module Ginatra
   # A singleton class that lets us make and use a constantly updating
   # list of repositories.
   class RepoList
+    include Logger
     include Singleton
     attr_accessor :list
 
@@ -29,7 +30,7 @@ module Ginatra
     def refresh
       list.clear
 
-      Ginatra.config.git_dirs.map do |git_dir|
+      Ginatra.load_config["git_dirs"].map do |git_dir|
         if Dir.exist?(git_dir.chop)
           dirs = Dir.glob(git_dir).sort
         else
@@ -55,6 +56,7 @@ module Ginatra
         begin
           list << Repo.new(path)
         rescue Rugged::RepositoryError
+          logger.warn "SKIPPING '#{path}' - not a git repository"
         end
       end
       list

data/lib/ginatra/version.rb

@@ -1,4 +1,4 @@
 module Ginatra
-  VERSION = "4.0.2"
-  RELEASE_NAME = "Aurora"
+  VERSION = "4.1.0"
+  RELEASE_NAME = "Baku"
 end

data/public/css/application.css

@@ -1,6 +1,5 @@
 /*
- *= require ./lib/bootstrap.min
- *= require ./lib/bootstrap-responsive.min
+ *= require twbs
  *= require ./lib/highlight
  *= require custom
 */

data/public/css/custom.css

@@ -1,13 +1,9 @@
-.push { padding-bottom: 40px; }
-footer p { margin: 10px 0; }
-.header { margin-top: 15px; box-shadow: none; }
-.filter { margin-top: -20px; }
+.header { margin: 15px 0 -20px 0; }
+.filter { margin-top: -10px; padding-bottom: 10px; }
 .author-box { padding-top: 10px; }
-#loader { margin-top: -20px; }
+#loader { display:none; padding-bottom: 20px; }
 pre { white-space: pre; }
 .btn .caret { margin-left: 3px; }
-.btn-small .caret { margin-top: 8px; }
-.dropdown-menu { border-radius: 3px; }
 .img-rounded { border-radius: 4px; }
 .clone-hint { font-style: italic; }
 .dropdown-hint { padding: 3px 20px; }
@@ -16,11 +12,22 @@ pre { white-space: pre; }
 .highlight table td { padding: 0; }
 .highlight table .gutter { border-right: 1px solid #c0c0c0; }
 
+.diff-files-list { display: none; }
+.repo-list a { color: #337ab7; }
+.repo-list a:hover, a:focus { color: #23527c; }
+.nav { padding-bottom: 10px; }
+.nav > li > a { padding: 7px 15px; }
+
 #diff { padding-top: 20px; }
 #diff .added a { color: #468847; }
 #diff .changed a { color: #3a87ad; }
 #diff .deleted a { color: #b94a48; }
 
+.icon {
+  height: 16px;
+  width: 16px;
+}
+
 .service-page {
   width: 50%;
   margin: 0 auto;
@@ -28,13 +35,6 @@ pre { white-space: pre; }
   padding-top: 10%;
 }
 
-.btn {
-  text-shadow: none;
-  background-image: none;
-  border-radius: 3px;
-  box-shadow: none;
-}
-
 .info-box {
   padding: 20px;
   background-color: #eee;

data/public/css/twbs.sass

@@ -0,0 +1,8 @@
+@import 'bootstrap-sprockets'
+@import 'bootstrap'
+
+h1, h2
+  font-weight: bold
+
+small
+  font-weight: normal

data/public/img/asterisk.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="119" height="128" viewBox="0 0 119 128">
+<path d="M105.857 75q3.286 1.857 4.25 5.536t-0.893 6.964l-4.571 7.857q-1.857 3.286-5.536 4.25t-6.964-0.893l-19-10.929v21.929q0 3.714-2.714 6.429t-6.429 2.714h-9.143q-3.714 0-6.429-2.714t-2.714-6.429v-21.929l-19 10.929q-3.286 1.857-6.964 0.893t-5.536-4.25l-4.571-7.857q-1.857-3.286-0.893-6.964t4.25-5.536l19-11-19-11q-3.286-1.857-4.25-5.536t0.893-6.964l4.571-7.857q1.857-3.286 5.536-4.25t6.964 0.893l19 10.929v-21.929q0-3.714 2.714-6.429t6.429-2.714h9.143q3.714 0 6.429 2.714t2.714 6.429v21.929l19-10.929q3.286-1.857 6.964-0.893t5.536 4.25l4.571 7.857q1.857 3.286 0.893 6.964t-4.25 5.536l-19 11z" fill="#444444"></path>
+</svg>

data/public/img/download.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="119" height="128" viewBox="0 0 119 128">
+<path d="M91.429 96q0-1.857-1.357-3.214t-3.214-1.357-3.214 1.357-1.357 3.214 1.357 3.214 3.214 1.357 3.214-1.357 1.357-3.214zM109.714 96q0-1.857-1.357-3.214t-3.214-1.357-3.214 1.357-1.357 3.214 1.357 3.214 3.214 1.357 3.214-1.357 1.357-3.214zM118.857 80v22.857q0 2.857-2 4.857t-4.857 2h-105.143q-2.857 0-4.857-2t-2-4.857v-22.857q0-2.857 2-4.857t4.857-2h33.214l9.643 9.714q4.143 4 9.714 4t9.714-4l9.714-9.714h33.143q2.857 0 4.857 2t2 4.857zM95.643 39.357q1.214 2.929-1 5l-32 32q-1.286 1.357-3.214 1.357t-3.214-1.357l-32-32q-2.214-2.071-1-5 1.214-2.786 4.214-2.786h18.286v-32q0-1.857 1.357-3.214t3.214-1.357h18.286q1.857 0 3.214 1.357t1.357 3.214v32h18.286q3 0 4.214 2.786z" fill="#444444"></path>
+</svg>

data/public/img/edit.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128" viewBox="0 0 128 128">
+<path d="M63.429 84.571l8.286-8.286-10.857-10.857-8.286 8.286v4h6.857v6.857h4zM94.857 33.143q-1.143-1.143-2.357 0.071l-25 25q-1.214 1.214-0.071 2.357t2.357-0.071l25-25q1.214-1.214 0.071-2.357zM100.571 75.571v13.571q0 8.5-6.036 14.536t-14.536 6.036h-59.429q-8.5 0-14.536-6.036t-6.036-14.536v-59.429q0-8.5 6.036-14.536t14.536-6.036h59.429q4.5 0 8.357 1.786 1.071 0.5 1.286 1.643 0.214 1.214-0.643 2.071l-3.5 3.5q-1 1-2.286 0.571-1.643-0.429-3.214-0.429h-59.429q-4.714 0-8.071 3.357t-3.357 8.071v59.429q0 4.714 3.357 8.071t8.071 3.357h59.429q4.714 0 8.071-3.357t3.357-8.071v-9q0-0.929 0.643-1.571l4.571-4.571q1.071-1.071 2.5-0.5t1.429 2.071zM93.714 22.857l20.571 20.571-48 48h-20.571v-20.571zM125.429 32.286l-6.571 6.571-20.571-20.571 6.571-6.571q2-2 4.857-2t4.857 2l10.857 10.857q2 2 2 4.857t-2 4.857z" fill="#444444"></path>
+</svg>

data/public/img/exclamation-circle.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generated by IcoMoon.io -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128" viewBox="0 0 128 128">
+<path d="M54.857 9.143q14.929 0 27.536 7.357t19.964 19.964 7.357 27.536-7.357 27.536-19.964 19.964-27.536 7.357-27.536-7.357-19.964-19.964-7.357-27.536 7.357-27.536 19.964-19.964 27.536-7.357zM64 98.214v-13.571q0-1-0.643-1.679t-1.571-0.679h-13.714q-0.929 0-1.643 0.714t-0.714 1.643v13.571q0 0.929 0.714 1.643t1.643 0.714h13.714q0.929 0 1.571-0.679t0.643-1.679zM63.857 73.643l1.286-44.357q0-0.857-0.714-1.286-0.714-0.571-1.714-0.571h-15.714q-1 0-1.714 0.571-0.714 0.429-0.714 1.286l1.214 44.357q0 0.714 0.714 1.25t1.714 0.536h13.214q1 0 1.679-0.536t0.75-1.25z" fill="#444444"></path>
+</svg>