rediscover 0.0.1 → 0.0.2

data/bin/rediscover

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
 
 $:.unshift(File.dirname(__FILE__) + '/../lib/')
-require 'rediscover'
-
-Rediscover::App.new.main_loop()
+require 'rediscover'

data/bin/rediscover.log

@@ -0,0 +1,18 @@
+# Logfile created on Tue Mar 09 19:31:21 -0600 2010 by logger.rb/22285
+E, [2010-03-09T19:31:24.476576 #20208] ERROR -- : Connection refused - connect(2) (Errno::ECONNREFUSED)
+/usr/lib/ruby/gems/1.8/gems/redis-0.1.2/lib/redis.rb:163:in `initialize'
+/usr/lib/ruby/gems/1.8/gems/redis-0.1.2/lib/redis.rb:163:in `new'
+/usr/lib/ruby/gems/1.8/gems/redis-0.1.2/lib/redis.rb:163:in `connect_to'
+/usr/lib/ruby/gems/1.8/gems/redis-0.1.2/lib/redis.rb:146:in `connect_to_server'
+./../lib/rediscover/app.rb:59:in `connect'
+./../lib/rediscover/frame/connect.rb:39:in `connect_button_evt'
+/usr/lib/ruby/gems/1.8/gems/wxruby-2.0.1-x86-linux/lib/wx/classes/evthandler.rb:133:in `call'
+/usr/lib/ruby/gems/1.8/gems/wxruby-2.0.1-x86-linux/lib/wx/classes/evthandler.rb:133:in `acquire_handler'
+./../lib/rediscover/app.rb:43:in `call'
+./../lib/rediscover/app.rb:43:in `process_event'
+./../lib/rediscover/app.rb:43:in `on_run'
+./../lib/rediscover/app.rb:43:in `on_run'
+./../lib/rediscover.rb:7:in `main_loop'
+./../lib/rediscover.rb:7
+rediscover:4:in `require'
+rediscover:4

data/lib/rediscover.rb

@@ -2,3 +2,7 @@ require 'rubygems'
 require 'wx'
 require 'redis'
 require 'rediscover/app'
+
+if not defined?(Ocra)
+  Rediscover::App.new.main_loop()
+end

data/lib/rediscover/app.rb

@@ -2,10 +2,23 @@ require 'logger'
 require 'forwardable'
 require 'rediscover/exception_handler'
 require 'rediscover/icon'
+require 'rediscover/key_list_ctrl'
+require 'rediscover/key_viewer'
+require 'rediscover/set_element_list'
+require 'rediscover/sorted_set_element_list'
+require 'rediscover/list_element_list'
 require 'rediscover/frame/connect'
 require 'rediscover/frame/main'
+require 'rediscover/frame/create_key'
 require 'rediscover/dialog/error'
 require 'rediscover/dialog/confirm'
+require 'rediscover/panel/server'
+require 'rediscover/panel/browser'
+require 'rediscover/panel/key_list'
+require 'rediscover/panel/string_view'
+require 'rediscover/panel/set_view'
+require 'rediscover/panel/sorted_set_view'
+require 'rediscover/panel/list_view'
 
 module Rediscover
   class App < Wx::App
@@ -18,7 +31,7 @@ module Rediscover
     attr_reader :logger, :host, :port, :redis
 
     def on_init
-      @logger = Logger.new(STDOUT)
+      @logger = Logger.new('rediscover.log')
       ExceptionHandler.set_logger(@logger)
       @host = DEFAULTS[:host]
       @port = DEFAULTS[:port]
@@ -26,6 +39,12 @@ module Rediscover
       display_connect
     end
 
+    def on_run
+      super
+    rescue Exception => e
+      @logger.fatal(e)
+    end	
+	
     def display_connect
       @connect_frame = Frame::Connect.new
     end
@@ -49,7 +68,6 @@ module Rediscover
         return
       end
 
-      @logger.info(@redis.to_s)
       display_main
     end
 

data/lib/rediscover/frame/main.rb

@@ -1,16 +1,3 @@
-require 'rediscover/panel/server'
-require 'rediscover/panel/browser'
-require 'rediscover/panel/key_list'
-require 'rediscover/key_viewer'
-require 'rediscover/set_element_list'
-require 'rediscover/sorted_set_element_list'
-require 'rediscover/list_element_list'
-require 'rediscover/panel/string_view'
-require 'rediscover/panel/set_view'
-require 'rediscover/panel/sorted_set_view'
-require 'rediscover/panel/list_view'
-require 'rediscover/frame/create_key'
-
 module Rediscover
   module Frame
     class Main < Wx::Frame

data/lib/rediscover/key_list_ctrl.rb

@@ -2,7 +2,7 @@ module Rediscover
   class KeyListCtrl < Wx::ListCtrl
     include Wx
 
-    COLS = %w(Key Value Type TTL)
+    COLS = %w(Key Value Type)
 
     def initialize(window)
       @redis = get_app.redis
@@ -15,9 +15,10 @@ module Rediscover
         insert_column(i += 1, name)
       end
       set_column_width(0, 200)
-      set_column_width(1, 200)
+      set_column_width(1, 300)
 
       evt_list_item_right_click self, :list_item_right_click_evt
+      evt_list_item_activated self, :list_item_activated_evt
     end
 
     def size
@@ -30,7 +31,6 @@ module Rediscover
 
     def update
       @keys = @on_get_keys_block.call()
-      @logger.debug("KeyListCtrl loaded #{size} keys")
       delete_all_items
       set_item_count(size)
       do_on_status_change
@@ -49,14 +49,18 @@ module Rediscover
         when COLS.index('Key') then @keys[item]
         when COLS.index('Value') then get_item_value(item)
         when COLS.index('Type') then get_item_type(item)
-        when COLS.index('TTL') then @redis.ttl(@keys[item]).to_s
       end
 
       return text || ''
     end
 
     def get_item_type(item)
-      @redis.type?(@keys[item])
+      if @cached_item.nil? || @cached_item[:index] != item
+        @cached_item = {}
+        @cached_item[:index] = item
+        @cached_item[:type] = @redis.type?(@keys[item])
+      end
+      @cached_item[:type]
     end
 
     def get_item_value(item)
@@ -68,6 +72,10 @@ module Rediscover
       end
     end
 
+    def list_item_activated_evt
+      do_on_edit(*get_selections)
+    end
+
     def list_item_right_click_evt(event)
       menu = get_ctx_menu_for_selections(get_selections)
       popup_menu(menu, event.get_point) if menu

data/lib/rediscover/panel/key_list.rb

@@ -1,5 +1,3 @@
-require 'rediscover/key_list_ctrl'
-
 module Rediscover
   module Panel
     class KeyList < Wx::Panel
@@ -10,7 +8,7 @@ module Rediscover
 
       def initialize(parent)
         @parent = parent
-        super(@parent, -1, :style => SUNKEN_BORDER)
+        super(@parent, -1)
 
         @redis = get_app.redis
         @logger = get_app.logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rediscover
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Chris Kite
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-07 00:00:00 -06:00
+date: 2010-03-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,7 @@ files:
 - lib/rediscover/icons/application.png
 - lib/rediscover/icons/add.png
 - lib/rediscover/app.rb
+- bin/rediscover.log
 - bin/rediscover
 has_rdoc: true
 homepage: http://github.com/chriskite/rediscover