fix a few legibility issues I had with the 2 --skip-schema patches

lib/taps/cli.rb

@@ -128,7 +128,7 @@ def clientoptparse(cmd)
         o.define_head "Push a database to a taps server"
       end
 
-      o.on(      '--no-schema', "Don't transfer the schema, just data") {|v| opts[:no_schema] = true }
+      o.on("-s", "--skip-schema", "Don't transfer the schema, just data") { |v| opts[:skip_schema] = true }
       o.on("-i", "--indexes-first", "Transfer indexes first before data") { |v| opts[:indexes_first] = true }
       o.on("-r", "--resume=file", "Resume a Taps Session from a stored file") { |v| opts[:resume_filename] = v }
       o.on("-c", "--chunksize=N", "Initial Chunksize") { |v| opts[:default_chunksize] = (v.to_i < 10 ? 10 : v.to_i) }
@@ -139,7 +139,6 @@ def clientoptparse(cmd)
         opts[:table_filter] = "(#{r_tables})"
       end
       o.on("-e", "--exclude_tables=A,B,C", Array, "Shortcut to exclude a list of tables") { |v| opts[:exclude_tables] = v }
-      o.on("-s", "--skip-schema", "Skip schema migration") { |v| opts[:skip_schema] = true }
       o.on("-d", "--debug", "Enable Debug Messages") { |v| opts[:debug] = true }
       o.parse!(argv)
 

lib/taps/operation.rb

@@ -30,7 +30,7 @@ def file_prefix
   end
 
   def skip_schema?
-    !!opts[:no_schema]
+    !!opts[:skip_schema]
   end
 
   def indexes_first?
@@ -245,13 +245,13 @@ def to_hash
   def run
     catch_errors do
       unless resuming?
-        pull_schema unless skip_schema?
-        pull_indexes if indexes_first?
+        pull_schema if !skip_schema?
+        pull_indexes if indexes_first? && !skip_schema?
       end
       setup_signal_trap
       pull_partial_data if resuming?
       pull_data
-      pull_indexes unless indexes_first?
+      pull_indexes if !indexes_first? && !skip_schema?
       pull_reset_sequences
     end
   end
@@ -404,13 +404,13 @@ def to_hash
   def run
     catch_errors do
       unless resuming?
-        push_schema unless skip_schema?
+        push_schema if !skip_schema?
         push_indexes if indexes_first? && !skip_schema?
       end
       setup_signal_trap
       push_partial_data if resuming?
       push_data
-      push_indexes unless indexes_first? || skip_schema?
+      push_indexes if !indexes_first? && !skip_schema?
       push_reset_sequences
     end
   end