pgsync 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06dcfff629b2d6d8e5fb56719c8527b908aa41d8
-  data.tar.gz: c3afdf8c5ac9b352c38169c65fe59ff1d55e61a5
+  metadata.gz: d12ffec2fc5681c48eb5f13eafca045330d3615f
+  data.tar.gz: f8ed258ee86c6cc099299b1e962856500431d6ac
 SHA512:
-  metadata.gz: fb13e085bd8bb12d027166481a64cf28d6c7dda07aee78996d65dcf8f8beba91af9850d6ebf544d0cd937abfed07f4c209147c08b010306f3ef4223b49591718
-  data.tar.gz: 2019ba48fac3b89f17d0c70069f1c975f1c052bed67bd2f8c63b7d8eaca5b396c2dbafe434dd7f0887a2b062a154210ce41bf76fd5067e190f2121209e7d6312
+  metadata.gz: f19de0157cf9e4ccadea5e787c6413995cfbcb9bd086750512c3392be495df3b7bc1868bd55fdc27d0e65c7a81adefbda6c9118dd9cf4f17b9102b2cc0628994
+  data.tar.gz: 1248be9efc810bf5eb14685696e0b5214740549af940aa67cb9f6484651b72bed4ed8ca82d85a4ea26b840f69208606064c6eb9935f027ce64079c02b95f2baa

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.3.1
+
+- Added `-t` or `--tables`, `-g` or `--groups` options
+- Deprecated `tables`, `groups`, and `setup` commands
+
 # 0.3.0
 
 - More powerful groups

data/README.md

@@ -20,19 +20,19 @@ This creates `.pgsync.yml` for you to customize. We recommend checking this into
 
 ## How to Use
 
-Fetch all tables
+Sync all tables
 
 ```sh
 pgsync
 ```
 
-Fetch specific tables
+Sync specific tables
 
 ```sh
 pgsync table1,table2
 ```
 
-Fetch specific rows
+Sync specific rows
 
 ```sh
 pgsync products "WHERE id < 1000"
@@ -76,7 +76,9 @@ And run:
 pgsync group1
 ```
 
-You can also sync specific rows:
+You can also use groups to sync a specific record and associated records in other tables.
+
+To get user `123` and his or her orders, use:
 
 ```yml
 groups:
@@ -91,11 +93,9 @@ And run:
 pgsync user:123
 ```
 
-to get rows associated with user `123`.
-
 ### Schema
 
-Fetch schema
+Sync schema
 
 ```sh
 pgsync --schema-only

data/lib/pgsync.rb

@@ -40,13 +40,23 @@ module PgSync
       end
       command = args[0]
 
-      # setup hack
-      if opts[:setup]
-        command = "setup"
-        args[1] = args[0]
+      case command
+      when "setup"
+        args.shift
+        opts[:setup] = true
+        deprecated "Use `psync --setup` instead"
+      when "tables"
+        args.shift
+        opts[:tables] = args.shift
+        deprecated "Use `pgsync #{opts[:tables]}` instead"
+      when "groups"
+        args.shift
+        opts[:groups] = args.shift
+        deprecated "Use `pgsync #{opts[:groups]}` instead"
       end
-      if command == "setup"
-        setup(db_config_file(args[1]) || config_file || ".pgsync.yml")
+
+      if opts[:setup]
+        setup(db_config_file(args[0]) || config_file || ".pgsync.yml")
       else
         source = parse_source(opts[:from])
         abort "No source" unless source
@@ -229,15 +239,11 @@ module PgSync
     def parse_args(args)
       opts = Slop.parse(args) do |o|
         o.banner = %{Usage:
-    pgsync [command] [options]
-
-Commands:
-    tables
-    groups
-    schema
-    setup
+    pgsync [options]
 
 Options:}
+        o.string "-t", "--tables", "tables"
+        o.string "-g", "--groups", "groups"
         o.string "--from", "source"
         o.string "--to", "destination"
         o.string "--where", "where"
@@ -508,45 +514,50 @@ Options:}
       end
     end
 
+    def add_tables(tables, t, id, boom)
+      t.each do |table|
+        sql = nil
+        if table.is_a?(Array)
+          table, sql = table
+        end
+        tables[table] = {}
+        tables[table][:sql] = (boom || sql).to_s.gsub("{id}", cast(id)) if boom || sql
+      end
+    end
+
     def table_list(args, opts, from_uri)
       tables = nil
 
-      if args[0] == "groups"
-        tables = Hash.new { |hash, key| hash[key] = {} }
-        specified_groups = to_arr(args[1])
+      if opts[:groups]
+        tables ||= Hash.new { |hash, key| hash[key] = {} }
+        specified_groups = to_arr(opts[:groups])
         specified_groups.map do |tag|
           group, id = tag.split(":", 2)
-          if (t = config["goups"][group])
-            t.each do |table|
-              tables[table] = {}
-              tables[table][:sql] = args[2].to_s.gsub("{id}", cast(id)) if args[2]
-            end
+          if (t = (config["groups"] || {})[group])
+            add_tables(tables, t, id, args[1])
           else
             abort "Group not found: #{group}"
           end
         end
-      elsif args[0] == "tables"
-        tables = Hash.new { |hash, key| hash[key] = {} }
-        to_arr(args[1]).each do |tag|
+      end
+
+      if opts[:tables]
+        tables ||= Hash.new { |hash, key| hash[key] = {} }
+        to_arr(opts[:tables]).each do |tag|
           table, id = tag.split(":", 2)
           tables[table] = {}
-          tables[table][:sql] = args[2].to_s.gsub("{id}", cast(id)) if args[2]
+          tables[table][:sql] = args[1].to_s.gsub("{id}", cast(id)) if args[1]
         end
-      elsif args[0]
+      end
+
+      if args[0]
         # could be a group, table, or mix
-        tables = Hash.new { |hash, key| hash[key] = {} }
+        tables ||= Hash.new { |hash, key| hash[key] = {} }
         specified_groups = to_arr(args[0])
         specified_groups.map do |tag|
           group, id = tag.split(":", 2)
-          if (t = config["groups"][group])
-            t.each do |table|
-              sql = nil
-              if table.is_a?(Array)
-                table, sql = table
-              end
-              tables[table] = {}
-              tables[table][:sql] = (args[1] || sql).to_s.gsub("{id}", cast(id)) if args[1] || sql
-            end
+          if (t = (config["groups"] || {})[group])
+            add_tables(tables, t, id, args[1])
           else
             tables[group] = {}
             tables[group][:sql] = args[1].to_s.gsub("{id}", cast(id)) if args[1]
@@ -570,5 +581,9 @@ Options:}
     def cast(value)
       value.to_s
     end
+
+    def deprecated(message)
+      log "[DEPRECATED] #{message}"
+    end
   end
 end

data/lib/pgsync/version.rb

@@ -1,3 +1,3 @@
 module PgSync
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgsync
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrew Kane