flare-tools 0.4.5.1 → 0.5.0

data/package/flare-tools/Makefile

@@ -0,0 +1,23 @@
+
+BINDIR=/usr/bin
+RUBYLIBDIR=/usr/lib/ruby/${RUBYVER}
+SRCDIR=../..
+
+install:
+	install -d ${DESTDIR}${BINDIR}
+	install -m 755 ${SRCDIR}/bin/* ${DESTDIR}${BINDIR}
+	install -d ${DESTDIR}${RUBYLIBDIR}/flare
+	install -m 644 ${SRCDIR}/lib/flare/*.rb ${DESTDIR}${RUBYLIBDIR}/flare
+	install -d ${DESTDIR}${RUBYLIBDIR}/flare/tools
+	install -m 644 ${SRCDIR}/lib/flare/tools/*.rb ${DESTDIR}${RUBYLIBDIR}/flare/tools
+	install -d ${DESTDIR}${RUBYLIBDIR}/flare/tools/cli
+	install -m 644 ${SRCDIR}/lib/flare/tools/cli/*.rb ${DESTDIR}${RUBYLIBDIR}/flare/tools/cli
+	install -d ${DESTDIR}${RUBYLIBDIR}/flare/util
+	install -m 644 ${SRCDIR}/lib/flare/util/*.rb ${DESTDIR}${RUBYLIBDIR}/flare/util
+	install -d ${DESTDIR}${RUBYLIBDIR}/flare/net
+	install -m 644 ${SRCDIR}/lib/flare/net/*.rb ${DESTDIR}${RUBYLIBDIR}/flare/net
+	install -d ${DESTDIR}${RUBYLIBDIR}/flare/test
+	install -m 644 ${SRCDIR}/lib/flare/test/*.rb ${DESTDIR}${RUBYLIBDIR}/flare/test
+
+clean:
+

data/package/flare-tools/debian/changelog

@@ -0,0 +1,135 @@
+flare-tools (0.4.5) unstable; urgency=low
+
+  * fixed install target of Makefile
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.net>  Wed, 17 Oct 2012 16:52:09 +0900
+
+flare-tools (0.4.4) unstable; urgency=low
+
+  * added 'summary' subcommand
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.net>  Wed, 01 Aug 2012 14:17:29 +0900
+
+flare-tools (0.4.3) unstable; urgency=low
+
+  * added --option
+  * fixed 'stats' subcommand
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.net>  Wed, 04 Jul 2012 14:11:12 +0900
+
+flare-tools (0.4.2) unstable; urgency=low
+
+  * fixed short and long options with paramters. 
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.net>  Wed, 23 May 2012 12:37:08 +0900
+
+flare-tools (0.4.1) unstable; urgency=low
+
+  * supported FLARE_INDEX_SERVER environment variable.
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.net>  Tue, 15 May 2012 19:48:26 +0900
+
+flare-tools (0.4.0) unstable; urgency=low
+
+  * public release
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.net>  Tue, 08 May 2012 20:00:05 +0900
+
+flare-tools (0.3.5) unstable; urgency=low
+
+  * added --version option.
+  * added --raw option to 'dump' subcommand.
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.net>  Fri, 04 May 2012 22:19:52 +0900
+
+flare-tools (0.3.4) unstable; urgency=low
+
+  * added 'restore' subcommand.
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.net>  Thu, 26 Apr 2012 20:24:59 +0900
+
+flare-tools (0.3.3) unstable; urgency=low
+
+  * added --meta option to verify subcommand.
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.net>  Mon, 23 Apr 2012 12:01:20 +0900
+
+flare-tools (0.3.2) unstable; urgency=low
+
+  * added 'verify' subcommand.
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.net>  Sat, 14 Apr 2012 19:06:04 +0900
+
+flare-tools (0.3.1) unstable; urgency=low
+
+  * fixed threads subcommand.
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.co.jp>  Sat, 25 Feb 2012 16:06:44 +0900
+
+flare-tools (0.3.0) unstable; urgency=low
+
+  * internal release
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.co.jp>  Fri, 24 Feb 2012 19:58:03 +0900
+
+flare-tools (0.2.7-1) unstable; urgency=low
+
+  * added some extra tests for experimental features.
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.co.jp>  Thu, 02 Feb 2012 14:52:26 +0900
+
+flare-tools (0.2.7) unstable; urgency=low
+
+  * added flare-keydump command for checking key distribution among nodes.
+  * added bandwidth limit function to Flare::Net::Connection class.
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.co.jp>  Fri, 20 Jan 2012 11:45:09 +0900
+
+flare-tools (0.2.6-2) unstable; urgency=low
+
+  * changed dependency of debian package.
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.co.jp>  Fri, 13 Jan 2012 10:16:55 +0900
+
+flare-tools (0.2.6-1) unstable; urgency=low
+
+  * added 'dump' and 'dumpkey' subcommands.
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.co.jp>  Thu, 12 Jan 2012 19:13:44 +0900
+
+flare-tools (0.2.5-1) unstable; urgency=low
+
+  * added various options to 'deploy' subcommand.
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.co.jp>  Fri, 06 Jan 2012 17:39:15 +0900
+
+flare-tools (0.2.4-1) unstable; urgency=low
+
+  * added activate subcommand.
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.co.jp>  Thu, 22 Dec 2011 19:11:21 +0900
+
+flare-tools (0.2.3-4) unstable; urgency=low
+
+  * fixed top level script files.
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.co.jp>  Mon, 05 Dec 2011 21:47:24 +0900
+
+flare-tools (0.2.3-3) unstable; urgency=low
+
+  * fixed dependency again.
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.co.jp>  Mon, 05 Dec 2011 19:44:29 +0900
+
+flare-tools (0.2.3-2) unstable; urgency=low
+
+  * fixed dependency.
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.co.jp>  Mon, 05 Dec 2011 19:21:00 +0900
+
+flare-tools (0.2.3-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Kiyoshi Ikehara <kiyoshi.ikehara@gree.co.jp>  Mon, 05 Dec 2011 17:25:58 +0900
+

data/package/flare-tools/debian/compat

@@ -0,0 +1 @@
+7

data/package/flare-tools/debian/control

@@ -0,0 +1,20 @@
+Source: flare-tools
+Section: misc
+Priority: extra
+Maintainer: Kiyoshi Ikehara <kiyoshi.ikehara@gree.co.jp>
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.7.3
+
+Package: flare-tools-ruby1.8
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 (>= 1.8.7)
+Recommends: rubygems1.8, liblog4r-ruby1.8
+Description: administration tools for flare server
+ This is a collection of command line tools to maintain a flare cluster.
+
+Package: flare-tools-ruby1.9
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.9 (>= 1.9.0)
+Recommends: rubygems1.9, liblog4r-ruby
+Description: administration tools for flare server
+ This is a collection of command line tools to maintain a flare cluster.

data/package/flare-tools/debian/copyright

@@ -0,0 +1,35 @@
+This package was debianized by Kiyoshi Ikehara <kiyoshi.ikehara@gree.net> on
+Mon, 05 Dec 2011 17:25:58 +0900.
+
+It was downloaded from <https://github.com/gree/flare-tools>
+
+Upstream Author:
+
+    Kiyoshi Ikehara <kiyoshi.ikehara@gree.net>
+
+Copyright:
+
+    Copyright (C) 2011 GREE, Inc.
+
+License: MIT-style
+
+Copyright (c) 2011 GREE, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+

data/package/flare-tools/debian/dirs

@@ -0,0 +1,2 @@
+usr/bin
+

data/package/flare-tools/debian/rules

@@ -0,0 +1,125 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets  by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+
+
+
+
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+
+#Architecture
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp  
+
+	# Add here commands to compile the arch part of the package.
+	#$(MAKE)
+	touch $@
+
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp  
+
+	# Add here commands to compile the indep part of the package.
+	#$(MAKE) doc
+	touch $@
+
+clean: 
+	dh_testdir
+	dh_testroot
+	rm -f build-arch-stamp build-indep-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	$(MAKE) clean
+
+	dh_clean 
+
+install: install-indep install-arch
+install-indep:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -i 
+	dh_installdirs -i
+
+	# Add here commands to install the indep part of the package into
+	# debian/<package>-doc.
+	#INSTALLDOC#
+	$(MAKE) DESTDIR=$(CURDIR)/debian/flare-tools-ruby1.8 RUBYVER=1.8 install
+	$(MAKE) DESTDIR=$(CURDIR)/debian/flare-tools-ruby1.9 RUBYVER=1.9 install
+
+	dh_install -i
+
+install-arch:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -s 
+	dh_installdirs -s
+
+	# Add here commands to install the arch part of the package into
+	# debian/tmp.
+
+	dh_install -s
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate	
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+#	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+

data/test/{test/integration → integration}/cli_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 'rubygems'
 gem 'test-unit'
@@ -22,13 +22,14 @@ class CliTest < 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
@@ -208,11 +209,12 @@ class CliTest < Test::Unit::TestCase
     assert_equal(S_OK, index())
   end
 
-  def remove_boostheader(s)
+  def remove_boostheader_and_version(s)
     lines = s.split("\n")
     h1 = lines.shift
     h2 = lines.shift
-    lines.shift
+    lines.shift # XXX boost header
+    lines.shift # XXX version
     lines.unshift(h2)
     lines.unshift(h1)
     lines.join("\n")
@@ -224,8 +226,8 @@ class CliTest < Test::Unit::TestCase
     args = ["--output=flare.xml"]
     assert_equal(S_OK, index(*args))
     assert_equal(true, File.exist?("flare.xml"))
-    flarexml = remove_boostheader(open("flare.xml").read)
-    indexxml = remove_boostheader(@flare_cluster.index)
+    flarexml = remove_boostheader_and_version(open("flare.xml").read)
+    indexxml = remove_boostheader_and_version(@flare_cluster.index)
     assert_equal(indexxml, flarexml)
     File.delete("flare.xml")
   end

data/test/{test/integration → integration}/dump_expired_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'
@@ -20,13 +20,14 @@ class DumpExpiredTest < 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}/dump_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 'rubygems'
 gem 'test-unit'
@@ -59,19 +59,19 @@ class DumpTest < Test::Unit::TestCase
 
     puts "dumping"
     @config = {
-      :index_server_hostname => src_cluster.indexname,
-      :index_server_port => src_cluster.indexport,
       :timeout => 10
     }
+    @index_server_hostname = src_cluster.indexname
+    @index_server_port = src_cluster.indexport
     args = %w(--format=tch --output=src.tch)
     args.concat extra_dump_options
     assert_equal(S_OK, dump(*args))
 
     @config = {
-      :index_server_hostname => dest_cluster.indexname,
-      :index_server_port => dest_cluster.indexport,
       :timeout => 10
     }
+    @index_server_hostname = dest_cluster.indexname
+    @index_server_port = dest_cluster.indexport
     n = dest_nodes[0]
     args = %w(--format=tch --input=src.tch)
     args.concat extra_restore_options