dump 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Y2EzOWRiZTc2MWU1MDNiYWE5YzJjZjQzMDcwZjAwMTdhM2ExYmIzNQ==
+  data.tar.gz: !binary |-
+    Y2YxZDcwMjZjZjY4ZjBhYTM1ZjdhMTBjN2FkZjViZjc1NTExZGE3YQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    Y2JmYjU5ODAwZGZhMmM1M2EwNjFkZmNiMjJhZDEwNjlkZDZjMjMxNGM1YzMw
+    MTZiODc2ZmI5YzA2ZTUzNTU5ZDhlNzZmMzRlZTUyZTA3M2UzOGNkMTQ2ZTI0
+    NTRkYjlkNDc3OTY5MmE2ODFlNjhhYjE2MzQ2MDY4Y2NjZGIyMWQ=
+  data.tar.gz: !binary |-
+    NjRjYTYxZjIyZGJiZTI4OTM2OWJmZGRkOGZlNjNiODkxYjEwM2I3NWFjNWM4
+    YjI1ZDNiNGM3NWM2Njg1NGU3ZGI5NjlhZmI2ZjE3NWRiMWRjYjk3NGU1MzM5
+    Njg0YjNhNjQwMjhiYmMyY2IwMzk3OWIyZDVlZGFjYWE1ZTNjMWE=

data/.gitignore

@@ -6,6 +6,7 @@
 /.yardoc/
 /coverage/
 
+Gemfile.lock
 Makefile
 *.o
 *.bundle

data/.travis.database.yml

@@ -0,0 +1,14 @@
+sqlite3:
+  adapter: sqlite3
+  database: ':memory:'
+
+mysql:
+  adapter: mysql2
+  database: myapp_test
+  username: travis
+  encoding: utf8
+
+postgresql:
+  adapter: postgresql
+  database: myapp_test
+  username: postgres

data/.travis.yml

@@ -0,0 +1,30 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+  - jruby-19mode
+  - rbx-19mode
+  - ree
+env:
+  - RAILS_VERSION='~> 2.3.0'
+  # - RAILS_VERSION='~> 3.0.0' # conflicting adapters for postgresql and mysql2
+  - RAILS_VERSION='~> 3.1.0'
+  - RAILS_VERSION='~> 3.2.0'
+  - RAILS_VERSION='~> 4.0.0'
+script: "bundle exec rspec"
+before_install:
+  - mysql -e 'create database myapp_test;'
+  - psql -c 'create database myapp_test;' -U postgres
+  - cp .travis.database.yml spec/db/database.yml
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode
+    - rvm: rbx-19mode
+  exclude:
+    - rvm: 1.8.7 # not supported by rails 4
+      env: RAILS_VERSION='~> 4.0.0'
+    - rvm: ree # not supported by rails 4
+      env: RAILS_VERSION='~> 4.0.0'
+    - rvm: 2.0.0 # problems with iconv
+      env: RAILS_VERSION='~> 2.3.0'

data/Gemfile

@@ -0,0 +1,20 @@
+source 'http://rubygems.org'
+
+rails_version = ENV['RAILS_VERSION'] || '~> 4.0'
+gem 'rails', rails_version
+
+if defined?(JRUBY_VERSION)
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'activerecord-jdbcmysql-adapter'
+  gem 'activerecord-jdbcpostgresql-adapter'
+else
+  gem 'sqlite3'
+  gem 'mysql2'
+  gem 'pg'
+  if rails_version =~ /(^|[^.\d])(2|3\.0)\.\d+/
+    gem 'activerecord-mysql2-adapter'
+  end
+end
+
+gem 'capistrano'
+gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2012 Ivan Kuchin
+Copyright (c) 2008-2013 Ivan Kuchin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -2,9 +2,11 @@
 
 Rails app rake and capistrano tasks to create and restore dumps of database and assets.
 
-Works with rails 2 and rails 3.
+Tested against rails 2.3, 3.0, 3.1, 3.2 and 4.0 (rails 2.3 has problems on ruby 2.0).
 
-Requires at least ruby 1.8.7, tested with ruby 1.9.
+Works with ruby 1.8.7, ree, 1.9, 2.0 (rails 4.0 requires at least ruby 1.9).
+
+[![Build Status](https://travis-ci.org/toy/dump.png?branch=master)](https://travis-ci.org/toy/dump)
 
 ## Install
 
@@ -247,4 +249,4 @@ restore backup (upload dump and restore on remote):
 
 ## Copyright
 
-Copyright (c) 2008-2012 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2008-2013 Ivan Kuchin. See LICENSE.txt for details.

data/dump.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'dump'
-  s.version     = '1.0.2'
+  s.version     = '1.0.3'
   s.summary     = %q{Rails app rake and capistrano tasks to create and restore dumps of database and assets}
   s.homepage    = "http://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
@@ -18,5 +18,4 @@ Gem::Specification.new do |s|
   s.add_dependency 'archive-tar-minitar', '= 0.5.2'
   s.add_dependency 'progress', '~> 2.4.0'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'sqlite3'
 end

data/lib/dump_rake/dump.rb

@@ -118,6 +118,10 @@ class DumpRake
       end
     end
 
+    def silence(&block)
+      Rails.logger.silence(&block)
+    end
+
   protected
 
     def assets_root_link

data/lib/dump_rake/dump_reader.rb

@@ -4,7 +4,7 @@ class DumpRake
 
     def self.restore(path)
       new(path).open do |dump|
-        ActiveRecord::Base.logger.silence do
+        dump.silence do
           dump.read_config
           dump.migrate_down
           dump.read_schema

data/lib/dump_rake/dump_writer.rb

@@ -4,7 +4,7 @@ class DumpRake
 
     def self.create(path)
       new(path).open do |dump|
-        ActiveRecord::Base.logger.silence do
+        dump.silence do
           dump.write_schema
 
           dump.write_tables

data/lib/dump_rake/table_manipulation.rb

@@ -112,7 +112,7 @@ class DumpRake
         rows = select_all_by_sql(select_where_primary_key % '>= 0')
         until rows.blank?
           rows.each(&block)
-          break if rows.length < chunk_size
+          break if rows.count < chunk_size
           rows = select_all_by_sql(select_where_primary_key % "> #{rows.last[primary_key].to_i}")
         end
       else

data/spec/.gitignore

@@ -1 +1,19 @@
 /db/database.yml
+
+/dummy-*/.bundle/
+/dummy-*/db/*.sqlite3
+/dummy-*/db/*.sqlite3-journal
+/dummy-*/log/*.log
+/dummy-*/tmp/
+
+/dummy-*/app/
+/dummy-*/bin/
+/dummy-*/doc/
+/dummy-*/Gemfile
+/dummy-*/lib/
+/dummy-*/public/
+/dummy-*/Rakefile
+/dummy-*/README*
+/dummy-*/script/
+/dummy-*/test/
+/dummy-*/vendor/

data/spec/cycle_spec.rb

@@ -16,10 +16,12 @@ def use_adapter(adapter)
     case config['adapter']
     when /^mysql/
       ActiveRecord::Base.establish_connection(config.merge('database' => nil))
+      ActiveRecord::Base.connection.drop_database config['database'] rescue nil
       ActiveRecord::Base.connection.create_database(config['database'])
       ActiveRecord::Base.establish_connection(config)
     when /^postgresql/
       ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+      ActiveRecord::Base.connection.drop_database config['database'] rescue nil
       ActiveRecord::Base.connection.create_database(config['database'])
       ActiveRecord::Base.establish_connection(config)
     else
@@ -52,7 +54,7 @@ def in_temp_rails_app
   DumpRake::RailsRoot.replace(File.join(PLUGIN_SPEC_DIR, 'temp_rails_app'))
   FileUtils.remove_entry(DumpRake::RailsRoot) if File.exist?(DumpRake::RailsRoot)
   FileUtils.mkpath(DumpRake::RailsRoot)
-  Progress.stub!(:io).and_return(StringIO.new)
+  Progress.stub(:io).and_return(StringIO.new)
   yield
 ensure
   FileUtils.remove_entry(DumpRake::RailsRoot) if File.exist?(DumpRake::RailsRoot)
@@ -74,22 +76,28 @@ def create_chickens!(options = {})
     :boolean => [true, false],
   }
   Chicken.create!
-  data.each do |type, values|
-    values.each do |value|
-      Chicken.create!("#{type}_col" => value)
+  data.values.map(&:length).max.times do |i|
+    Chicken.create! do |chicken|
+      data.each do |type, values|
+        chicken["#{type}_col"] = values[i]
+      end
     end
   end
   if options[:random]
     options[:random].to_i.times do
-      attributes = {}
-      data.each do |type, values|
-        attributes["#{type}_col"] = values[rand(values.length)] if rand > 0.5
+      Chicken.create! do |chicken|
+        data.each do |type, values|
+          chicken["#{type}_col"] = values[rand(values.length)] if rand > 0.5
+        end
       end
-      Chicken.create!(attributes)
     end
   end
 end
 
+def chicken_data
+  Chicken.all.map(&:attributes).sort_by{ |attributes| attributes['id'] }
+end
+
 def reset_rake!
   @rake = Rake::Application.new
   Rake.application = @rake
@@ -139,7 +147,7 @@ describe 'full cycle' do
           use_adapter(adapter) do
             #add chickens store their attributes and create dump
             create_chickens!(:random => 100)
-            chicken_attributes = Chicken.all.map(&:attributes)
+            saved_chicken_data = chicken_data
             call_rake_create(:description => 'chickens')
 
             #clear database
@@ -148,14 +156,14 @@ describe 'full cycle' do
 
             #restore dump and verify equality
             call_rake_restore(:version => 'chickens')
-            Chicken.all.map(&:attributes).should == chicken_attributes
+            chicken_data.should == saved_chicken_data
 
             # go throught create/restore cycle and verify equality
             call_rake_create
             load_schema
             Chicken.all.should be_empty
             call_rake_restore
-            Chicken.all.map(&:attributes).should == chicken_attributes
+            chicken_data.should == saved_chicken_data
           end
         end
       end
@@ -178,12 +186,12 @@ describe 'full cycle' do
     adapters.combination(2) do |adapter_src, adapter_dst|
       it "should dump using #{adapter_src} and restore using #{adapter_dst}" do
         in_temp_rails_app do
-          chicken_attributes = nil
+          saved_chicken_data = nil
           use_adapter(adapter_src) do
             Chicken.all.should be_empty
 
             create_chickens!(:random => 100)
-            chicken_attributes = Chicken.all.map(&:attributes)
+            saved_chicken_data = chicken_data
             call_rake_create
           end
 
@@ -191,7 +199,7 @@ describe 'full cycle' do
             Chicken.all.should be_empty
 
             call_rake_restore
-            chicken_attributes.should == Chicken.all.map(&:attributes)
+            chicken_data.should == saved_chicken_data
           end
         end
       end

data/spec/dummy-2.3/config/boot.rb

@@ -0,0 +1,114 @@
+# Don't change this file!
+# Configure your app in config/environment.rb and config/environments/*.rb
+
+RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
+
+module Rails
+  class << self
+    def boot!
+      unless booted?
+        preinitialize
+        pick_boot.run
+      end
+    end
+
+    def booted?
+      defined? Rails::Initializer
+    end
+
+    def pick_boot
+      (vendor_rails? ? VendorBoot : GemBoot).new
+    end
+
+    def vendor_rails?
+      File.exist?("#{RAILS_ROOT}/vendor/rails")
+    end
+
+    def preinitialize
+      load(preinitializer_path) if File.exist?(preinitializer_path)
+    end
+
+    def preinitializer_path
+      "#{RAILS_ROOT}/config/preinitializer.rb"
+    end
+  end
+
+  class Boot
+    def run
+      load_initializer
+      Rails::Initializer.run(:set_load_path)
+    end
+  end
+
+  class VendorBoot < Boot
+    def load_initializer
+      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      Rails::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path
+    end
+  end
+
+  class GemBoot < Boot
+    def load_initializer
+      self.class.load_rubygems
+      load_rails_gem
+      require 'initializer'
+    end
+
+    def load_rails_gem
+      if version = self.class.gem_version
+        gem 'rails', version
+      else
+        gem 'rails'
+      end
+    rescue Gem::LoadError => load_error
+      if load_error.message =~ /Could not find RubyGem rails/
+        STDERR.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
+        exit 1
+      else
+        raise
+      end
+    end
+
+    class << self
+      def rubygems_version
+        Gem::RubyGemsVersion rescue nil
+      end
+
+      def gem_version
+        if defined? RAILS_GEM_VERSION
+          RAILS_GEM_VERSION
+        elsif ENV.include?('RAILS_GEM_VERSION')
+          ENV['RAILS_GEM_VERSION']
+        else
+          parse_gem_version(read_environment_rb)
+        end
+      end
+
+      def load_rubygems
+        min_version = '1.3.2'
+        require 'rubygems'
+        unless rubygems_version >= min_version
+          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
+          exit 1
+        end
+
+      rescue LoadError
+        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+        exit 1
+      end
+
+      def parse_gem_version(text)
+        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
+      end
+
+      private
+        def read_environment_rb
+          File.read("#{RAILS_ROOT}/config/environment.rb")
+        end
+    end
+  end
+end
+
+# All that for this:
+Rails.boot!

data/spec/dummy-2.3/config/database.yml

@@ -0,0 +1,22 @@
+# SQLite version 3.x
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000

data/spec/dummy-2.3/config/environment.rb

@@ -0,0 +1,41 @@
+# Be sure to restart your server when you modify this file
+
+# Specifies gem version of Rails to use when vendor/rails is not present
+RAILS_GEM_VERSION = '2.3.18' unless defined? RAILS_GEM_VERSION
+
+# Bootstrap the Rails environment, frameworks, and default configuration
+require File.join(File.dirname(__FILE__), 'boot')
+
+Rails::Initializer.run do |config|
+  # Settings in config/environments/* take precedence over those specified here.
+  # Application configuration should go into files in config/initializers
+  # -- all .rb files in that directory are automatically loaded.
+
+  # Add additional load paths for your own custom dirs
+  # config.autoload_paths += %W( #{RAILS_ROOT}/extras )
+
+  # Specify gems that this application depends on and have them installed with rake gems:install
+  # config.gem "bj"
+  # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
+  # config.gem "sqlite3-ruby", :lib => "sqlite3"
+  # config.gem "aws-s3", :lib => "aws/s3"
+
+  # Only load the plugins named here, in the order given (default is alphabetical).
+  # :all can be used as a placeholder for all plugins not explicitly named
+  # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+  # Skip frameworks you're not going to use. To use Rails without a database,
+  # you must remove the Active Record framework.
+  # config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
+
+  # Activate observers that should always be running
+  # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+  # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+  # Run "rake -D time" for a list of tasks for finding time zone names.
+  config.time_zone = 'UTC'
+
+  # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
+  # config.i18n.default_locale = :de
+end