sidekiq-client-cli 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1bc9f8f02820b43c796142355fe9d8751b77018
-  data.tar.gz: f8c3a7e82183d93763ab6a37ac7e094336c1c830
+  metadata.gz: 81057e325bfea17dfcdc32ded3e762566f04b852
+  data.tar.gz: 134fd765c8cb6ca8fc9dcad824ef888514e7e3ff
 SHA512:
-  metadata.gz: 74cc88fc0e354c05d17953b446f23504b00a566bf5ca8d8843e48e56808b2973102b3ee3541ec0e0e81a0c663bb483b37b0889a72cacac5cf682213505fdd996
-  data.tar.gz: 91b257c7e54236dcf2e9d0e05f451008d1118fc82dd5015858616ec8a4dc055676fe82e230e2bc77f29d01fb326945ff4e88e0a6f3bb7a8063470f51bc53b586
+  metadata.gz: 076942c11f7f2987954315cf78a4988544827627d19d13ad93b04e405086b9254854d03749297c3fc63bb02f94c4ea34849c1e4a7c24f809cf0524e0a1359578
+  data.tar.gz: f24582aab8c62e625755ef7ffa3425f0eb8994e7a5dabbbb51a692e79043695caaf8514773dd385f4c261be8d05864aa1f47b9362eb3da1f40d92836b4bef9aa

data/bin/sidekiq-client

@@ -5,9 +5,9 @@ require_relative '../lib/sidekiq_client_cli'
 begin
   client = SidekiqClientCLI.new
   client.parse
-  client.run
+  client.run or exit 1
 rescue => e
   STDERR.puts e.message
   STDERR.puts e.backtrace.join("\n")
   exit 1
-end
+end

data/lib/sidekiq_client_cli.rb

@@ -41,18 +41,26 @@ class SidekiqClientCLI
     self.send settings.command.to_sym
   end
 
+  # Returns true if all args can be pushed successfully.
+  # Returns false if at least one exception occured.
   def push
-    settings.command_args.each do |arg|
-      begin
-        jid = Sidekiq::Client.push({ 'class' => arg,
-                                     'queue' => settings.queue,
-                                     'args'  => [],
-                                     'retry' => settings.retry })
-        p "Posted #{arg} to queue '#{settings.queue}', Job ID : #{jid}, Retry : #{settings.retry}"
-      rescue StandardError => ex
-        p "Failed to push to queue : #{ex.message}"
-      end
+    settings.command_args.inject(true) do |success, arg|
+      push_argument arg
     end
   end
 
+  private
+
+  def push_argument(arg)
+    jid = Sidekiq::Client.push({ 'class' => arg,
+                                 'queue' => settings.queue,
+                                 'args'  => [],
+                                 'retry' => settings.retry })
+    p "Posted #{arg} to queue '#{settings.queue}', Job ID : #{jid}, Retry : #{settings.retry}"
+    true
+  rescue StandardError => ex
+    p "Failed to push to queue : #{ex.message}"
+    false
+  end
+
 end

data/lib/sidekiq_client_cli/version.rb

@@ -1,3 +1,3 @@
 class SidekiqClientCLI
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/sidekiq_client_cli_spec.rb

@@ -157,97 +157,87 @@ describe SidekiqClientCLI do
     let(:settings) { double("settings") }
     let(:klass1) { "FirstWorker" }
     let(:klass2) { "SecondWorker" }
+    let(:client) { SidekiqClientCLI.new }
 
     before(:each) do
       settings.stub(:command_args).and_return [klass1, klass2]
+      client.settings = settings
+    end
+
+    it 'returns true if all #push_argument calls return true' do
+      client.stub(:push_argument).and_return(true)
+      client.push.should eq true
+    end
+
+    it 'returns false if at least one #push_argument call fails' do
+      client.should_receive(:push_argument).with('FirstWorker').and_return(true)
+      client.should_receive(:push_argument).with('SecondWorker').and_return(false)
+      client.push.should eq false
+    end
+  end
+
+  describe '#push_argument' do
+    let(:settings) { double("settings", :queue => default_queue, :retry => default_retry_option) }
+    let(:klass1) { "FirstWorker" }
+    let(:client) { SidekiqClientCLI.new }
+
+    before(:each) do
+      client.settings = settings
     end
 
     it "pushes the worker classes" do
-      settings.stub(:queue).and_return default_queue
-      settings.stub(:retry).and_return default_retry_option
-      @client.settings = settings
       Sidekiq::Client.should_receive(:push).with('class' => klass1,
                                                  'args' => [],
                                                  'queue' => default_queue,
                                                  'retry' => default_retry_option)
-      Sidekiq::Client.should_receive(:push).with('class' => klass2,
-                                                 'args' => [],
-                                                 'queue' => default_queue,
-                                                 'retry' => default_retry_option)
 
-      @client.push
+      client.__send__(:push_argument, klass1).should eq true
     end
 
     it "pushes the worker classes to the correct queue" do
       queue = "Queue"
       settings.stub(:queue).and_return queue
-      settings.stub(:retry).and_return default_retry_option
-      @client.settings = settings
 
       Sidekiq::Client.should_receive(:push).with('class' => klass1,
                                                  'args' => [],
                                                  'queue' => queue,
                                                  'retry' => default_retry_option)
-      Sidekiq::Client.should_receive(:push).with('class' => klass2,
-                                                 'args' => [],
-                                                 'queue' => queue,
-                                                 'retry' => default_retry_option)
 
-      @client.push
+      client.__send__(:push_argument, klass1).should eq true
     end
 
     it 'pushes the worker classes with retry disabled' do
       retry_option = false
-      settings.stub(:queue).and_return default_queue
       settings.stub(:retry).and_return retry_option
-      @client.settings = settings
 
       Sidekiq::Client.should_receive(:push).with('class' => klass1,
                                                  'args' => [],
                                                  'queue' => default_queue,
                                                  'retry' => retry_option)
-      Sidekiq::Client.should_receive(:push).with('class' => klass2,
-                                                 'args' => [],
-                                                 'queue' => default_queue,
-                                                 'retry' => retry_option)
 
-      @client.push
+      client.__send__(:push_argument, klass1).should eq true
     end
 
     it 'pushes the worker classes with a set retry number' do
       retry_attempts = 5
-      settings.stub(:queue).and_return default_queue
       settings.stub(:retry).and_return retry_attempts
-      @client.settings = settings
 
       Sidekiq::Client.should_receive(:push).with('class' => klass1,
                                                  'args' => [],
                                                  'queue' => default_queue,
                                                  'retry' => retry_attempts)
-      Sidekiq::Client.should_receive(:push).with('class' => klass2,
-                                                 'args' => [],
-                                                 'queue' => default_queue,
-                                                 'retry' => retry_attempts)
 
-      @client.push
+      client.__send__(:push_argument, klass1).should eq true
     end
 
     it "prints and continues if an exception is raised" do
-      settings.stub(:queue).and_return default_queue
-      settings.stub(:retry).and_return default_retry_option
-      @client.settings = settings
-
       Sidekiq::Client.should_receive(:push).with('class' => klass1,
                                                  'args' => [],
                                                  'queue' => default_queue,
                                                  'retry' => default_retry_option).and_raise
-      Sidekiq::Client.should_receive(:push).with('class' => klass2,
-                                                 'args' => [],
-                                                 'queue' => default_queue,
-                                                 'retry' => default_retry_option)
 
       out = IOHelper.stdout_read do
-        @client.push
+        client.__send__(:push_argument, klass1).should eq false
       end
       out.should include("Failed to push")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-client-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Adil Haritah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler