bin/redis-load in redis-dump-0.3.6 vs bin/redis-load in redis-dump-0.4.0

@@ -1,72 +1,78 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 # = Redis-Dump
-# 
 #
+#
 # Usage:
-# 
+#
 #     $ redis-load -h
 #     $ <dumpfile_full.json redis-load
 #     $ <dumpfile_db15.json redis-load -d 15
 #
 #--
 
 RD_HOME = File.expand_path File.join(File.dirname(__FILE__), '..')
 lib_dir = File.join(RD_HOME, 'lib')
-$:.unshift lib_dir  
+$:.unshift lib_dir
 
 require 'redis/dump'
 require 'drydock'
 
 # Command-line interface for bin/redis-dump
 class Redis::Dump::CLI
   extend Drydock
-  
+
   default :load
   trawler :load
-  
+
   global :u, :uri, String, "Redis URI (e.g. redis://hostname[:port])"
   global :d, :database, Integer, "Redis database (e.g. -d 15)"
+  global :a, :password, String, "Redis password (e.g. -a 'my@pass/word')" do |v|
+    Redis::Dump.password = v
+  end
   global :s, :sleep, Integer, "Sleep for S seconds after dumping (for debugging)"
+  global :b, :base64, "Decode key values from base64 (used with redis-dump -b)" do
+    Redis::Dump.with_base64 = true
+  end
   global :n, :no_check_utf8 do
     Redis::Dump.check_utf8 = false
   end
-  global :V, :version, "Display version" do 
+  global :V, :version, "Display version" do
     puts "redis-dump v#{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 ||= ENV['REDIS_URI']
     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})"
     Redis::Dump.ld "Process: #{$$}; Memory: #{Redis::Dump.memory_usage}" if Redis::Dump.debug
   end
-  
+
   after do |obj|
     Redis::Dump.ld "Process: #{$$}; Memory: #{Redis::Dump.memory_usage}" if Redis::Dump.debug
     sleep obj.global.sleep.to_i if obj.global.sleep
   end
-  
+
   usage "<dumpfile_full.json redis-load"
   usage "<dumpfile_db15.json redis-load -d 15"
   command :load do |obj|
     rd = Redis::Dump.new obj.global.database, obj.global.uri
     raise "Usage: cat dumpfile_db15.json | redis-load -d 15" if STDIN.tty?
     rd.load STDIN
   end
-  
+
   about "Add test data to redis"
   usage "redis-load populate -c 1000"
   usage "redis-load -d 1 populate -c 1000"
   option :c, :count, Integer, "Populate the redis db with <count> keys"
   option :FLUSH, "Flush the redis db before populating. THIS WILL DESTROY DATA."
@@ -95,11 +101,11 @@
       puts '%s: %s' % [redis.client.id, info["db#{redis.client.db}"]]
       puts 'Total used memory: %s' % [info['used_memory_human']]
       puts time.to_s
     end
   end
-  
+
   command :info do |obj|
     rd = Redis::Dump.new obj.global.database, obj.global.uri
     memory = nil
     rd.each_database do |redis|
       info = redis.info
@@ -109,10 +115,10 @@
     end
     puts 'Total used memory: %s' % [memory]
   end
 end
 
-  
+
 begin
   Drydock.run!(ARGV, STDIN) if Drydock.run? && !Drydock.has_run?
 rescue RuntimeError => ex
   STDERR.puts ex.message
 rescue Drydock::ArgError, Drydock::OptError => ex