vegas 0.1.7 → 0.1.8

data/History.txt

@@ -1,3 +1,8 @@
+== 0.1.8
+
+* Add --no-proxy option for dealing with https and services behind proxies (	plukevdh)
+* Update test suite for 1.9.2
+
 == 0.1.7
 
 * Exit with specific exit status (for monitoring/good unix citizen).

data/lib/vegas.rb

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

data/lib/vegas/runner.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 if Vegas::WINDOWS
   begin
     require 'win32/process'
-  rescue 
+  rescue
     puts "Sorry, in order to use Vegas on Windows you need the win32-process gem:",
          "gem install win32-process"
   end
@@ -16,26 +16,26 @@ module Vegas
   class Runner
     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'))
     PORT       = 5678
     HOST       = WINDOWS ? 'localhost' : '0.0.0.0'
-    
+
     def initialize(app, app_name, set_options = {}, runtime_args = ARGV, &block)
       @options = set_options || {}
-      
+
       self.class.logger.level = options[:debug] ? Logger::DEBUG : Logger::INFO
-      
+
       @app      = app
       @app_name = app_name
-      
+
       @filesystem_friendly_app_name = @app_name.gsub(/\W+/, "_")
       @quoted_app_name = "'#{app_name}'"
-      
+
       @runtime_args = runtime_args
       @rack_handler = setup_rack_handler
-      
-      # load options from opt parser      
+
+      # load options from opt parser
       @args = define_options do |opts|
         if block_given?
           opts.separator ''
@@ -48,7 +48,7 @@ module Vegas
         kill!
         exit!(0)
       end
-      
+
       # Handle :before_run hook
       if (before_run = options.delete(:before_run)).respond_to?(:call)
         before_run.call(self)
@@ -56,24 +56,24 @@ module Vegas
 
       # Set app options
       @host = options[:host] || HOST
-      
+
       if app.respond_to?(:set)
-        app.set(options) 
+        app.set(options)
         app.set(:vegas, self)
       end
-      
+
       # Make sure app dir is setup
       FileUtils.mkdir_p(app_dir)
-      
+
       return if options[:start] == false
-      
+
       # evaluate the launch_path
       path = if options[:launch_path].respond_to?(:call)
         options[:launch_path].call(self)
       else
         options[:launch_path]
       end
-      
+
       start(path)
     end
 
@@ -92,7 +92,7 @@ module Vegas
     def log_file
       options[:log_file] || File.join(app_dir, "#{filesystem_friendly_app_name}.log")
     end
-    
+
     def url
       "http://#{host}:#{port}"
     end
@@ -116,7 +116,7 @@ module Vegas
     def find_port
       if @port = options[:port]
         announce_port_attempted
-        
+
         unless port_open?
           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."
@@ -124,24 +124,28 @@ module Vegas
       else
         @port = PORT
         announce_port_attempted
-        
+
         until port_open?
           @port += 1
           announce_port_attempted
         end
       end
     end
-    
+
     def announce_port_attempted
       logger.info "trying port #{port}..."
     end
 
     def port_open?(check_url = nil)
       begin
-        open(check_url || url)
+        check_url ||= url
+        options[:no_proxy] ? open(check_url, :proxy => nil) : open(check_url)
         false
       rescue Errno::ECONNREFUSED => e
         true
+      rescue Errno::EPERM => e
+        # catches the "Operation not permitted" under Cygwin
+        true
       end
     end
 
@@ -162,7 +166,7 @@ module Vegas
 
     def run!
       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
@@ -182,13 +186,13 @@ module Vegas
       else
         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}") }
@@ -218,8 +222,8 @@ module Vegas
         logger.info "#{quoted_app_name} not running!"
       end
     end
-    
-    # Loads a config file at config_path and evals it in the context of the @app. 
+
+    # Loads a config file at config_path and evals it in the context of the @app.
     def load_config_file(config_path)
       abort "Can not find config file at #{config_path}" if !File.readable?(config_path)
       config = File.read(config_path)
@@ -227,11 +231,11 @@ module Vegas
       config.sub!(/^__END__\n.*/, '')
       @app.module_eval(config)
     end
-    
+
     def self.logger=(logger)
       @logger = logger
     end
-    
+
     def self.logger
       @logger ||= LOGGER if defined?(LOGGER)
       if !@logger
@@ -245,16 +249,16 @@ module Vegas
     def logger
       self.class.logger
     end
-    
+
   private
     def setup_rack_handler
       # First try to set Rack handler via a special hook we honor
       @rack_handler = if @app.respond_to?(:detect_rack_handler)
         @app.detect_rack_handler
-      
+
       # If they aren't using our hook, try to use their @app.server settings
       elsif @app.respond_to?(:server) and @app.server
-        # If :server isn't set, it returns an array of possibilities, 
+        # If :server isn't set, it returns an array of possibilities,
         # sorted from most to least preferable.
         if @app.server.is_a?(Array)
           handler = nil
@@ -267,32 +271,32 @@ module Vegas
             end
           end
           handler
-        
+
         # :server might be set explicitly to a single option like "mongrel"
         else
           Rack::Handler.get(@app.server)
         end
-      
+
       # If all else fails, we'll use Thin
       else
         Rack::Handler::Thin
       end
     end
-    
+
     def define_options
       OptionParser.new("", 24, '  ') do |opts|
-        # TODO instead of app_name, we should determine the name of the script 
+        # TODO instead of app_name, we should determine the name of the script
         # used to invoke Vegas and use that here
         opts.banner = "Usage: #{$0 || app_name} [options]"
 
         opts.separator ""
         opts.separator "Vegas options:"
 
-        opts.on('-K', "--kill", "kill the running process and exit") {|k| 
+        opts.on('-K', "--kill", "kill the running process and exit") {|k|
           @should_kill = true
         }
 
-        opts.on('-S', "--status", "display the current running PID and URL then quit") {|s| 
+        opts.on('-S', "--status", "display the current running PID and URL then quit") {|s|
           status
           exit!(0)
         }
@@ -309,6 +313,10 @@ module Vegas
           @options[:port] = port
         }
 
+        opts.on("-x", "--no-proxy", "ignore env proxy settings (e.g. http_proxy)") { |p|
+          @options[:no_proxy] = true
+        }
+
         opts.on("-e", "--env ENVIRONMENT", "use ENVIRONMENT for defaults (default: development)") { |e|
           @options[:environment] = e
         }
@@ -320,27 +328,27 @@ module Vegas
         opts.on("-L", "--no-launch", "don't launch the browser") { |f|
           @options[:skip_launch] = true
         }
-        
-        opts.on('-d', "--debug", "raise the log level to :debug (default: :info)") {|s| 
+
+        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| 
+
+        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| 
+
+        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| 
+
+        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| 
+        }
+
+        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 ""
@@ -375,5 +383,5 @@ module Vegas
       File.delete(pid_file) if File.exist?(pid_file)
     end
   end
-  
+
 end

data/test/test_helper.rb

@@ -12,18 +12,18 @@ rescue LoadError
   dependencies.each {|f| require f }
 end
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'vegas.rb')
-require File.join(File.dirname(__FILE__), 'apps.rb')
+require File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'vegas.rb')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'apps.rb')
 
 
 module TestHelper
-  
+
   def vegas(*args, &block)
     Vegas::Runner.any_instance.stubs(:daemonize!).once
     Rack::Handler::Thin.stubs(:run).once
     @vegas = Vegas::Runner.new(*args, &block)
   end
-  
+
   def body
     last_response.body.to_s
   end
@@ -31,14 +31,14 @@ module TestHelper
   def instance_of(klass)
     lambda {|obj| obj.is_a?(klass) }
   end
-  
+
   def exist_as_file
     lambda {|obj| File.exist?(obj) }
   end
-  
+
   def have_matching_file_content(content_regex)
-    lambda {|obj| 
-      File.exist?(obj) && File.read(obj).match(content_regex) 
+    lambda {|obj|
+      File.exist?(obj) && File.read(obj).match(content_regex)
     }
   end
 

data/test/test_vegas_runner.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'test_helper.rb')
+require File.join('.', File.dirname(__FILE__), 'test_helper.rb')
 
 Vegas::Runner.class_eval do
   remove_const :ROOT_DIR
@@ -27,11 +27,11 @@ describe 'Vegas::Runner' do
       it "sets app name" do
         @vegas.app_name.should == 'vegas_test_app_1'
       end
-      
+
       it "sets quoted app name" do
         @vegas.quoted_app_name.should == "'vegas_test_app_1'"
       end
-      
+
       it "sets filesystem friendly app name" do
         @vegas.filesystem_friendly_app_name.should == 'vegas_test_app_1'
       end
@@ -55,14 +55,14 @@ describe 'Vegas::Runner' do
       it "writes a url with the port" do
         @vegas.url_file.should have_matching_file_content(/0.0.0.0\:#{@vegas.port}/)
       end
-      
+
       it "knows where to find the pid file" do
         @vegas.pid_file.should.equal \
           File.join(@vegas.app_dir, @vegas.filesystem_friendly_app_name + ".pid")
         # @vegas.pid_file.should exist_as_file
       end
     end
-    
+
     describe 'basic usage with a funky app name' do
       before do
         Vegas::Runner.any_instance.expects(:system).once
@@ -76,15 +76,15 @@ describe 'Vegas::Runner' do
       it "sets app name" do
         @vegas.app_name.should == 'Funky YEAH!1!'
       end
-      
+
       it "sets quoted app name" do
         @vegas.quoted_app_name.should == "'Funky YEAH!1!'"
       end
-      
+
       it "sets filesystem friendly app name" do
         @vegas.filesystem_friendly_app_name.should == 'Funky_YEAH_1_'
       end
-      
+
       it "stores options" do
         @vegas.options[:sessions].should.be.true
       end
@@ -104,14 +104,14 @@ describe 'Vegas::Runner' do
       it "writes a url with the port" do
         @vegas.url_file.should have_matching_file_content(/0.0.0.0\:#{@vegas.port}/)
       end
-      
+
       it "knows where to find the pid file" do
         @vegas.pid_file.should.equal \
           File.join(@vegas.app_dir, @vegas.filesystem_friendly_app_name + ".pid")
         # @vegas.pid_file.should exist_as_file
       end
     end
-    
+
     describe 'with a sinatra app using an explicit server setting' do
       before do
         TestApp1.set :server, "webrick"
@@ -119,7 +119,7 @@ describe 'Vegas::Runner' do
         Rack::Handler::WEBrick.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::WEBrick
       end
@@ -129,36 +129,35 @@ describe 'Vegas::Runner' do
       before 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
-      end      
+      end
     end
-    
-    describe 'with a launch path specified as a proc' do      
+
+    describe 'with a launch path specified as a proc' do
       it 'evaluates the proc in the context of the runner' do
         Vegas::Runner.any_instance.expects(:system).once.with {|s| s =~ /\?search\=blah$/ }
-        vegas(TestApp2, 
-              'vegas_test_app_2', 
-              {:launch_path => Proc.new {|r| "?search=#{r.args.first}" }}, 
+        vegas(TestApp2,
+              'vegas_test_app_2',
+              {:launch_path => Proc.new {|r| "?search=#{r.args.first}" }},
               ["--debug", "blah"])
         @vegas.options[:launch_path].should.be instance_of(Proc)
-      end      
+      end
     end
-    
+
     describe 'with a launch path specified as string' do
       it 'launches to the specific path' do
         Vegas::Runner.any_instance.expects(:system).once.with {|s| s =~ /\?search\=blah$/ }
-        vegas(TestApp2, 
-              'vegas_test_app_2', 
-              {:launch_path => "?search=blah"}, 
+        vegas(TestApp2,
+              'vegas_test_app_2',
+              {:launch_path => "?search=blah"},
               ["--debug", "blah"])
         @vegas.options[:launch_path].should == "?search=blah"
       end
     end
-    
+
 
   end
 
 end
-

data/vegas.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vegas}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = %q{2010-05-24}
+  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.email = ["aaron@quirkey.com"]
   s.extra_rdoc_files = [
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{quirkey}
-  s.rubygems_version = %q{1.3.6}
+  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 = [
     "test/apps.rb",
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       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"])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Aaron Quint
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 -04:00
+date: 2010-10-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -49,6 +51,7 @@ dependencies:
   name: bacon
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -63,6 +66,7 @@ dependencies:
   name: sinatra
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -108,6 +112,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -115,6 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -124,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: quirkey
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps.