vegas 0.1.8 → 0.1.9

data/lib/vegas.rb

@@ -1,5 +1,6 @@
 begin
   require 'rack'
+  require 'rbconfig'
 rescue LoadError
   require 'rubygems'
   require 'rack'
@@ -8,8 +9,10 @@ end
 $LOAD_PATH.unshift File.dirname(__FILE__)
 
 module Vegas
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
   WINDOWS = !!(RUBY_PLATFORM =~ /(mingw|bccwin|wince|mswin32)/i)
+  JRUBY = !!(RbConfig::CONFIG["RUBY_INSTALL_NAME"] =~ /^jruby/i)
 
   autoload :Runner, 'vegas/runner'
+
 end

data/lib/vegas/runner.rb

@@ -17,7 +17,7 @@ module Vegas
     attr_reader :app, :app_name, :filesystem_friendly_app_name, :quoted_app_name,
       :rack_handler, :port, :host, :options, :args
 
-    ROOT_DIR   = File.expand_path(File.join('~', '.vegas'))
+    ROOT_DIR = ENV['HOME'] ? File.expand_path(File.join('~', '.vegas')) : nil
     PORT       = 5678
     HOST       = WINDOWS ? 'localhost' : '0.0.0.0'
 
@@ -78,6 +78,9 @@ module Vegas
     end
 
     def app_dir
+      if !options[:app_dir] && !ROOT_DIR
+        raise ArgumentError.new("nor --app-dir neither EVN['HOME'] defined")
+      end
       options[:app_dir] || File.join(ROOT_DIR, filesystem_friendly_app_name)
     end
 
@@ -99,6 +102,7 @@ module Vegas
 
     def start(path = nil)
       logger.info "Running with Windows Settings" if WINDOWS
+      logger.info "Running with JRuby" if JRUBY
       logger.info "Starting #{quoted_app_name}..."
       begin
         check_for_running(path)
@@ -168,25 +172,37 @@ module Vegas
       logger.info "Running with Rack handler: #{@rack_handler.inspect}"
 
       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 "#{quoted_app_name} received INT ... stopping"
-          delete_pid!
+        kill_commands.each do |command|
+          trap(command) do
+            ## Use thins' hard #stop! if available, otherwise just #stop
+            server.respond_to?(:stop!) ? server.stop! : server.stop
+            logger.info "#{quoted_app_name} received INT ... stopping"
+            delete_pid!
+          end
         end
       end
     end
 
     # Adapted from Rackup
     def daemonize!
-      if RUBY_VERSION < "1.9"
+      if JRUBY
+        # It's not a true daemon but when executed with & works like one
+        thread = Thread.new {daemon_execute}
+        thread.join
+        
+      elsif RUBY_VERSION < "1.9"
         logger.debug "Parent Process: #{Process.pid}"
         exit!(0) if fork
         logger.debug "Child Process: #{Process.pid}"
+        daemon_execute
+        
       else
         Process.daemon(true, true)
+        daemon_execute
       end
-
+    end
+    
+    def daemon_execute
       File.umask 0000
       FileUtils.touch log_file
       STDIN.reopen    log_file
@@ -207,7 +223,7 @@ module Vegas
 
     def kill!
       pid = File.read(pid_file)
-      logger.warn "Sending INT to #{pid.to_i}"
+      logger.warn "Sending #{kill_command} to #{pid.to_i}"
       Process.kill(kill_command, pid.to_i)
     rescue => e
       logger.warn "pid not found at #{pid_file} : #{e}"
@@ -279,7 +295,7 @@ module Vegas
 
       # If all else fails, we'll use Thin
       else
-        Rack::Handler::Thin
+        JRUBY ? Rack::Handler::WEBrick : Rack::Handler::Thin
       end
     end
 
@@ -375,8 +391,8 @@ module Vegas
       exit
     end
 
-    def kill_command
-      WINDOWS ? 1 : :INT
+    def kill_commands
+      WINDOWS ? [1] : [:INT, :TERM]
     end
 
     def delete_pid!

data/test/test_helper.rb

@@ -20,7 +20,9 @@ module TestHelper
 
   def vegas(*args, &block)
     Vegas::Runner.any_instance.stubs(:daemonize!).once
-    Rack::Handler::Thin.stubs(:run).once
+
+    Vegas::JRUBY ? Rack::Handler::WEBrick.stubs(:run).once : Rack::Handler::Thin.stubs(:run).once
+
     @vegas = Vegas::Runner.new(*args, &block)
   end
 

data/test/test_vegas_runner.rb

@@ -1,8 +1,8 @@
-require File.join('.', File.dirname(__FILE__), 'test_helper.rb')
+require 'test_helper'
 
 Vegas::Runner.class_eval do
   remove_const :ROOT_DIR
