bin/ginatra-daemon bin/ginatra-directory bin/ginatra-server vendor/vegas @@ -8,4 +8,6 @@ spec/*.html public/*/ public/*.html _site -_layouts \ No newline at end of file +_layouts +**/*.swp +*.swp .gitignore @@ -1,3 +1,3 @@ -[submodule "sinatra"] - path = sinatra - url = git://github.com/sinatra/sinatra.git +[submodule "vendor/vegas"] + path = vendor/vegas + url = git://github.com/quirkey/vegas.git .gitmodules @@ -3,11 +3,58 @@ current_path = File.expand_path(File.dirname(__FILE__)) require "#{current_path}/../lib/ginatra" -require 'vegas' -pid = Kernel.fork { system "git daemon --base-path=#{Ginatra::Config.git_dir} --export-all" } -Vegas::Runner.new(Ginatra::App, 'ginatra-app', :port => Ginatra::Config.port) -trap("INT", "HUP", "TERM") do - Process.kill(pid) - puts "Farewell." + +module Ginatra::Executable + HELP = <<HELP +Usage: ginatra [ version | server <options> <command> | + daemon <command> | directory <command> <args> ] + +Ginatra Commands: + version - Pretty Self explanatory. Print version number and exit + +Ginatra Server Commands: + start - Start the Ginatra HTTP Server. + stop - Stop the Ginatra Server. + status - How's your Ginatra Server holding up? + +Ginatra Daemon Commands: + start - Starts the Git Daemon servimg Ginatra's Repositories + stop - Stops the Git Daemon + restart - Restarts the Git Daemon + status - Is the Git Daemon on or off? + + +Ginatra Directory Commands: + add - Adds the <globs> to the array of dirs that Ginatra + looks in for repositories. + remove - Removes the <globs> from the aforementioned array. + list - Lists the globs Ginatra looks in for repositories + +HELP + + @current_path = File.expand_path(File.dirname(__FILE__)) + + def self.daemon(*args) + system("#{@current_path}/ginatra-daemon #{args.join(" ")}") + end + + def self.directory(*args) + system("#{@current_path}/ginatra-directory #{args.join(" ")}") + end + + def self.server(*args) + system("#{@current_path}/ginatra-server #{args.join(" ")}") + end + + def self.version(*args) + puts Ginatra::VERSION + end +end + +command, *args = ARGV[0], ARGV[1..-1] +if command !~ /^(version|daemon|directory|server)$/ + puts Ginatra::Executable::HELP + exit end +Ginatra::Executable.send(command, *args) bin/ginatra @@ -24,7 +24,7 @@ module Ginatra end end - VERSION = "0.9.9" + VERSION = "1.1.0" class App < Sinatra::Base lib/ginatra.rb @@ -2,7 +2,7 @@ module Ginatra class Config current_path = File.expand_path("#{File.dirname(__FILE__)}") - CONFIG_PATH = File.expand_path("~/.ginatra") + CONFIG_PATH = File.expand_path("~/.ginatra/config.yml") DEFAULT_CONFIG = { :git_dirs => [File.expand_path("#{current_path}/../../repos/*")], :ignored_files => ['README.md'], @@ -52,4 +52,4 @@ module Ginatra end end -end \ No newline at end of file +end lib/ginatra/config.rb 5eb789dd2b13970770464ee55e5923070666dfe7 Samuel Elliott sam@lenary.co.uk http://github.com/lenary/ginatra/commit/a3327a5f3e0b8f91454100d71f78643b1f1f3132 a3327a5f3e0b8f91454100d71f78643b1f1f3132 2009-08-25T14:28:47-07:00 2009-08-25T14:28:47-07:00 Added Loads of Ginatra executables and submoduled vegas for its new features. Closes GH-16 Lots of new Ginatra Commands relating to starting and stopping the server, starting and stopping the daemon and adding and removing glob-paths from the config. 0cb61188f7ca04dbc8d999b9ed74397b2110b6be Samuel Elliott sam@lenary.co.uk