promiscuous 0.50.0 → 0.50.1

data/bin/promiscuous

@@ -2,7 +2,7 @@
 
 begin
   require 'promiscuous'
-  Promiscuous::CLI.new.run
+  Promiscuous::CLI.new.boot
 rescue => e
   $stderr.puts "#{e.class}: #{e.message}"
   $stderr.puts '-' * 80

data/lib/promiscuous/cli.rb

@@ -1,4 +1,6 @@
 class Promiscuous::CLI
+  attr_accessor :options
+
   def self.trap_signals
     Signal.trap 'SIGUSR2' do
       Thread.list.each do |thread|
@@ -14,18 +16,19 @@ class Promiscuous::CLI
   end
   trap_signals
 
-  def publish(options={})
-    print_status "Publishing #{options[:criteria]}..."
-    criteria = eval(options[:criteria])
-
-    bar = ProgressBar.create(:format => '%t |%b>%i| %c/%C %e', :title => 'Publishing', :total => criteria.count)
-    criteria.each do |doc|
-      doc.promiscuous_sync
-      bar.increment
+  def publish
+    options[:criterias].map { |criteria| eval(criteria) }.each do |criteria|
+      title = criteria.name
+      title = "#{title}#{' ' * [0, 20 - title.size].max}"
+      bar = ProgressBar.create(:format => '%t |%b>%i| %c/%C %e', :title => title, :total => criteria.count)
+      criteria.each do |doc|
+        doc.promiscuous_sync
+        bar.increment
+      end
     end
   end
 
-  def subscribe(options={})
+  def subscribe
     Promiscuous::Loader.load_descriptors if defined?(Rails)
     print_status "Replicating with #{Promiscuous::Subscriber::AMQP.subscribers.count} subscribers"
     Promiscuous::Subscriber::Worker.run
@@ -42,8 +45,8 @@ class Promiscuous::CLI
 
       opts.separator ""
       opts.separator "Actions:"
-      opts.separator "    publish \"Model.where(:shard => 123)\""
-      opts.separator "    subscribe"
+      opts.separator "    promiscuous publish \"Member.where(:updated_at.gt => 1.day.ago)\" BrandAction"
+      opts.separator "    promiscuous subscribe"
       opts.separator ""
       opts.separator "Options:"
 
@@ -71,7 +74,7 @@ class Promiscuous::CLI
     parser.parse!(args)
 
     options[:action] = args.shift.try(:to_sym)
-    options[:criteria] = args.shift
+    options[:criterias] = args
 
     unless options[:action].in? [:publish, :subscribe]
       puts parser
@@ -79,9 +82,9 @@ class Promiscuous::CLI
     end
 
     if options[:action] == :publish
-      raise "Please specify a criteria" unless options[:criteria]
+      raise "Please specify one or more criterias" unless options[:criterias].present?
     else
-      raise "Why are you specifying a criteria?" if options[:criteria]
+      raise "Why are you specifying a criteria?" if options[:criterias].present?
     end
 
     options
@@ -90,7 +93,7 @@ class Promiscuous::CLI
     exit
   end
 
-  def load_app(options={})
+  def load_app
     if options[:require]
       require options[:require]
     else
@@ -100,22 +103,25 @@ class Promiscuous::CLI
     end
   end
 
-  def run
-    options = parse_args(ARGV)
-    load_app(options)
-    maybe_run_bareback(options)
+  def boot
+    self.options = parse_args(ARGV)
+    load_app
+    maybe_run_bareback
+    run
+  end
 
+  def run
     case options[:action]
-    when :publish then publish(options)
-    when :subscribe then subscribe(options)
+    when :publish then publish
+    when :subscribe then subscribe
     end
   end
 
-  def maybe_run_bareback(options)
+  def maybe_run_bareback
     if options[:bareback]
       Promiscuous::Config.bareback = true
       print_status "WARNING: --- BAREBACK MODE ----"
-      print_status "WARNING: You are replicating without protection, you can get corrupted in no time"
+      print_status "WARNING: You are replicating without protection, you can get out of sync in no time"
       print_status "WARNING: --- BAREBACK MODE ----"
     end
   end

data/lib/promiscuous/subscriber/worker/message.rb

@@ -15,6 +15,7 @@ class Promiscuous::Subscriber::Worker::Message
   end
 
   def version
+    return nil unless parsed_payload['version'].is_a? Hash # TODO remove once migrated
     @version ||= parsed_payload['version'].try(:symbolize_keys)
   end
 

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.50.0'
+  VERSION = '0.50.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.50.0
+  version: 0.50.1
   prerelease: 
 platform: ruby
 authors:
@@ -216,8 +216,8 @@ files:
 - lib/promiscuous/subscriber/observer.rb
 - lib/promiscuous/subscriber/amqp.rb
 - lib/promiscuous/subscriber/dummy.rb
-- lib/promiscuous/subscriber/worker.rb
 - lib/promiscuous/subscriber/model.rb
+- lib/promiscuous/subscriber/worker.rb
 - lib/promiscuous/error/subscriber.rb
 - lib/promiscuous/error/publisher.rb
 - lib/promiscuous/error/connection.rb