vegas 0.1.3 → 0.1.4

data/History.txt

@@ -1,3 +1,10 @@
+== 0.1.4 2010-02-09
+
+* Fixed: Logging on Ruby 1.9 (greatseth)
+* Fixed: Dont chdir when daemonizing (messes up filesystem paths in apps)
+* Fixed: Test cases and dev installation (greatseth)
+* New: You can set the app_dir, pid file, log file and others via command line
+
 == 0.1.3 2010-01-08
 
 * Fixed: Runner escapes :app_name to make it a valid string for using in paths (thanks greatseth!)

data/Rakefile

@@ -3,33 +3,45 @@ require File.dirname(__FILE__) + '/lib/vegas'
 
 begin
   require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = %q{vegas}
-    s.version = Vegas::VERSION
-    s.authors = ["Aaron Quint"]
-    s.date = %q{2009-08-30}
-    s.summary              = "Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps."
-    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.homepage = %q{http://code.quirkey.com/vegas}
-    s.rubyforge_project = %q{quirkey}
-    
-    s.add_runtime_dependency(%q<rack>, [">= 1.0.0"])
-    
-    s.add_development_dependency(%q<mocha>,   ["~> 0.9.8"])
-    s.add_development_dependency(%q<bacon>,   ["~> 1.1.0"])
-    s.add_development_dependency(%q<sinatra>, ["~> 0.9.4"])
-    
-  end
-  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
+VEGAS_VERSION = if ENV["DEV"]
+  "#{Vegas::VERSION}.#{Time.new.to_i}"
+else
+  Vegas::VERSION
+end
+
+Jeweler::Tasks.new do |s|
+  s.name = %q{vegas}
+  s.version = VEGAS_VERSION
+  s.authors = ["Aaron Quint"]
+  s.date = %q{2009-08-30}
+  s.summary              = "Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps."
+  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.homepage = %q{http://code.quirkey.com/vegas}
+  s.rubyforge_project = %q{quirkey}
+  
+  s.add_runtime_dependency(%q<rack>, [">= 1.0.0"])
+  
+  s.add_development_dependency(%q<mocha>,   ["~> 0.9.8"])
+  s.add_development_dependency(%q<bacon>,   ["~> 1.1.0"])
+  s.add_development_dependency(%q<sinatra>, ["~> 0.9.4"])
+end
+
+Jeweler::GemcutterTasks.new
+
 Rake::TestTask.new do |t|
   t.libs << "test"
   t.test_files = FileList['test/test*.rb']
   t.verbose = true
 end
 
+task :package => :build
 task :default => :test
+
+task "install:dev" => :build do
+  system "gem install pkg/vegas-#{VEGAS_VERSION}.gem"
+end

data/lib/vegas.rb

@@ -8,7 +8,7 @@ end
 $LOAD_PATH.unshift File.dirname(__FILE__)
 
 module Vegas
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
   WINDOWS = !!(RUBY_PLATFORM =~ /(mingw|bccwin|wince|mswin32)/i)
   
   autoload :Runner, 'vegas/runner'

data/lib/vegas/runner.rb

@@ -6,7 +6,7 @@ if Vegas::WINDOWS
   begin
     require 'win32/process'
   rescue 
-    puts "Sorry, in order to use Vegas on Windows you need the win32-process gem:\n " +
+    puts "Sorry, in order to use Vegas on Windows you need the win32-process gem:",
          "gem install win32-process"
   end
 end
@@ -25,8 +25,8 @@ module Vegas
       
       self.class.logger.level = options[:debug] ? Logger::DEBUG : Logger::INFO
       
-      @app          = app
-      @app_name     = app_name
+      @app      = app
+      @app_name = app_name
       
       @filesystem_friendly_app_name = @app_name.gsub(/\W+/, "_")
       @quoted_app_name = "'#{app_name}'"
@@ -72,28 +72,28 @@ module Vegas
     end
 
     def app_dir
-      File.join(ROOT_DIR, filesystem_friendly_app_name)
+      options[:app_dir] || File.join(ROOT_DIR, filesystem_friendly_app_name)
     end
 
     def pid_file
-      File.join(app_dir, "#{filesystem_friendly_app_name}.pid")
+      options[:pid_file] || File.join(app_dir, "#{filesystem_friendly_app_name}.pid")
     end
 
     def url_file
-      File.join(app_dir, "#{filesystem_friendly_app_name}.url")
+      options[:url_file] || File.join(app_dir, "#{filesystem_friendly_app_name}.url")
     end
 
+    def log_file
+      options[:log_file] || File.join(app_dir, "#{filesystem_friendly_app_name}.log")
+    end
+    
     def url
       "http://#{host}:#{port}"
     end
 
-    def log_file
-      File.join(app_dir, "#{filesystem_friendly_app_name}.log")
-    end
-
     def start(path = nil)
       logger.info "Running with Windows Settings" if WINDOWS
-      logger.info "Starting #{quoted_app_name}"
+      logger.info "Starting #{quoted_app_name}..."
       begin
         check_for_running(path)
         find_port
@@ -112,7 +112,8 @@ module Vegas
         announce_port_attempted
         
         unless port_open?
-          logger.warn "Port #{port} is already in use. Please try another or don't use -P, for auto-port"
+          logger.warn "Port #{port} is already in use. Please try another. " +
+                      "You can also omit the port flag, and we'll find one for you."
         end
       else
         @port = PORT
@@ -126,7 +127,7 @@ module Vegas
     end
     
     def announce_port_attempted
-      logger.info "Trying to start #{quoted_app_name} on port #{port}"
+      logger.info "trying port #{port}..."
     end
 
     def port_open?(check_url = nil)
@@ -172,15 +173,16 @@ module Vegas
         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
+        Process.daemon(true, true)
       end
+      
+      File.umask 0000
+      FileUtils.touch log_file
+      STDIN.reopen    log_file
+      STDOUT.reopen   log_file, "a"
+      STDERR.reopen   log_file, "a"
+      
       logger.debug "Child Process: #{Process.pid}"
 
       File.open(pid_file, 'w') {|f| f.write("#{Process.pid}") }
@@ -275,11 +277,21 @@ module Vegas
       OptionParser.new("", 24, '  ') do |opts|
         # TODO instead of app_name, we should determine the name of the script 
         # used to invoke Vegas and use that here
-        opts.banner = "Usage: your_executable_name [options]"
+        opts.banner = "Usage: #{$0 || app_name} [options]"
 
         opts.separator ""
         opts.separator "Vegas options:"
 
+        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("-s", "--server SERVER", "serve using SERVER (thin/mongrel/webrick)") { |s|
           @rack_handler = Rack::Handler.get(s)
         }
@@ -303,21 +315,27 @@ module Vegas
         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
         }
-
+                
+        opts.on("--app-dir APP_DIR", "set the app dir where files are stored (default: ~/.vegas/#{filesystem_friendly_app_name})/)") {|app_dir| 
+          @options[:app_dir] = app_dir
+        }
+        
+        opts.on("-P", "--pid-file PID_FILE", "set the path to the pid file (default: app_dir/#{filesystem_friendly_app_name}.pid)") {|pid_file| 
+          @options[:pid_file] = pid_file
+        }
+        
+        opts.on("--log-file LOG_FILE", "set the path to the log file (default: app_dir/#{filesystem_friendly_app_name}.log)") {|log_file| 
+          @options[:log_file] = log_file
+        }                
+        
+        opts.on("--url-file URL_FILE", "set the path to the URL file (default: app_dir/#{filesystem_friendly_app_name}.url)") {|url_file| 
+          @options[:url_file] = url_file
+        }                
+        
         yield opts if block_given?
 
         opts.separator ""

data/test/test_vegas_runner.rb

@@ -112,20 +112,7 @@ describe 'Vegas::Runner' do
       end
     end
     
-    describe 'with a sinatra app using mongrel for the server' do
-      before do
-        TestApp1.set :server, "mongrel"
-        Vegas::Runner.any_instance.expects(:system).once
-        Rack::Handler::Mongrel.stubs(:run)
-        vegas(TestApp1, 'vegas_test_app_1', {:skip_launch => true, :sessions => true}, ["route","--debug"])
-      end
-      
-      it 'sets the rack handler automaticaly' do
-        @vegas.rack_handler.should == Rack::Handler::Mongrel
-      end
-    end
-    
-    describe 'with a sinatra app using webrick for the server' do
+    describe 'with a sinatra app using an explicit server setting' do
       before do
         TestApp1.set :server, "webrick"
         Vegas::Runner.any_instance.expects(:system).once

data/vegas.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vegas}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = %q{2010-01-08}
+  s.date = %q{2010-02-10}
   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 = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vegas
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Aaron Quint
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 -05:00
+date: 2010-02-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency