dump 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2EzOWRiZTc2MWU1MDNiYWE5YzJjZjQzMDcwZjAwMTdhM2ExYmIzNQ==
+    ZGMzMDVmMTc4YzIyN2IyMjBhMTlhODM1NjdlMzIxMjYzNTc5M2EwNg==
   data.tar.gz: !binary |-
-    Y2YxZDcwMjZjZjY4ZjBhYTM1ZjdhMTBjN2FkZjViZjc1NTExZGE3YQ==
-!binary "U0hBNTEy":
+    ZmEwODViYTNjMzcxOWM3N2E1YzY2NmQ5MDQ1YTJjM2RlMzFkZWZhZA==
+SHA512:
   metadata.gz: !binary |-
-    Y2JmYjU5ODAwZGZhMmM1M2EwNjFkZmNiMjJhZDEwNjlkZDZjMjMxNGM1YzMw
-    MTZiODc2ZmI5YzA2ZTUzNTU5ZDhlNzZmMzRlZTUyZTA3M2UzOGNkMTQ2ZTI0
-    NTRkYjlkNDc3OTY5MmE2ODFlNjhhYjE2MzQ2MDY4Y2NjZGIyMWQ=
+    MDZhMGNjY2JjODcwOGI1ZmFjMjJiYWIyYWJmMjkwYzVmZDE3NDU3N2ZhZDBi
+    NTE1OWJmM2VjNjYxNDNiYTBmZTIxMzk1ZGU4MjMwNDkxMTJlM2YwNDcxNTE5
+    YzI1YjY3ZWM3ZjY5M2Q3OTg3NjIzNWQ3YjAxOTg0ZTA4MDRkMDk=
   data.tar.gz: !binary |-
-    NjRjYTYxZjIyZGJiZTI4OTM2OWJmZGRkOGZlNjNiODkxYjEwM2I3NWFjNWM4
-    YjI1ZDNiNGM3NWM2Njg1NGU3ZGI5NjlhZmI2ZjE3NWRiMWRjYjk3NGU1MzM5
-    Njg0YjNhNjQwMjhiYmMyY2IwMzk3OWIyZDVlZGFjYWE1ZTNjMWE=
+    Yzc5NzZkYjk3MzlmMWNmYjk0NTYwMTM2ZTEyMWZlMWYzOWJhYTQxYjY5Yzlm
+    OGJkZDRjOTAwOTBkMWM5ZWM2NzdkYjgwY2I2NWQ0NGM0OTUyNzU3ZmIzYTYx
+    ZjYwNWNkMTVkZTg3ODhlZTg0ZjVlZjRlMmM0YjZmYWM0NzZmNjc=

data/.travis.yml

@@ -2,29 +2,32 @@ language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
-  - 2.0.0
+  - '2.0'
+  - '2.1'
   - 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'
+  - RAILS_VERSION='~> 4.1.0'
 script: "bundle exec rspec"
 before_install:
+  - sudo /etc/init.d/postgresql stop
+  - sudo /etc/init.d/postgresql start
   - 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: 1.8.7 # not supported by rails 4
+      env: RAILS_VERSION='~> 4.1.0'
     - rvm: 2.0.0 # problems with iconv
       env: RAILS_VERSION='~> 2.3.0'
+    - rvm: 2.1.0
+      env: RAILS_VERSION='~> 2.3.0'

data/Gemfile

@@ -14,7 +14,11 @@ else
   if rails_version =~ /(^|[^.\d])(2|3\.0)\.\d+/
     gem 'activerecord-mysql2-adapter'
   end
+  if rails_version =~ /(^|[^.\d])2\.\d+/ && RUBY_VERSION >= '2.0'
+    gem 'iconv', '~> 1.0.4'
+  end
 end
 
-gem 'capistrano'
+gem 'capistrano', '~> 2.0'
+
 gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2013 Ivan Kuchin
+Copyright (c) 2008-2014 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

