capistrano-db_sync 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 097af0fe9943edd79ebaf5adf6b0a4b38e93f3a3
-  data.tar.gz: 1aeaaa0f28c9828512582cf48b3752c6135b65cd
+  metadata.gz: 4ef45f2b85cc220b6ffeacdf2aa5d73999798973
+  data.tar.gz: 94bd2de62b244170fa0d1890d54b0dfc6584d902
 SHA512:
-  metadata.gz: 089b61e05c9e168bd8c16529a01aca55178c61f0e77c6eff263c550f05d426ea7aea1a08503ebe928c397054e2873b2c45e6a75709873895c81bd97edc8a3f43
-  data.tar.gz: 42b8a807837d3bb8c155c132b960f0b88ba172b0776415961e19130c1231a1aa9d732eccea9ed5060351b01b538274058dfb1ee1362dbd65bac75c123edab130
+  metadata.gz: d8593d8accbb23f835447f3f317ffc20da35d46f25d0c2a08f8cd6916ca8ab20172ded4dd34580693edd84bba62b8c08222ecef20b0a4a7ce9dc392c3b887372
+  data.tar.gz: 9e75118beffc54c8d195e4d5fe315fa074ff304f95e2d506ad8254cc22c55c382128a65f8640f700413e15e4d2c9c6c08f1edeee529ef1f9d823d89179b08ad3

data/README.md

