mock_redis 0.6.3 → 0.6.4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 0.6.4
+* Update INFO command for latest Redis 2.6 compatibility
+
 ### 0.6.3
 * Treat symbols as strings for keys
 * Add #reconnect method (no-op)

data/lib/mock_redis/database.rb

@@ -7,6 +7,7 @@ require 'mock_redis/string_methods'
 require 'mock_redis/zset_methods'
 require 'mock_redis/sort_method'
 require 'mock_redis/indifferent_hash'
+require 'mock_redis/info_method'
 
 class MockRedis
   class Database
@@ -16,6 +17,7 @@ class MockRedis
     include StringMethods
     include ZsetMethods
     include SortMethod
+    include InfoMethod
 
     attr_reader :data, :expire_times
 
@@ -89,203 +91,6 @@ class MockRedis
       'OK'
     end
 
-    def info
-      astats = [
-        ["2", "2699"],
-        ["6", "1"],
-        ["7", "1"],
-        ["8", "17197"],
-        ["9", "109875"],
-        ["10", "94348"],
-        ["11", "32580"],
-        ["12", "52347"],
-        ["13", "86475"],
-        ["14", "58175"],
-        ["15", "53408"],
-        ["16", "876949"],
-        ["17", "71157"],
-        ["18", "5104"],
-        ["19", "2705"],
-        ["20", "2903"],
-        ["21", "1024"],
-        ["22", "2546"],
-        ["23", "952"],
-        ["24", "186080"],
-        ["25", "611"],
-        ["26", "40936"],
-        ["27", "960"],
-        ["28", "1323"],
-        ["29", "14216"],
-        ["30", "52412"],
-        ["31", "21130"],
-        ["32", "47959"],
-        ["33", "6891"],
-        ["34", "9712"],
-        ["35", "3366"],
-        ["36", "5737"],
-        ["37", "11274"],
-        ["38", "8057"],
-        ["39", "2957"],
-        ["40", "51200"],
-        ["42", "8220"],
-        ["43", "8278"],
-        ["44", "6539"],
-        ["45", "764"],
-        ["47", "1018"],
-        ["48", "19250"],
-        ["49", "713"],
-        ["51", "51"],
-        ["53", "2"],
-        ["55", "3922"],
-        ["56", "153"],
-        ["57", "614"],
-        ["58", "1"],
-        ["59", "1775"],
-        ["61", "32865"],
-        ["63", "2530"],
-        ["64", "565"],
-        ["65", "1322"],
-        ["67", "1572"],
-        ["69", "1421"],
-        ["71", "1220"],
-        ["72", "241"],
-        ["73", "5432"],
-        ["74", "1122"],
-        ["75", "2555"],
-        ["77", "1539"],
-        ["78", "612"],
-        ["79", "902"],
-        ["81", "1678"],
-        ["83", "51"],
-        ["84", "612"],
-        ["85", "706"],
-        ["87", "410"],
-        ["88", "5435"],
-        ["89", "813"],
-        ["90", "612"],
-        ["93", "153"],
-        ["94", "612"],
-        ["96", "159"],
-        ["97", "306"],
-        ["99", "153"],
-        ["101", "456"],
-        ["103", "741"],
-        ["105", "447"],
-        ["107", "754"],
-        ["109", "414"],
-        ["111", "475"],
-        ["113", "757"],
-        ["115", "287"],
-        ["117", "420"],
-        ["118", "765"],
-        ["119", "642"],
-        ["120", "159"],
-        ["121", "926"],
-        ["122", "612"],
-        ["123", "251"],
-        ["125", "390"],
-        ["127", "354"],
-        ["128", "617"],
-        ["129", "528"],
-        ["131", "298"],
-        ["132", "612"],
-        ["133", "809"],
-        ["135", "244"],
-        ["136", "306"],
-        ["137", "504"],
-        ["139", "201"],
-        ["141", "1124"],
-        ["143", "139"],
-        ["144", "159"],
-        ["145", "1322"],
-        ["147", "410"],
-        ["149", "253"],
-        ["151", "304"],
-        ["153", "312"],
-        ["155", "249"],
-        ["157", "306"],
-        ["159", "348"],
-        ["161", "255"],
-        ["163", "458"],
-        ["165", "5"],
-        ["167", "306"],
-        ["168", "47"],
-        ["169", "214"],
-        ["171", "250"],
-        ["173", "5"],
-        ["177", "10"],
-        ["179", "158"],
-        ["181", "5"],
-        ["183", "10"],
-        ["185", "51"],
-        ["187", "49"],
-        ["191", "5"],
-        ["192", "47"],
-        ["193", "51"],
-        ["197", "112"],
-        ["199", "5"],
-        ["201", "5"],
-        ["203", "5"],
-        ["209", "5"],
-        ["213", "51"],
-        ["217", "102"],
-        ["225", "357"],
-        ["229", "51"],
-        ["233", "204"],
-        ["237", "51"],
-        ["239", "1"],
-        ["247", "46"],
-        ["255", "102"],
-        [">=256", "6201"],
-      ]
-
-      {
-        "allocation_stats" => astats.map {|(a,b)| "#{a}=#{b}"}.join(','),
-        "aof_enabled" => "0",
-        "arch_bits" => "64",
-        "bgrewriteaof_in_progress" => "0",
-        "bgsave_in_progress" => "0",
-        "blocked_clients" => "0",
-        "changes_since_last_save" => "0",
-        "client_biggest_input_buf" => "0",
-        "client_longest_output_list" => "0",
-        "connected_clients" => "1",
-        "connected_slaves" => "0",
-        "db0" => "keys=8,expires=0",
-        "evicted_keys" => "0",
-        "expired_keys" => "0",
-        "hash_max_zipmap_entries" => "512",
-        "hash_max_zipmap_value" => "64",
-        "keyspace_hits" => "62645",
-        "keyspace_misses" => "29757",
-        "last_save_time" => "1310596333",
-        "loading" => "0",
-        "lru_clock" => "1036434",
-        "mem_fragmentation_ratio" => "2.04",
-        "multiplexing_api" => "kqueue",
-        "process_id" => "14508",
-        "pubsub_channels" => "0",
-        "pubsub_patterns" => "0",
-        "redis_git_dirty" => "0",
-        "redis_git_sha1" => "00000000",
-        "redis_version" => "2.2.11",
-        "role" => "master",
-        "total_commands_processed" => "196800",
-        "total_connections_received" => "4359",
-        "uptime_in_days" => "0",
-        "uptime_in_seconds" => "84215",
-        "use_tcmalloc" => "0",
-        "used_cpu_sys" => "5.54",
-        "used_cpu_sys_childrens" => "0.00",
-        "used_cpu_user" => "7.65",
-        "used_cpu_user_childrens" => "0.02",
-        "used_memory" => "931456",
-        "used_memory_human" => "909.62K",
-        "used_memory_rss" => "1904640",
-        "vm_enabled" => "0",
-      }
-    end
-
     def keys(format = '*')
       data.keys.grep(redis_pattern_to_ruby_regex(format))
     end

data/lib/mock_redis/info_method.rb

@@ -0,0 +1,159 @@
+class MockRedis
+  module InfoMethod
+    SERVER_INFO = {
+      "arch_bits" => "64",
+      "gcc_version" => "4.2.1",
+      "lru_clock" => "1036434",
+      "multiplexing_api" => "kqueue",
+      "os" => "Darwin 12.2.1 x86_64",
+      "process_id" => "14508",
+      "redis_git_dirty" => "0",
+      "redis_git_sha1" => "00000000",
+      "redis_mode" => "standalone",
+      "redis_version" => "2.6.10",
+      "run_id" => "1f3f7af2fc11eb68011eb43e154adce125c85e9a",
+      "tcp_port" => "6379",
+      "uptime_in_days" => "0",
+      "uptime_in_seconds" => "84215"
+    }
+
+    CLIENTS_INFO = {
+      "blocked_clients" => "0",
+      "client_biggest_input_buf" => "0",
+      "client_longest_output_list" => "0",
+      "connected_clients" => "1"
+    }
+
+    MEMORY_INFO = {
+      "mem_allocator" => "libc",
+      "mem_fragmentation_ratio" => "2.04",
+      "used_memory" => "931456",
+      "used_memory_human" => "909.62K",
+      "used_memory_lua" => "31744",
+      "used_memory_peak" => "1005424",
+      "used_memory_peak_human" => "981.86K",
+      "used_memory_rss" => "1904640"
+    }
+
+    PERSISTENCE_INFO = {
+      "aof_current_rewrite_time_sec" => "-1",
+      "aof_enabled" => "0",
+      "aof_last_bgrewrite_status" => "ok",
+      "aof_last_rewrite_time_sec" => "-1",
+      "aof_rewrite_in_progress" => "0",
+      "aof_rewrite_scheduled" => "0",
+      "loading" => "0",
+      "rdb_bgsave_in_progress" => "0",
+      "rdb_changes_since_last_save" => "0",
+      "rdb_current_bgsave_time_sec" => "-1",
+      "rdb_last_bgsave_status" => "ok",
+      "rdb_last_bgsave_time_sec" => "-1",
+      "rdb_last_save_time" => "1361423635"
+    }
+
+    STATS_INFO = {
+      "evicted_keys" => "0",
+      "expired_keys" => "0",
+      "instantaneous_ops_per_sec" => "0",
+      "keyspace_hits" => "62645",
+      "keyspace_misses" => "29757",
+      "latest_fork_usec" => "0",
+      "pubsub_channels" => "0",
+      "pubsub_patterns" => "0",
+      "rejected_connections" => "0",
+      "total_commands_processed" => "196800",
+      "total_connections_received" => "4359"
+    }
+
+    REPLICATION_INFO = {
+      "role" => "master",
+      "connected_slaves" => "0"
+    }
+
+    CPU_INFO = {
+      "used_cpu_sys" => "5.54",
+      "used_cpu_sys_childrens" => "0.00",
+      "used_cpu_user" => "7.65",
+      "used_cpu_user_childrens" => "0.02"
+    }
+
+    KEYSPACE_INFO = {
+      "db0" => "keys=8,expires=0"
+    }
+
+    # The Ruby Reids client returns commandstats differently when it's called as
+    # "INFO commandstats".
+    COMMAND_STATS_SOLO_INFO = {
+      "auth"=>{"calls"=>"572501", "usec"=>"2353163", "usec_per_call"=>"4.11"},
+      "client"=>{"calls"=>"1", "usec"=>"80", "usec_per_call"=>"80.00"},
+      "config"=>{"calls"=>"4", "usec"=>"71", "usec_per_call"=>"17.75"},
+      "flushall"=>{"calls"=>"2097790", "usec"=>"27473940655", "usec_per_call"=>"13096.61"},
+      "flushdb"=>{"calls"=>"692247", "usec"=>"2235143397", "usec_per_call"=>"3228.82"},
+      "get"=>{"calls"=>"185724", "usec"=>"604479", "usec_per_call"=>"3.25"},
+      "info"=>{"calls"=>"965566", "usec"=>"229377331", "usec_per_call"=>"237.56"},
+      "keys"=>{"calls"=>"16591", "usec"=>"917676", "usec_per_call"=>"55.31"},
+      "llen"=>{"calls"=>"39", "usec"=>"150", "usec_per_call"=>"3.85"},
+      "ping"=>{"calls"=>"697509", "usec"=>"3836044", "usec_per_call"=>"5.50"},
+      "rpush"=>{"calls"=>"2239810", "usec"=>"15013298", "usec_per_call"=>"6.70"},
+      "sadd"=>{"calls"=>"13950129156", "usec"=>"30126628979", "usec_per_call"=>"2.16"},
+      "scard"=>{"calls"=>"153929", "usec"=>"726596", "usec_per_call"=>"4.72"},
+      "set"=>{"calls"=>"6975081982", "usec"=>"16453671451", "usec_per_call"=>"2.36"},
+      "slowlog"=>{"calls"=>"136", "usec"=>"16815", "usec_per_call"=>"123.64"},
+      "smembers"=>{"calls"=>"58", "usec"=>"231", "usec_per_call"=>"3.98"},
+      "sunionstore"=>{"calls"=>"4185027", "usec"=>"11762454022", "usec_per_call"=>"2810.60"}
+    }
+
+    COMMAND_STATS_COMBINED_INFO = {
+      "cmdstat_auth"=>"calls=572506,usec=2353182,usec_per_call=4.11",
+      "cmdstat_client"=>"calls=1,usec=80,usec_per_call=80.00",
+      "cmdstat_config"=>"calls=4,usec=71,usec_per_call=17.75",
+      "cmdstat_flushall"=>"calls=2097790,usec=27473940655,usec_per_call=13096.61",
+      "cmdstat_flushdb"=>"calls=692247,usec=2235143397,usec_per_call=3228.82",
+      "cmdstat_get"=>"calls=185724,usec=604479,usec_per_call=3.25",
+      "cmdstat_info"=>"calls=965571,usec=229378327,usec_per_call=237.56",
+      "cmdstat_keys"=>"calls=16591,usec=917676,usec_per_call=55.31",
+      "cmdstat_llen"=>"calls=39,usec=150,usec_per_call=3.85",
+      "cmdstat_ping"=>"calls=697509,usec=3836044,usec_per_call=5.50",
+      "cmdstat_rpush"=>"calls=2239810,usec=15013298,usec_per_call=6.70",
+      "cmdstat_sadd"=>"calls=13950129156,usec=30126628979,usec_per_call=2.16",
+      "cmdstat_scard"=>"calls=153929,usec=726596,usec_per_call=4.72",
+      "cmdstat_set"=>"calls=6975081982,usec=16453671451,usec_per_call=2.36",
+      "cmdstat_slowlog"=>"calls=136,usec=16815,usec_per_call=123.64",
+      "cmdstat_smembers"=>"calls=58,usec=231,usec_per_call=3.98",
+      "cmdstat_sunionstore"=>"calls=4185027,usec=11762454022,usec_per_call=2810.60"
+    }
+
+    DEFAULT_INFO = [
+      SERVER_INFO,
+      CLIENTS_INFO,
+      MEMORY_INFO,
+      PERSISTENCE_INFO,
+      STATS_INFO,
+      REPLICATION_INFO,
+      CPU_INFO,
+      KEYSPACE_INFO
+    ].inject({}){|memo,info| memo.merge(info)}
+
+    ALL_INFO = [
+      DEFAULT_INFO,
+      COMMAND_STATS_COMBINED_INFO
+    ].inject({}){|memo,info| memo.merge(info)}
+
+    def info( section = :default )
+      case section
+        when :default ;      DEFAULT_INFO
+        when :all ;          ALL_INFO
+        when :server ;       SERVER_INFO
+        when :clients ;      CLIENTS_INFO
+        when :memory ;       MEMORY_INFO
+        when :persistence ;  PERSISTENCE_INFO
+        when :stats ;        STATS_INFO
+        when :replication ;  REPLICATION_INFO
+        when :cpu ;          CPU_INFO
+        when :keyspace ;     KEYSPACE_INFO
+        when :commandstats ; COMMAND_STATS_SOLO_INFO
+      end
+    end
+  end
+end
+

data/lib/mock_redis/version.rb

@@ -1,3 +1,3 @@
 class MockRedis
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

data/spec/commands/info_spec.rb

@@ -1,13 +1,62 @@
 require 'spec_helper'
 
 describe '#info [mock only]' do
-  before { @info = @redises.mock.info }
+  let(:redis) { @redises.mock }
 
   it "responds with a config hash" do
-    @info.should be_a(Hash)
+    redis.info.should be_a(Hash)
   end
 
-  it "has some data in it" do
-    @info.keys.length.should > 0
+  it "gets default set of info" do
+    info = redis.info
+    info["arch_bits"].should be_a(String)
+    info["connected_clients"].should be_a(String)
+    info["aof_rewrite_scheduled"].should be_a(String)
+    info["used_cpu_sys"].should be_a(String)
+  end
+
+  it "gets all info" do
+    info = redis.info(:all)
+    info["arch_bits"].should be_a(String)
+    info["connected_clients"].should be_a(String)
+    info["aof_rewrite_scheduled"].should be_a(String)
+    info["used_cpu_sys"].should be_a(String)
+    info["cmdstat_slowlog"].should be_a(String)
+  end
+
+  it "gets server info" do
+    redis.info(:server)["arch_bits"].should be_a(String)
+  end
+
+  it "gets clients info" do
+    redis.info(:clients)["connected_clients"].should be_a(String)
+  end
+
+  it "gets memory info" do
+    redis.info(:memory)["used_memory"].should be_a(String)
+  end
+
+  it "gets persistence info" do
+    redis.info(:persistence)["aof_rewrite_scheduled"].should be_a(String)
+  end
+
+  it "gets stats info" do
+    redis.info(:stats)["keyspace_hits"].should be_a(String)
+  end
+
+  it "gets replication info" do
+    redis.info(:replication)["role"].should be_a(String)
+  end
+
+  it "gets cpu info" do
+    redis.info(:cpu)["used_cpu_sys"].should be_a(String)
+  end
+
+  it "gets keyspace info" do
+    redis.info(:keyspace)["db0"].should be_a(String)
+  end
+
+  it "gets commandstats info" do
+    redis.info(:commandstats)["sunionstore"]["usec"].should be_a(String)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_redis
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -83,6 +83,7 @@ files:
 - lib/mock_redis/expire_wrapper.rb
 - lib/mock_redis/hash_methods.rb
 - lib/mock_redis/indifferent_hash.rb
+- lib/mock_redis/info_method.rb
 - lib/mock_redis/list_methods.rb
 - lib/mock_redis/multi_db_wrapper.rb
 - lib/mock_redis/pipelined_wrapper.rb