yggdrasil 0.0.7 → 0.0.8

data/spec/log_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe Yggdrasil, "log" do
+describe Yggdrasil, 'log' do
   it '-------- log' do
     puts '-------- log'
     prepare_environment
@@ -36,7 +36,7 @@ EOS
   it 'should show log (relative path)' do
     puts '---- should show log (relative path)'
     out = catch_out do
-      FileUtils.cd "/tmp" do
+      FileUtils.cd '/tmp' do
         Yggdrasil.command %w{log yggdrasil-test}+
                           %w{--username hoge --password foo}
       end
@@ -66,7 +66,7 @@ EOS
   it 'should show log (no path)' do
     puts '---- should show log (no path)'
     out = catch_out do
-      FileUtils.cd "/tmp/yggdrasil-test" do
+      FileUtils.cd '/tmp/yggdrasil-test' do
         Yggdrasil.command %w{log} +
                           %w{--username hoge --password foo}
       end

data/spec/revert_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe Yggdrasil, "revert" do
+describe Yggdrasil, 'revert' do
   it '-------- revert' do
     puts '-------- revert'
     prepare_environment
@@ -12,11 +12,11 @@ describe Yggdrasil, "revert" do
     puts '---- should commit added files'
     `echo hoge > /tmp/yggdrasil-test/AA`
     `echo foo > /tmp/yggdrasil-test/BB`
-    FileUtils.cd "/tmp/yggdrasil-test" do
+    FileUtils.cd '/tmp/yggdrasil-test' do
       puts '-- add'
       Yggdrasil.command %w{add AA /tmp/yggdrasil-test/BB}
 
-      puts "-- revert"
+      puts '-- revert'
       Yggdrasil.command %w{revert --username hoge --password foo},
                         "0\nY\n"
     end
@@ -27,15 +27,15 @@ describe Yggdrasil, "revert" do
                             %w{--username hoge --password foo}
     end
     puts out
-    out.should == ""
+    out.should == ''
   end
 
   it 'should revert modified file' do
-    puts "---- should revert modified file"
-    puts "-- modify"
+    puts '---- should revert modified file'
+    puts '-- modify'
     `echo hoge >> /tmp/yggdrasil-test/A`
 
-    puts "-- revert"
+    puts '-- revert'
     Yggdrasil.command %w{revert / --username hoge --password foo},
                       "0\nY\n"
 
@@ -45,11 +45,11 @@ describe Yggdrasil, "revert" do
                             %w{--username hoge --password foo}
     end
     puts out
-    out.should == ""
+    out.should == ''
   end
 
   it 'should accept password interactive' do
-    puts "---- should accept password interactive"
+    puts '---- should accept password interactive'
     `echo A >> /tmp/yggdrasil-test/A`
 
     Yggdrasil.command %w{revert /tmp/yggdrasil-test/A --username hoge},
@@ -61,11 +61,11 @@ describe Yggdrasil, "revert" do
                             %w{--username hoge --password foo}
     end
     puts out
-    out.should == ""
+    out.should == ''
   end
 
   it 'should revert specified file only' do
-    puts "---- should revert specified file only"
+    puts '---- should revert specified file only'
     `echo A >> /tmp/yggdrasil-test/A`
     `echo B >> /tmp/yggdrasil-test/B`
 
@@ -84,7 +84,7 @@ describe Yggdrasil, "revert" do
   end
 
   it 'should not revert deleted file' do
-    puts "---- should not revert deleted file"
+    puts '---- should not revert deleted file'
     `rm -f /tmp/yggdrasil-test/A`
 
     Yggdrasil.command %w{revert /} +
@@ -99,11 +99,11 @@ describe Yggdrasil, "revert" do
     out.chomp!
     puts out
     out.gsub!(%r{\s+},' ')
-    out.should == "D 3 tmp/yggdrasil-test/A"
+    out.should == 'D 3 tmp/yggdrasil-test/A'
   end
 
   it 'should revert all files at once' do
-    puts "---- should revert all files at once"
+    puts '---- should revert all files at once'
 
     `echo HOGE >> /tmp/yggdrasil-test/A`
     `rm -f /tmp/yggdrasil-test/B`
@@ -121,6 +121,6 @@ describe Yggdrasil, "revert" do
                             %w{--username hoge --password foo}
     end
     puts out
-    out.should == ""
+    out.should == ''
   end
 end

data/spec/server_help_spec.rb

@@ -0,0 +1,142 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require 'yggdrasil_server'
+
+describe YggdrasilServer, 'help (server)' do
+  puts '-------- help (server)'
+
+  show_subcommands = <<"EOS"
+usage: #{File.basename($0)} <subcommand> [options] [args]
+Yggdrasil version #{Yggdrasil::VERSION}
+Type '#{File.basename($0)} help <subcommand>' for help on a specific subcommand.
+
+Available subcommands:
+   daemon
+   debug
+   help (?, h)
+   init
+   results
+   version
+
+Yggdrasil server is a TCP server
+to receive/record the yggdrasil check result of all managed servers.
+
+At first, you should type '#{File.basename($0)} init' to create config file.
+
+EOS
+
+  it 'should show subcommands on no subcommands (server)' do
+    puts '---- should show subcommands on no subcommands (server)'
+    out = catch_out{YggdrasilServer.command []}
+    out.should == show_subcommands
+  end
+
+  it 'should show subcommands on "help" (server)' do
+    puts '---- should show subcommands on "help" (server)'
+    out = catch_out{YggdrasilServer.command %w{help}}
+    out.should == show_subcommands
+  end
+
+  it 'should show subcommands on "h" (server)' do
+    puts '---- should show subcommands on "h" (server)'
+    out = catch_out{YggdrasilServer.command %w{h}}
+    out.should == show_subcommands
+  end
+
+  it 'should show subcommands on "?" (server)' do
+    puts '---- should show subcommands on "?" (server)'
+    out = catch_out{YggdrasilServer.command %w{?}}
+    out.should == show_subcommands
+  end
+
+  it 'should be unknown subcommand on "hoge" (server)' do
+    puts '---- should be unknown subcommand on "hoge" (server)'
+    err = catch_err do
+      lambda{YggdrasilServer.command(%w{hoge})}.should raise_error(SystemExit)
+    end
+    err.should == "Unknown subcommand: 'hoge'\n"
+  end
+
+  help_help = <<"EOS"
+help (?,h): Describe the usage of this program or its subcommands.
+usage: #{File.basename($0)} help [SUBCOMMAND]
+
+EOS
+
+  it 'should show help_help (server)' do
+    puts '---- should show help_help (server)'
+    out = catch_out{YggdrasilServer.command %w{help help}}
+    out.should == help_help
+  end
+
+  it 'should error too many arguments (server)' do
+    puts '---- should error too many arguments (server)'
+    err = catch_err do
+      lambda{YggdrasilServer.command(%w{help help help})}.should raise_error(SystemExit)
+    end
+    err.should == "#{File.basename($0)} error: too many arguments.\n\n"
+  end
+
+  it 'should show help of version (server)' do
+    puts '---- should show help of version (server)'
+    out = catch_out{YggdrasilServer.command %w{help version}}
+    out.should == <<"EOS"
+version: See the program version
+usage: #{File.basename($0)} version
+
+EOS
+  end
+
+
+  it 'should show help of init (server)' do
+    puts '---- should show help of init (server)'
+    out = catch_out{YggdrasilServer.command %w{help init}}
+    out.should == <<"EOS"
+init: setup yggdrasil server configuration.
+usage: #{File.basename($0)} init [OPTIONS...]
+
+Valid options:
+  --port ARG               : specify a TCP port number ARG
+  --repo ARG               : URL of subversion repository
+                             ARG can contain {HOST} or a {host}
+                             {HOST} is replaced by client hostname with domain
+                             {host} is replaced by client hostname without domain
+                             e.g. svn://192.168.3.5/servers/{host}/ygg
+  --ro-username ARG        : specify a username ARG for read only
+  --ro-password ARG        : specify a password ARG for read only
+
+EOS
+  end
+
+  it 'should show help of debug (server)' do
+    puts '---- should show help of debug (server)'
+    out = catch_out{YggdrasilServer.command %w{help debug}}
+    out.should == <<"EOS"
+debug: launch TCP server by debug mode.
+usage: #{File.basename($0)} debug
+
+EOS
+  end
+
+  it 'should show help of daemon (server)' do
+    puts '---- should show help of daemon (server)'
+    out = catch_out{YggdrasilServer.command %w{help daemon}}
+    out.should == <<"EOS"
+daemon: launch TCP server by daemon mode.
+usage: #{File.basename($0)} daemon
+
+EOS
+  end
+
+  it 'should show help of results (server)' do
+    puts '---- should show help of results'
+    out = catch_out{YggdrasilServer.command %w{help results}}
+    out.should == <<"EOS"
+results: display the result of yggdrasil check command.
+usage: #{File.basename($0)} results [OPTIONS...]
+
+Valid options:
+  --expire ARG              : minutes from the final report, to judge the host not be alive
+
+EOS
+  end
+end

data/spec/{init_server_spec.rb → server_init_spec.rb}

@@ -1,8 +1,9 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require 'yggdrasil_server'
 
-describe Yggdrasil, "init-server" do
-  it '-------- init-server' do
-    puts '-------- init-server'
+describe YggdrasilServer, 'init (server)' do
+  it '-------- init (server)' do
+    puts '-------- init (server)'
     prepare_environment
   end
 
@@ -10,7 +11,7 @@ describe Yggdrasil, "init-server" do
     `rm -rf /tmp/yggdrasil-test/.yggdrasil`
     puts '---- should error: "Not enough arguments provided"'
     err = catch_err do
-      lambda{Yggdrasil.command(%w{init-server --repo})}.should raise_error(SystemExit)
+      lambda{YggdrasilServer.command(%w{init --repo})}.should raise_error(SystemExit)
     end
     err.should == "#{File.basename($0)} error: Not enough arguments provided: --repo\n\n"
   end
@@ -18,13 +19,13 @@ describe Yggdrasil, "init-server" do
   it 'should make server_config (all interactive)' do
     `rm -rf /tmp/yggdrasil-test/.yggdrasil`
     puts '---- should make server_config (all interactive)"'
-    Yggdrasil.command %w{init-server},
+    YggdrasilServer.command %w{init},
                       "4000\n"+ # tcp port
                       "svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}/\n"+ #svn repository
                       "hoge\n"+ # read only username
                       "foo\n" #read only password
 
-    File.exists?("/tmp/yggdrasil-test/.yggdrasil/server_config").should be_true
+    File.exists?('/tmp/yggdrasil-test/.yggdrasil/server_config').should be_true
     `cat /tmp/yggdrasil-test/.yggdrasil/server_config`.should == <<"EOS"
 port=4000
 repo=svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}
@@ -36,13 +37,13 @@ EOS
   it 'should make server_config (all argument)' do
     `rm -rf /tmp/yggdrasil-test/.yggdrasil`
     puts '---- should make server_config (all interactive)"'
-    Yggdrasil.command %w{init-server} +
+    YggdrasilServer.command %w{init} +
                           %w{--port 4000} +
                           %w{--repo svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}/} +
                           %w{--ro-username hoge} +
                           %w{--ro-password foo}
 
-    File.exists?("/tmp/yggdrasil-test/.yggdrasil/server_config").should be_true
+    File.exists?('/tmp/yggdrasil-test/.yggdrasil/server_config').should be_true
     `cat /tmp/yggdrasil-test/.yggdrasil/server_config`.should == <<"EOS"
 port=4000
 repo=svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}
@@ -54,12 +55,12 @@ EOS
   it 'should make server_config (no ro-username)' do
     `rm -rf /tmp/yggdrasil-test/.yggdrasil`
     puts '---- should make server_config (all interactive)"'
-    Yggdrasil.command %w{init-server} +
+    YggdrasilServer.command %w{init} +
                           %w{--port 4000} +
                           %w{--repo svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}/},
                       "\n" # prompt for input read only username
 
-    File.exists?("/tmp/yggdrasil-test/.yggdrasil/server_config").should be_true
+    File.exists?('/tmp/yggdrasil-test/.yggdrasil/server_config').should be_true
     `cat /tmp/yggdrasil-test/.yggdrasil/server_config`.should == <<"EOS"
 port=4000
 repo=svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}
@@ -71,11 +72,11 @@ EOS
     puts '---- should error if argument have only password'
 
     err = catch_err do
-      args = %w{init-server} +
+      args = %w{init} +
           %w{--port 4000} +
           %w{--repo svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}/} +
           %w{--ro-password foo}
-      lambda{Yggdrasil.command(args)}.should raise_error(SystemExit)
+      lambda{YggdrasilServer.command(args)}.should raise_error(SystemExit)
     end
     err.should == "#{File.basename($0)} error: --ro-password option need --ro-username, too.\n\n"
   end

data/spec/{results_spec.rb → server_results_spec.rb}

@@ -1,28 +1,29 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require 'yggdrasil_server'
 
-describe Yggdrasil, "results" do
+describe YggdrasilServer, 'results' do
   before(:all) do
     puts '-------- results'
     prepare_environment
 
     sock = 0
     begin
-      sock = TCPSocket.open("localhost", 4000)
+      sock = TCPSocket.open('localhost', 4000)
     rescue
-      puts "OK. no server"
+      puts 'OK. no server'
     else
-      puts "NG. zombie server. try quit"
-      sock.puts("quit")
+      puts 'NG. zombie server. try quit'
+      sock.puts('quit')
       sock.close
     end
 
-    Yggdrasil.command %w{init-server} +
+    YggdrasilServer.command %w{init} +
                           %w{--port 4000} +
                           %w{--repo svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}/}+
                           %w{--ro-username hoge --ro-password foo},
                       "\n\n"
     fork do
-      Yggdrasil.command %w{server --debug}
+      YggdrasilServer.command %w{debug}
     end
     sleep 1
   end
@@ -42,9 +43,9 @@ describe Yggdrasil, "results" do
     Yggdrasil.command %w{check}
     sleep 1
     out = catch_out do
-      Yggdrasil.command %w{results --limit 30}
+      YggdrasilServer.command %w{results --expire 30}
     end
-    out.should == ""
+    out.should == ''
   end
 
   it 'should show results' do
@@ -56,16 +57,16 @@ describe Yggdrasil, "results" do
     `echo hoge > /tmp/yggdrasil-test/.yggdrasil/results/hoge-old`
     File.utime Time.local(2001, 5, 22, 23, 59, 59),
                Time.local(2001, 5, 1, 0, 0, 0),
-               "/tmp/yggdrasil-test/.yggdrasil/results/hoge-old"
+               '/tmp/yggdrasil-test/.yggdrasil/results/hoge-old'
     sleep 1
 
     out = catch_out do
-      lambda{Yggdrasil.command(%w{results --limit 30})}.should raise_error(SystemExit)
+      lambda{YggdrasilServer.command(%w{results --expire 30})}.should raise_error(SystemExit)
     end
 
     out.should == <<"EOS"
 ######## hoge-old: last check is too old: 2001-05-01 00:00:00 +0900
-######## centos6_127.0.0.1 Mismatch:
+######## #{Socket.gethostname}_127.0.0.1 Mismatch:
 M                2   tmp/yggdrasil-test/A
 
 Index: tmp/yggdrasil-test/A
@@ -80,8 +81,8 @@ EOS
 
   after(:all) do
     sleep 1
-    sock = TCPSocket.open("localhost", 4000)
-    sock.puts("quit")
+    sock = TCPSocket.open('localhost', 4000)
+    sock.puts('quit')
     sock.close
     Process.waitall
   end

data/spec/server_spec.rb

@@ -1,117 +1,118 @@
 require File.dirname(__FILE__) + '/spec_helper'
 require 'timeout'
 require 'socket'
+require 'yggdrasil_server'
 
-describe Yggdrasil, "server" do
+describe YggdrasilServer, 'server' do
 
   before(:all) do
     puts '-------- server'
     prepare_environment
-    Yggdrasil.command %w{init-server} +
+    YggdrasilServer.command %w{init} +
                           %w{--port 4000} +
                           %w{--repo svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}/} +
                           %w{--ro-username hoge} +
                           %w{--ro-password foo}
   end
 
-  it "should quit server on debug mode" do
-    puts "---- should quit server on debug mode"
+  it 'should quit server on debug mode' do
+    puts '---- should quit server on debug mode'
 
     fork do
       # client behavior
       sleep 1
-      sock = TCPSocket.open("localhost", 4000)
-      sock.puts("quit")
+      sock = TCPSocket.open('localhost', 4000)
+      sock.puts('quit')
       sock.close
       exit
     end
 
     timeout 5 do
-      Yggdrasil.command %w{server --debug}
+      YggdrasilServer.command %w{debug}
     end
 
     Process.waitall
   end
 
-  it "should response repository URL" do
-    puts "---- should response repository URL"
+  it 'should response repository URL' do
+    puts '---- should response repository URL'
 
     fork do
       sleep 1
-      sock = TCPSocket.open("localhost", 4000)
-      sock.puts("get_repo")
+      sock = TCPSocket.open('localhost', 4000)
+      sock.puts('get_repo')
       rcv = sock.gets
       rcv.should_not be_nil
       rcv.chomp!
-      rcv.should == "svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}"
+      rcv.should == 'svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}'
       sock.close
 
-      sock = TCPSocket.open("localhost", 4000)
-      sock.puts("quit")
+      sock = TCPSocket.open('localhost', 4000)
+      sock.puts('quit')
       sock.close
       exit
     end
 
     timeout 5 do
-      Yggdrasil.command %w{server --debug}
+      YggdrasilServer.command %w{debug}
     end
 
     Process.waitall
   end
 
-  it "should response get_ro_id_pw" do
-    puts "---- should response get_ro_id_pw"
+  it 'should response get_ro_id_pw' do
+    puts '---- should response get_ro_id_pw'
 
     fork do
       sleep 1
-      sock = TCPSocket.open("localhost", 4000)
-      sock.puts("get_ro_id_pw")
+      sock = TCPSocket.open('localhost', 4000)
+      sock.puts('get_ro_id_pw')
       username = sock.gets
       username.should_not be_nil
-      username.chomp.should == "hoge"
+      username.chomp.should == 'hoge'
 
       password = sock.gets
       password.should_not be_nil
-      password.chomp.should == "foo"
+      password.chomp.should == 'foo'
       sock.close
 
-      sock = TCPSocket.open("localhost", 4000)
-      sock.puts("quit")
+      sock = TCPSocket.open('localhost', 4000)
+      sock.puts('quit')
       sock.close
       exit
     end
 
     timeout 5 do
-      Yggdrasil.command %w{server --debug}
+      YggdrasilServer.command %w{debug}
     end
 
     Process.waitall
   end
 
-  it "should write file of check result to results directory" do
-    puts "---- should write file of check result to results directory"
+  it 'should write file of check result to results directory' do
+    puts '---- should write file of check result to results directory'
 
     fork do
       sleep 1
-      sock = TCPSocket.open("localhost", 4000)
-      sock.puts("put_result HOSTNAME")
+      sock = TCPSocket.open('localhost', 4000)
+      sock.puts('put_result HOSTNAME')
       sock.puts <<"EOS"
 CHECK RESULTS................1
 CHECK RESULTS................2
 EOS
       sock.close
 
-      sock = TCPSocket.open("localhost", 4000)
-      sock.puts("quit")
+      sock = TCPSocket.open('localhost', 4000)
+      sock.puts('quit')
       sock.close
       exit
     end
 
     timeout 5 do
-      Yggdrasil.command %w{server --debug}
+      YggdrasilServer.command %w{debug}
     end
 
-    File.exist?("/tmp/yggdrasil-test/.yggdrasil/results/HOSTNAME_127.0.0.1").should be_true
+    File.exist?('/tmp/yggdrasil-test/.yggdrasil/results/HOSTNAME_127.0.0.1').should be_true
     `cat /tmp/yggdrasil-test/.yggdrasil/results/HOSTNAME_127.0.0.1`.should == <<"EOS"
 CHECK RESULTS................1
 CHECK RESULTS................2
@@ -120,37 +121,37 @@ EOS
     Process.waitall
   end
 
-  it "should not response get_ro_id_pw" do
-    puts "---- should not response get_ro_id_pw"
+  it 'should not response get_ro_id_pw' do
+    puts '---- should not response get_ro_id_pw'
     prepare_environment
-    Yggdrasil.command %w{init-server} +
+    YggdrasilServer.command %w{init} +
                           %w{--port 4000} +
                           %w{--repo svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}/},
                       "\n\n"
 
     fork do
       sleep 1
-      sock = TCPSocket.open("localhost", 4000)
+      sock = TCPSocket.open('localhost', 4000)
       sock.puts("\n")
       no_res = sock.gets
       no_res.should be_nil
       sock.close
 
       sleep 1
-      sock = TCPSocket.open("localhost", 4000)
-      sock.puts("get_ro_id_pw")
+      sock = TCPSocket.open('localhost', 4000)
+      sock.puts('get_ro_id_pw')
       username = sock.gets
       username.should be_nil
       sock.close
 
-      sock = TCPSocket.open("localhost", 4000)
-      sock.puts("quit")
+      sock = TCPSocket.open('localhost', 4000)
+      sock.puts('quit')
       sock.close
       exit
     end
 
     timeout 5 do
-      Yggdrasil.command %w{server --debug}
+      YggdrasilServer.command %w{debug}
     end
 
     Process.waitall

data/spec/server_version_spec.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require 'yggdrasil_server'
+
+describe YggdrasilServer, 'version' do
+
+  show_version = <<"EOS"
+#{File.basename($0)}, version #{Yggdrasil::VERSION}
+
+Copyright (C) 2012-2013 Tomohisa Kusukawa.
+Yggdrasil is open source software, see https://github.com/tkusukawa/yggdrasil/
+
+EOS
+
+  it 'should show version on "version"' do
+    puts '---- should show version on "version"'
+    out = catch_out{YggdrasilServer.command %w{version}}
+    out.should == show_version
+  end
+
+  it 'should show version on "--version"' do
+    puts '---- should show version on "--version"'
+    out = catch_out{YggdrasilServer.command %w{--version}}
+    out.should == show_version
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../lib/yggdrasil'
 
 def prepare_environment
-  puts "---- prepare environment"
+  puts '---- prepare environment'
 
   `pkill svnserve`
   `rm -rf /tmp/yggdrasil-test`
@@ -13,10 +13,10 @@ def prepare_environment
 
   puts '-- launch svnserve'
 
-  File.open("/tmp/yggdrasil-test/svn-repo/conf/passwd", "w") do |f|
+  File.open('/tmp/yggdrasil-test/svn-repo/conf/passwd', 'w') do |f|
     f.write "[users]\nhoge = foo"
   end
-  File.open("/tmp/yggdrasil-test/svn-repo/conf/svnserve.conf", "w") do |f|
+  File.open('/tmp/yggdrasil-test/svn-repo/conf/svnserve.conf', 'w') do |f|
     f.write <<"EOS"
 [general]
 anon-access = none