flare-tools 0.4.5.1 → 0.5.0

data/test/{test/integration → integration}/index_server_test.rb

@@ -2,7 +2,7 @@
 # -*- coding: utf-8; -*-
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.dirname(__FILE__)+"/../../../lib")
+$LOAD_PATH.unshift(File.dirname(__FILE__)+"/../../lib")
 
 require 'test/unit'
 require 'flare/tools.rb'

data/test/{test/integration → integration}/node_test.rb

@@ -2,7 +2,7 @@
 # -*- coding: utf-8; -*-
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.dirname(__FILE__)+"/../../../lib")
+$LOAD_PATH.unshift(File.dirname(__FILE__)+"/../../lib")
 
 require 'test/unit'
 require 'flare/tools'

data/test/{test/integration → integration}/partition_test.rb

@@ -2,7 +2,7 @@
 # -*- coding: utf-8; -*- 
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.dirname(__FILE__)+"/../../../lib")
+$LOAD_PATH.unshift(File.dirname(__FILE__)+"/../../lib")
 
 require 'test/unit'
 require 'flare/tools'
@@ -92,15 +92,16 @@ class PartitionTest < Test::Unit::TestCase
     }
     sleep 1 # XXX
     @flare_cluster.wait_for_ready
+
+    @nodes = @node_servers.map {|node| node.open}
+    @wait = 0.005
     @config = {
       :command => 'dummy',
-      :index_server_hostname => @flare_cluster.indexname,
-      :index_server_port => @flare_cluster.indexport,
       :dry_run => false,
       :timeout => 10
     }
-    @nodes = @node_servers.map {|node| node.open}
-    @wait = 0.005
+    @index_server_hostname = @flare_cluster.indexname
+    @index_server_port = @flare_cluster.indexport
   end
 
   def teardown

data/test/{test/integration → integration}/proxy_test.rb

@@ -2,7 +2,7 @@
 # -*- coding: utf-8; -*- 
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.dirname(__FILE__)+"/../../../lib")
+$LOAD_PATH.unshift(File.dirname(__FILE__)+"/../../lib")
 
 require 'test/unit'
 require 'flare/tools'
@@ -17,13 +17,14 @@ class ProxyTest < Test::Unit::TestCase
     @node_servers = ['node1', 'node2', 'node3'].map {|name| @flare_cluster.create_node(name)}
     sleep 1 # XXX
     @flare_cluster.wait_for_ready
+
     @config = {
       :command => 'dummy',
-      :index_server_hostname => @flare_cluster.indexname,
-      :index_server_port => @flare_cluster.indexport,
       :dry_run => false,
       :timeout => 10
     }
+    @index_server_hostname = @flare_cluster.indexname
+    @index_server_port = @flare_cluster.indexport
   end
 
   def teardown

data/test/{test/integration → integration}/stats_test.rb

@@ -2,7 +2,7 @@
 # -*- coding: utf-8; -*-
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.dirname(__FILE__)+"/../../../lib")
+$LOAD_PATH.unshift(File.dirname(__FILE__)+"/../../lib")
 
 require 'test/unit'
 require 'flare/tools.rb'

data/test/integration/subcommands.rb

@@ -0,0 +1,128 @@
+
+require 'test/unit'
+require 'flare/tools'
+require 'flare/tools/cli'
+require 'flare/test/cluster'
+
+module Subcommands
+
+  S_OK = 0
+  S_NG = 1
+
+  def instantiate(cls, args)
+    subc = cls.new
+    subc.setup
+    subc.optp.parse!(args)
+    subc
+  end
+
+  def ping(*args)
+    subc = instantiate(Flare::Tools::Cli::Ping, args)
+    subc.execute(@config.merge({:command => 'ping'}), args)
+  end
+  
+  def list(*args)
+    args << "--index-server" << @index_server_hostname
+    args << "--index-server-port" << @index_server_port.to_s unless @index_server_port.nil?
+    subc = instantiate(Flare::Tools::Cli::List, args)
+    subc.execute(@config.merge({:command => 'list'}), args)
+  end
+
+  def stats(*args)
+    args << "--index-server" << @index_server_hostname
+    args << "--index-server-port" << @index_server_port.to_s unless @index_server_port.nil?
+    subc = instantiate(Flare::Tools::Cli::Stats, args)
+    subc.execute(@config.merge({:command => 'stats'}), args)
+  end
+
+  def down(*args)
+    args << "--index-server" << @index_server_hostname
+    args << "--index-server-port" << @index_server_port.to_s unless @index_server_port.nil?
+    args << "--force"
+    subc = instantiate(Flare::Tools::Cli::Down, args)
+    subc.execute(@config.merge({:command => 'down'}), args)
+  end
+
+  def activate(*args)
+    args << "--index-server" << @index_server_hostname
+    args << "--index-server-port" << @index_server_port.to_s unless @index_server_port.nil?
+    args << "--force"
+    subc = instantiate(Flare::Tools::Cli::Activate, args)
+    subc.execute(@config.merge({:command => 'activate'}), args)
+  end
+
+  def slave(*args)
+    args << "--index-server" << @index_server_hostname
+    args << "--index-server-port" << @index_server_port.to_s unless @index_server_port.nil?
+    args << "--force"
+    subc = instantiate(Flare::Tools::Cli::Slave, args)
+    subc.execute(@config.merge({:command => 'slave'}), args)
+  end
+
+  def balance(*args)
+    args << "--index-server" << @index_server_hostname
+    args << "--index-server-port" << @index_server_port.to_s unless @index_server_port.nil?
+    args << "--force"
+    subc = instantiate(Flare::Tools::Cli::Balance, args)
+    subc.execute(@config.merge({:command => 'balance'}), args)
+  end
+  
+  def reconstruct(*args)
+    args << "--index-server" << @index_server_hostname
+    args << "--index-server-port" << @index_server_port.to_s unless @index_server_port.nil?
+    args << "--force"
+    subc = instantiate(Flare::Tools::Cli::Reconstruct, args)
+    subc.execute(@config.merge({:command => 'reconstruct'}), args)
+  end
+
+  def index(*args)
+    args << "--index-server" << @index_server_hostname
+    args << "--index-server-port" << @index_server_port.to_s unless @index_server_port.nil?
+    subc = instantiate(Flare::Tools::Cli::Index, args)
+    subc.execute(@config.merge({:command => 'index'}), args)
+  end
+
+  def remove(*args)
+    args << "--index-server" << @index_server_hostname
+    args << "--index-server-port" << @index_server_port.to_s unless @index_server_port.nil?
+    args << "--force"
+    subc = instantiate(Flare::Tools::Cli::Remove, args)
+    subc.execute(@config.merge({:command => 'remove'}), args)
+  end
+
+  def master(*args)
+    args << "--index-server" << @index_server_hostname
+    args << "--index-server-port" << @index_server_port.to_s unless @index_server_port.nil?
+    args << "--force"
+    subc = instantiate(Flare::Tools::Cli::Master, args)
+    subc.execute(@config.merge({:command => 'master'}), args)
+  end
+
+  def dump(*args)
+    args << "--index-server" << @index_server_hostname
+    args << "--index-server-port" << @index_server_port.to_s unless @index_server_port.nil?
+    subc = instantiate(Flare::Tools::Cli::Dump, args)
+    subc.execute(@config.merge({:command => 'dump'}), args)
+  end
+  
+  def dumpkey(*args)
+    args << "--index-server" << @index_server_hostname
+    args << "--index-server-port" << @index_server_port.to_s unless @index_server_port.nil?
+    subc = instantiate(Flare::Tools::Cli::Dumpkey, args)
+    subc.execute(@config.merge({:command => 'dumpkey'}), args)
+  end
+  
+  def verify(*args)
+    args << "--index-server" << @index_server_hostname
+    args << "--index-server-port" << @index_server_port.to_s unless @index_server_port.nil?
+    puts "args: "+args.join(' ')
+    subc = instantiate(Flare::Tools::Cli::Verify, args)
+    subc.execute(@config.merge({:command => 'verify'}), args)
+  end
+  
+  def restore(*args)
+    subc = instantiate(Flare::Tools::Cli::Restore, args)
+    subc.execute(@config.merge({:command => 'restore'}), args)
+  end
+  
+end

data/test/{test/system → system}/flare_admin_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 # -*- coding: utf-8; -*-
 
-$LOAD_PATH.unshift File.dirname(__FILE__)+"/../lib"
+$LOAD_PATH.unshift File.dirname(__FILE__)+"/../../lib"
 
 require 'test/unit'
 require 'flare/tools'
@@ -10,7 +10,7 @@ require 'flare/test/cluster'
 ENV['FLARE_INDEX_SERVER'] = nil
 
 class FlareAdminTest < Test::Unit::TestCase
-  Admin = "../bin/flare-admin"
+  Admin = "./bin/flare-admin"
   S_OK = 0
   S_NG = 1
 
@@ -30,14 +30,14 @@ class FlareAdminTest < Test::Unit::TestCase
   end
 
   def flare_admin_with_yes arg
-    cmd = "yes | #{Admin} #{arg}"
+    cmd = "yes | ruby #{Admin} #{arg}"
     puts "> #{cmd}"
     puts `#{cmd}`
     $?.exitstatus
   end
 
   def flare_admin arg
-    cmd = "#{Admin} #{arg}"
+    cmd = "ruby #{Admin} #{arg}"
     puts "> #{cmd}"
     puts `#{cmd}`
     $?.exitstatus
@@ -71,7 +71,9 @@ class FlareAdminTest < Test::Unit::TestCase
     assert_equal(S_NG, $?.exitstatus)
     flare_admin "list --log-file=''"
     assert_equal(S_NG, $?.exitstatus)
-    flare_admin "list #{@opt_index} --dry-run"
+    flare_admin_with_yes "down #{@opt_index} --dry-run #{@datanodes[0].hostname}:#{@datanodes[0].port}"
+    assert_equal(S_OK, $?.exitstatus)
+    flare_admin "list #{@opt_index} --timeout=20"
     assert_equal(S_OK, $?.exitstatus)
   end
 

data/test/{test/unit → unit}/cluster_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 # -*- coding: utf-8; -*-
 
-$LOAD_PATH.unshift File.dirname(__FILE__)+"/../lib"
+$LOAD_PATH.unshift File.dirname(__FILE__)+"/../../lib"
 
 require 'test/unit'
 require 'flare/tools/cluster'

data/test/unit/util/pretty_table_test.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8; -*-
+
+$LOAD_PATH.unshift File.dirname(__FILE__)+"/../lib"
+
+require 'test/unit'
+require 'flare/util/pretty_table'
+class PrettyTableTest < Test::Unit::TestCase
+  include Flare::Util::PrettyTable
+
+  def test_pretty_table
+    expect = <<EOF.strip
+abc defghi      jklm
+  1 foo_bar_baz 1.11
+  2 foo         0.00
+EOF
+    table = Table.new
+    row = Row.new
+    row.add_column(Column.new('abc'))
+    row.add_column(Column.new('defghi'))
+    row.add_column(Column.new('jklm'))
+    table.add_row(row)
+    row = Row.new
+    row.add_column(Column.new(1, :align => :right))
+    row.add_column(Column.new('foo_bar_baz'))
+    row.add_column(Column.new('1.11'))
+    table.add_row(row)
+    row = Row.new
+    row.add_column(Column.new(2, :align => :right))
+    row.add_column(Column.new('foo'))
+    row.add_column(Column.new('0.00'))
+    table.add_row(row)
+
+    assert_equal(expect, table.prettify)
+  end
+
+  def test_column_separator
+    expect = "abc\tdefghi\tjklm"
+
+    row = Row.new(:separator => "\t")
+    row.add_column(Column.new('abc'))
+    row.add_column(Column.new('defghi'))
+    row.add_column(Column.new('jklm'))
+
+    assert_equal(expect, row.prettify(0))
+  end
+end

data/test/{test/unit → unit}/util_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
 # -*- coding: utf-8; -*-
 
-$LOAD_PATH.unshift File.dirname(__FILE__)+"/../lib"
+$LOAD_PATH.unshift File.dirname(__FILE__)+"/../../lib"
 
 require 'test/unit'
 require 'flare/util/result.rb'
@@ -44,9 +44,14 @@ class UtilTest < Test::Unit::TestCase
   end
 
   def test_interruption1
-    obj = Interruption.new
+    _ = Interruption.new
+
     assert_raise InterruptionTestException do
       Process.kill :INT, Process.pid
+
+      # sleep needed.
+      # https://github.com/ruby/ruby/blob/2ebafed88a665dcaaf4fb58b8c3fd0809db8fa2c/test/ruby/test_signal.rb#L21
+      sleep 0.1
     end
   end
 

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: flare-tools
 version: !ruby/object:Gem::Version
-  version: 0.4.5.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
 - kikehara
+- Yuya YAGUCHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -18,7 +19,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,23 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
-- !ruby/object:Gem::Dependency
-  name: zookeeper
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.1.10
 - !ruby/object:Gem::Dependency
   name: tokyocabinet
   requirement: !ruby/object:Gem::Requirement
@@ -60,29 +45,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.29'
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: newgem
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,27 +59,28 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: hoe
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0'
 description: Flare-tools is a collection of tools for Flare distributed key-value
   store.
 email:
 - kiyoshi.ikehara@gree.net
+- yuya.yaguchi@gree.net
 executables:
 - flare-admin
 - flare-argv0
@@ -121,19 +91,17 @@ executables:
 - flare-stats
 - flare-zkadmin
 extensions: []
-extra_rdoc_files:
-- Flare-tools.txt
-- History.txt
-- Manifest.txt
-- PostInstall.txt
-- README.txt
-- Tutorial.txt
+extra_rdoc_files: []
 files:
+- .gitignore
+- .travis.yml
 - Flare-tools.txt
+- Gemfile
+- Gemfile.lock
 - History.txt
 - LICENSE
+- Makefile
 - Manifest.txt
-- PostInstall.txt
 - README.txt
 - Rakefile
 - Tutorial.txt
@@ -145,6 +113,8 @@ files:
 - bin/flare-ping
 - bin/flare-stats
 - bin/flare-zkadmin
+- flare-tools.gemspec
+- lib/flare/entity/server.rb
 - lib/flare/net/connection.rb
 - lib/flare/test/cluster.rb
 - lib/flare/test/daemon.rb
@@ -153,8 +123,8 @@ files:
 - lib/flare/tools/cli.rb
 - lib/flare/tools/cli/activate.rb
 - lib/flare/tools/cli/balance.rb
-- lib/flare/tools/cli/cli_util.rb
 - lib/flare/tools/cli/deploy.rb
+- lib/flare/tools/cli/dispatch.rb
 - lib/flare/tools/cli/down.rb
 - lib/flare/tools/cli/dump.rb
 - lib/flare/tools/cli/dumpkey.rb
@@ -163,8 +133,10 @@ files:
 - lib/flare/tools/cli/flare_keychecker.rb
 - lib/flare/tools/cli/flare_zkadmin.rb
 - lib/flare/tools/cli/index.rb
+- lib/flare/tools/cli/index_server_config.rb
 - lib/flare/tools/cli/list.rb
 - lib/flare/tools/cli/master.rb
+- lib/flare/tools/cli/option.rb
 - lib/flare/tools/cli/part.rb
 - lib/flare/tools/cli/ping.rb
 - lib/flare/tools/cli/reconstruct.rb
@@ -185,7 +157,6 @@ files:
 - lib/flare/tools/zk_util.rb
 - lib/flare/util.rb
 - lib/flare/util/bwlimit.rb
-- lib/flare/util/command_line.rb
 - lib/flare/util/conf.rb
 - lib/flare/util/constant.rb
 - lib/flare/util/conversion.rb
@@ -200,35 +171,47 @@ files:
 - lib/flare/util/log4r_logger.rb
 - lib/flare/util/logger.rb
 - lib/flare/util/logging.rb
+- lib/flare/util/pretty_table.rb
+- lib/flare/util/pretty_table/column.rb
+- lib/flare/util/pretty_table/row.rb
+- lib/flare/util/pretty_table/table.rb
 - lib/flare/util/result.rb
-- test/test/integration/partition_test.rb
-- test/test/integration/index_server_test.rb
-- test/test/integration/dump_test.rb
-- test/test/integration/proxy_test.rb
-- test/test/integration/cli_test.rb
-- test/test/integration/stats_test.rb
-- test/test/integration/dump_expired_test.rb
-- test/test/integration/node_test.rb
-- test/test/extra/replication_test.rb
-- test/test/experimental/keychecker_test.rb
-- test/test/experimental/key_distribution_test.rb
-- test/test/experimental/cache_test.rb
-- test/test/experimental/list_test.rb
-- test/test/unit/util_test.rb
-- test/test/unit/bwlimit_test.rb
-- test/test/unit/tools_test.rb
-- test/test/unit/logger_test.rb
-- test/test/unit/cluster_test.rb
-- test/test/unit/daemon_test.rb
-- test/test/system/flare_admin_test.rb
-- .gemtest
+- package/Rakefile
+- package/flare-tools/Makefile
+- package/flare-tools/debian/changelog
+- package/flare-tools/debian/compat
+- package/flare-tools/debian/control
+- package/flare-tools/debian/copyright
+- package/flare-tools/debian/dirs
+- package/flare-tools/debian/docs
+- package/flare-tools/debian/rules
+- test/experimental/cache_test.rb
+- test/experimental/key_distribution_test.rb
+- test/experimental/keychecker_test.rb
+- test/experimental/list_test.rb
+- test/extra/replication_test.rb
+- test/integration/cli_test.rb
+- test/integration/dump_expired_test.rb
+- test/integration/dump_test.rb
+- test/integration/index_server_test.rb
+- test/integration/node_test.rb
+- test/integration/partition_test.rb
+- test/integration/proxy_test.rb
+- test/integration/stats_test.rb
+- test/integration/subcommands.rb
+- test/system/flare_admin_test.rb
+- test/unit/bwlimit_test.rb
+- test/unit/cluster_test.rb
+- test/unit/daemon_test.rb
+- test/unit/logger_test.rb
+- test/unit/tools_test.rb
+- test/unit/util/pretty_table_test.rb
+- test/unit/util_test.rb
 homepage: http://github.com/gree/flare-tools
 licenses:
 - MIT
-post_install_message: PostInstall.txt
-rdoc_options:
-- --main
-- README.txt
+post_install_message: 
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -237,6 +220,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 54780071370042886
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -244,29 +230,31 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: flare-tools
+rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Management Tools for Flare
 test_files:
-- test/test/integration/partition_test.rb
-- test/test/integration/index_server_test.rb
-- test/test/integration/dump_test.rb
-- test/test/integration/proxy_test.rb
-- test/test/integration/cli_test.rb
-- test/test/integration/stats_test.rb
-- test/test/integration/dump_expired_test.rb
-- test/test/integration/node_test.rb
-- test/test/extra/replication_test.rb
-- test/test/experimental/keychecker_test.rb
-- test/test/experimental/key_distribution_test.rb
-- test/test/experimental/cache_test.rb
-- test/test/experimental/list_test.rb
-- test/test/unit/util_test.rb
-- test/test/unit/bwlimit_test.rb
-- test/test/unit/tools_test.rb
-- test/test/unit/logger_test.rb
-- test/test/unit/cluster_test.rb
-- test/test/unit/daemon_test.rb
-- test/test/system/flare_admin_test.rb
+- test/experimental/cache_test.rb
+- test/experimental/key_distribution_test.rb
+- test/experimental/keychecker_test.rb
+- test/experimental/list_test.rb
+- test/extra/replication_test.rb
+- test/integration/cli_test.rb
+- test/integration/dump_expired_test.rb
+- test/integration/dump_test.rb
+- test/integration/index_server_test.rb
+- test/integration/node_test.rb
+- test/integration/partition_test.rb
+- test/integration/proxy_test.rb
+- test/integration/stats_test.rb
+- test/integration/subcommands.rb
+- test/system/flare_admin_test.rb
+- test/unit/bwlimit_test.rb
+- test/unit/cluster_test.rb
+- test/unit/daemon_test.rb
+- test/unit/logger_test.rb
+- test/unit/tools_test.rb
+- test/unit/util/pretty_table_test.rb
+- test/unit/util_test.rb