dynport_tools 0.1.3 → 0.2.0

data/Gemfile

@@ -6,6 +6,7 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 gem 'nokogiri'
+gem 'redis'
 
 group :development do
   gem "rspec", "~> 2.3.0"

data/Gemfile.lock

@@ -18,6 +18,7 @@ GEM
     rake (0.9.2)
     rbx-require-relative (0.0.5)
     rcov (0.9.9)
+    redis (2.2.1)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -43,5 +44,6 @@ DEPENDENCIES
   jeweler (~> 1.6.4)
   nokogiri
   rcov
+  redis
   rspec (~> 2.3.0)
   ruby-debug

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/bin/redis_dumper

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require "dynport_tools/redis_dumper"
+
+DynportTools::RedisDumper.new.run_from_args(ARGV)

data/bin/xmldiff

@@ -1,12 +1,12 @@
-require "dynport_tools"
+#!/usr/bin/env ruby
 require "dynport_tools/differ"
-require "xml_file"
+require "dynport_tools/xml_file"
 
 file_a, file_b = ARGV[0,2]
 
 if file_a && File.exists?(file_a) && file_b && File.exists?(file_b)
-  a = XmlFile.new(file_a)
-  b = XmlFile.new(file_b)
+  a = DynportTools::XmlFile.new(file_a)
+  b = DynportTools::XmlFile.new(file_b)
   differ = DynportTools::Differ.new
   diff = differ.diff(a.nodes_hash, b.nodes_hash)
   puts differ.diff_to_message_lines(diff)

data/dynport_tools.gemspec

@@ -5,15 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynport_tools}
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-08-15}
-  s.default_executable = %q{xmldiff}
+  s.date = %q{2011-08-16}
   s.description = %q{Collection of various tools}
   s.email = %q{tobias.schwab@dynport.de}
