heroku-forward 0.3.0 → 0.3.1

data/lib/heroku/forward.rb

@@ -2,3 +2,4 @@ require 'heroku/forward/version'
 require 'heroku/forward/errors'
 require 'heroku/forward/backends'
 require 'heroku/forward/proxy'
+require 'heroku/forward/utils/dir'

data/lib/heroku/forward/backends/thin.rb

@@ -22,7 +22,7 @@ module Heroku
         #  ssl_verify:    activated with  ssl_verify
         def initialize(options = {})
           @application = options[:application]
-          @socket = options[:socket] || new_socket
+          @socket = options[:socket] || Heroku::Forward::Utils::Dir.tmp_filename('thin-', '.sock')
           @env = options[:env] || :development
 
           @ssl = options[:ssl] || false
@@ -62,16 +62,10 @@ module Heroku
 
         private
 
-          def new_socket
-            Tempfile.open 'thin' do |file|
-              return file.path
-            end
-          end
-
-          def check!
-            raise Heroku::Forward::Errors::MissingBackendOptionError.new('application') unless @application && @application.length > 0
-            raise Heroku::Forward::Errors::MissingBackendApplicationError.new(@application) unless File.exists?(@application)
-          end
+        def check!
+          raise Heroku::Forward::Errors::MissingBackendOptionError.new('application') unless @application && @application.length > 0
+          raise Heroku::Forward::Errors::MissingBackendApplicationError.new(@application) unless File.exists?(@application)
+        end
 
       end
     end

data/lib/heroku/forward/backends/unicorn.rb

@@ -3,51 +3,46 @@ module Heroku
     module Backends
       class Unicorn
         attr_accessor :application, :socket, :environment, :pid, :config_file
-        
+
         def initialize(options = {})
           @application = options[:application]
-          @socket = options[:socket] || tmp_filename('unicorn', '.sock')
+          @socket = options[:socket] || Heroku::Forward::Utils::Dir.tmp_filename('unicorn-', '.sock')
           @env = options[:env] || 'development'
           @config_file = options[:config_file]
         end
-        
+
         def spawn!
           return false if spawned?
           check!
-          
+
           args = ['unicorn']
           args.push '--env', @env
           args.push '--config-file', @config_file if @config_file
           args.push '--listen', @socket
           args.push @application
-          
+
           @pid = Spoon.spawnp(*args)
           @spawned = true
         end
-        
+
         def terminate!
           return false unless spawned?
           Process.kill 'QUIT', @pid
           @spawned = false
           true
         end
-        
+
         def spawned?
           !!@spawned
         end
-        
+
         private
-        
-        # Borrowed from ruby 1.9's Dir::Tmpname.make_tmpname for 1.8.7-compatibility.
-        def tmp_filename(prefix, suffix)
-          File.join Dir.tmpdir, "#{prefix}#{Time.now.strftime("%Y%m%d")}-#{$$}-#{rand(0x100000000).to_s(36)}#{suffix}"
-        end
-        
+
         def check!
           raise Heroku::Forward::Errors::MissingBackendOptionError.new('application') unless @application && @application.length > 0
           raise Heroku::Forward::Errors::MissingBackendApplicationError.new(@application) unless File.exists?(@application)
         end
-        
+
       end
     end
   end

data/lib/heroku/forward/utils/dir.rb

@@ -0,0 +1,16 @@
+module Heroku
+  module Forward
+    module Utils
+      
+      module Dir
+      
+        # Partially borrowed from ruby 1.9's Dir::Tmpname.make_tmpname for 1.8.7-compatibility.
+        def self.tmp_filename(prefix, suffix)
+          File.join ::Dir.tmpdir, "#{prefix}#{Time.now.strftime("%Y%m%d")}-#{$$}-#{rand(0x100000000).to_s(36)}#{suffix}"
+        end
+        
+      end
+      
+    end
+  end
+end

data/lib/heroku/forward/version.rb

@@ -1,5 +1,5 @@
 module Heroku
   module Forward
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-forward
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-proxy
@@ -208,6 +208,7 @@ files:
 - lib/heroku/forward/errors/missing_backend_option_error.rb
 - lib/heroku/forward/proxy.rb
 - lib/heroku/forward/proxy/server.rb
+- lib/heroku/forward/utils/dir.rb
 - lib/heroku/forward/version.rb
 - LICENSE.md
 - README.md
@@ -226,7 +227,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4102819039813777077
+      hash: 669463106192419404
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: