dolt 0.18.0 → 0.19.0

data/Gemfile.lock

@@ -4,39 +4,30 @@ PATH
     dolt (0.18.0)
       json (~> 1.5)
       libdolt (~> 0.21)
-      main (~> 5.2)
       sinatra (~> 1.0)
       thin (~> 1.4)
       tiltout (~> 1.4)
+      trollop (~> 2.0)
 
 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)
-    libdolt (0.21.0)
+    libdolt (0.22.0)
       htmlentities (~> 4.3)
       json (~> 1.7)
       makeup (~> 0.2)
       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)
@@ -61,6 +52,7 @@ GEM
     tilt (1.4.1)
     tiltout (1.4.0)
       tilt (~> 1.3)
+    trollop (2.0)
     tzinfo (0.3.37)
     yajl-ruby (1.1.0)
 

data/bin/dolt

@@ -4,7 +4,7 @@ require "tiltout"
 require "thin"
 require "sinatra/base"
 require "cgi"
-require "main"
+require "trollop"
 
 ### TODO: Extract this into a testable API
 
@@ -83,71 +83,55 @@ class DoltApp
   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"
-  }
-
-  option("port=[port]") {
-    cast :int
-    description "A port to listen to"
-  }
-
-  option("bind=[bind]") {
-    description "An IP address to bind to"
-    default "0.0.0.0"
-  }
-
-  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"
-  }
-
-  environment("IP") {
-    description "An IP address to bind to"
-  }
-
-  environment("PORT") {
-    description "A port to listen on"
-    cast :int
-  }
-
-  # Use option if given, otherwise ENV var if given, otherwise default value
-  def option(param, env, default)
-    return params[param].value if params[param].given?
-    return params[env].value || default
-  end
+# Use option if given, otherwise ENV var if given, otherwise default value
+def option_from_options_or_env(option_name, env_name, default, options)
+  return options[option_name] if options[option_name]
+  return ENV[env_name] || default
+end
 
-  def run
-    options = {}
-    if params[:socket].given?
-      options[:socket] = params[:socket].value
-    else
-      options[:port] = option(:port, :PORT, 3000)
-      options[:ip] = option(:bind, :IP, "0.0.0.0")
-    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
-    root = File.expand_path(params[:root].value)
-    DoltApp.new(File.join(File.dirname(__FILE__), "..")).run(root, options)
-  end
-}
+given_root = ARGV.pop
+parser = Trollop::Parser.new do
+  version "Dolt #{Dolt::VERSION}"
+  banner <<-END_HELP
+Dolt is a Git repository browser.
+
+Usage:
+   #{$0} [options] ROOT
+
+   where ROOT is either the path to a repository or a directory containing
+   repositories.
+
+   Valid options are:
+END_HELP
+
+  opt :socket, "A socket to listen to", :type => :string
+  opt :port, "A port to listen to", :type => :integer
+  opt :bind, "An IP address to bind to", :type => :string
+  opt :tabwidth, "The number of spaces to use as a tab", :type => :integer, :default => 4
+  opt :pidfile, "Run as daemon with pidfile stored here", :type => :string
+  opt :logfile, "Use as log file. Assumes --pidfile option", :type => :string
+end
+
+params = Trollop::with_standard_exception_handling(parser) do
+  raise Trollop::HelpNeeded if given_root.nil?
+  raise Trollop::HelpNeeded unless File.exist?(given_root)
+  parser.parse(ARGV)
+end
+
+options = {}
+options[:root] = File.expand_path(given_root)
+if params[:socket]
+  options[:socket] = params[:socket]
+else
+  options[:port] = option_from_options_or_env(:port, "PORT", 3000, params).to_i
+  options[:ip] = option_from_options_or_env(:ip, "IP", "0.0.0.0", params)
+end
+
+if params[:pidfile]
+  options[:pidfile] = params[:pidfile]
+  options[:logfile] = params[:logfile] || "/tmp/dolt.log"
+end
+
+options[:tab_width] = params[:tabwidth]
+
+DoltApp.new(File.join(File.dirname(__FILE__), "..")).run(options.delete(:root), options)

data/dolt.gemspec

@@ -11,7 +11,7 @@ end
 
 Gem::Specification.new do |s|
   s.name        = "dolt"
-  s.version     = "0.18.0"
+  s.version     = "0.19.0"
   s.authors     = ["Christian Johansen"]
   s.email       = ["christian@gitorious.org"]
   s.homepage    = "http://gitorious.org/gitorious/dolt"
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   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_dependency "trollop", "~>2.0"
 
   s.add_development_dependency "minitest", "~> 2.0"
   s.add_development_dependency "rake", "~> 0.9"

metadata

@@ -1,25 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: dolt
 version: !ruby/object:Gem::Version
-  version: 0.18.0
   prerelease: 
+  version: 0.19.0
 platform: ruby
 authors:
 - Christian Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: libdolt
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.21'
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -27,15 +26,15 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.21'
+  name: libdolt
 - !ruby/object:Gem::Dependency
-  name: thin
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -43,15 +42,15 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
+  name: thin
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -59,15 +58,15 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+  name: sinatra
 - !ruby/object:Gem::Dependency
-  name: tiltout
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -75,15 +74,15 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
+  name: tiltout
 - !ruby/object:Gem::Dependency
-  name: json
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -91,31 +90,31 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+  name: json
 - !ruby/object:Gem::Dependency
-  name: main
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.2'
-  type: :runtime
+        version: '2.0'
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '2.0'
+  name: trollop
 - !ruby/object:Gem::Dependency
-  name: minitest
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -123,15 +122,15 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+  name: minitest
 - !ruby/object:Gem::Dependency
-  name: rake
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -139,15 +138,15 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
+  name: rake
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  type: :development
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
-  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -155,6 +154,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
+  name: rack-test
 description: Dolt serves git trees and syntax highlighted blobs
 email:
 - christian@gitorious.org
@@ -252,4 +252,3 @@ signing_key:
 specification_version: 3
 summary: Dolt serves git trees and syntax highlighted blobs
 test_files: []
-has_rdoc: