sidekiq-client-cli 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzBkYjYxNGJhOTNmMDQwNDBmNGFmYTMwMTZiNTMxZjc0ZmQ3MWIzOQ==
+    ZGIzNWE2MTRhMTM0ODcxZDQ0YjlmYTZiMmQxYTI3OThmOGJmMWM0Ng==
   data.tar.gz: !binary |-
-    NTEwNWUzNWUyNjY0YzE5NDViYzE2MWY5OWE2MDU4Yzk5MDdjMTNkOQ==
+    OWRkMmRkMmE3OTcyY2U1NTE0MzE3MjlhZThkNjA3ZGZkMWI5MTQ3MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2RmNzk1ZWVmZjE3ZjEzNGQ5NDgyMTNlMjUzYjIxN2JjODMyMzM0Yjk0YjZl
-    YjQ1MGEyZDA5M2Q3MjVkNWIyNWM2MzBhZjY2YmY4ZTFkZTY5NmU4ZDQyNzBi
-    NzBmNTZmZWQxMmJiYzRmNzljN2M1MDAwZjliMmJiYmY2OWI0Yjk=
+    MDAyNTZmMTc4NDllZmU5NTdiMjBmNTk3ZWVhMWNkNjk4MjcxODc5YzcyYmZk
+    Mzg3OTllMTdlYzZkOTczZWZjMWQwOTA4NTM5NWJlNGMxYTQ5ZjZkOGU4OTk4
+    NWUzZWNjZjI1YjU1ZGUxZGQ2ZTAzNTljZmU4YjM3OTQ1YmUwNzg=
   data.tar.gz: !binary |-
-    MWRjMTRiNmU3YmRhMTViZjE2NTg3M2Q5MWMxNDEyYmZiNjIxYjYwYWVjOGZk
-    NWFjZmYxMTVjZDAyYjYxZTFkMWEyZGEyZDQ2NTdmNGM3Yzk3ZjI0MDQxOGE4
-    MjRhNWJkZDRlMGE4NzQxODgyNzg4NTNjMTc4YTkxYjcyYTFmODU=
+    MzdjNWNhM2QyNGYyMjU2Y2RlY2U3NTQ3NzZiM2I2MWNiNTQ0MGIxMjhkZWRj
+    ZjE3NjhjOTZiZTViNTNiM2ExOGQ2Yjc5NjY4YTg0NWZjMDczOTY0Yjc5ZTU0
+    MDAyYWJjYmExZTdlOWZkZTdhMDFkOGUzZWU3M2QwMTBhMGIwZTY=

data/README.md

@@ -25,7 +25,15 @@ Push worker classes to Sidekiq :
 
     $ sidekiq-client push MyWorker OtherWorker
 
-help
+You can specify a sidekiq config file via the -c option (if not specified the usual rails path config/initializers/sidekiq.rb is used) :
+
+    $ sidekiq-client -c mysidekiq.conf push MyWorker OtherWorker
+
+You can also specify a specific queue to push the jobs to :
+
+    $ sidekiq-client -q my_queue push MyWorker OtherWorker
+
+For help :
 
     $ sidekiq-client --help
 

data/lib/sidekiq_client_cli.rb

@@ -5,6 +5,7 @@ require_relative 'sidekiq_client_cli/version'
 class SidekiqClientCLI
   COMMANDS = %w{push}
   DEFAULT_CONFIG_PATH = "config/initializers/sidekiq.rb"
+	DEFAULT_QUEUE = Sidekiq::Worker::ClassMethods::DEFAULT_OPTIONS['queue']
 
   attr_accessor :settings
 
@@ -15,6 +16,7 @@ class SidekiqClientCLI
   def parse
     @settings = CLI.new do
       option :config_path, :short => :c, :default => DEFAULT_CONFIG_PATH, :description => "Sidekiq client config file path"
+			option :queue, :short => :q, :default => DEFAULT_QUEUE, :description => "Queue to place job on"
       argument :command, :description => "'push' to push a job to the queue"
       arguments :command_args, :required => false, :description => "command arguments"
     end.parse! do |settings|
@@ -36,8 +38,8 @@ class SidekiqClientCLI
   def push
     settings.command_args.each do |arg|
       begin
-        jid = Sidekiq::Client.push('class' => arg, 'args' => [])
-        p "Posted #{arg} to queue, Job ID : #{jid}"
+        jid = Sidekiq::Client.push('class' => arg, 'queue' => settings.queue, 'args' => [])
+        p "Posted #{arg} to queue '#{settings.queue}', Job ID : #{jid}"
       rescue StandardError => ex
         p "Failed to push to queue : #{ex.message}"
       end

data/lib/sidekiq_client_cli/version.rb

@@ -1,3 +1,3 @@
 class SidekiqClientCLI
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/sidekiq_client_cli_spec.rb

@@ -46,15 +46,27 @@ describe SidekiqClientCLI do
       @client.settings.command.should eq "push"
       @client.settings.command_args.should eq worker_klasses
       @client.settings.config_path.should eq SidekiqClientCLI::DEFAULT_CONFIG_PATH
+			@client.settings.queue.should eq SidekiqClientCLI::DEFAULT_QUEUE
     end
 
-    it "parses push with classes" do
+    it "parses push with a configuration file" do
       worker_klasses = %w{FirstWorker SecondWorker}
       ARGV = %w{ -c mysidekiq.conf push }.concat(worker_klasses)
       @client.parse
       @client.settings.command.should eq "push"
       @client.settings.command_args.should eq worker_klasses
       @client.settings.config_path.should eq "mysidekiq.conf"
+			@client.settings.queue.should eq SidekiqClientCLI::DEFAULT_QUEUE
+    end
+
+    it "parses push with a queue" do
+      worker_klasses = %w{FirstWorker SecondWorker}
+      ARGV = %w{ -q my_queue push }.concat(worker_klasses)
+      @client.parse
+      @client.settings.command.should eq "push"
+      @client.settings.command_args.should eq worker_klasses
+      @client.settings.config_path.should eq SidekiqClientCLI::DEFAULT_CONFIG_PATH
+			@client.settings.queue.should eq "my_queue"
     end
 
   end
@@ -95,14 +107,48 @@ describe SidekiqClientCLI do
       klass1 = "FirstWorker"
       klass2 = "SecondWorker"
       settings = double("settings")
-      settings.stub(:command_args).and_return [klass1 , klass2]
+      settings.stub(:command_args).and_return [klass1, klass2]
+      settings.stub(:queue).and_return SidekiqClientCLI::DEFAULT_QUEUE
       @client.settings = settings
 
-      Sidekiq::Client.should_receive(:push).with('class' => klass1, 'args' => [])
-      Sidekiq::Client.should_receive(:push).with('class' => klass2, 'args' => [])
+      Sidekiq::Client.should_receive(:push).with('class' => klass1, 'args' => [], 'queue' => SidekiqClientCLI::DEFAULT_QUEUE)
+      Sidekiq::Client.should_receive(:push).with('class' => klass2, 'args' => [], 'queue' => SidekiqClientCLI::DEFAULT_QUEUE)
 
       @client.push
     end
+
+    it "pushes the worker classes to the correct queue" do
+			queue = "Queue"
+      klass1 = "FirstWorker"
+      klass2 = "SecondWorker"
+      settings = double("settings")
+      settings.stub(:command_args).and_return [klass1, klass2]
+      settings.stub(:queue).and_return queue
+      @client.settings = settings
+
+      Sidekiq::Client.should_receive(:push).with('class' => klass1, 'args' => [], 'queue' => queue)
+      Sidekiq::Client.should_receive(:push).with('class' => klass2, 'args' => [], 'queue' => queue)
+
+      @client.push
+    end
+
+    it "prints and continues if an exception is raised" do
+      klass1 = "FirstWorker"
+      klass2 = "SecondWorker"
+      settings = double("settings")
+      settings.stub(:command_args).and_return [klass1, klass2]
+      settings.stub(:queue).and_return SidekiqClientCLI::DEFAULT_QUEUE
+      @client.settings = settings
+
+      Sidekiq::Client.should_receive(:push).with('class' => klass1, 'args' => [], 'queue' => SidekiqClientCLI::DEFAULT_QUEUE).and_raise
+      Sidekiq::Client.should_receive(:push).with('class' => klass2, 'args' => [], 'queue' => SidekiqClientCLI::DEFAULT_QUEUE)
+
+      out = IOHelper.stdout_read do
+        @client.push
+      end
+      out.should include("Failed to push")
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-client-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Adil Haritah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler