clone_remote_db 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e4ef1f0948c75e7b40317ada0a5561c677ce93a
-  data.tar.gz: c1f4de4836d591b99952a9587ac908b072715f13
+  metadata.gz: 7bd2ff0fa7e22c69b5649170bd2d66b30ffefdd3
+  data.tar.gz: aa38915a48d27f3ac23d1b3622482353d4f4c832
 SHA512:
-  metadata.gz: b3b63f475666459d1a108fca67f0129814195a0e8379ee00584193066e2df20724247c8f24f541a1ee0e06e6cd23e70b48c42b1c7dfdb7cbfcc39cb61df3e369
-  data.tar.gz: 7551aee85ba3d6e42b9c9f86c20edce8c68251daa569593f12cb50b1979d28919d18c9d36e60e20e017e01a6a68c7a7052c26526954073bb25be0431460cc0c6
+  metadata.gz: eda295fe00556e2f497b209f2aa4681818ff775cb40182ab6b569111a016dc441894aa7e8fd915017b241c89c28c370087617cfcd3c1e3365b147a7ec80487c4
+  data.tar.gz: b47d9c51ca1a2586f21cdb6ff0e2b7a0ce90b2e2f49db07b6b5c6869ef83c91e44732505990812cb4da5905d5ec09ea3d35d6b61144eb6263ed19c08dc6c97ff

data/bin/clone_remote_db

@@ -48,12 +48,16 @@ if cmd
   cmd_config = CONFIG['environments'][cmd]
   if cmd_config
     cmd_config = cmd_config.symbolize_keys
-    loader.options.merge!(cmd_config.select { |k,v| cli_opts[k].nil? })
+
+    # do not merge parameters that were set from the command line
+    cmd_config_opts = cmd_config.select { |k,v| cli_opts[k].nil? }
+    loader.options.merge!(cmd_config_opts)
   else
     loader.die("unknown subcommand #{cmd}")
   end
 end
 
+loader.load_defaults!
 opts = loader.options
 
 [:local_db, :remote_db, :host].each do |opt|
@@ -66,7 +70,7 @@ loader.die(:import_only, "file not found") if opts[:import_only] && !File.exist?
 gzip_opts = opts[:gzip_opts]
 
 # pg_dump exclude-table-data tables
-pg_exclude_data = opts[:pg_exclude_data]
+pg_exclude_data = opts[:exclude_table_data]
 
 db_name = opts[:remote_db]
 local_dbname = opts[:local_db]
@@ -75,7 +79,9 @@ host = opts[:host]
 # pg_dump setup
 pg_user = opts[:remote_user]
 pg_options = opts[:pg_dump_opts] << "-x #{escape_opts(db_name)}"
-pg_options_joined = pg_exclude_data.map { |t| '--exclude-table-data=' + escape_opts(t) }.
+pg_options_joined = \
+  (pg_exclude_data.is_a?(String) ? pg_exclude_data.split(',') : pg_exclude_data).
+  map { |t| '--exclude-table-data=' + escape_opts(t) }.
   join(' ') + ' ' + pg_options.join(' ')
 pg_dump_part = "pg_dump #{pg_options_joined}"
 

data/clone_remote_db.gemspec

@@ -19,4 +19,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "debugger"
 end

data/lib/clone_remote_db/loader.rb

@@ -16,6 +16,8 @@ class CloneRemoteDb::Loader
       opt(opts, :host, "Host of the postgresql database", arg: 'HOST', short: '-h')
       opt(opts, :import_only, "Skip download and provide path to dump.sql.gz file", arg: 'PATH')
       opt(opts, :local_dest, "The path to save the dump.sql.gz file to", arg: 'PATH')
+      opt(opts, :remote_user, "Sudo as this user on the remote server", arg: 'USER')
+      opt(opts, :exclude_table_data, "Do not download data from these table(s). Separate multiple tables by comma.", arg: 'TABLE')
       opt(opts, :dry_run, "Don't actually do anything", short: '-n')
     end.parse!
     options
@@ -54,23 +56,23 @@ EOS
     arg << " #{arg_opts[:arg]}" if arg_opts[:arg]
     on_args = [arg, msg]
     on_args.unshift(arg_opts[:short]) if arg_opts[:short]
-    opts.on(*on_args, msg) do |v|
+    opts.on(*on_args) do |v|
       options[key] = v
     end
   end
 
   def options
-    @options ||= {}.merge(defaults)
+    @options ||= {}
   end
 
-  def defaults
-    {
+  def load_defaults!
+    @options = {
       local_dest: '~/pg_dumps/{remote_db}/%Y-%m/%Y-%m-%d_%H.%M.sql.gz',
       gzip_opts: %w(-9 --stdout),
       pg_dump_opts: %w(-c -O),
-      pg_exclude_data: %w(versions),
+      exclude_table_data: %w(versions),
       remote_user: 'postgres'
-    }
+    }.merge(options)
   end
 
   def replace_variables(str)

data/lib/clone_remote_db/version.rb

@@ -1,3 +1,3 @@
 module CloneRemoteDb
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,41 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: clone_remote_db
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Josh McDade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  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: 
@@ -46,7 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -67,17 +95,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Helper script to dump, download, and remote a remote PostgreSQL database