sidekiq-spy 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c1eeb7d31dc8ab0fc09db02331d9116b847af2d
-  data.tar.gz: 6fcef234faf6569e59c79195bcd657a5751e82ed
+  metadata.gz: 97f98f4a68df8e56708112a5f61bb7e1ed08e1f7
+  data.tar.gz: bed604a760716cf97f6679324a2f8f0e2225bd5f
 SHA512:
-  metadata.gz: 5495713387031f47cdea190c120b51a1226a05b2cbf95e7dc6b83310f40bf0034c5dfc407d01445df23420953b4833d460fdb40dadde42d1af45d3079552d057
-  data.tar.gz: 868f3381360522b426f5ae2ac0565cc3e7860c55d0a6afb449fc2e2104c70529473fafbe49163ad0e9bb59a6dd5af0526f52f5821baa3456e6af98ce1b6c386d
+  metadata.gz: 88dcfc4471f4b926e529920da8d91edbd8d0c54ea5c443e8b9a166a971b8c47f3c0af805df3f27195972d9669b8a528121f14aeca944427d7a4c0ed73620bf13
+  data.tar.gz: c5a76d8c6371a232f328193edcb83b7d7d364e712643aa79397a6325659039e31186c942c64769f6739301fc6d8249cefd23e92a39504618f01b1e4f5395f5be

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.0
+2.1.1

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 before_install:
   - "gem install bundler -v '~> 1.5, != 1.5.0'"
 rvm:
+  - 2.1.1
   - 2.1.0
   - 2.0.0
   - 1.9.3

data/CHANGELOG.md

@@ -6,6 +6,11 @@ For many of commits by [tiredpixel](http://www.tiredpixel.com), the commit
 message provides information and examples.
 
 
+## 0.3.2
+
+- [#11] curses fix for bundle exec on Ruby 2.1.0 and earlier
+
+
 ## 0.3.1
 
 - major refactoring of data structures

data/README.md

@@ -42,6 +42,9 @@ Install using:
 
     $ gem install sidekiq-spy
 
+The default Ruby version supported is defined in `.ruby-version`.
+Any other versions supported are defined in `.travis.yml`.
+
 
 ## Usage
 

data/bin/sidekiq-spy

@@ -23,6 +23,14 @@ OptionParser.new do |opts|
     "Redis connection string URL"
   ) { |o| options[:url] = o }
   
+  opts.on("-U", "--username USERNAME",
+    "Redis username"
+  ) { |o| options[:username] = o }
+  
+  opts.on("-P", "--password PASSWORD",
+    "Redis password"
+  ) { |o| options[:password] = o }
+  
   opts.on("-h", "--host HOSTNAME",
     "Redis hostname (default: 127.0.0.1)"
   ) { |o| options[:host] = o }
@@ -85,6 +93,8 @@ end.parse!
 @app.configure do |c|
   params = [
     :url,
+    :username,
+    :password,
     :host,
     :port,
     :database,

data/lib/sidekiq-spy/config.rb

@@ -4,6 +4,8 @@ require 'uri'
 module SidekiqSpy
   class Config
     
+    attr_accessor :username
+    attr_accessor :password
     attr_accessor :host
     attr_accessor :port
     attr_accessor :database
@@ -11,6 +13,8 @@ module SidekiqSpy
     attr_accessor :interval
     
     def initialize
+      @username  = nil
+      @password  = nil
       @host      = '127.0.0.1'
       @port      = 6379
       @database  = 0
@@ -21,13 +25,24 @@ module SidekiqSpy
     def url=(url)
       url = URI.parse(url)
       
+      @username = url.user if url.user && !url.user.empty?
+      @password = url.password if url.password && !url.password.empty?
       @host     = url.host unless url.host.empty?
-      @port     = url.port unless url.path.empty?
+      @port     = url.port if url.port
       @database = url.path.tr('/', '').to_i unless url.path.empty?
     end
     
     def url
-      "redis://#{@host}:#{@port}/#{@database}"
+      url = URI('')
+      
+      url.scheme   = 'redis'
+      url.user     = @username
+      url.password = @password
+      url.host     = @host
+      url.port     = @port
+      url.path     = "/#{@database}"
+      
+      url.to_s
     end
     
   end

data/lib/sidekiq-spy/version.rb

@@ -1,5 +1,5 @@
 module SidekiqSpy
   
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
   
 end

data/sidekiq-spy.gemspec

@@ -18,24 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   
-  spec.extensions += [
-    'ext/mkrf_conf.rb',
-  ]
-  
   spec.add_dependency "sidekiq", "~> 2.15"
-  # spec.add_dependency "curses", "~> 1.0" # SEE: ext/mkrf_conf.rb
+  spec.add_dependency "curses", ">= 1.0.1"
   
   spec.add_development_dependency "bundler", "~> 1.3", "!= 1.5.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "mocha", "~> 0.14"
-  
-  if RUBY_VERSION >= '2.1'
-    # This is only for development; note that RUBY_VERSION is evaluated at
-    # build-time, not install-time. ext/mkrf_conf.rb takes care of the install-
-    # time dependency; this takes care of the development-time dependency.
-    # Note that this doesn't work in Gemfile, since :ruby_21 is not a valid
-    # platform in Ruby 1.9.3 .
-    # BEWARE: repetition; SEE: ext/mkrf_conf.rb
-    spec.add_development_dependency "curses", "~> 1.0"
-  end
 end

data/test/sidekiq-spy/config_test.rb

@@ -31,17 +31,51 @@ describe SidekiqSpy::Config do
     end
   end
   
-  describe "#url" do
+  describe "#url=" do
     before do
       @config = SidekiqSpy::Config.new
+    end
+    
+    it "sets connection string URL when db" do
+      @config.url = 'redis://da.example.com:237/15'
       
+      @config.url.must_equal 'redis://da.example.com:237/15'
+    end
+    
+    it "sets connection string URL when no db" do
+      @config.url = 'redis://da.example.com:237'
+      
+      @config.url.must_equal 'redis://da.example.com:237/0'
+    end
+    
+    it "sets connection string URL when auth" do
+      @config.url = 'redis://the:dolphins@da.example.com:238/5'
+      
+      @config.url.must_equal 'redis://the:dolphins@da.example.com:238/5'
+    end
+  end
+  
+  describe "#url" do
+    before do
+      @config = SidekiqSpy::Config.new
+    end
+    
+    it "returns connection string URL" do
       @config.host     = 'da.example.com'
       @config.port     = 237
       @config.database = 42
+      
+      @config.url.must_equal 'redis://da.example.com:237/42'
     end
     
-    it "returns connection string URL" do
-      @config.url.must_equal 'redis://da.example.com:237/42'
+    it "returns connection string URL when auth" do
+      @config.username = 'the'
+      @config.password = 'dolphins'
+      @config.host     = 'da.example.com'
+      @config.port     = 237
+      @config.database = 42
+      
+      @config.url.must_equal 'redis://the:dolphins@da.example.com:237/42'
     end
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-spy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - tiredpixel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.15'
+- !ruby/object:Gem::Dependency
+  name: curses
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +86,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: curses
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Sidekiq monitoring in the console. A bit like Sidekiq::Web. But without
   the web.
 email:
 - tp@tiredpixel.com
 executables:
 - sidekiq-spy
-extensions:
-- ext/mkrf_conf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -106,7 +105,6 @@ files:
 - README.md
 - Rakefile
 - bin/sidekiq-spy
-- ext/mkrf_conf.rb
 - lib/sidekiq-spy.rb
 - lib/sidekiq-spy/app.rb
 - lib/sidekiq-spy/config.rb
@@ -163,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sidekiq monitoring in the console.

data/ext/mkrf_conf.rb

@@ -1,27 +0,0 @@
-require 'rubygems/dependency_installer'
-
-# SEE: http://en.wikibooks.org/wiki/Ruby_Programming/RubyGems#How_to_install_different_versions_of_gems_depending_on_which_version_of_ruby_the_installee_is_using
-
-di = Gem::DependencyInstaller.new
-
-begin
-  if RUBY_VERSION >= '2.1'
-    puts "Installing curses because Ruby #{RUBY_VERSION}"
-    
-    # BEWARE: repetition; SEE: sidekiq-spy.gemspec
-    di.install "curses", "~> 1.0"
-  else
-    puts "Not installing curses because Ruby #{RUBY_VERSION}"
-  end
-rescue => e
-  warn "#{$0}: #{e}"
-  
-  exit!
-end
-
-puts "Writing fake Rakefile"
-
-# Write fake Rakefile for rake since Makefile isn't used
-File.open(File.join(File.dirname(__FILE__), 'Rakefile'), 'w') do |f|
-  f.write("task :default" + $/)
-end