pgsync 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58a427f20bdf42cd97ca4101964a571ab7f5da76
-  data.tar.gz: 13da001cf27f6ddda55a96b5f9ec3a8e27577eb5
+  metadata.gz: 6bb82b59d50e88dd20c969af273b2a0caeee6764
+  data.tar.gz: 291db7c3a69dcb341c9079f13635bbd057d5ea06
 SHA512:
-  metadata.gz: 7399365349da94533619effdeee4c80d05817384b75377af12c4d2f05d1cc2af6b9681dcc0e9b5d4cf8c3616e9f7f048b6b3fd7ca765d74b97437f29a503e04c
-  data.tar.gz: 15abafa358b77760f493d28f7c20ad8c44cf2e5a6e3ed7f5432f2b2b50c0aa67c465219026f705e1e37da4830c6881fc579ccb756ea694a05429c92c4f270112
+  metadata.gz: bd3ad5d52e94b6ed1466ee49ebb843ea74cc9ec1397d56587972c4d1388b707bb98d1921ee26f96393a27cd6b254973cf804770ab4514a325b8621797c58ff36
+  data.tar.gz: 06ab1eab6b466d21f9d641b3aaeb5134caaa372db806efcd860dd3cf6a28cf4b22c7a417d88af8bc2463e2fee1f2a83dd447711547298e0fe29aa7a45ff92f31

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# 0.1.1
+
+- Better support for multiple databases
+- Search parent directories for config file
+
+# 0.1.0
+
+- First release

data/README.md

@@ -14,7 +14,7 @@ And in your project directory, run:
 pgsync setup
 ```
 
-This creates a `.pgsync.yml` for you to customize. We recommend checking this into your version control (assuming it doesn’t contain sensitive information).
+This creates `.pgsync.yml` for you to customize. We recommend checking this into your version control (assuming it doesn’t contain sensitive information).
 
 ## How to Use
 
@@ -91,7 +91,7 @@ And run:
 pgsync groups group1,group2
 ```
 
-## Senstive Information
+## Sensitive Information
 
 Prevent sensitive information - like passwords and email addresses - from leaving the remote server.
 
@@ -125,6 +125,20 @@ Options for replacement are:
 - random_ip
 - untouched
 
+## Multiple Databases
+
+To use with multiple databases, run:
+
+```sh
+pgsync setup db2
+```
+
+This creates `.pgsync-db2.yml` for you to edit. Specify a database in commands with:
+
+```sh
+pgsync --db db2
+```
+
 ## Safety
 
 To keep you from accidentally overwriting production, the destination is limited to `localhost` or `127.0.0.1` by default.

data/lib/pgsync.rb

@@ -13,10 +13,19 @@ module PgSync
   class Rollback < StandardError; end
 
   class Client
+    attr_reader :config_file
+
     def initialize(args)
       $stdout.sync = true
       @arguments, @options = parse_args(args)
-      @config_file = @options[:config]
+      @config_file =
+        if @options[:db]
+          db_config_file(@options[:db])
+        else
+          @options[:config] || ".pgsync.yml"
+        end
+      @config_file = search_tree(@config_file)
+      abort "Config not found" unless @config_file
       @mutex = MultiProcessing::Mutex.new
     end
 
@@ -31,7 +40,7 @@ module PgSync
       command = args[0]
 
       if command == "setup"
-        setup
+        setup(db_config_file(args[1]) || config_file)
       else
         source = parse_source(opts[:from])
         abort "No source" unless source
@@ -186,7 +195,8 @@ module PgSync
         o.string "--to", "destination"
         o.string "--where", "where"
         o.string "--exclude", "exclude tables"
-        o.string "--config", "config file", default: ".pgsync.yml"
+        o.string "--config", "config file"
+        o.string "--db", "database"
         # TODO much better name for this option
         o.boolean "--to-safe", "accept danger", default: false
         o.on "-v", "--version", "print the version" do
@@ -203,37 +213,39 @@ module PgSync
       abort e.message
     end
 
-    # TODO look down path
     def config
       @config ||= begin
-        if File.exist?(@config_file)
-          begin
-            YAML.load_file(@config_file) || {}
-          rescue Psych::SyntaxError => e
-            raise PgSync::Error, e.message
-          end
-        else
-          {}
+        begin
+          YAML.load_file(config_file) || {}
+        rescue Psych::SyntaxError => e
+          raise PgSync::Error, e.message
         end
       end
     end
 
     def parse_source(source)
       if source && source[0..1] == "$(" && source[-1] == ")"
-        source = `#{source[2..-2]}`.chomp
+        command = source[2..-2]
+        # puts "Running #{command}"
+        source = `#{command}`.chomp
       end
       source
     end
 
-    def setup
-      if File.exist?(@config_file)
-        abort "#{@config_file} exists."
+    def setup(config_file)
+      if File.exist?(config_file)
+        abort "#{config_file} exists."
       else
-        FileUtils.cp(File.dirname(__FILE__) + "/../config.yml", @config_file)
-        puts "#{@config_file} created. Add your database credentials."
+        FileUtils.cp(File.dirname(__FILE__) + "/../config.yml", config_file)
+        puts "#{config_file} created. Add your database credentials."
       end
     end
 
+    def db_config_file(db)
+      return unless db
+      ".pgsync-#{db}.yml"
+    end
+
     def with_connection(uri, timeout: 0)
       conn =
         PG::Connection.new(
@@ -355,6 +367,19 @@ module PgSync
       uri.to_s
     end
 
+    def search_tree(file)
+      path = Dir.pwd
+      # prevent infinite loop
+      20.times do
+        absolute_file = File.join(path, file)
+        if File.exist?(absolute_file)
+          break absolute_file
+        end
+        path = File.dirname(path)
+        break if path == "/"
+      end
+    end
+
     def abort(message)
       raise PgSync::Error, message
     end

data/lib/pgsync/version.rb

@@ -1,3 +1,3 @@
 module PgSync
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgsync
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -117,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -146,9 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Quickly and securely sync data between environments
 test_files: []
-has_rdoc: