pg-migrator 1.2.0 → 1.2.1

data/lib/pg-migrator/tasks.rb

@@ -3,13 +3,21 @@ require 'uri'
 
 namespace :db do
   task :setup do
-    next unless ENV['DATABASE_URL']
+    next if @migrator
+    next if ENV['DATABASE_URL'].nil?
     uri = URI.parse ENV['DATABASE_URL']
-    if uri.opaque
-      @migrator = PG::Migrator.new(:dbname => uri.opaque)
-    else
-      @migrator = PG::Migrator.new(uri.host, uri.port, nil, nil, uri.path.sub(/\//, ''), uri.user, uri.password)
-    end
+    conn_hash = 
+      if uri.opaque
+        { :dbname => uri.opaque }
+      else
+        { :host => uri.host,
+          :port => uri.port || 5432,
+          :dbname => uri.path[1..-1],
+          :user => uri.user,
+          :password => uri.password
+        }
+      end
+    @migrator = PG::Migrator.new conn_hash
   end
 
   desc 'Drops all schemas currently in the search_path and then applies all the migrations'

data/lib/pg-migrator/version.rb

@@ -1,5 +1,5 @@
 module PG
   class Migrator
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg-migrator
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-04 00:00:00.000000000 Z
+date: 2011-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70326906755800 !ruby/object:Gem::Requirement
+  requirement: &70334490073660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326906755800
+  version_requirements: *70334490073660
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70326906755380 !ruby/object:Gem::Requirement
+  requirement: &70334490072440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326906755380
+  version_requirements: *70334490072440
 description: Rake migration tasks which utilities pure SQL files
 email:
 - carl.hoerberg@gmail.com