redis-ui 0.1.1 → 0.1.3

data/Gemfile

@@ -1,3 +1,2 @@
 source :rubygems
-
 gemspec

data/bin/redis-ui

@@ -9,10 +9,13 @@ end
 
 require 'redis-ui'
 
-Vegas::Runner.new(RedisUI::Server, 'redis-ui') do |runner, opts, app|
+Vegas::Runner.new(RedisUI::Server, 'redis-ui', {
+  :before_run => lambda {|v|
+    RedisUI.redis=v.args.first unless v.args.first.nil?
+  }
+}) do |runner, opts, app|
   opts.on('-N NAMESPACE', "--namespace NAMESPACE", "set the Redis namespace") {|namespace|
     runner.logger.info "Using Redis namespace '#{namespace}'"
     RedisUI.redis.namespace = namespace
   }
-end
- 
+end 

data/lib/redis-ui.rb

@@ -12,14 +12,38 @@ require 'sinatra/respond_to'
 require 'erb'
 
 module RedisUI
+  extend self
+  
+  # hostname:port
+  # redis://hostname:port
+  def redis=(server)    
+    case server
+    when String
+      if server =~ /redis\:\/\//
+        redis = Redis.connect(:url => server, :thread_safe => true)
+      else
+        server, namespace = server.split('/', 2)
+        host, port, db = server.split(':')
+        redis = Redis.new(:host => host, :port => port,
+          :thread_safe => true, :db => db)
+      end
+      namespace ||= ""
+      
+      @redis = Redis::Namespace.new(namespace, :redis => redis)
     
-  # Returns the current Redis connection. If none has been created, will
-  # create a new one.
-  def self.redis
+    when Redis::Namespace
+      @redis = server
+    else
+      @redis = Redis::Namespace.new(@namespace, :redis => server)
+    end
+  end
+
+  def redis
     return @redis if @redis
-    @redis = Redis.new
+    self.redis = Redis.respond_to?(:connect) ? Redis.connect : "localhost:6379"
+    self.redis
   end
-  
+   
   
   class Server < Sinatra::Base
     register Sinatra::RespondTo

data/lib/redis-ui/version.rb

@@ -1,5 +1,5 @@
 module Redis
   module Ui
-    VERSION = "0.1.1"
+    VERSION = "0.1.3"
   end
 end

data/redis-ui.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'redis-namespace', '~> 1.0.2'
   s.add_runtime_dependency 'sinatra'
   s.add_runtime_dependency 'sinatra-respond_to'
+  s.add_runtime_dependency 'vegas'
 end

metadata

@@ -1,122 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: redis-ui
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.1.3
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - supermatter
 - jwelshiv
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-23 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-10 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bacon
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70244677408460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70244677408460
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70244677408020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hiredis
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70244677408020
+- !ruby/object:Gem::Dependency
+  name: hiredis
+  requirement: &70244677407420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.3.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: redis-namespace
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70244677407420
+- !ruby/object:Gem::Dependency
+  name: redis-namespace
+  requirement: &70244677406660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70244677406660
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70244677406000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70244677406000
+- !ruby/object:Gem::Dependency
   name: sinatra-respond_to
+  requirement: &70244677405020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70244677405020
+- !ruby/object:Gem::Dependency
+  name: vegas
+  requirement: &70244677386880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *70244677386880
 description: View and manage redis store
-email: 
+email:
 - james@supermatter.com
-executables: 
+executables:
 - redis-ui
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -140,40 +120,31 @@ files:
 - redis-ui.gemspec
 - test/helper.rb
 - test/test_redis_ui.rb
-has_rdoc: true
 homepage: http://github.com/jwelshiv/redis-ui
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: redis-ui
-rubygems_version: 1.4.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Sinatra backed redis ui
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_redis_ui.rb