sidekiq-client-cli 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGIzNWE2MTRhMTM0ODcxZDQ0YjlmYTZiMmQxYTI3OThmOGJmMWM0Ng==
+    NTgyYzgzOGEyYzEwMGJhM2FiNGNjZDE0NDFmN2U4ZjQ2YTIzMGUxYg==
   data.tar.gz: !binary |-
-    OWRkMmRkMmE3OTcyY2U1NTE0MzE3MjlhZThkNjA3ZGZkMWI5MTQ3MA==
+    ZTdiZDI4YTNkYTZlM2Y4ZWJjOTM1MzU4ZDg1MWQyMzNmNTQyODQ5NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDAyNTZmMTc4NDllZmU5NTdiMjBmNTk3ZWVhMWNkNjk4MjcxODc5YzcyYmZk
-    Mzg3OTllMTdlYzZkOTczZWZjMWQwOTA4NTM5NWJlNGMxYTQ5ZjZkOGU4OTk4
-    NWUzZWNjZjI1YjU1ZGUxZGQ2ZTAzNTljZmU4YjM3OTQ1YmUwNzg=
+    NWVkODk5YzcwMDE2Y2Y0NTY4NmY4Mjc3NmRmMDBmNDk5ZDBhYTBmNjVlMDZh
+    MGUzNGRlOGU1YTIyYzdhYmM2YzhkYzExNWE0ZGE2ZGMyZGI5ZTJkYWYxMWY0
+    MWMwZDJkMmMyZDEyYzRiN2U5MWIwOWJjMzNjYWE0NDhkNjFiMGU=
   data.tar.gz: !binary |-
-    MzdjNWNhM2QyNGYyMjU2Y2RlY2U3NTQ3NzZiM2I2MWNiNTQ0MGIxMjhkZWRj
-    ZjE3NjhjOTZiZTViNTNiM2ExOGQ2Yjc5NjY4YTg0NWZjMDczOTY0Yjc5ZTU0
-    MDAyYWJjYmExZTdlOWZkZTdhMDFkOGUzZWU3M2QwMTBhMGIwZTY=
+    NzdmMDU3Y2YyMTE0N2U0NTZmMTVkMGM2Y2MzYjAwYjY2MmNkYjVhY2QzOTM4
+    NTAzNmQ0ZWE0NWQxMzI3N2NiMTRkNzZmYTE4ZjZiM2I3Y2I5OTk5NjEwMTQ2
+    NDk2NzFjOWY3MzE1MGMxNzM2ZGU1ZWIzZjQ1ZmMxZjM5ZmUzODk=

data/README.md

@@ -19,6 +19,10 @@ Or install it yourself as:
 
     $ gem install sidekiq-client-cli
 
+## Dependencies
+
+Requires sidekiq >= 2.15.0
+
 ## Usage
 
 Push worker classes to Sidekiq :

data/lib/sidekiq_client_cli.rb

@@ -5,18 +5,13 @@ 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
 
-  def initialize
-
-  end
-
   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"
+      option :queue, :short => :q, :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|
@@ -30,7 +25,10 @@ class SidekiqClientCLI
 
   def run
     # load the config file
-    load settings.config_path if File.exists? settings.config_path
+    load settings.config_path if File.exists?(settings.config_path)
+
+    # set queue if not given
+    settings.queue ||= Sidekiq.default_worker_options['queue']
 
     self.send settings.command.to_sym
   end
@@ -45,5 +43,5 @@ class SidekiqClientCLI
       end
     end
   end
-end
 
+end

data/lib/sidekiq_client_cli/version.rb

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

data/sidekiq-client-cli.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"
 
-  spec.add_dependency "sidekiq"
+  spec.add_dependency "sidekiq", "~> 2.15.0"
   spec.add_dependency "cli"
 
 end

data/spec/sidekiq_client_cli_spec.rb

@@ -1,9 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe SidekiqClientCLI do
-  before(:each) do
-    @client = SidekiqClientCLI.new
-  end
+  let(:default_queue) { Sidekiq.default_worker_options['queue'] }
+
+  before(:each) { @client = SidekiqClientCLI.new }
 
   describe "ARGV parsing" do
     it "fails if no command" do
@@ -46,7 +46,7 @@ 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
+      @client.settings.queue.should eq nil
     end
 
     it "parses push with a configuration file" do
@@ -56,7 +56,7 @@ describe SidekiqClientCLI do
       @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
+      @client.settings.queue.should eq nil
     end
 
     it "parses push with a queue" do
@@ -66,7 +66,7 @@ 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 "my_queue"
+      @client.settings.queue.should eq "my_queue"
     end
 
   end
@@ -77,6 +77,7 @@ describe SidekiqClientCLI do
       config_path = "sidekiq.conf"
       @client.settings.stub(:config_path).and_return(config_path)
       @client.settings.stub(:command).and_return("mycommand")
+      @client.settings.stub(:queue).and_return(default_queue)
       @client.should_receive(:mycommand)
 
       File.should_receive(:exists?).with(config_path).and_return true
@@ -90,6 +91,7 @@ describe SidekiqClientCLI do
       settings = double("settings")
       settings.stub(:config_path).and_return(config_path)
       settings.stub(:command).and_return("mycommand")
+      settings.stub(:queue).and_return(default_queue)
 
       @client.settings = settings
       @client.should_receive(:mycommand)
@@ -108,17 +110,17 @@ describe SidekiqClientCLI do
       klass2 = "SecondWorker"
       settings = double("settings")
       settings.stub(:command_args).and_return [klass1, klass2]
-      settings.stub(:queue).and_return SidekiqClientCLI::DEFAULT_QUEUE
+      settings.stub(:queue).and_return default_queue
       @client.settings = settings
 
-      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)
+      Sidekiq::Client.should_receive(:push).with('class' => klass1, 'args' => [], 'queue' => default_queue)
+      Sidekiq::Client.should_receive(:push).with('class' => klass2, 'args' => [], 'queue' => default_queue)
 
       @client.push
     end
 
     it "pushes the worker classes to the correct queue" do
-			queue = "Queue"
+      queue = "Queue"
       klass1 = "FirstWorker"
       klass2 = "SecondWorker"
       settings = double("settings")
@@ -137,11 +139,11 @@ describe SidekiqClientCLI do
       klass2 = "SecondWorker"
       settings = double("settings")
       settings.stub(:command_args).and_return [klass1, klass2]
-      settings.stub(:queue).and_return SidekiqClientCLI::DEFAULT_QUEUE
+      settings.stub(:queue).and_return 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)
+      Sidekiq::Client.should_receive(:push).with('class' => klass1, 'args' => [], 'queue' => default_queue).and_raise
+      Sidekiq::Client.should_receive(:push).with('class' => klass2, 'args' => [], 'queue' => default_queue)
 
       out = IOHelper.stdout_read do
         @client.push

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-client-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Adil Haritah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.15.0
 - !ruby/object:Gem::Dependency
   name: cli
   requirement: !ruby/object:Gem::Requirement