dolt 0.12.0 → 0.13.0

data/Gemfile.lock

@@ -4,6 +4,7 @@ PATH
     dolt (0.12.0)
       json (~> 1.5)
       libdolt (~> 0.17)
+      main (~> 5.2)
       sinatra (~> 1.0)
       thin (~> 1.4)
       tiltout (~> 1.4)
@@ -11,8 +12,11 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
+    arrayfields (4.9.0)
+    chronic (0.9.1)
     daemons (1.1.9)
     eventmachine (1.0.3)
+    fattr (2.2.1)
     github-markup (0.7.5)
     htmlentities (4.3.1)
     json (1.8.0)
@@ -23,10 +27,16 @@ GEM
       mime-types (~> 1.19)
       rugged (= 0.17.0.b6)
       tzinfo (~> 0.3)
+    main (5.2.0)
+      arrayfields (>= 4.7.4)
+      chronic (>= 0.6.2)
+      fattr (>= 2.2.0)
+      map (>= 5.1.0)
     makeup (0.3.0)
       github-markup (~> 0.7)
       htmlentities (~> 4.3)
       pygments.rb (~> 0.2)
+    map (6.5.1)
     mime-types (1.23)
     minitest (2.12.1)
     posix-spawn (0.3.6)

data/bin/dolt

@@ -3,67 +3,128 @@ require "libdolt"
 require "tiltout"
 require "thin"
 require "sinatra/base"
-
-if ARGV.length == 0
-  puts("Dolt should be run with a directory as its sole argument")
-  puts("The directory should either be a Git repository or a directory")
-  puts("that holds Git repositories.")
-  exit(1)
+require "cgi"
+require "main"
+if RUBY_VERSION < "1.9"
+  require "dolt/ruby19"
 end
-
 ### TODO: Extract this into a testable API
 
-def is_git_repo?(dir)
-  File.exists?(File.join(dir, ".git"))
-end
 
-def create_app(dir, view)
-  if is_git_repo?(dir)
-    dir = File.expand_path(dir)
-    resolver = Dolt::DiskRepoResolver.new(File.dirname(dir))
-    actions = Dolt::RepoActions.new(resolver)
-    view.helper(Dolt::View::SingleRepository)
-    require "dolt/sinatra/single_repo_browser"
-    Dolt::Sinatra::SingleRepoBrowser.new(File.basename(dir), actions, view)
-  else
-    resolver = Dolt::DiskRepoResolver.new(dir)
-    actions = Dolt::RepoActions.new(resolver)
-    view.helper(Dolt::View::MultiRepository)
-    require "dolt/sinatra/multi_repo_browser"
-    Dolt::Sinatra::MultiRepoBrowser.new(actions, view)
+class DoltApp
+  def initialize(layout_base)
+    @layout_base = layout_base
+  end
+
+  def is_git_repo?(dir)
+    File.exists?(File.join(dir, ".git"))
+  end
+
+  def create_app(dir, view)
+    if is_git_repo?(dir)
+      dir = File.expand_path(dir)
+      resolver = Dolt::DiskRepoResolver.new(File.dirname(dir))
+      actions = Dolt::RepoActions.new(resolver)
+      view.helper(Dolt::View::SingleRepository)
+      require "dolt/sinatra/single_repo_browser"
+      Dolt::Sinatra::SingleRepoBrowser.new(File.basename(dir), actions, view)
+    else
+      resolver = Dolt::DiskRepoResolver.new(dir)
+      actions = Dolt::RepoActions.new(resolver)
+      view.helper(Dolt::View::MultiRepository)
+      require "dolt/sinatra/multi_repo_browser"
+      Dolt::Sinatra::MultiRepoBrowser.new(actions, view)
+    end
   end
-end
 
-base = File.join(File.dirname(__FILE__), "..")
+  def run(root, options)
+    view = Tiltout.new(Dolt.template_dir, {
+        :cache => false,
+        :layout => "layout"
+      })
 
-view = Tiltout.new(Dolt.template_dir, {
-  :cache => false,
-  :layout => "layout"
-})
+    view.helper(Dolt::View::Object)
+    view.helper(Dolt::View::Urls)
+    view.helper(Dolt::View::Blob)
+    view.helper(Dolt::View::Blame)
+    view.helper(Dolt::View::Breadcrumb)
+    view.helper(Dolt::View::Tree)
+    view.helper(Dolt::View::Commit)
+    view.helper(Dolt::View::Gravatar)
+    view.helper(Dolt::View::TabWidth)
+    view.helper(Dolt::View::BinaryBlobEmbedder)
+    view.helper(:tab_width => options[:tab_width], :maxdepth => 3)
 
-view.helper(Dolt::View::Object)
-view.helper(Dolt::View::Urls)
-view.helper(Dolt::View::Blob)
-view.helper(Dolt::View::Blame)
-view.helper(Dolt::View::Breadcrumb)
-view.helper(Dolt::View::Tree)
-view.helper(Dolt::View::Commit)
-view.helper(Dolt::View::Gravatar)
-view.helper(Dolt::View::TabWidth)
-view.helper(Dolt::View::BinaryBlobEmbedder)
-view.helper(:tab_width => 4, :maxdepth => 3)
+    # Configure blob rendering module
 
-# Configure blob rendering module
+    # Attempt to syntax highlight every blob
+    # view.helper(Dolt::View::SyntaxHighlight)
 
-# Attempt to syntax highlight every blob
-# view.helper(Dolt::View::SyntaxHighlight)
+    # Attempt to render every blob as markup
+    # view.helper(Dolt::View::Markup)
 
-# Attempt to render every blob as markup
-# view.helper(Dolt::View::Markup)
+    # Render supported formats as markup, syntax highlight the rest
+    view.helper(Dolt::View::SmartBlobRenderer)
+    Sinatra::Base.set(:public_folder, File.join(@layout_base, "vendor/ui"))
+    server = create_app(root, view)
+    thin_server = if options[:socket]
+                    Thin::Server.new(options[:socket], server)
+                  else
+                    Thin::Server.new("0.0.0.0", options[:port], server)
+                  end
+    if options[:pidfile]
+      thin_server.pid_file = options[:pidfile]
+      thin_server.log_file = options[:logfile]
+      thin_server.daemonize
+    end
+    thin_server.start
+  end
+end
+
+Main {
+  argument("root") {
+    required
+    validate {|dir| File.exists?(dir) }
+    description "The base directory to serve repositories from"
+  }
+
+  option("socket=[socket]") {
+    cast :string
+    description "A socket to listen to"
+  }
 
-# Render supported formats as markup, syntax highlight the rest
-view.helper(Dolt::View::SmartBlobRenderer)
+  option("port=[port]") {
+    cast :int
+    description "A port to listen to"
+    default 3000
+  }
 
-Sinatra::Base.set(:public_folder, File.join(base, "vendor/ui"))
-server = create_app(ARGV[0], view)
-Thin::Server.start("0.0.0.0", 3000, server)
+  option("tabwidth=[tabwidth]") {
+    cast :int
+    description "The number of spaces to use as a tab"
+    default 4
+  }
+
+  option("pidfile=[pidfile]") {
+    description "Run as daemon with pidfile stored here."
+  }
+
+  option("logfile=[logfile]") {
+    description "Use as log file. Assumes --pidfile option"
+  }
+
+  def run
+    options = {}
+    if params[:socket].given?
+      options[:socket] = params[:socket].value
+    else
+      options[:port] = params[:port].value
+    end
+    if params[:pidfile].given?
+      options[:pidfile] = params[:pidfile].value
+      options[:logfile] = params[:logfile].value || "/tmp/dolt.log"
+    end
+    options[:tab_width] = params[:tabwidth].value
+    DoltApp.new(File.join(File.dirname(__FILE__), "..")).run(params[:root].value, options)
+  end
+}

data/dolt.gemspec

@@ -11,7 +11,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = "dolt"
-  s.version     = "0.12.0"
+  s.version     = "0.13.0"
   s.authors     = ["Christian Johansen"]
   s.email       = ["christian@gitorious.org"]
   s.homepage    = "http://gitorious.org/gitorious/dolt"
@@ -20,11 +20,12 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "dolt"
 
-  s.add_dependency "libdolt", "~>0.17"
+  s.add_dependency "libdolt", "~>0.18"
   s.add_dependency "thin", "~>1.4"
   s.add_dependency "sinatra", "~>1.0"
   s.add_dependency "tiltout", "~>1.4"
   s.add_dependency "json", "~>1.5"
+  s.add_dependency "main", "~>5.2"
 
   s.add_development_dependency "minitest", "~> 2.0"
   s.add_development_dependency "rake", "~> 0.9"

data/lib/dolt/ruby19.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+#--
+#   Copyright (C) 2013 Gitorious AS
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU Affero General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU Affero General Public License for more details.
+#
+#   You should have received a copy of the GNU Affero General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#++
+unless defined?(Encoding)
+  class Encoding
+    def self.default_external
+      nil
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dolt
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libdolt
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +91,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: main
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -154,6 +170,7 @@ files:
 - ./Readme.md
 - ./bin/dolt
 - ./dolt.gemspec
+- ./lib/dolt/ruby19.rb
 - ./lib/dolt/sinatra/actions.rb
 - ./lib/dolt/sinatra/base.rb
 - ./lib/dolt/sinatra/multi_repo_browser.rb