pg_tasks 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5fcc8c4ebd3261bb86e000784e251573fe277d3
-  data.tar.gz: a1eacb6d11cbc6fe09042a92c82fa1343c4c648e
+  metadata.gz: fc265a9b51988c66412de5651644fe6427761bd0
+  data.tar.gz: 7326fe644b0d418c17707e6f80600c3554ba9c61
 SHA512:
-  metadata.gz: 2fd7aa59f705bff7d9709290ab2be2b81b1305f18d6ecf5ed9bec0bd9bd71c64c2bf69a50dd5e312cbd133a77d64c9acbfa198e2407e1bb6cfe62f7ec582d92b
-  data.tar.gz: eca219a82b9e75fc951ecc41d29e38fbdfafe25555f5af1604a24dcb0c8ae811fac0509c015792f9588fb2bb31a53025b8008131fd1fe8f6eeea6fe1bf3ba071
+  metadata.gz: b005994e668eb75f856f12ad35b17d671cea87a31779ee6bd519a7035147b01dd478f95d150f800e0b4faee7920858e50dd1289403c08ea21c4e0d7e99a826a7
+  data.tar.gz: 5bfd6120421f4f5606a274e7840c23c474846eaed9150d04e60b898c594d068f9bcb02b1d0415c959e504c84a5df5317d8e709f5ccb68f50ce19b36b4c974462

data/Rakefile

@@ -14,6 +14,4 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
 Bundler::GemHelper.install_tasks
-

data/lib/pg_tasks/railtie.rb

@@ -1,8 +1,8 @@
 #--
 # Copyright (c) 2015 Thomas Schank
 #
-# Released to the public under the terms of the MIT license. 
-# See MIT-LICENSE. 
+# Released to the public under the terms of the MIT license.
+# See MIT-LICENSE.
 #
 #++
 

data/lib/pg_tasks/version.rb

@@ -1,11 +1,11 @@
 #--
 # Copyright (c) 2015 Thomas Schank
 #
-# Released to the public under the terms of the MIT license. 
-# See MIT-LICENSE. 
+# Released to the public under the terms of the MIT license.
+# See MIT-LICENSE.
 #
 #++
 
 module PgTasks
-  VERSION = "1.0.1"
+  VERSION = '1.1.0'
 end

data/lib/pg_tasks.rb

@@ -1,23 +1,21 @@
 #--
 # Copyright (c) 2015 Thomas Schank
 #
-# Released to the public under the terms of the MIT license. 
-# See MIT-LICENSE. 
+# Released to the public under the terms of the MIT license.
+# See MIT-LICENSE.
 #
 #++
- 
+
 require 'active_record/tasks/database_tasks'
 require 'active_record/tasks/postgresql_database_tasks'
 
 module PgTasks
-
   require 'pg_tasks/railtie' if defined?(Rails)
 
   DEFAULT_BINARY_DATA_FILE_NAME = 'data.pgbin'
   DEFAULT_BINARY_STRUCTURE_AND_DATA_FILE_NAME = 'structure_and_data.pgbin'
 
   class << self
-
     %w(data_dump data_restore).each do |method_name|
       define_method method_name  do |filename = nil|
         ActiveRecord::Tasks::DatabaseTasks \
@@ -29,17 +27,17 @@ module PgTasks
 
     %w(structure_and_data_dump structure_and_data_restore).each do |method_name|
       define_method method_name  do |filename = nil|
-      ActiveRecord::Tasks::DatabaseTasks \
-        .perform_pg_db_task_for_config_and_filename \
-        method_name, current_config,
-        filename_or_default_binary_structure_and_data_file(filename)
+        ActiveRecord::Tasks::DatabaseTasks \
+          .perform_pg_db_task_for_config_and_filename \
+          method_name, current_config,
+          filename_or_default_binary_structure_and_data_file(filename)
       end
     end
 
     def truncate_tables
       ActiveRecord::Base.connection.tap do |connection|
         connection.tables.reject { |tn| tn == 'schema_migrations' }
-        .join(', ').tap do |tables|
+          .join(', ').tap do |tables|
           connection.execute " TRUNCATE TABLE #{tables} CASCADE; "
         end
       end
@@ -62,32 +60,37 @@ module PgTasks
         File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir,
                   DEFAULT_BINARY_STRUCTURE_AND_DATA_FILE_NAME)
     end
-
   end
 end
 
 module ActiveRecord
   module Tasks
     class PostgreSQLDatabaseTasks
-
       def data_dump(filename)
         set_psql_env
         command = 'pg_dump -F c -a -T schema_migrations -x -O -f ' \
           "#{Shellwords.escape(filename)} " \
           "#{Shellwords.escape(configuration['database'])}"
-        raise 'Error during data_dump' unless Kernel.system(command)
-        $stdout.puts "The data of '#{configuration['database']} " \
-          "has been dumped to '#{filename}'"
+        unless Kernel.system(command)
+          raise 'Error during data_dump'
+        else
+          $stdout.puts "The data of '#{configuration['database']} " \
+            "has been dumped to '#{filename}'"
+        end
       end
 
       def data_restore(filename)
         set_psql_env
-        command = 'pg_restore --disable-triggers -a -x -O -d ' \
-          "#{Shellwords.escape(configuration['database'])} " \
+        command = 'pg_restore --disable-triggers ' \
+          '--single-transaction -a -x -O ' \
+          "-d #{Shellwords.escape(configuration['database'])} " \
           "#{Shellwords.escape(filename)}"
-        raise 'Error during data_restore ' unless Kernel.system(command)
-        $stdout.puts "Data from '#{filename}' has been restored to \
+        unless Kernel.system(command)
+          raise 'Error during data_restore '
+        else
+          $stdout.puts "Data from '#{filename}' has been restored to \
                         '#{configuration['database']}'"
+        end
       end
 
       def structure_and_data_dump(filename)
@@ -105,7 +108,7 @@ module ActiveRecord
 
       def structure_and_data_restore(filename)
         set_psql_env
-        command = 'pg_restore --disable-triggers -x -O -d ' \
+        command = 'pg_restore --disable-triggers --single-transaction -x -O -d ' \
           "#{Shellwords.escape(configuration['database'])} " \
           "#{Shellwords.escape(filename)}"
         unless Kernel.system(command)
@@ -115,7 +118,6 @@ module ActiveRecord
             "has been restored to '#{filename}'"
         end
       end
-
     end
   end
 end
@@ -123,7 +125,6 @@ end
 module ActiveRecord
   module Tasks
     module DatabaseTasks
-
       def perform_pg_db_task_for_config_and_filename(task_name, *arguments)
         configuration = arguments.first
         filename = arguments.delete_at 1
@@ -134,7 +135,6 @@ module ActiveRecord
       rescue Exception => error
         $stderr.puts error, *(error.backtrace)
       end
-
     end
   end
 end

data/lib/tasks/pg_tasks.rake

@@ -1,23 +1,20 @@
 #--
 # Copyright (c) 2015 Thomas Schank
 #
-# Released to the public under the terms of the MIT license. 
-# See MIT-LICENSE. 
+# Released to the public under the terms of the MIT license.
+# See MIT-LICENSE.
 #
 #++
 
 require 'pg_tasks'
 
 namespace :db do
-
   namespace :pg do
-
     task truncate_tables: [:environment, :load_config] do
       PgTasks.truncate_tables
     end
 
     namespace :data do
-
       task dump: [:environment, :load_config] do
         PgTasks.data_dump ENV['FILE']
       end
@@ -25,11 +22,9 @@ namespace :db do
       task restore: [:environment, :load_config] do
         PgTasks.data_restore ENV['FILE']
       end
-
     end
 
     namespace :structure_and_data do
-
       task dump: [:environment, :load_config] do
         PgTasks.structure_and_data_dump ENV['FILE']
       end
@@ -37,9 +32,6 @@ namespace :db do
       task restore: [:environment, :load_config] do
         PgTasks.structure_and_data_restore ENV['FILE']
       end
-
     end
-
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_tasks
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Thomas Schank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-11 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - DrTom@schank.ch