-  s.executables = ["xmldiff"]
+  s.executables = ["xmldiff", "redis_dumper"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -28,17 +27,21 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "autotest/discover.rb",
+    "bin/redis_dumper",
     "bin/xmldiff",
     "dynport_tools.gemspec",
     "lib/dynport_tools.rb",
     "lib/dynport_tools/differ.rb",
+    "lib/dynport_tools/redis_dumper.rb",
+    "lib/dynport_tools/xml_file.rb",
     "lib/have_attributes.rb",
-    "lib/xml_file.rb",
     "spec/dynport_tools/differ_spec.rb",
+    "spec/dynport_tools/redis_dumper_spec.rb",
+    "spec/dynport_tools/xml_file_spec.rb",
     "spec/dynport_tools_spec.rb",
     "spec/fixtures/file_a.xml",
     "spec/spec_helper.rb",
-    "spec/xml_file_spec.rb"
+    "spec/xml_diff_spec.rb"
   ]
   s.homepage = %q{http://github.com/tobstarr/dynport_tools}
   s.licenses = ["MIT"]
@@ -51,6 +54,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
+      s.add_runtime_dependency(%q<redis>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -61,6 +65,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
     else
       s.add_dependency(%q<nokogiri>, [">= 0"])
+      s.add_dependency(%q<redis>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -72,6 +77,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<nokogiri>, [">= 0"])
+    s.add_dependency(%q<redis>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/lib/dynport_tools/redis_dumper.rb

@@ -0,0 +1,55 @@
+require "dynport_tools"
+require "redis"
+
+class DynportTools::RedisDumper
+  attr_accessor :redis
+  
+  def initialize(redis = nil)
+    self.redis = redis
+  end
+  
+  def zset_to_hash(key, window = 10_000)
+    hash = {}
+    offset = 0
+    while true
+      values = redis.zrevrange(key, offset, offset + (window - 1), :with_scores => true)
+      current_key = nil
+      values.each do |value|
+        if current_key.nil?
+          current_key = value
+        else
+          hash[current_key] = value
+          current_key = nil
+        end
+      end
+      offset += window
+      break if values.length < window * 2
+    end
+    hash
+  end
+  
+  def dump_hash(hash)
+    hash.each do |key, value|
+      puts [key, value].join("\t")
+    end
+  end
+  
+  def run_from_args(args)
+    host, port, key = args
+    if key
+      self.redis = Redis.new(:host => host, :port => port)
+      key_type = redis.type(key)
+      if key_type == "zset"
+        dump_hash(zset_to_hash(key))
+      else
+        puts "only zsets are supported for now"
+      end
+    else
+      print_usage
+    end
+  end
+
+  def print_usage
+    puts "USAGE: redis_dumper <redis_host> <redis_port> <key>"
+  end
+end

data/lib/{xml_file.rb → dynport_tools/xml_file.rb}

@@ -1,6 +1,6 @@
 require "nokogiri"
 
-class XmlFile
+class DynportTools::XmlFile
   attr_accessor :path
   
   def initialize(path)

data/lib/dynport_tools.rb

@@ -1,2 +1,7 @@
 module DynportTools
+  class << self
+    def xmldiff(file1, file2)
+      throw :print_usage
+    end
+  end
 end

data/spec/dynport_tools/redis_dumper_spec.rb

@@ -0,0 +1,70 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "dynport_tools/redis_dumper"
+
+describe "DynportTools::RedisDumper" do
+  let(:redis) { double("redis", :type => "zset") }
+  let(:dumper) { DynportTools::RedisDumper.new(redis) }
+  
+  describe "#initialize" do
+    it "can be initialized with redis" do
+      redis = double("redis")
+      dumper = DynportTools::RedisDumper.new(redis)
+      dumper.redis.should == redis
+    end
+  end
+  
+  describe "#zset_to_hash" do
+    it "calls zrevrange the correct number of times" do
+      redis.should_receive(:zrevrange).with("redis_key", 0, 1, :with_scores => true).and_return(["1", "2", "2", "4"])
+      redis.should_receive(:zrevrange).with("redis_key", 2, 3, :with_scores => true).and_return(["3", "2"])
+      dumper.zset_to_hash("redis_key", 2).should == { "1" => "2", "2" => "4", "3" => "2" }
+    end
+    
+    it "only calls once when window is big enough" do
+      redis.should_receive(:zrevrange).with("redis_key", 0, 9999, :with_scores => true).and_return(["1", "2", "2", "4"])
+      dumper.zset_to_hash("redis_key").should == { "1" => "2", "2" => "4" }
+    end
+  end
+  
+  describe "#dump_hash" do
+    it "calls puts the correct lines" do
+      dumper.should_receive(:puts).with("a\t1")
+      dumper.should_receive(:puts).with("b\t3")
+      dumper.dump_hash("a" => "1", "b" => "3")
+    end
+  end
+  
+  describe "#run_from_args" do
+    before(:each) do
+      Redis.stub!(:new).and_return redis
+      dumper.stub(:zset_to_hash).and_return({})
+      dumper.stub(:dump_hash).and_return true
+    end
+    
+    it "initializes a new redis instance" do
+      Redis.should_receive(:new).with(:host => "host", :port => "port").and_return redis
+      dumper.redis = nil
+      dumper.run_from_args(["host", "port", "key"])
+      dumper.redis.should == redis
+    end
+    
+    it "calls dump_hash with zset_to_hash when type is zset" do
+      redis.should_receive(:type).with("key").and_return "zset"
+      hash = { "a" => 1 }
+      dumper.should_receive(:zset_to_hash).and_return(hash)
+      dumper.should_receive(:dump_hash).with(hash)
+      dumper.run_from_args(["host", "port", "key"])
+    end
+    
+    it "prints a message when type is not zset" do
+      redis.should_receive(:type).with("key").and_return "hash"
+      dumper.should_receive(:puts).with("only zsets are supported for now")
+      dumper.run_from_args(["host", "port", "key"])
+    end
+    
+    it "calls print_usage when not enough parameters" do
+      dumper.should_receive(:print_usage)
+      dumper.run_from_args(["host", "port"])
+    end
+  end
+end

data/spec/{xml_file_spec.rb → dynport_tools/xml_file_spec.rb}

@@ -1,16 +1,16 @@
 require 'spec_helper'
-require "xml_file"
+require "dynport_tools/xml_file"
 
 FILE1 = ROOT.join("spec/fixtures/file_a.xml")
 FILE2 = ROOT.join("spec/fixtures/file_b.xml")
 
 
-describe XmlFile do
-  let(:file) { XmlFile.new(FILE1) }
+describe "DynportTools::XmlFile" do
+  let(:file) { DynportTools::XmlFile.new(FILE1) }
   
   describe "#initialize" do
     it "sets the correct path" do
-      XmlFile.new(FILE1).path.should == FILE1.to_s
+      DynportTools::XmlFile.new(FILE1).path.should == FILE1.to_s
     end
   end
   

data/spec/dynport_tools_spec.rb

@@ -1,4 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "DynportTools" do
+  describe "#xmldiff" do
+    it "raises print usage when first file does not exist" do
+      catch(:print_usage) do
+        DynportTools.xmldiff(nil, nil)
+        violated "print_usage should been thrown"
+      end
+    end
+  end
 end

data/spec/xml_diff_spec.rb

@@ -0,0 +1,4 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "XmlDiff" do
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynport_tools
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 +02:00
-default_executable: xmldiff
+date: 2011-08-16 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -33,9 +33,23 @@ dependencies:
   type: :runtime
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: redis
   prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,11 +61,11 @@ dependencies:
         - 0
         version: 2.3.0
   type: :development
-  requirement: *id002
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,11 +77,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  requirement: *id003
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,11 +93,11 @@ dependencies:
         - 4
         version: 1.6.4
   type: :development
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,11 +107,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  requirement: *id005
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: ZenTest
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -109,11 +123,11 @@ dependencies:
         - 0
         version: 4.5.0
   type: :development
-  requirement: *id006
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   name: autotest
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -123,11 +137,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  requirement: *id007
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   name: autotest-growl
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -137,11 +151,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  requirement: *id008
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,11 +165,12 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  requirement: *id009
+  requirement: *id010
 description: Collection of various tools
 email: tobias.schwab@dynport.de
 executables: 
 - xmldiff
+- redis_dumper
 extensions: []
 
 extra_rdoc_files: 
@@ -171,17 +186,21 @@ files:
 - Rakefile
 - VERSION
 - autotest/discover.rb
+- bin/redis_dumper
 - bin/xmldiff
 - dynport_tools.gemspec
 - lib/dynport_tools.rb
 - lib/dynport_tools/differ.rb
+- lib/dynport_tools/redis_dumper.rb
+- lib/dynport_tools/xml_file.rb
 - lib/have_attributes.rb
-- lib/xml_file.rb
 - spec/dynport_tools/differ_spec.rb
+- spec/dynport_tools/redis_dumper_spec.rb
+- spec/dynport_tools/xml_file_spec.rb
 - spec/dynport_tools_spec.rb
 - spec/fixtures/file_a.xml
 - spec/spec_helper.rb
-- spec/xml_file_spec.rb
+- spec/xml_diff_spec.rb
 has_rdoc: true
 homepage: http://github.com/tobstarr/dynport_tools
 licenses: