ginatra 2.2.6 → 2.2.7

data/bin/ginatra

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 
-require "bundler"
-Bundler.setup(:default)
 require "ginatra"
 
 module Ginatra::Executable
   HELP = <<HELP
-Usage: ginatra [ version | server <options> <command> |
-                 daemon <command> | directory <command> <args> ]
+Usage: ginatra [ version |
+                 server <options> <command> |
+                 daemon <command> |
+                 directory <command> <globs> ]
 
 Ginatra Commands:
   version - Pretty Self explanatory. Print version number and exit
@@ -32,29 +32,37 @@ Ginatra Directory Commands:
 
 HELP
 
-  @current_path = File.expand_path(File.dirname(__FILE__))
-
-  def self.daemon(*args)
-    system("#{@current_path}/ginatra-daemon #{args.join(" ")}")
+  def self.daemon
+    path = File.expand_path(File.dirname(__FILE__))
+    load "#{path}/ginatra-daemon"
   end
 
-  def self.directory(*args)
-    system("#{@current_path}/ginatra-directory #{args.join(" ")}")
+  def self.directory
+    path = File.expand_path(File.dirname(__FILE__))
+    load "#{path}/ginatra-directory"
   end
 
-  def self.server(*args)
-    system("#{@current_path}/ginatra-server #{args.join(" ")}")
+  def self.server
+    path = File.expand_path(File.dirname(__FILE__))
+    load("#{path}/ginatra-server")
   end
 
-  def self.version(*args)
-    puts Ginatra::VERSION
+  def self.execute(command, args)
+    case command
+    when "version"
+      puts Ginatra::VERSION
+    when "daemon"
+      daemon
+    when "directory"
+      directory
+    when "server"
+      server
+    else
+      puts Ginatra::Executable::HELP
+    end
   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)
+Ginatra::Executable.execute ARGV.shift, ARGV
+
 

data/bin/ginatra-daemon

@@ -1,17 +1,6 @@
 #!/usr/bin/env ruby
 
-require "bundler"
-Bundler.setup(:default)
 require "ginatra"
-require "logger"
-
-def logger
-  return @logger if @logger
-  @logger = Logger.new(STDOUT)
-  @logger.level = Logger::INFO
-  @logger.formatter = Proc.new {|s, t, n, msg| "[#{t}] #{msg}\n"}
-  @logger
-end
 
 module Ginatra::Daemon
 
@@ -63,6 +52,7 @@ HELP
   end
 
   def self.status
+    logger.level = Logger::INFO
     if File.exists?(PID_FILE)
       logger.info "Ginatra Daemon running at pid:#{File.new(PID_FILE).read}"
     else
@@ -70,13 +60,28 @@ HELP
     end
   end
 
-end
+  def self.logger
+    Ginatra::Config.logger
+  end
+
+  def self.execute(command)
+    case command
+    when "start"
+      start
+    when "stop"
+      stop
+    when "restart"
+      restart
+    when "status"
+      status
+    else
+      puts Ginatra::Daemon::HELP
+    end
+  end
 
-command = ARGV[0]
-if command !~ /^(stop|status|start|restart)$/
-  puts Ginatra::Daemon::HELP
-else
-  Ginatra::Daemon.send(command)
 end
 
+Ginatra::Daemon.execute ARGV[0]
+
+
 

data/bin/ginatra-directory

@@ -1,17 +1,6 @@
 #!/usr/bin/env ruby
 
-require "bundler"
-Bundler.setup(:default)
 require "ginatra"
-require "logger"
-
-def logger
-  return @logger if @logger
-  @logger = Logger.new(STDOUT)
-  @logger.level = Logger::INFO
-  @logger.formatter = Proc.new {|s, t, n, msg| "[#{t}] #{msg}\n"}
-  @logger
-end
 
 module Ginatra::Directory
 
@@ -29,7 +18,7 @@ HELP
   def self.add(globs)
     Ginatra::Config.load!
     Ginatra::Config[:git_dirs] += globs
-    logger.info "Added #{globs.join(" ")} to your config"
+    Ginatra::Config.logger.info "Added #{globs.join(" ")} to your config"
     Ginatra::Config.dump!
   end
 
@@ -38,21 +27,29 @@ HELP
     globs.each do |glob|
       Ginatra::Config[:git_dirs].delete(glob)
     end
-    logger.info "Removed #{globs.join(" ")} from your config"
+    Ginatra::Config.logger.info "Removed #{globs.join(" ")} from your config"
     Ginatra::Config.dump!
   end
 
-  def self.list(args)
+  def self.list
     Ginatra::Config.load!
     puts "Directories Ginatra will look for repos in:"
     puts Ginatra::Config[:git_dirs].map{|r| "  - #{r}"}.join("\n")
     puts ""
   end
-end
 
-command, args = ARGV[0], ARGV[1..-1]
-if command !~ /^(add|remove|list)$/
-  puts Ginatra::Directory::HELP
-else
-  Ginatra::Directory.send(command, args)
+  def self.execute(command, args)
+    case command
+    when "add"
+      add(args)
+    when "remove"
+      remove(args)
+    when "list"
+      list
+    else
+      puts Ginatra::Directory::HELP
+    end
+  end
 end
+
+Ginatra::Directory.execute ARGV[0], ARGV[1..-1]

data/bin/ginatra-server

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-require "bundler"
-Bundler.setup(:default)
 require "ginatra"
 require "vegas"
 

data/config.ru

@@ -1,5 +1,3 @@
-require "bundler"
-Bundler.setup(:default)
 require "ginatra"
 
 map '/' do

data/ginatra.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ginatra"
-  s.version = "2.2.6"
+  s.version = "2.2.7"
   s.summary = "A Gitweb Clone in Sinatra and Grit"
   s.description = "Host your own git repository browser through the power of Sinatra and Grit"
   s.email = "sam@lenary.co.uk"

data/lib/ginatra.rb

@@ -1,6 +1,4 @@
 
-require "bundler"
-Bundler.setup(:default)
 require 'sinatra/base'
 require "sinatra/partials"
 
@@ -30,6 +28,8 @@ module Ginatra
     end
   end
 
+  VERSION = "2.2.7"
+
   # The main application class.
   #
   # This class contains all the core application logic

data/lib/ginatra/config.rb

@@ -1,5 +1,6 @@
 require "yaml"
-require 'fileutils'
+require "fileutils"
+require "logger"
 
 module Ginatra
 
@@ -26,7 +27,7 @@ module Ginatra
     def self.logger
       return @logger if @logger
 
-      log_file = Ginatra::Config[:log_file].to_s || STDOUT
+      log_file = Ginatra::Config[:log_file] || STDOUT
 
       # create log_file location
       # The log_file config option should be an absolute file system path

data/rackup.ru

@@ -1,5 +1,3 @@
-require "bundler"
-Bundler.setup(:default)
 require "ginatra"
 
 map '/' do

data/spec/repo_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
-require "grit"
 
 describe "Ginatra" do
   describe "Repo" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ginatra
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 2
   - 2
-  - 6
-  version: 2.2.6
+  - 7
+  version: 2.2.7
 platform: ruby
 authors: 
 - Sam Elliott