ginatra 2.0.1 → 2.0.2

data/Rakefile

@@ -78,6 +78,7 @@ begin
     gemspec.add_dependency('sinatra', '>=0.9.4')
     gemspec.add_dependency('grit', '>=1.1.1')
     gemspec.add_dependency('coderay', '>=0.8.0')
+    gemspec.files.include 'vendor/**/*'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/ginatra.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ginatra}
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Elliott", "Ryan Bigg"]
-  s.date = %q{2009-08-25}
+  s.date = %q{2009-08-26}
   s.description = %q{Host your own git repository browser through the power of Sinatra and Grit}
   s.email = %q{sam@lenary.co.uk}
   s.executables = ["ginatra", "ginatra-daemon", "ginatra-directory", "ginatra-server"]
@@ -63,6 +63,19 @@ Gem::Specification.new do |s|
      "spec/repo_list_spec.rb",
      "spec/repo_spec.rb",
      "spec/spec_helper.rb",
+     "vendor/vegas/History.txt",
+     "vendor/vegas/LICENSE",
+     "vendor/vegas/Manifest.txt",
+     "vendor/vegas/README.rdoc",
+     "vendor/vegas/Rakefile",
+     "vendor/vegas/lib/vegas.rb",
+     "vendor/vegas/lib/vegas/runner.rb",
+     "vendor/vegas/test/test_app/bin/test_app",
+     "vendor/vegas/test/test_app/test_app.rb",
+     "vendor/vegas/test/test_apps.rb",
+     "vendor/vegas/test/test_helper.rb",
+     "vendor/vegas/test/test_vegas_runner.rb",
+     "vendor/vegas/vegas.gemspec",
      "views/_actor_box.erb",
      "views/_commit_info_box.erb",
      "views/_header.erb",

data/vendor/vegas/History.txt

@@ -0,0 +1,18 @@
+== 0.0.4 2009-08-09
+
+* new -L (--skip-launch) option doesn't launch the web browser (thanks bmabey!)
+* rubygems is required only on LoadError
+
+== 0.0.3 2009-07-06
+
+* Vegas::Runner is now Windows compatible (require win32-process gem)
+  * Includes daemon-ization
+  * PID tracking
+  * Vegas::WINDOWS is a top level boolean
+* Vegas is no longer dependent on Launchy 
+  * launching browser is done simply with open/start depending on platform
+  
+== 0.0.1 2009-04-13
+
+* 1 major enhancement:
+  * Initial release

data/vendor/vegas/LICENSE

@@ -0,0 +1,22 @@
+(The MIT License)
+
+Copyright (c) 2009 Aaron Quint, Quirkey NYC, LLC.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/vendor/vegas/Manifest.txt

@@ -0,0 +1,5 @@
+History.txt
+LICENSE
+README.rdoc
+lib/vegas.rb
+lib/vegas/runner.rb

data/vendor/vegas/README.rdoc

@@ -0,0 +1,45 @@
+= vegas
+
+http://code.quirkey.com/vegas
+
+== DESCRIPTION:
+
+Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps.
+
+== FEATURES/PROBLEMS:
+
+Currently, Vegas just includes a single class Vegas::Runner which wraps your Sinatra app to give it command line options, daemonization, PID/URL tracking, and browser launching (using Launchy).
+
+Lets say you have a gem with a sinatra application. With Vegas you can create a bin that looks like
+  
+  #!/usr/bin/env ruby
+  # ./bin/myapp
+  
+  require File.expand_path(File.dirname(__FILE__) + "/../lib/myapp")
+  require 'vegas'
+  
+  Vegas::Runner.new(Sinatra::Application, 'myapp')
+  
+
+See the website: http://code.quirkey.com/vegas for full usage/options.
+
+=== WINDOWS:
+
+Using vegas (and gems that depend on it) on Windows works but isn't 100% the same. 
+Daemon-ization and browser launching work, but you will see duplicate messages.
+
+If you see a warning like:
+
+  `expand_path': couldn't find HOME environment -- expanding `~/.vegas' (ArgumentError)
+
+You have to set your HOME path:
+
+  c:\> set HOME=%HOMEPATH%
+
+== INSTALL:
+
+  sudo gem install vegas
+
+== LICENSE:
+
+MIT LICENSE, see LICENSE for details

data/vendor/vegas/Rakefile

@@ -0,0 +1,32 @@
+%w[rubygems rake rake/clean hoe fileutils newgem rubigen].each { |f| require f }
+require File.dirname(__FILE__) + '/lib/vegas'
+
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+$hoe = Hoe.spec('vegas') do |p|
+  p.version              = Vegas::VERSION
+  p.developer('Aaron Quint', 'aaron@quirkey.com')
+  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
+  p.summary              = "Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps."
+  p.description          = %{Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps. It includes a class Vegas::Runner that wraps Rack/Sinatra applications and provides a simple command line interface and launching mechanism.}
+  p.rubyforge_name       = 'quirkey'
+  p.extra_deps         = [
+    ['sinatra','>= 0.9.1']
+  ]
+  p.extra_dev_deps = [
+    ['newgem', ">= #{::Newgem::VERSION}"],
+    ['nokogiri', ">= 1.0.6"],
+    ['bacon', ">= 1.1.0"]
+  ]
+  
+  p.clean_globs |= %w[**/.DS_Store tmp *.log]
+  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
+  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
+  p.rsync_args = '-av --delete --ignore-errors'
+end
+
+require 'newgem/tasks' # load /tasks/*.rake
+Dir['tasks/**/*.rake'].each { |t| load t }
+
+# TODO - want other tests/tasks run by default? Add them to the list
+# task :default => [:spec, :features]

data/vendor/vegas/lib/vegas.rb

@@ -0,0 +1,16 @@
+begin
+  require 'sinatra'
+rescue LoadError
+  require 'rubygems'
+  require 'sinatra'
+end
+
+$LOAD_PATH.unshift File.dirname(__FILE__)
+
+module Vegas
+  VERSION = "0.0.4.1"
+  WINDOWS = !!(RUBY_PLATFORM =~ /(mingw|bccwin|wince|mswin32)/i)
+  
+  autoload :Runner, 'vegas/runner'
+end
+

data/vendor/vegas/lib/vegas/runner.rb

@@ -0,0 +1,270 @@
+require 'open-uri'
+require 'logger'
+require 'optparse'
+
+if Vegas::WINDOWS
+  begin
+    require 'win32/process'
+  rescue 
+    puts "Sorry, in order to use Vegas on Windows you need the win32-process gem:\n gem install win32-process"
+  end
+end
+
+module Vegas
+  class Runner
+    attr_reader :app, :app_name, :rack_handler, :port, :host, :options
+    
+    ROOT_DIR   = File.expand_path(File.join('~', '.vegas'))
+    PORT       = 5678
+    HOST       = WINDOWS ? 'localhost' : '0.0.0.0'
+    
+    def initialize(app, app_name, set_options = {}, &block)
+      # initialize
+      @app          = app
+      @app_name     = app_name
+      @options      = set_options || {}
+      @rack_handler = @app.send :detect_rack_handler
+      # load options from opt parser
+      define_options do |opts|
+        if block_given?
+          opts.separator ''
+          opts.separator "#{app_name} options:"
+          yield(self, opts, app)
+        end
+      end
+      # set app options
+      @host = options[:host] || HOST
+      @app.set options
+      # initialize app dir
+      FileUtils.mkdir_p(app_dir)
+      
+      return if options[:start] === false
+      
+      logger.info "Running with Windows Settings" if WINDOWS
+      logger.info "Starting #{app_name}"
+      
+      check_for_running
+      find_port
+      write_url
+      start
+    end
+    
+    def app_dir
+      File.join(ROOT_DIR, app_name)
+    end
+    
+    def pid_file
+      File.join(app_dir, "#{app_name}.pid")
+    end
+    
+    def url_file
+      File.join(app_dir, "#{app_name}.url")
+    end
+    
+    def url
+      "http://#{host}:#{port}"
+    end
+    
+    def log_file
+      File.join(app_dir, "#{app_name}.log")
+    end
+    
+    def handler_name
+      rack_handler.name.gsub(/.*::/, '')
+    end
+        
+    def find_port
+      if @port = options[:port]
+        if !port_open?
+          logger.warn "Port #{port} is already in use. Please try another or don't use -P, for auto-port"
+        end
+      else
+        @port = PORT
+        logger.info "Trying to start #{app_name} on Port #{port}"
+        while !port_open?
+          @port += 1
+          logger.info "Trying to start #{app_name} on Port #{port}"
+        end
+      end
+    end
+    
+    def port_open?(check_url = nil)
+      begin
+        open(check_url || url)
+        false
+      rescue Errno::ECONNREFUSED => e
+        true
+      end
+    end
+    
+    def write_url
+      File.open(url_file, 'w') {|f| f << url }
+    end
+    
+    def check_for_running
+      if File.exists?(pid_file) && File.exists?(url_file)
+        running_url = File.read(url_file)
+        if !port_open?(running_url)
+          logger.warn "#{app_name} is already running at #{running_url}"
+          launch!(running_url)
+          exit!
+        end
+      end
+    end
+    
+    def run!
+      rack_handler.run app, :Host => host, :Port => port do |server|
+        trap(kill_command) do
+          ## Use thins' hard #stop! if available, otherwise just #stop
+          server.respond_to?(:stop!) ? server.stop! : server.stop
+          logger.info "#{app_name} received INT ... stopping"
+          delete_pid!
+        end
+      end
+    end
+    
+    # Adapted from Rackup
+    def daemonize!
+      if RUBY_VERSION < "1.9"
+        logger.debug "Parent Process: #{Process.pid}"
+        exit! if fork
+        logger.debug "Child Process: #{Process.pid}"
+        Dir.chdir "/"
+        File.umask 0000
+        FileUtils.touch(log_file)
+        STDIN.reopen  log_file
+        STDOUT.reopen log_file, "a"
+        STDERR.reopen log_file, "a"
+      else
+        Process.daemon
+      end
+      logger.debug "Child Process: #{Process.pid}"
+
+      File.open(pid_file, 'w') {|f| f.write("#{Process.pid}") }
+      at_exit { delete_pid! }
+    end
+    
+    def launch!(specific_url = nil)
+      return if options[:skip_launch]
+      cmd = WINDOWS ? "start" : "sleep 2 && open"
+      system "#{cmd} #{specific_url || url}"
+    end
+    
+    def kill!
+      pid = File.read(pid_file)
+      logger.warn "Sending INT to #{pid.to_i}"
+      Process.kill(kill_command, pid.to_i)
+    rescue => e
+      logger.warn "pid not found at #{pid_file} : #{e}"
+    end
+    
+    def start
+      begin
+        launch!    
+        daemonize! unless options[:foreground]      
+        run!
+      rescue RuntimeError => e
+        logger.warn "There was an error starting #{app_name}: #{e}"
+        exit
+      end
+    end
+    
+    def status
+      if File.exists?(pid_file)
+        logger.info "#{app_name} running"
+        logger.info "PID #{File.read(pid_file)}"
+        logger.info "URL #{File.read(url_file)}" if File.exists?(url_file)
+      else
+        logger.info "#{app_name} not running!"
+      end
+    end
+
+    def logger
+      return @logger if @logger
+      @logger = Logger.new(STDOUT)
+      @logger.level     = options[:debug] ? Logger::DEBUG : Logger::INFO
+      @logger.formatter = Proc.new {|s, t, n, msg| "[#{t}] #{msg}\n"}
+      @logger
+    end
+    
+    private
+    def define_options
+      OptionParser.new("", 24, '  ') { |opts|
+        opts.banner = "Usage: #{app_name} [options]"
+
+        opts.separator ""
+        opts.separator "Vegas options:"
+                
+        opts.on("-s", "--server SERVER", "serve using SERVER (webrick/mongrel)") { |s|
+          @rack_handler = Rack::Handler.get(s)
+        }
+        
+        opts.on("-o", "--host HOST", "listen on HOST (default: #{HOST})") { |host|
+          @options[:host] = host
+        }
+
+        opts.on("-p", "--port PORT", "use PORT (default: #{PORT})") { |port|
+          @options[:port] = port
+        }
+
+        opts.on("-e", "--env ENVIRONMENT", "use ENVIRONMENT for defaults (default: development)") { |e|
+          @options[:environment] = e
+        }
+
+        opts.on("-F", "--foreground", "don't daemonize, run in the foreground") { |f|
+          @options[:foreground] = true
+        }
+
+        opts.on("-L", "--no-launch", "don't launch the browser") { |f|
+          @options[:skip_launch] = true
+        }
+
+        opts.on('-K', "--kill", "kill the running process and exit") {|k| 
+          kill!
+          exit
+        }
+        
+        opts.on('-S', "--status", "display the current running PID and URL then quit") {|s| 
+          status
+          exit!
+        }
+        
+        opts.on('-d', "--debug", "raise the log level to :debug (default: :info)") {|s| 
+          @options[:debug] = true
+        }
+                
+        yield opts if block_given?
+        
+        opts.separator ""
+        opts.separator "Common options:"
+
+        opts.on_tail("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
+
+        opts.on_tail("--version", "Show version") do
+          if app.respond_to?(:version)
+            puts "#{app_name} #{app.version}"
+          end
+          puts "sinatra #{Sinatra::VERSION}"
+          puts "vegas #{Vegas::VERSION}"
+          exit
+        end
+
+        opts.parse! ARGV
+      }
+    rescue OptionParser::MissingArgument => e
+      logger.warn "#{e}, run -h for options"
+      exit
+    end
+    
+    def kill_command
+      WINDOWS ? 1 : :INT
+    end
+    
+    def delete_pid!
+      File.delete(pid_file) if File.exist?(pid_file)
+    end
+  end
+end

data/vendor/vegas/test/test_app/bin/test_app

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+#
+#  Created on 2009-2-27.
+#  Copyright (c) 2009. All rights reserved.
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_app.rb'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'lib','vegas.rb'))
+
+Vegas::Runner.new(TestApp, 'test_app')

data/vendor/vegas/test/test_app/test_app.rb

@@ -0,0 +1,10 @@
+require 'rubygems'
+require 'sinatra'
+
+class TestApp < Sinatra::Base
+  
+  get '/' do
+    'This is a TEST'
+  end
+  
+end

data/vendor/vegas/test/test_apps.rb

@@ -0,0 +1,22 @@
+class TestApp1 < Sinatra::Default
+  
+  get '/' do
+    'TestApp1 Index'
+  end
+  
+  get '/route' do
+    'TestApp1 route'
+  end
+end
+
+
+class TestApp2 < Sinatra::Default
+  
+  get '/' do
+    'TestApp2 Index'
+  end
+  
+  get '/route' do
+    'TestApp2 route'
+  end
+end

data/vendor/vegas/test/test_helper.rb

@@ -0,0 +1,59 @@
+dependencies = %w{
+  bacon
+  sinatra
+  rack/test
+  nokogiri
+}
+
+begin
+  dependencies.each {|f| require f }
+rescue LoadError
+  require 'rubygems'
+  dependencies.each {|f| require f }
+end
+
+require File.join(File.dirname(__FILE__), '..', 'lib', 'vegas.rb')
+
+module TestHelper
+  def rackup(app)
+    Rack::Test::Session.new(app)
+  end
+  
+  def body
+    last_response.body.to_s
+  end
+
+  def instance_of(klass)
+    lambda {|obj| obj.is_a?(klass) }
+  end
+
+  def html_body
+    body =~ /^\<html/ ? body : "<html><body>#{body}</body></html>"
+  end
+
+end
+
+Bacon::Context.send(:include, TestHelper)
+
+class Should
+
+  def have_element(search, content = nil)
+    satisfy "have element matching #{search}" do
+      doc = Nokogiri.parse(@object.to_s)
+      node_set = doc.search(search)
+      if node_set.empty?
+        false
+      else
+        collected_content = node_set.collect {|t| t.content }.join(' ')
+        case content
+        when Regexp
+          collected_content =~ content
+        when String
+          collected_content.include?(content)
+        when nil
+          true
+        end
+      end
+    end
+  end
+end

data/vendor/vegas/test/test_vegas_runner.rb

@@ -0,0 +1,8 @@
+require File.join(File.dirname(__FILE__), 'test_helper.rb')
+
+describe 'Vegas::Runner' do
+  
+  
+
+end
+

data/vendor/vegas/vegas.gemspec

@@ -0,0 +1,45 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{vegas}
+  s.version = "0.0.4.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Aaron Quint"]
+  s.date = %q{2009-08-09}
+  s.description = %q{Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps. It includes a class Vegas::Runner that wraps Rack/Sinatra applications and provides a simple command line interface and launching mechanism.}
+  s.email = ["aaron@quirkey.com"]
+  s.extra_rdoc_files = ["History.txt"]
+  s.files = ["History.txt", "LICENSE", "README.rdoc", "lib/vegas.rb", "lib/vegas/runner.rb", "test/test_app/test_app.rb", "test/test_apps.rb", "test/test_helper.rb", "test/test_vegas_runner.rb"]
+  s.rdoc_options = ["--main", "README.txt"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{quirkey}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps.}
+  s.test_files = ["test/test_app/test_app.rb", "test/test_apps.rb", "test/test_helper.rb", "test/test_vegas_runner.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.1"])
+      s.add_development_dependency(%q<newgem>, [">= 1.5.1"])
+      s.add_development_dependency(%q<nokogiri>, [">= 1.0.6"])
+      s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
+      s.add_development_dependency(%q<hoe>, [">= 2.3.3"])
+    else
+      s.add_dependency(%q<sinatra>, [">= 0.9.1"])
+      s.add_dependency(%q<newgem>, [">= 1.5.1"])
+      s.add_dependency(%q<nokogiri>, [">= 1.0.6"])
+      s.add_dependency(%q<bacon>, [">= 1.1.0"])
+      s.add_dependency(%q<hoe>, [">= 2.3.3"])
+    end
+  else
+    s.add_dependency(%q<sinatra>, [">= 0.9.1"])
+    s.add_dependency(%q<newgem>, [">= 1.5.1"])
+    s.add_dependency(%q<nokogiri>, [">= 1.0.6"])
+    s.add_dependency(%q<bacon>, [">= 1.1.0"])
+    s.add_dependency(%q<hoe>, [">= 2.3.3"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ginatra
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Sam Elliott
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-25 00:00:00 +01:00
+date: 2009-08-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,6 +101,19 @@ files:
 - spec/repo_list_spec.rb
 - spec/repo_spec.rb
 - spec/spec_helper.rb
+- vendor/vegas/History.txt
+- vendor/vegas/LICENSE
+- vendor/vegas/Manifest.txt
+- vendor/vegas/README.rdoc
+- vendor/vegas/Rakefile
+- vendor/vegas/lib/vegas.rb
+- vendor/vegas/lib/vegas/runner.rb
+- vendor/vegas/test/test_app/bin/test_app
+- vendor/vegas/test/test_app/test_app.rb
+- vendor/vegas/test/test_apps.rb
+- vendor/vegas/test/test_helper.rb
+- vendor/vegas/test/test_vegas_runner.rb
+- vendor/vegas/vegas.gemspec
 - views/_actor_box.erb
 - views/_commit_info_box.erb
 - views/_header.erb