sequel-rails 0.4.1 → 0.4.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTk2YTY3ZWMxMDZjZGUxZTljODFiODAwOTQ0YjA4ZGQ4NGZjYWRhYQ==
+  data.tar.gz: !binary |-
+    OTlhZGU5ODc5NzI2YTI2NmFhZTcxNDc3MDRlNGM3MmE3ZmQ2MGNkNQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NDM4NGVkZTBhMWNlYzk1MTEyMTc3NGMwZDFmZTQyNzFjNzliNDc4MTEzNDEx
+    OGRmZmNhNWIzMGRiMzIwMTIzNWEwNzI1MjBkNjcxMWYyMDBjZDhiN2E3NzIx
+    NTY3NTlkNmNmOWY5NGJiZjgyZjIwN2FmNjFiNWY2YjM2NzM1YTM=
+  data.tar.gz: !binary |-
+    NGY0NjZjOWZmMGUzYjVhMDg0M2QwNjlhYmIzYzg1ODBjNWViMmIzMmM4NjQw
+    MGI4YzliZDEzNDFhYzlhY2M1MWU0ZjQ5ZDJiZDFhMDFjMTRlMDI1OGU2MTIx
+    ZDkzM2NkMWY2ZTk5ZTZlM2JjZjM1YTdlYzk2YjlhNWM4ZmQyZTI=

data/History.md

@@ -1,3 +1,15 @@
+0.4.2 (2013-03-18)
+==================
+
+* Add schema dump format option and sql dump/load for Postgresql (Rafał Rzepecki)
+
+  To make `rake db:dump` and `rake db:load` use sql format for schema instead
+  of the default ruby version, put in your `config/application.rb`:
+  ```ruby
+  config.sequel.schema_format = :sql
+  ```
+* Improve detection of JRuby (Ed Ruder)
+
 0.4.1 (2013-03-12)
 ==================
 

data/README.md

@@ -126,6 +126,7 @@ Improvements has been made by those awesome contributors:
 * Brian Donovan (eventualbuddha)
 * Jack Danger Canty (JackDanger)
 * Ed Ruder (edruder)
+* Rafał Rzepecki (dividedmind)
 
 Credits
 =======

data/lib/sequel_rails.rb

@@ -3,10 +3,6 @@ require "sequel_rails/railtie" if defined? Rails
 
 module SequelRails
   def self.jruby?
-    @using_jruby ||= if defined?(RUBY_ENGINE)
-      RUBY_ENGINE == "jruby"
-    else
-      ENV['RUBY_VERSION'].to_s =~ /jruby/
-    end
+    (defined?(RUBY_ENGINE) && RUBY_ENGINE=="jruby") || defined?(JRUBY_VERSION)
   end
 end

data/lib/sequel_rails/configuration.rb

@@ -13,7 +13,7 @@ module SequelRails
     end
   end
 
-  class Configuration
+  class Configuration < ActiveSupport::OrderedOptions
 
     def self.for(root, database_yml_hash)
       ::SequelRails.configuration ||= new(root, database_yml_hash)

data/lib/sequel_rails/railtie.rb

@@ -32,6 +32,8 @@ module SequelRails
       "Sequel::ValidationFailed" => :unprocessable_entity,
       "Sequel::NoExistingObject" => :unprocessable_entity
     )
+    
+    config.sequel = ActiveSupport::OrderedOptions.new
 
     rake_tasks do
       load "sequel_rails/railties/database.rake"
@@ -62,7 +64,7 @@ module SequelRails
     def configure_sequel(app)
       app.config.sequel = ::SequelRails::Configuration.for(
         ::Rails.root, app.config.database_configuration
-      )
+      ).merge!(app.config.sequel)
     end
 
     def setup_i18n_support(app)

data/lib/sequel_rails/railties/database.rake

@@ -38,6 +38,51 @@ namespace :db do
     end
   end
 
+  namespace :structure do
+    desc "Dump the database structure to db/structure.sql. Specify another file with DB_STRUCTURE=db/my_structure.sql"
+    task :dump, [:env] => :environment do |t, args|
+      args.with_defaults(:env => Rails.env)
+      
+      filename = ENV['DB_STRUCTURE'] || File.join(Rails.root, "db", "structure.sql")
+      unless SequelRails::Storage.dump_environment args.env, filename
+        abort "Could not dump structure for #{args.env}."
+      end
+      
+      Rake::Task["db:structure:dump"].reenable
+    end
+
+    task :load, [:env] => :environment do |t, args|
+      args.with_defaults(:env => Rails.env)
+      
+      filename = ENV['DB_STRUCTURE'] || File.join(Rails.root, "db", "structure.sql")
+      unless SequelRails::Storage.load_environment args.env, filename
+        abort "Could not load structure for #{args.env}."
+      end
+    end
+  end
+  
+  task dump: :environment do
+    case (SequelRails.configuration.schema_format ||= :ruby)
+    when :ruby
+      Rake::Task["db:schema:dump"].invoke
+    when :sql
+      Rake::Task["db:structure:dump"].invoke
+    else
+      abort "unknown schema format #{SequelRails.configuration.schema_format}"
+    end
+  end
+  
+  task load: :environment do
+    case (SequelRails.configuration.schema_format ||= :ruby)
+    when :ruby
+      Rake::Task["db:schema:load"].invoke
+    when :sql
+      Rake::Task["db:structure:load"].invoke
+    else
+      abort "unknown schema format #{SequelRails.configuration.schema_format}"
+    end
+  end
+  
   namespace :create do
     desc 'Create all the local databases defined in config/database.yml'
     task :all => :environment do
@@ -98,7 +143,7 @@ namespace :db do
       version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       raise "VERSION is required" unless version
       SequelRails::Migrations.migrate_up!(version)
-      Rake::Task["db:schema:dump"].invoke unless Rails.env.test?
+      Rake::Task["db:dump"].invoke unless Rails.env.test?
     end
 
     desc 'Runs the "down" for a given migration VERSION.'
@@ -106,14 +151,14 @@ namespace :db do
       version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       raise "VERSION is required" unless version
       SequelRails::Migrations.migrate_down!(version)
-      Rake::Task["db:schema:dump"].invoke unless Rails.env.test?
+      Rake::Task["db:dump"].invoke unless Rails.env.test?
     end
   end
 
   desc 'Migrate the database to the latest version'
   task :migrate => "migrate:load" do
     SequelRails::Migrations.migrate_up!(ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-    Rake::Task["db:schema:dump"].invoke unless Rails.env.test?
+    Rake::Task["db:dump"].invoke unless Rails.env.test?
   end
 
   desc 'Load the seed data from db/seeds.rb'
@@ -123,7 +168,7 @@ namespace :db do
   end
 
   desc 'Create the database, load the schema, and initialize with the seed data'
-  task :setup => [ 'db:create', 'db:schema:load', 'db:seed' ]
+  task :setup => [ 'db:create', 'db:load', 'db:seed' ]
 
   desc 'Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.'
   task :reset => [ 'db:drop', 'db:setup' ]
@@ -140,7 +185,7 @@ namespace :db do
       previous_env, Rails.env = Rails.env, 'test'
       Rake::Task['db:drop'].execute
       Rake::Task['db:create'].execute
-      Rake::Task['db:schema:load'].execute
+      Rake::Task['db:load'].execute
       Sequel::DATABASES.each do |db|
         db.disconnect
       end

data/lib/sequel_rails/storage.rb

@@ -24,6 +24,14 @@ module SequelRails
       adapter.close_connections
       adapter.drop
     end
+    
+    def self.dump_environment(config_or_env, filename)
+      adapter_for(config_or_env).dump(filename)
+    end
+
+    def self.load_environment(config_or_env, filename)
+      adapter_for(config_or_env).load(filename)
+    end
 
     def self.close_all_connections
       with_all_repositories { |config| close_connections_environment(config) }

data/lib/sequel_rails/storage/abstract.rb

@@ -21,6 +21,18 @@ module SequelRails
         res
       end
 
+      def dump filename
+        res = _dump filename
+        puts "[sequel] Dumped structure of database '#{database}' to '#{filename}'" if res
+        res
+      end
+
+      def load filename
+        res = _load filename
+        puts "[sequel] Loaded structure of database '#{database}' from '#{filename}'" if res
+        res
+      end
+
       # To be overriden by subclasses
       def close_connections
         true

data/lib/sequel_rails/storage/postgres.rb

@@ -25,6 +25,32 @@ module SequelRails
         ENV["PGPASSWORD"] = nil unless password.blank?
         res
       end
+      
+      def _dump filename
+        ENV["PGPASSWORD"] = password unless password.blank?
+        commands = %w(pg_dump -i -s -x -O)
+        commands << "-f" << filename
+        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
+
+      def _load filename
+        ENV["PGPASSWORD"] = password unless password.blank?
+        commands = %w(psql)
+        commands << "-f" << filename
+        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
 
       def close_connections
         begin

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Brasten Sager (brasten)
@@ -10,104 +9,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sequel
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.28'
-  prerelease: false
   type: :runtime
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.28'
+  name: sequel
 - !ruby/object:Gem::Dependency
-  name: railties
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
-  prerelease: false
   type: :runtime
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
+  name: railties
 - !ruby/object:Gem::Dependency
-  name: rake
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
-  prerelease: false
   type: :development
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
+  name: rake
 - !ruby/object:Gem::Dependency
-  name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.7.0
-  prerelease: false
   type: :development
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.7.0
+  name: rspec
 - !ruby/object:Gem::Dependency
-  name: combustion
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.1
-  prerelease: false
   type: :development
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.1
+  name: combustion
 - !ruby/object:Gem::Dependency
-  name: generator_spec
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
-  prerelease: false
   type: :development
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
+  name: generator_spec
 description: Integrate Sequel with Rails 3
 email:
 - brasten@gmail.com
@@ -175,34 +162,27 @@ files:
 - tasks/spec.rake
 homepage: https://github.com/TalentBox/sequel-rails
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 4606545589271147809
-      segments:
-      - 0
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 4606545589271147809
-      segments:
-      - 0
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use Sequel with Rails 3
 test_files:
 - spec/internal/Rakefile