@@ -1,6 +1,4 @@
-[![Build Status](https://snap-ci.com/heartbits/capistrano-db_sync/branch/master/build_image)](https://snap-ci.com/heartbits/capistrano-db_sync/branch/master)
-
-## Capistrano::DBSync
+### Capistrano::DBSync [![Build Status](https://snap-ci.com/heartbits/capistrano-db_sync/branch/master/build_image)](https://snap-ci.com/heartbits/capistrano-db_sync/branch/master) [![Code Climate](https://codeclimate.com/github/heartbits/capistrano-db_sync/badges/gpa.svg)](https://codeclimate.com/github/heartbits/capistrano-db_sync)
 
 Fast and sophisticated remote database import using the best of **Postgres 9.2.x**
 
@@ -10,6 +8,7 @@ Fast and sophisticated remote database import using the best of **Postgres 9.2.x
 * No downtime on restore - it uses a temporary database while restoring
 * Uses Postgres parallel restore
 * Uses Postgres custom dump format that is automatically compressed
+* *MySQL will be supported in near future*
 
 ### Requirements
 
@@ -25,6 +24,7 @@ Fast and sophisticated remote database import using the best of **Postgres 9.2.x
    ```ruby
    gem 'capistrano-db_sync', require: false
    ```
+   Available in RubyGems: https://rubygems.org/gems/capistrano-db_sync
 
 2. Define your custom settings, if needed. We suggest to put this file at `lib/capistrano/tasks/db_sync.rake`.
    Capistrano 3.x should load all `*.rake` files by default in `Capfile`.
@@ -78,11 +78,18 @@ The following steps describe what happens when executing `cap production db_sync
 
 ### Contributors
 
-* Rafael Sales [@rafaelsales](http://github.com/rafaelsales) - help me not stay forever alone here :)
+* Rafael Sales [@rafaelsales](https://github.com/rafaelsales)
+* Jérémy Lecour [@jlecour](https://github.com/jlecour)
+
+### Plans
+
+* Increase test coverage
+* Add support to MySQL
+* Validate database versions before applying any changes
 
 ### Contributing
 
-1. Fork it ( https://github.com/rafaelsales/capistrano-db_sync/fork )
+1. Fork it ( https://github.com/heartbits/capistrano-db_sync/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/capistrano-db_sync.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "capistrano", ">= 3.0.0"
-  spec.add_dependency "activesupport", ">= 3.0.0"
+  spec.add_runtime_dependency "capistrano", "~> 3.0.0", ">= 3.0.0"
+  spec.add_dependency "activesupport", "~> 3.0.0", ">= 3.0.0"
 end

data/lib/capistrano/db_sync/configuration.rb

@@ -1,3 +1,4 @@
+require 'tmpdir'
 require 'active_support/core_ext/hash'
 
 module Capistrano::DBSync
@@ -21,14 +22,14 @@ module Capistrano::DBSync
 
           pg_jobs: 1, # Number of jobs to run in parallel on pg_restore
 
-          working_dir: "./tmp",
+          working_dir: Dir.tmpdir,
           env: ENV.fetch('RAILS_ENV', 'development'),
         },
 
         remote: {
           cleanup: true, # If the remote dump directory should be removed after downloaded
 
-          working_dir: "/tmp",
+          working_dir: cap.fetch(:tmp_dir, "/tmp"),
           env: cap.fetch(:stage).to_s,
         },
       }
@@ -41,6 +42,7 @@ module Capistrano::DBSync
 
     def load_options
       user_options = cap.fetch(:db_sync_options)
+      user_options = user_options.reject { |_, v| v.nil? }
       DEFAULT_OPTIONS.call(cap).deep_merge(user_options)
     end
 

data/lib/capistrano/db_sync/postgres/cli.rb

@@ -4,11 +4,13 @@ class Capistrano::DBSync::Postgres::CLI
   end
 
   def dump(to_file, db, options = [])
-    "#{with_pw} pg_dump #{credentials} #{format_args} -f #{to_file} #{options.join(' ')} #{db}"
+    args = to_string_args(options)
+    "#{with_pw} pg_dump #{credentials} #{format_args} -f #{to_file} #{args} #{db}".strip
   end
 
   def restore(from_file, db, options = [])
-    "#{with_pw} pg_restore #{credentials} #{format_args} -d #{db} #{options.join(' ')} #{from_file}"
+    args = to_string_args(options)
+    "#{with_pw} pg_restore #{credentials} #{format_args} -d #{db} #{args} #{from_file}".strip
   end
 
   def drop_db(db)
@@ -23,13 +25,9 @@ class Capistrano::DBSync::Postgres::CLI
     psql %Q|ALTER DATABASE "#{old_db}" RENAME TO "#{new_db}";|
   end
 
-  def clone_db(new_db, template_db)
-    psql %Q|CREATE DATABASE "#{new_db}" WITH TEMPLATE "#{template_db}";|
-  end
-
   def psql(command, db = "postgres")
     normalized_command = command.gsub('"', '\"').gsub(/\s\s+|\n/, " ")
-    %Q|#{with_pw} psql #{credentials} -d #{db} -c "#{normalized_command}"|
+    %Q|#{with_pw} psql #{credentials} -d #{db} -c "#{normalized_command}"|.strip
   end
 
   def kill_processes_for_db(db)
@@ -64,7 +62,13 @@ class Capistrano::DBSync::Postgres::CLI
   end
 
   def with_pw
-    "PGPASSWORD='#{config['password']}'" unless config.fetch('password', '').empty?
+    if config['password']
+      "PGPASSWORD='#{config['password']}'"
+    end
+  end
+
+  def to_string_args(options)
+    options.nil? ? "" : options.join(" ")
   end
 
   attr_reader :config, :session_id

data/lib/capistrano/db_sync/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module DBSync
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/spec/lib/capistrano/db_sync/postgres/cli_spec.rb

@@ -1,30 +1,101 @@
 require 'spec_helper'
 
-describe Capistrano::DBSync::Postgres::CLI do
-  let(:config) do
-    {
-      "database" => "staging",
-      "username" => "user",
-      "password" => "pw",
-      "adapter"  => "postgresql",
-      "host"     => "127.0.0.1",
-      "port"     => "5432",
-    }
-  end
+describe "Using a config with a password" do
+
+  describe Capistrano::DBSync::Postgres::CLI do
+    let(:config) do
+      {
+        "database" => "staging",
+        "username" => "user",
+        "password" => "pw",
+        "adapter"  => "postgresql",
+        "host"     => "127.0.0.1",
+        "port"     => "5432",
+      }
+    end
 
-  let(:cli) { Capistrano::DBSync::Postgres::CLI.new(config) }
+    let(:cli) { Capistrano::DBSync::Postgres::CLI.new(config) }
 
-  describe "#dump" do
-    it "generates pg_dump command" do
-      command = cli.dump("/tmp/staging.dump", "staging", ["--section=pre-data"])
-      command.must_equal "PGPASSWORD='pw' pg_dump -U user -h 127.0.0.1 -p 5432 --no-acl --no-owner --format=custom -f /tmp/staging.dump --section=pre-data staging"
+    describe "#dump" do
+      it "generates pg_dump command" do
+        command = cli.dump("/tmp/staging.dump", "staging", ["--section=pre-data"])
+        command.must_equal "PGPASSWORD='pw' pg_dump -U user -h 127.0.0.1 -p 5432 --no-acl --no-owner --format=custom -f /tmp/staging.dump --section=pre-data staging"
+      end
+    end
+
+    describe "#restore" do
+      it "generates pg_dump command" do
+        command = cli.restore("/db/production.dump", "staging", ["--jobs=3"])
+        command.must_equal "PGPASSWORD='pw' pg_restore -U user -h 127.0.0.1 -p 5432 --no-acl --no-owner --format=custom -d staging --jobs=3 /db/production.dump"
+      end
+    end
+
+    describe "#psql" do
+      it "generates a command to drop a database" do
+        command = cli.psql("fake command")
+        command.must_equal %Q{PGPASSWORD='pw' psql -U user -h 127.0.0.1 -p 5432 -d postgres -c "fake command"}
+      end
+    end
+
+    describe "#drop_db" do
+      it "generates a command to drop a database" do
+        command = cli.drop_db("staging")
+        command.must_match /psql .* -c "DROP DATABASE IF EXISTS \\"staging\\";"/
+      end
+    end
+
+    describe "#create_db" do
+      it "generates a database creation command" do
+        command = cli.create_db("staging")
+        command.must_match /psql .* -c "CREATE DATABASE \\"staging\\";"/
+      end
     end
-  end
 
-  describe "#restore" do
-    it "generates pg_dump command" do
-      command = cli.restore("/db/production.dump", "staging", ["--jobs=3"])
-      command.must_equal "PGPASSWORD='pw' pg_restore -U user -h 127.0.0.1 -p 5432 --no-acl --no-owner --format=custom -d staging --jobs=3 /db/production.dump"
+    describe "#rename_db" do
+      it "generates a database creation command" do
+        command = cli.rename_db("staging_old", "staging_new")
+        command.must_match /psql .* -c "ALTER DATABASE \\"staging_old\\" RENAME TO \\"staging_new\\";"/
+      end
     end
   end
 end
+
+describe "Using a config without password" do
+
+  describe Capistrano::DBSync::Postgres::CLI do
+    let(:config) do
+      {
+        "database" => "staging",
+        "username" => "user",
+        "adapter"  => "postgresql",
+        "host"     => "127.0.0.1",
+        "port"     => "5432",
+      }
+    end
+
+    let(:cli) { Capistrano::DBSync::Postgres::CLI.new(config) }
+
+    describe "#dump" do
+      it "generates pg_dump command" do
+        command = cli.dump("/tmp/staging.dump", "staging", ["--section=pre-data"])
+        command.must_equal "pg_dump -U user -h 127.0.0.1 -p 5432 --no-acl --no-owner --format=custom -f /tmp/staging.dump --section=pre-data staging"
+      end
+    end
+
+    describe "#restore" do
+      it "generates pg_dump command" do
+        command = cli.restore("/db/production.dump", "staging", ["--jobs=3"])
+        command.must_equal "pg_restore -U user -h 127.0.0.1 -p 5432 --no-acl --no-owner --format=custom -d staging --jobs=3 /db/production.dump"
+      end
+    end
+
+    describe "#psql" do
+      it "generates a command to drop a database" do
+        command = cli.psql("fake command")
+        command.must_equal %Q{psql -U user -h 127.0.0.1 -p 5432 -d postgres -c "fake command"}
+      end
+    end
+    
+  end
+  
+end

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-db_sync
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Rafael Sales
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -28,6 +34,9 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -35,6 +44,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0