o2h 0.1.4 → 0.1.5

data/lib/o2h/recipes/sync.rb

@@ -5,6 +5,9 @@ _cset(:sync_db_remote_config) { "#{shared_path}/config/database.yml" }
 _cset(:sync_db_local_file) { "tmp/#{sync_db_file}" }
 _cset(:sync_db_local_config) { "config/database.yml" }
 
+require 'pg_dumper'
+require 'capistrano/cli'
+
 namespace :sync do
 
   namespace :db do
@@ -45,11 +48,11 @@ namespace :sync do
 
       raise "remote database config not found" unless remote
 
-      require 'pg_dumper'
       pg = PgDumper.new(remote["database"], 'pg_dump')
       pg.output = remote_file
       pg.clean!
       pg.compress! 9
+      pg.skip_owner!
       pg.auth = remote
 
       run pg.command
@@ -60,11 +63,14 @@ namespace :sync do
       local = database_config
       raise "local database config not found" unless local
 
-      require 'pg_dumper'
       pg = PgDumper.new(local["database"], "psql")
       pg.auth = local
 
-      run_locally "gunzip --stdout #{sync_db_local_file} | #{pg.command}"
+      agree = Capistrano::CLI.ui.agree("Rewrite local database '#{local["database"]}'? (Yes, [No]) ") do |q|
+        q.default = 'n'
+      end
+
+      run_locally "gunzip --stdout #{sync_db_local_file} | #{pg.command}" if agree
     end
 
     task :fetch do

data/lib/o2h/version.rb

@@ -1,3 +1,3 @@
 module O2h
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/o2h.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'newrelic_rpm', '~> 3.3.0'
   gem.add_dependency 'capistrano', '~> 2.9.0'
   gem.add_dependency 'rvm', '~> 1.9.2'
-  gem.add_dependency 'pg_dumper', '~> 0.1.5'
+  gem.add_dependency 'pg_dumper', '~> 0.1.6'
 end

data/spec/recipes/sync_spec.rb

@@ -23,10 +23,11 @@ describe "sync" do
     end
 
     it "should set proper repository" do
+      Capistrano::CLI.ui.stub(:agree) { true }
       subject.should_receive(:download)
       subject.should_receive(:run_locally).with("gunzip --stdout tmp/app-dump.sql.gz | psql -p local-port local-db")
       subject.execute_task(task)
-      subject.should have_run("pg_dump -c -Z 9 -p #{port} -h #{host} -U #{username} -f /shared/app/backup/app-dump.sql.gz #{database}")
+      subject.should have_run("pg_dump -c -Z 9 --no-owner -p #{port} -h #{host} -U #{username} -f /shared/app/backup/app-dump.sql.gz #{database}")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: o2h
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
-  requirement: &70337709359240 !ruby/object:Gem::Requirement
+  requirement: &70217441008420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70337709359240
+  version_requirements: *70217441008420
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70337709358620 !ruby/object:Gem::Requirement
+  requirement: &70217441007880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70337709358620
+  version_requirements: *70217441007880
 - !ruby/object:Gem::Dependency
   name: rvm
-  requirement: &70337709358060 !ruby/object:Gem::Requirement
+  requirement: &70217441007260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,18 +43,18 @@ dependencies:
         version: 1.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70337709358060
+  version_requirements: *70217441007260
 - !ruby/object:Gem::Dependency
   name: pg_dumper
-  requirement: &70337709357360 !ruby/object:Gem::Requirement
+  requirement: &70217441006580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70337709357360
+  version_requirements: *70217441006580
 description: Collection of recipes and gem dependencies for o2h deployment
 email:
 - michal@o2h.cz