redis-dump 0.1.1 → 0.1.2

data/CHANGES.txt

@@ -1,5 +1,9 @@
 REDIS-DUMP, CHANGES
 
+#### 0.1.2 (2010-11-15) ###############################
+
+* ADDED: redis-report
+
 #### 0.1.1 (2010-11-15) ###############################
 
 * ADDED: redis-load and redis-dump executables

data/README.rdoc

@@ -4,6 +4,8 @@
 
 <b>NOTE: This is alpha software. DO NOT RELY ON IT FOR PRECIOUS THINGS!!</b>
 
+<b>ALSO: This is an unofficial tool.</b>
+
 
 == Usage
 
@@ -31,12 +33,12 @@ Here are examples of each datatype:
     {"db":0,"key":"hashkey","ttl":-1,"type":"hash","value":{"field_a":"value_a","field_b":"value_b","field_c":"value_c"},"size":42}
     {"db":0,"key":"listkey","ttl":-1,"type":"list","value":["value_0","value_1","value_2","value_0","value_1","value_2"],"size":42}
     {"db":0,"key":"setkey","ttl":-1,"type":"set","value":["value_2","value_0","value_1","value_3"],"size":28}
-        {"db":0,"key":"zsetkey","ttl":-1,"type":"zset","value":[["value_0","100"],["value_1","100"],["value_2","200"],["value_3","300"],["value_4","400"]],"size":50}
+    {"db":0,"key":"zsetkey","ttl":-1,"type":"zset","value":[["value_0","100"],["value_1","100"],["value_2","200"],["value_3","300"],["value_4","400"]],"size":50}
     {"db":0,"key":"stringkey","ttl":79,"type":"string","value":"stringvalue","size":11}
 
 === Important note about TTLs
 
-One of the purposes of redis-dump is the ability to restore the database to a known state. When you restore a redis database from a redis-dump file, <em>expires are reset to their values at the time the dump was created</em>. This is different from restoring from Redis' native .rdb or .aof files (expires are stored relative to the actual time they were set). 
+One of the purposes of redis-dump is the ability to restore the database to a known state. When you restore a redis database from a redis-dump file, <em>the expires are reset to their values at the time the dump was created</em>. This is different from restoring from Redis' native .rdb or .aof files (expires are stored relative to the actual time they were set). 
 
 
 == Installation
@@ -49,6 +51,7 @@ One of:
 == More Info
 
 * Codes[http://github.com/delano/redis-dump]
+* Docs[http://goldensword.ca/redis-dump/]
 
 
 == Credits

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :MAJOR: 0
 :MINOR: 1
-:PATCH: 1
+:PATCH: 2
 :BUILD: '001'

data/bin/redis-load

@@ -37,7 +37,7 @@ class Redis::Dump::CLI
   global :nosafe do
     Redis::Dump.safe = false
   end
-
+  
   before do |obj|
     obj.global.uri ||= 'redis://%s:%s' % [Redis::Dump.host, Redis::Dump.port]
     obj.global.uri = 'redis://' << obj.global.uri unless obj.global.uri.match(/^redis:\/\//)

data/bin/redis-report

@@ -0,0 +1,86 @@
+#!/usr/bin/ruby
+
+# = Redis-Dump
+# 
+#
+# Usage:
+# 
+#     $ redis-report -h
+#     $ redis-report
+#     $ redis-report -d 15
+#
+#--
+
+RD_HOME = File.expand_path File.join(File.dirname(__FILE__), '..')
+lib_dir = File.join(RD_HOME, 'lib')
+$:.unshift lib_dir  
+
+require 'redis/dump'
+require 'drydock'
+
+# Command-line interface for bin/redis-dump
+class Redis::Dump::CLI
+  extend Drydock
+  
+  default :report
+  trawler :report
+  
+  global :u, :uri, String, "Redis URI (e.g. redis://hostname[:port])"
+  global :d, :database, Integer, "Redis database (e.g. -d 15)"
+  global :v, :verbose, "Increase output" do 
+    @verbose ||= 0
+    @verbose += 1
+  end
+  global :V, :version, "Display version" do 
+    puts "Version: #{Redis::Dump::VERSION.to_s}"
+    exit 0
+  end
+  global :D, :debug do
+    Redis::Dump.debug = true
+  end
+  global :nosafe do
+    Redis::Dump.safe = false
+  end
+  
+  before do |obj|
+    obj.global.uri ||= 'redis://%s:%s' % [Redis::Dump.host, Redis::Dump.port]
+    obj.global.uri = 'redis://' << obj.global.uri unless obj.global.uri.match(/^redis:\/\//)
+    obj.global.database &&= obj.global.database.to_i
+    obj.global.database ||= (0..15)
+    Redis::Dump.ld " redis_uri: #{obj.global.uri} (#{obj.global.database})"
+  end
+  
+  usage "<dumpfile_full.json redis-load"
+  usage "<dumpfile_db15.json redis-load -d 15"
+  command :report do |obj|
+    rd = Redis::Dump.new obj.global.database, obj.global.uri
+    total_size, dbs = 0, {}
+    rd.report do |record|
+      puts record if obj.global.verbose >= 1
+      dbs[record['db']] ||= 0
+      dbs[record['db']] += record['size']
+      total_size += record['size']
+    end
+    puts dbs.keys.sort.collect { |db| "  db#{db}: #{dbs[db].to_bytes}" }
+    puts "total: #{total_size.to_bytes}"
+  end
+  
+end
+
+  
+begin
+  Drydock.run!(ARGV, STDIN) if Drydock.run? && !Drydock.has_run?
+rescue Drydock::ArgError, Drydock::OptError => ex
+  STDERR.puts ex.message
+  STDERR.puts ex.usage
+rescue Drydock::InvalidArgument => ex
+  STDERR.puts ex.message
+rescue Drydock::UnknownCommand => ex
+  STDERR.puts "Unknown command: %s" % ex.name
+rescue Interrupt
+  puts $/, "Exiting... "
+  exit 1
+rescue => ex
+  STDERR.puts "ERROR (#{ex.class.to_s}): #{ex.message}"
+  STDERR.puts ex.backtrace if Redis::Dump.debug
+end

data/lib/redis/dump.rb

@@ -147,20 +147,18 @@ class Redis
         this_redis.set key, str
       end
       
-      def value_string(this_redis, key)  this_redis.get key                                    end
-      def value_list  (this_redis, key)  this_redis.lrange key, 0, -1                          end
-      def value_set   (this_redis, key)  this_redis.smembers key                               end
-      def value_zset  (this_redis, key)  
-        zset = this_redis.zrange(key, 0, -1, :with_scores => true).tuple
-      end
-      def value_hash  (this_redis, key)  this_redis.hgetall(key)                               end
-      def value_none  (this_redis, key)  ''                                                end
-      def stringify_string(this_redis, key, v=nil)  (v || value_string(this_redis, key))                     end
-      def stringify_list  (this_redis, key, v=nil)  (v || value_list(this_redis, key)).join                  end
-      def stringify_set   (this_redis, key, v=nil)  (v || value_set(this_redis, key)).join                   end
-      def stringify_zset  (this_redis, key, v=nil)  (v || value_zset(this_redis, key)).flatten.compact.join  end
+      def value_string(this_redis, key)  this_redis.get key                                                       end
+      def value_list  (this_redis, key)  this_redis.lrange key, 0, -1                                             end
+      def value_set   (this_redis, key)  this_redis.smembers key                                                  end
+      def value_zset  (this_redis, key)  this_redis.zrange(key, 0, -1, :with_scores => true).tuple                end
+      def value_hash  (this_redis, key)  this_redis.hgetall(key)                                                  end
+      def value_none  (this_redis, key)  ''                                                                       end
+      def stringify_string(this_redis, key, v=nil)  (v || value_string(this_redis, key))                          end
+      def stringify_list  (this_redis, key, v=nil)  (v || value_list(this_redis, key)).join                       end
+      def stringify_set   (this_redis, key, v=nil)  (v || value_set(this_redis, key)).join                        end
+      def stringify_zset  (this_redis, key, v=nil)  (v || value_zset(this_redis, key)).flatten.compact.join       end
       def stringify_hash  (this_redis, key, v=nil)  (v || value_hash(this_redis, key)).to_a.flatten.compact.join  end
-      def stringify_none  (this_redis, key, v=nil)  (v || '')                                            end
+      def stringify_none  (this_redis, key, v=nil)  (v || '')                                                     end
     end
     extend Redis::Dump::ClassMethods
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redis-dump
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -53,6 +53,7 @@ email: delano@solutious.com
 executables: 
 - redis-dump
 - redis-load
+- redis-report
 extensions: []
 
 extra_rdoc_files: 
@@ -66,6 +67,7 @@ files:
 - VERSION.yml
 - bin/redis-dump
 - bin/redis-load
+- bin/redis-report
 - lib/redis/dump.rb
 - try/10_redis_dump_try.rb
 - try/db0.json