sequel-rails 0.4.0.pre1 → 0.4.0.pre2

data/History.md

@@ -1,3 +1,12 @@
+0.4.0.pre2
+==========
+
+* Remove `rake db:forward` and `rake db:rollback` as it makes not much sense
+  when using the TimeStampMigration which is how this gem generates migrations
+* Ensure rake tasks returns appropriate code on errors
+* Ensure PostgreSQL adapter passes the right options to both create and drop 
+  database (Sascha Cunz)
+
 0.4.0.pre1
 ==========
 

data/README.md

@@ -66,14 +66,12 @@ rake db:create:all                    # Create all the local databases defined i
 rake db:drop[env]                     # Create the database defined in config/database.yml for the current Rails.env
 rake db:drop:all                      # Drops all the local databases defined in config/database.yml
 rake db:force_close_open_connections  # Forcibly close any open connections to the test database 
-rake db:forward                       # Pushes the schema to the next version. Specify the number of steps with STEP=n
 rake db:migrate                       # Migrate the database to the latest version
 rake db:migrate:down                  # Runs the "down" for a given migration VERSION.
 rake db:migrate:redo                  # Rollbacks the database one migration and re migrate up.
 rake db:migrate:reset                 # Resets your database using your migrations for the current environment
 rake db:migrate:up                    # Runs the "up" for a given migration VERSION.
 rake db:reset                         # Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.
-rake db:rollback                      # Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x. Target specific version with VERSION=x.
 rake db:schema:dump                   # Create a db/schema.rb file that can be portably used against any DB supported by Sequel
 rake db:schema:load                   # Load a schema.rb file into the database
 rake db:seed                          # Load the seed data from db/seeds.rb
@@ -115,6 +113,7 @@ Improvements has been made by those awesome contributors:
 * Joshua Hansen (binarypaladin)
 * Arron Washington (radicaled)
 * Thiago Pradi (tchandy)
+* Sascha Cunz (scunz)
 
 Credits
 =======

data/lib/sequel_rails/railties/database.rake

@@ -44,7 +44,9 @@ namespace :db do
   namespace :create do
     desc 'Create all the local databases defined in config/database.yml'
     task :all => :environment do
-      SequelRails::Storage.create_all
+      unless SequelRails::Storage.create_all
+        abort "Could not create all databases."
+      end
     end
   end
 
@@ -52,13 +54,17 @@ namespace :db do
   task :create, [:env] => :environment do |t, args|
     args.with_defaults(:env => Rails.env)
 
-    SequelRails::Storage.adapter_for(args.env).create
+    unless SequelRails::Storage.adapter_for(args.env).create
+      abort "Could not create database for #{args.env}."
+    end
   end
 
   namespace :drop do
     desc 'Drops all the local databases defined in config/database.yml'
     task :all => :environment do
-      SequelRails::Storage.drop_all
+      unless SequelRails::Storage.drop_all
+        abort "Could not drop all databases."
+      end
     end
   end
 
@@ -66,7 +72,9 @@ namespace :db do
   task :drop, [:env] => :environment do |t, args|
     args.with_defaults(:env => Rails.env)
 
-    SequelRails::Storage.adapter_for(args.env).drop
+    unless SequelRails::Storage.adapter_for(args.env).drop
+      abort "Could not drop database for #{args.env}."
+    end
   end
 
   namespace :migrate do
@@ -85,7 +93,6 @@ namespace :db do
       end
     end
 
-
     desc 'Resets your database using your migrations for the current environment'
     task :reset => ["db:drop", "db:create", "db:migrate"]
 
@@ -112,20 +119,6 @@ namespace :db do
     Rake::Task["db:schema:dump"].invoke unless Rails.env.test?
   end
 
-  desc 'Rolls the schema back to the previous version. Specify the number of steps with STEP=n'
-  task :rollback => "migrate:load" do
-    step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-    Sequel::Migrator.rollback('db/migrate/', step)
-    Rake::Task["db:schema:dump"].invoke unless Rails.env.test?
-  end
-
-  desc 'Pushes the schema to the next version. Specify the number of steps with STEP=n'
-  task :forward => "migrate:load" do
-    step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-    Sequel::Migrator.forward('db/migrate/', step)
-    Rake::Task["db:schema:dump"].invoke unless Rails.env.test?
-  end
-
   desc 'Load the seed data from db/seeds.rb'
   task :seed => :abort_if_pending_migrations do
     seed_file = File.join(Rails.root, 'db', 'seeds.rb')

data/lib/sequel_rails/storage/abstract.rb

@@ -9,14 +9,16 @@ module SequelRails
       end
 
       def create
-        _create
-        puts "[sequel] Created database '#{database}'"
+        res = _create
+        puts "[sequel] Created database '#{database}'" if res
+        res
       end
 
       def drop
         ::Sequel::Model.db.disconnect
-        _drop
-        puts "[sequel] Dropped database '#{database}'"
+        res = _drop
+        puts "[sequel] Dropped database '#{database}'" if res
+        res
       end
 
       def database

data/lib/sequel_rails/storage/postgres.rb

@@ -6,16 +6,24 @@ module SequelRails
         commands = ["createdb", "--encoding", charset]
         commands << "--username" << username unless username.blank?
         commands << "--owner" << owner unless owner.blank?
-        commands << "--port" << port unless port.blank?
+        commands << "--port" << port.to_s unless port.blank?
         commands << "--host" << host unless host.blank?
         commands << database
         res = system(*commands)
-        ENV["PGPASSWORD"] = nil
+        ENV["PGPASSWORD"] = nil unless password.blank?
         res
       end
 
       def _drop
-        system("dropdb", "-U", username, database)
+        ENV["PGPASSWORD"] = password unless password.blank?
+        commands = ["dropdb"]
+        commands << "-U" << username unless username.blank?
+        commands << "--port" << port.to_s unless port.blank?
+        commands << "--host" << host unless host.blank?
+        commands << database
+        res = system(*commands)
+        ENV["PGPASSWORD"] = nil unless password.blank?
+        res
       end
     end
   end

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = "0.4.0.pre1"
+  VERSION = "0.4.0.pre2"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre1
   prerelease: 6
+  version: 0.4.0.pre2
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -10,104 +10,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.28'
+    none: false
+  prerelease: false
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.28'
+    none: false
   type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.28'
-- !ruby/object:Gem::Dependency
+        version: 3.2.0
+    none: false
+  prerelease: false
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
+    none: false
   type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
-- !ruby/object:Gem::Dependency
+        version: 0.8.7
+    none: false
+  prerelease: false
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
+    none: false
   type: :development
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.7
-- !ruby/object:Gem::Dependency
+        version: 2.7.0
+    none: false
+  prerelease: false
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.7.0
+    none: false
   type: :development
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
-- !ruby/object:Gem::Dependency
+        version: 0.3.1
+    none: false
+  prerelease: false
   name: combustion
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.1
+    none: false
   type: :development
-  prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
+        version: 0.8.7
+    none: false
+  prerelease: false
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.7
+  type: :development
 description: Integrate Sequel with Rails 3
 email:
 - brasten@gmail.com
@@ -176,20 +176,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -1196153117723463501
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: -2469418507765572891
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24