-  ROOT_DIR = File.join(File.dirname(__FILE__), 'tmp', '.vegas')
+  Vegas::Runner::ROOT_DIR = File.join(File.dirname(__FILE__), 'tmp', '.vegas')
 end
 
 describe 'Vegas::Runner' do
@@ -130,8 +130,12 @@ describe 'Vegas::Runner' do
         vegas(RackApp1, 'rack_app_1', {:skip_launch => true, :sessions => true})
       end
 
-      it "sets default rack handler to thin" do
-        @vegas.rack_handler.should == Rack::Handler::Thin
+      it "sets default rack handler to thin when in ruby and WEBrick when in jruby" do
+        if Vegas::JRUBY
+          @vegas.rack_handler.should == Rack::Handler::WEBrick
+        else
+          @vegas.rack_handler.should == Rack::Handler::Thin
+        end
       end
     end
 
@@ -157,6 +161,30 @@ describe 'Vegas::Runner' do
       end
     end
 
+    describe 'without environment' do
+
+      Vegas::Runner::ROOT_DIR = nil
+
+      before do
+        @app_dir = './test/tmp'
+      end
+
+      it 'should be ok with --app-dir' do
+        vegas(RackApp1, 'rack_app_1', {:skip_launch => true, :app_dir => @app_dir})
+        @vegas.app_dir.should == @app_dir
+      end
+
+      it 'should raise an exception without --app-dir' do
+        success = false
+        begin
+          vegas(RackApp1, 'rack_app_1', {:skip_launch => true})
+        rescue ArgumentError
+          success = true
+        end
+        success.should == true
+      end
+
+    end
 
   end
 

data/vegas.gemspec

@@ -1,52 +1,43 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{vegas}
-  s.version = "0.1.8"
+  s.name = "vegas"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = %q{2010-10-11}
-  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.date = "2009-08-30"
+  s.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."
   s.email = ["aaron@quirkey.com"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "History.txt",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "lib/vegas.rb",
-     "lib/vegas/runner.rb",
-     "test/apps.rb",
-     "test/test_app/bin/test_app",
-     "test/test_app/bin/test_rack_app",
-     "test/test_app/test_app.rb",
-     "test/test_helper.rb",
-     "test/test_vegas_runner.rb",
-     "vegas.gemspec"
-  ]
-  s.homepage = %q{http://code.quirkey.com/vegas}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{quirkey}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps.}
-  s.test_files = [
+    "History.txt",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "lib/vegas.rb",
+    "lib/vegas/runner.rb",
     "test/apps.rb",
-     "test/test_app/test_app.rb",
-     "test/test_helper.rb",
-     "test/test_vegas_runner.rb"
+    "test/test_app/bin/test_app",
+    "test/test_app/bin/test_rack_app",
+    "test/test_app/test_app.rb",
+    "test/test_helper.rb",
+    "test/test_vegas_runner.rb",
+    "vegas.gemspec"
   ]
+  s.homepage = "http://code.quirkey.com/vegas"
+  s.require_paths = ["lib"]
+  s.rubyforge_project = "quirkey"
+  s.rubygems_version = "1.8.10"
+  s.summary = "Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,94 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vegas
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 8
-  version: 0.1.8
+version: !ruby/object:Gem::Version
+  version: 0.1.9
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Aaron Quint
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-11 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2009-08-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70197311115560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70197311115560
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70197311114760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
+      - !ruby/object:Gem::Version
         version: 0.9.8
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bacon
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70197311114760
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: &70197311113980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70197311113980
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70197311112980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 4
+      - !ruby/object:Gem::Version
         version: 0.9.4
   type: :development
-  version_requirements: *id004
-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.
-email: 
+  prerelease: false
+  version_requirements: *70197311112980
+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.
+email:
 - aaron@quirkey.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
-- .gitignore
+files:
 - History.txt
 - LICENSE
 - README.rdoc
@@ -102,40 +79,29 @@ files:
 - test/test_helper.rb
 - test/test_vegas_runner.rb
 - vegas.gemspec
-has_rdoc: true
 homepage: http://code.quirkey.com/vegas
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: quirkey
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps.
-test_files: 
-- test/apps.rb
-- test/test_app/test_app.rb
-- test/test_helper.rb
-- test/test_vegas_runner.rb
+summary: Vegas aims to solve the simple problem of creating executable versions of
+  Sinatra/Rack apps.
+test_files: []

data/.gitignore

@@ -1,5 +0,0 @@
-.DS_Store
-test/tmp
-pkg/*
-_layouts
-*.sw?