promiscuous 0.17.0 → 0.18.0

data/bin/promiscuous

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require 'promiscuous/cli'
+begin
+  Promiscuous::CLI.new.run
+rescue => e
+  $stderr.puts e.backtrace.join("\n")
+  $stderr.puts '-' * 80
+  $stderr.puts e.message
+end

data/lib/promiscuous/cli.rb

@@ -0,0 +1,159 @@
+require 'promiscuous'
+
+class Promiscuous::CLI
+  def replicate(config_options={}, &block)
+    require 'eventmachine'
+    require 'em-synchrony'
+
+    EM.synchrony do
+      trap_signals
+      Promiscuous::Loader.load_descriptors if defined?(Rails)
+      force_backend :rubyamqp
+      block.call
+    end
+  end
+
+  def force_backend(backend)
+    Promiscuous::AMQP.disconnect
+    Promiscuous::Config.backend = backend
+    Promiscuous::AMQP.connect
+  end
+
+  def trap_signals
+    %w(SIGTERM SIGINT).each do |signal|
+      Signal.trap(signal) do
+        print_status "Exiting..."
+        Promiscuous::Worker.stop
+        EM.stop
+      end
+    end
+  end
+
+  def publish(options={})
+    replicate do
+      Promiscuous::Worker.replicate(options)
+      print_status "Replicating with #{Promiscuous::Publisher::Mongoid::Defer.klasses.count} publishers"
+    end
+  end
+
+  def subscribe(options={})
+    replicate do
+      Promiscuous::Worker.replicate(options)
+      print_status "Replicating with #{Promiscuous::Subscriber::AMQP.subscribers.count} subscribers"
+    end
+  end
+
+  def publish_sync(options={})
+    print_status "Replicating #{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(options)
+      bar.increment
+    end
+
+    print_status "Done. You may switch your subscriber worker back to regular mode, and delete the sync queues"
+  end
+
+  def subscribe_sync(options={})
+    replicate do
+      # Create the regular queue if needed, so we don't lose messages.
+      Promiscuous::AMQP.open_queue(Promiscuous::Subscriber::Worker.new.queue_bindings)
+
+      print_status "WARNING: --- SYNC MODE ----"
+      print_status "WARNING: Make sure you are not running the regular subscriber worker (it's racy)"
+      print_status "WARNING: --- SYNC MODE ----"
+      Promiscuous::Worker.replicate(options)
+      print_status "Replicating with #{Promiscuous::Subscriber::AMQP.subscribers.count} subscribers"
+    end
+  end
+
+  def parse_args(args)
+    options = {}
+
+    parser = OptionParser.new do |opts|
+      opts.banner = "Usage: promiscuous [options] action"
+
+      opts.separator ""
+      opts.separator "Actions:"
+      opts.separator "    publish"
+      opts.separator "    subscribe"
+      opts.separator ""
+      opts.separator "Options:"
+
+      opts.on "-s", "--sync", "Use a separate queue for sychronizing databases" do
+        options[:personality] = :sync
+      end
+
+      opts.on "-c", "--criteria CRITERIA", "Published criteria in sync mode (often a model)" do |criteria|
+        options[:criteria] = criteria
+      end
+
+      opts.on "-b", "--bareback", "Bareback mode aka continue on error. Use with extreme caution" do
+        options[:bareback] = true
+      end
+
+      opts.on "-r", "--require FILE", "File to require to load your app. Don't worry about it with rails" do |file|
+        options[:require] = file
+      end
+
+      opts.on("-h", "--help", "Show this message") do
+        puts opts
+        exit
+      end
+
+      opts.on("-V", "--version", "Show version") do
+        puts "Promiscuous #{Promiscuous::VERSION}"
+        puts "License MIT"
+        exit
+      end
+    end
+
+    args = args.dup
+    parser.parse!(args)
+
+    options[:action] = args.shift.try(:to_sym)
+    raise "Please specify an action (publish or subscribe)" unless options[:action].in? [:publish, :subscribe]
+
+    if options[:action] == :publish && options[:personality] == :sync
+      raise "Please specify a criteria" unless options[:criteria]
+    else
+      raise "Why are you specifying a criteria?" if options[:criteria]
+    end
+
+    options
+  end
+
+  def load_app(options={})
+    if options[:require]
+      require options[:require]
+    else
+      require 'rails'
+      require File.expand_path("./config/environment.rb")
+      ::Rails.application.eager_load!
+    end
+  end
+
+  def run
+    options = parse_args(ARGV)
+    load_app(options)
+    maybe_warn_bareback(options)
+
+    # calls publish, publish_sync, subscribe, subscribe_sync
+    __send__([options[:action], options[:personality]].compact.join('_'), options)
+  end
+
+  def maybe_warn_bareback(options)
+    if options[:bareback]
+      print_status "WARNING: --- BAREBACK MODE ----"
+      print_status "WARNING: You are replicating without protection, you can get corrupted in no time"
+      print_status "WARNING: --- BAREBACK MODE ----"
+    end
+  end
+
+  def print_status(msg)
+    Promiscuous.info msg
+    $stderr.puts msg
+  end
+end

