gorp 0.18.3 → 0.18.4

data/gorp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorp}
-  s.version = "0.18.3"
+  s.version = "0.18.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Ruby"]

data/lib/gorp/rails.rb

@@ -33,11 +33,13 @@ if $?.success?
   # setup vendored environment
   FileUtils.mkdir_p File.join($WORK, 'vendor', 'gems')
   FileUtils.rm_f File.join($WORK, 'vendor', 'rails')
-  unless $rails =~ /^rails( |$)/
+  if $rails =~ /^rails( |$)/
+    FileUtils.rm_f File.join($WORK, 'vendor', 'gems', 'environment.rb')
+  else
     FileUtils.ln_s $rails, File.join($WORK, 'vendor', 'rails')
+    FileUtils.cp File.join(File.dirname(__FILE__), 'rails.env'),
+      File.join($WORK, 'vendor', 'gems', 'environment.rb')
   end
-  FileUtils.cp File.join(File.dirname(__FILE__), 'rails.env'),
-    File.join($WORK, 'vendor', 'gems', 'environment.rb')
 else
   puts "Install rails or specify path to git clone of rails as the " + 
     "first argument."

data/lib/gorp/test.rb

@@ -270,7 +270,7 @@ end
 
 # Produce output for standalone scripts
 at_exit do
-  next if caller.empty? or $output
+  next if !caller or caller.empty? or $output
   source = File.basename(caller.first.split(/:/).first)
   name = source.sub(Regexp.new(Regexp.escape(File.extname(source))+'$'), '')
   $output = name

data/lib/version.rb

@@ -2,7 +2,7 @@ module Gorp
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 18
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gorp
 version: !ruby/object:Gem::Version 
-  version: 0.18.3
+  version: 0.18.4
 platform: ruby
 authors: 
 - Sam Ruby