@@ -1,12 +1,14 @@
+[![Gem Version](https://img.shields.io/gem/v/dump.svg?style=flat)](https://rubygems.org/gems/dump)
+[![Build Status](https://img.shields.io/travis/toy/dump/master.svg?style=flat)](https://travis-ci.org/toy/dump)
+[![Code Climate](https://img.shields.io/codeclimate/github/toy/dump.svg?style=flat)](https://codeclimate.com/github/toy/dump)
+
 # DumpRake
 
 Rails app rake and capistrano tasks to create and restore dumps of database and assets.
 
-Tested against rails 2.3, 3.0, 3.1, 3.2 and 4.0 (rails 2.3 has problems on ruby 2.0).
-
-Works with ruby 1.8.7, ree, 1.9, 2.0 (rails 4.0 requires at least ruby 1.9).
+Tested against rails 2.3, 3.0, 3.1, 3.2, 4.0, 4.1 (rails 2.3 has problems on ruby 2.0 and 2.1).
 
-[![Build Status](https://travis-ci.org/toy/dump.png?branch=master)](https://travis-ci.org/toy/dump)
+Works with ruby 1.8.7, ree, 1.9, 2.0, 2.1 (rails 4.0 requires at least ruby 1.9).
 
 ## Install
 
@@ -249,4 +251,4 @@ restore backup (upload dump and restore on remote):
 
 ## Copyright
 
-Copyright (c) 2008-2013 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2008-2014 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.3'
+  s.version     = '1.0.4'
   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']
@@ -17,5 +17,5 @@ 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 'rspec', '~> 3.0'
 end

data/lib/dump_rake/dump_reader.rb

@@ -169,6 +169,7 @@ class DumpRake
     end
 
     def read_tables
+      return if DumpRake::Env[:restore_tables] && DumpRake::Env[:restore_tables].empty?
       verify_connection
       config[:tables].with_progress('Tables') do |table, rows|
         if (restore_schema? && schema_tables.include?(table)) || DumpRake::Env.filter(:restore_tables).pass?(table)
@@ -207,6 +208,7 @@ class DumpRake
     end
 
     def read_assets
+      return if DumpRake::Env[:restore_assets] && DumpRake::Env[:restore_assets].empty?
       unless config[:assets].blank?
         assets = config[:assets]
         if Hash === assets

data/spec/.tmignore

@@ -1 +1,2 @@
 /dummy-*
+!/db/database.yml

data/spec/cycle_spec.rb

@@ -2,6 +2,8 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 require File.dirname(__FILE__) + '/../lib/dump_rake'
 
+require 'tmpdir'
+
 def database_configs
   YAML::load(IO.read(PLUGIN_SPEC_DIR + "/db/database.yml"))
 end
@@ -51,13 +53,12 @@ end
 
 def in_temp_rails_app
   old_rails_root = DumpRake::RailsRoot.dup
-  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)
-  yield
+  Dir.mktmpdir do |dir|
+    DumpRake::RailsRoot.replace(dir)
+    allow(Progress).to receive(:io).and_return(StringIO.new)
+    yield
+  end
 ensure
-  FileUtils.remove_entry(DumpRake::RailsRoot) if File.exist?(DumpRake::RailsRoot)
   DumpRake::RailsRoot.replace(old_rails_root)
 end
 
@@ -152,18 +153,18 @@ describe 'full cycle' do
 
             #clear database
             load_schema
-            Chicken.all.should == []
+            expect(Chicken.all).to eq([])
 
             #restore dump and verify equality
             call_rake_restore(:version => 'chickens')
-            chicken_data.should == saved_chicken_data
+            expect(chicken_data).to eq(saved_chicken_data)
 
             # go throught create/restore cycle and verify equality
             call_rake_create
             load_schema
-            Chicken.all.should be_empty
+            expect(Chicken.all).to be_empty
             call_rake_restore
-            chicken_data.should == saved_chicken_data
+            expect(chicken_data).to eq(saved_chicken_data)
           end
         end
       end
@@ -188,7 +189,7 @@ describe 'full cycle' do
         in_temp_rails_app do
           saved_chicken_data = nil
           use_adapter(adapter_src) do
-            Chicken.all.should be_empty
+            expect(Chicken.all).to be_empty
 
             create_chickens!(:random => 100)
             saved_chicken_data = chicken_data
@@ -196,10 +197,10 @@ describe 'full cycle' do
           end
 
           use_adapter(adapter_dst) do
-            Chicken.all.should be_empty
+            expect(Chicken.all).to be_empty
 
             call_rake_restore
-            chicken_data.should == saved_chicken_data
+            expect(chicken_data).to eq(saved_chicken_data)
           end
         end
       end
@@ -217,7 +218,12 @@ describe 'full cycle' do
             Zlib::GzipReader.open(dump_path) do |gzip|
               Archive::Tar::Minitar.open(gzip, 'r') do |stream|
                 stream.each do |entry|
-                  data << [entry.full_name, entry.read]
+                  entry_data = if entry.full_name == 'schema.rb'
+                    entry.read
+                  else
+                    Marshal.load(entry.read)
+                  end
+                  data << [entry.full_name, entry_data]
                 end
               end
             end
@@ -226,8 +232,8 @@ describe 'full cycle' do
         end
 
         dumps.combination(2) do |dump_a, dump_b|
-          dump_a[:path].should_not == dump_b[:path]
-          dump_a[:data].should == dump_b[:data]
+          expect(dump_a[:path]).not_to eq(dump_b[:path])
+          expect(dump_a[:data]).to eq(dump_b[:data])
         end
       end
     end

data/spec/dummy-4.1/.gitignore

@@ -0,0 +1,16 @@
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp

data/spec/dummy-4.1/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Rails.application

data/spec/dummy-4.1/config/application.rb

@@ -0,0 +1,30 @@
+require File.expand_path('../boot', __FILE__)
+
+# Pick the frameworks you want:
+require "active_model/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_view/railtie"
+# require "sprockets/railtie"
+# require "rails/test_unit/railtie"
+
+# Require the gems listed in Gemfile, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(*Rails.groups)
+
+module Dummy41
+  class Application < Rails::Application
+    # 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.
+
+    # 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. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # 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}').to_s]
+    # config.i18n.default_locale = :de
+  end
+end

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

@@ -0,0 +1,4 @@
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

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

@@ -0,0 +1,25 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+#
+default: &default
+  adapter: sqlite3
+  pool: 5
+  timeout: 5000
+
+development:
+  <<: *default
+  database: db/development.sqlite3
+
+# 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:
+  <<: *default
+  database: db/test.sqlite3
+
+production:
+  <<: *default
+  database: db/production.sqlite3

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

@@ -0,0 +1,5 @@
+# Load the Rails application.
+require File.expand_path('../application', __FILE__)
+
+# Initialize the Rails application.
+Rails.application.initialize!

data/spec/dummy-4.1/config/environments/development.rb

@@ -0,0 +1,28 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
+
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end

data/spec/dummy-4.1/config/environments/production.rb

@@ -0,0 +1,67 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Code is not reloaded between requests.
+  config.cache_classes = true
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable Rails's static asset server (Apache or nginx will already do this).
+  config.serve_static_assets = false
+
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # Set to :debug to see everything in the log.
+  config.log_level = :info
+
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation cannot be found).
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners.
+  config.active_support.deprecation = :notify
+
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
+end

data/spec/dummy-4.1/config/environments/test.rb

@@ -0,0 +1,39 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # The test environment is used exclusively to run your application's
+  # test suite. You never need to work with it otherwise. Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs. Don't rely on the data there!
+  config.cache_classes = true
+
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # Configure static asset server for tests with Cache-Control for performance.
+  config.serve_static_assets  = true
+  config.static_cache_control = 'public, max-age=3600'
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Print deprecation notices to the stderr.
+  config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end