data/lib/promiscuous/common/worker.rb

@@ -15,7 +15,7 @@ module Promiscuous::Common::Worker
   end
 
   def bareback?
-    !!ENV['BAREBACK']
+    !!options[:bareback]
   end
 
   included { attr_accessor :stop, :options }

data/lib/promiscuous/railtie.rb

@@ -1,7 +1,5 @@
 module Promiscuous
   class Railtie < Rails::Railtie
-    rake_tasks { load 'promiscuous/railtie/replicate.rake' }
-
     initializer 'load promiscuous' do
       config.after_initialize do
         Promiscuous::Loader.load_descriptors(:publishers)

data/lib/promiscuous/subscriber/mongoid/versioning.rb

@@ -6,7 +6,7 @@ module Promiscuous::Subscriber::Mongoid::Versioning
 
     def atomic_selector
       if use_atomic_promiscuous_selector
-        super.merge({ '$or' => [{'_psv' => { '$lt'     => self._psv }},
+        super.merge({ '$or' => [{'_psv' => { '$lte'    => self._psv }},
                                 {'_psv' => { '$exists' => false     }}]})
       else
         super

data/lib/promiscuous/version.rb

@@ -1,3 +1,3 @@
 module Promiscuous
-  VERSION = '0.17.0'
+  VERSION = '0.18.0'
 end

data/lib/promiscuous/worker.rb

@@ -3,11 +3,11 @@ module Promiscuous::Worker
   self.workers = []
 
   def self.replicate(options={})
-    publish   = options[:only].nil? || options[:only] == :publish
-    subscribe = options[:only].nil? || options[:only] == :subscribe
+    options[:action] ||= [:publish, :subscribe]
+    actions = [options[:action]].flatten
 
-    self.workers << Promiscuous::Publisher::Worker.new(options) if publish
-    self.workers << Promiscuous::Subscriber::Worker.new(options) if subscribe
+    self.workers << Promiscuous::Publisher::Worker.new(options)  if :publish.in? actions
+    self.workers << Promiscuous::Subscriber::Worker.new(options) if :subscribe.in? actions
     self.workers.each { |w| w.replicate }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promiscuous
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,13 +112,14 @@ description: Replicate your Mongoid/ActiveRecord models across your applications
 email:
 - nicolas@viennot.biz
 - kareem@doubleonemedia.com
-executables: []
+executables:
+- promiscuous
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/promiscuous/amqp/null.rb
-- lib/promiscuous/amqp/bunny.rb
 - lib/promiscuous/amqp/rubyamqp.rb
+- lib/promiscuous/amqp/bunny.rb
 - lib/promiscuous/common/lint.rb
 - lib/promiscuous/common/lint/base.rb
 - lib/promiscuous/common/class_helpers.rb
@@ -148,8 +149,6 @@ files:
 - lib/promiscuous/publisher/ephemeral.rb
 - lib/promiscuous/publisher/mongoid.rb
 - lib/promiscuous/publisher/worker.rb
-- lib/promiscuous/railtie.rb
-- lib/promiscuous/railtie/replicate.rake
 - lib/promiscuous/subscriber/active_record.rb
 - lib/promiscuous/subscriber/envelope.rb
 - lib/promiscuous/subscriber/error.rb
@@ -176,12 +175,15 @@ files:
 - lib/promiscuous/common.rb
 - lib/promiscuous/config.rb
 - lib/promiscuous/amqp.rb
-- lib/promiscuous/worker.rb
 - lib/promiscuous/ephemeral.rb
 - lib/promiscuous/subscriber.rb
 - lib/promiscuous/publisher.rb
+- lib/promiscuous/cli.rb
+- lib/promiscuous/railtie.rb
+- lib/promiscuous/worker.rb
 - lib/promiscuous/version.rb
 - lib/promiscuous.rb
+- bin/promiscuous
 - README.md
 homepage: http://github.com/crowdtap/promiscuous
 licenses: []

data/lib/promiscuous/railtie/replicate.rake

@@ -1,87 +0,0 @@
-namespace :promiscuous do
-  # Note These rake tasks can be loaded without Rails
-
-  def trap_signals
-    %w(SIGTERM SIGINT).each do |signal|
-      Signal.trap(signal) do
-        Promiscuous.info "Exiting..."
-        Promiscuous::Worker.stop
-        EM.stop
-      end
-    end
-  end
-
-  def print_status(msg)
-    Promiscuous.info msg
-    $stderr.puts msg
-  end
-
-  def force_backend(backend)
-    Promiscuous::AMQP.disconnect
-    Promiscuous::Config.backend = backend
-    Promiscuous::AMQP.connect
-  end
-
-  def replicate(config_options={}, &block)
-    require 'eventmachine'
-    require 'em-synchrony'
-
-    EM.synchrony do
-      trap_signals
-      Promiscuous::Loader.load_descriptors if defined?(Rails)
-      force_backend :rubyamqp
-      block.call
-    end
-  end
-
-  desc 'Run the publisher worker'
-  task :publish => :environment do
-    replicate do
-      Promiscuous::Worker.replicate :only => :publish
-      print_status "Replicating with #{Promiscuous::Publisher::Mongoid::Defer.klasses.count} publishers"
-    end
-  end
-
-  desc 'Run the subscriber worker'
-  task :subscribe => :environment do
-    replicate do
-      Promiscuous::Worker.replicate :only => :subscribe
-      print_status "Replicating with #{Promiscuous::Subscriber::AMQP.subscribers.count} subscribers"
-    end
-  end
-
-  namespace :synchronized do
-    desc 'Synchronize a collection'
-    task :publish, [:criteria] => :environment do |t, args|
-      raise "Usage: rake promiscuous:synchronized:publish[Model]" unless args.criteria
-
-      criteria = eval(args.criteria)
-      count = criteria.count
-      print_status "Replicating #{args.criteria}..."
-
-      bar = ProgressBar.create(:format => '%t |%b>%i| %c/%C %e',
-                               :title => 'Publishing',
-                               :total => count)
-      criteria.each do |doc|
-        doc.promiscuous_sync :personality => :sync
-        bar.increment
-      end
-
-      print_status "Done. You may switch your subscriber worker back to regular mode, and delete the sync queues"
-    end
-
-    desc 'Subscribe to a collection synchronization'
-    task :subscribe => :environment do |t|
-      replicate do
-        # Create the regular queue if needed, so we don't lose messages.
-        Promiscuous::AMQP.open_queue(Promiscuous::Subscriber::Worker.new.queue_bindings)
-
-        print_status "WARNING: --- SYNC MODE ----"
-        print_status "WARNING: Make sure you are not running the regular subscriber worker (it's racy)"
-        print_status "WARNING: --- SYNC MODE ----"
-        Promiscuous::Worker.replicate :personality => :sync, :only => :subscribe
-        print_status "Replicating with #{Promiscuous::Subscriber::AMQP.subscribers.count} subscribers"
-      end
-    end
-  end
-end