yggdrasil 0.0.7 → 0.0.8

data/lib/yggdrasil_server/{init_server.rb → init.rb}

@@ -11,29 +11,29 @@ class YggdrasilServer
     end
 
     if !@options.has_key?(:ro_username) && @options.has_key?(:ro_password)
-      error "--ro-password option need --ro-username, too."
+      error '--ro-password option need --ro-username, too.'
     end
 
     until @options.has_key?(:port)
-      print "Input tcp port number: "
+      print 'Input tcp port number: '
       input = $stdin.gets
-      error "can not input tcp port number" unless input
+      error 'can not input tcp port number' unless input
 
       input.chomp!
       unless %r{\d+} =~ input && input.to_i < 0x10000
-        puts "ERROR: Invalid port number."
+        puts 'ERROR: Invalid port number.'
         redo
       end
       @options[:port] = input # string
     end
 
     until @options.has_key?(:repo)
-      print "Input svn repo URL: "
+      print 'Input svn repo URL: '
       input = $stdin.gets
-      error "can not input svn repo URL." unless input
+      error 'can not input svn repo URL.' unless input
 
       unless %r{^(http://|https://|file://|svn://)} =~ input
-        puts "ERROR: Invalid URL."
+        puts 'ERROR: Invalid URL.'
         redo
       end
       @options[:repo] = input
@@ -42,14 +42,14 @@ class YggdrasilServer
     @options[:repo].chomp!('/')
 
     unless @options.has_key?(:ro_password)
-      puts "Input read-only username/password (clients use this to read repo)."
-      puts "ATTENTION! username/password are stored to disk unencrypted!"
+      puts 'Input read-only username/password (clients use this to read repo).'
+      puts 'ATTENTION! username/password are stored to disk unencrypted!'
       input_user_pass
     end
 
     # make config file
     Dir.mkdir @config_dir, 0755 unless File.exist?(@config_dir)
-    File.open(@server_config_file, "w") do |f|
+    File.open(@server_config_file, 'w') do |f|
       f.write "port=#{@options[:port]}\n"\
               "repo=#{@options[:repo]}\n"
       if @options.has_key?(:ro_password)

data/lib/yggdrasil_server/put_result.rb

@@ -1,6 +1,6 @@
 class YggdrasilServer
   def put_result(sock, arg_hash = {})
-    result_string = ""
+    result_string = ''
     while (line=sock.gets)
       result_string << line
     end
@@ -8,7 +8,7 @@ class YggdrasilServer
     Dir.mkdir @results_dir, 0755 unless File.exist?(@results_dir)
     result_file = "#@results_dir/#{arg_hash[:hostname]}_#{sock.peeraddr[3]}"
     File.delete result_file if File.exist?(result_file)
-    File.open(result_file, "w") do |f|
+    File.open(result_file, 'w') do |f|
       f.write result_string
     end
     arg_hash

data/lib/yggdrasil_server/results.rb

@@ -2,7 +2,7 @@ class YggdrasilServer
 
   # @param [Array] args
   def results(args)
-    args = parse_options(args, {'--limit'=>:limit})
+    args = parse_options(args, {'--expire'=>:expire})
 
     if args.size != 0
       error "invalid arguments: #{args.join(',')}"
@@ -14,9 +14,9 @@ class YggdrasilServer
     files.each do |file|
       next if /^\./ =~ file
       absolute = "#@results_dir/#{file}"
-      if @options.has_key?(:limit)
+      if @options.has_key?(:expire)
         stat = File.stat(absolute)
-        if stat.mtime < (Time.now - @options[:limit].to_i * 60)
+        if stat.mtime < (Time.now - @options[:expire].to_i * 60)
           alert = true
           puts "######## #{file}: last check is too old: #{stat.mtime.to_s}"
           next

data/lib/yggdrasil_server/version.rb

@@ -0,0 +1,14 @@
+require 'yggdrasil'
+
+class YggdrasilServer
+
+  def version
+    puts <<"EOS"
+#@base_cmd, version #{Yggdrasil::VERSION}
+
+Copyright (C) 2012-2013 Tomohisa Kusukawa.
+Yggdrasil is open source software, see https://github.com/tkusukawa/yggdrasil/
+
+EOS
+  end
+end

data/lib/yggdrasil_server.rb

@@ -1,13 +1,15 @@
 require 'socket'
 
-require "yggdrasil_common"
+require 'yggdrasil_common'
 
-require "yggdrasil_server/init_server"
-require "yggdrasil_server/results"
+require 'yggdrasil_server/version'
+require 'yggdrasil_server/help'
+require 'yggdrasil_server/init'
+require 'yggdrasil_server/results'
 
-require "yggdrasil_server/get_repo"
-require "yggdrasil_server/get_ro_id_pw"
-require "yggdrasil_server/put_result"
+require 'yggdrasil_server/get_repo'
+require 'yggdrasil_server/get_ro_id_pw'
+require 'yggdrasil_server/put_result'
 
 class YggdrasilServer
   MESSAGE_QUIT = 'quit'
@@ -17,17 +19,46 @@ class YggdrasilServer
       :put_result => [:hostname],
   }
 
+  def YggdrasilServer.command(args, input = nil)
+    $stdin = StringIO.new(input) if input != nil
+    ENV['LANG'] = 'en_US.UTF-8'
+
+    if args.size == 0
+      new(false).help([])
+      return
+    end
+    case args[0]
+      when 'daemon'
+        Process.daemon
+        YggdrasilServer.new.server(args[1..-1])
+      when 'debug'
+        args << '--debug'
+        YggdrasilServer.new.server(args[1..-1])
+      when 'help', '--help', 'h', '?'
+        new(false).help(args[1..-1])
+      when 'init'
+        new(false).init_server(args[1..-1])
+      when 'results'
+        YggdrasilServer.new.results(args[1..-1])
+      when 'version', '--version'
+        new(false).version
+      else
+        $stderr .puts "Unknown subcommand: '#{args[0]}'"
+        exit 1
+    end
+  end
+
   def initialize(exist_config = true)
     @base_cmd = File::basename($0)
     @current_dir = `readlink -f .`.chomp
-    @config_dir = "#{ENV["HOME"]}/.yggdrasil"
+    @config_dir = "#{ENV['HOME']}/.yggdrasil"
     @server_config_file = "#@config_dir/server_config"
     @results_dir = "#@config_dir/results"
 
     return unless exist_config
     configs = read_config(@server_config_file)
-    error "need 'port' in config file" unless (@port = configs[:port])
-    error "need 'repo' in config file" unless (@repo = configs[:repo])
+    error 'need "port" in config file' unless (@port = configs[:port])
+    error 'need "repo" in config file' unless (@repo = configs[:repo])
     @ro_username = configs[:ro_username] if configs.has_key?(:ro_username)
     @ro_password = configs[:ro_password] if configs.has_key?(:ro_password)
   end
@@ -44,9 +75,11 @@ class YggdrasilServer
     loop do
       sock = s0.accept
       msg = sock.gets # first line
+      ctime = Time.now
       if msg && msg.chomp! != MESSAGE_QUIT
         msg.chomp!
-        puts "RCV: #{msg}"
+        printf "RCV[%04d-%02d-%02d %02d:%02d:%02d.%03d](#{sock.peeraddr[3]}): #{msg}\n",
+               ctime.year, ctime.month, ctime.day, ctime.hour, ctime.min, ctime.sec, (ctime.usec/1000).round
         msg_parts = msg.split
         if msg_parts.size != 0
           msg_cmd = msg_parts[0]

data/spec/add_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe Yggdrasil, "add" do
+describe Yggdrasil, 'add' do
   it '-------- add' do
     puts '-------- add'
     prepare_environment

data/spec/check_spec.rb

@@ -1,7 +1,8 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require 'yggdrasil_server'
 
-describe Yggdrasil, "check" do
-  it '-------- check' do
+describe Yggdrasil, 'check' do
+  before(:all) do
     puts '-------- check'
     prepare_environment
     init_yggdrasil
@@ -79,22 +80,22 @@ EOS
 
     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
@@ -105,8 +106,8 @@ EOS
     Yggdrasil.command %w{check}
 
     sleep 1
-    File.exist?("/tmp/yggdrasil-test/.yggdrasil/results").should be_true
-    files = Dir.entries("/tmp/yggdrasil-test/.yggdrasil/results")
+    File.exist?('/tmp/yggdrasil-test/.yggdrasil/results').should be_true
+    files = Dir.entries('/tmp/yggdrasil-test/.yggdrasil/results')
     result_files = files.select{|file| %r{^#{Socket.gethostname}} =~ file}
     result_files.size.should == 1
     `cat /tmp/yggdrasil-test/.yggdrasil/results/#{result_files[0]}`.should == <<"EOS"
@@ -137,8 +138,8 @@ Index: tmp/yggdrasil-test/A
 +foo
 EOS
 
-    sock = TCPSocket.open("localhost", 4000)
-    sock.puts("quit")
+    sock = TCPSocket.open('localhost', 4000)
+    sock.puts('quit')
     sock.close
     Process.waitall
   end

data/spec/cleanup_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe Yggdrasil, "cleanup" do
+describe Yggdrasil, 'cleanup' do
   it '-------- cleanup' do
     puts '-------- cleanup'
     prepare_environment
@@ -8,15 +8,15 @@ describe Yggdrasil, "cleanup" do
   end
 
   it 'should success cleanup' do
-    puts "---- should success cleanup"
-    puts "-- rm .svn"
+    puts '---- should success cleanup'
+    puts '-- rm .svn'
     `rm -rf /tmp/yggdrasil-test/.yggdrasil/mirror/.svn`
 
-    puts "-- cleanup"
+    puts '-- cleanup'
     Yggdrasil.command %w{cleanup --username hoge --password foo}
 
-    puts "-- check .svn"
-    res = File.exist?("/tmp/yggdrasil-test/.yggdrasil/mirror/.svn")
+    puts '-- check .svn'
+    res = File.exist?('/tmp/yggdrasil-test/.yggdrasil/mirror/.svn')
     p res
     res.should == true
   end

data/spec/commit_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe Yggdrasil, "commit" do
+describe Yggdrasil, 'commit' do
   it '-------- commit' do
     puts '-------- commit'
     prepare_environment
@@ -15,12 +15,12 @@ describe Yggdrasil, "commit" do
     puts '---- should commit added files'
     `echo hoge > /tmp/yggdrasil-test/A`
     `echo foo > /tmp/yggdrasil-test/B`
-    FileUtils.cd "/tmp/yggdrasil-test" do
+    FileUtils.cd '/tmp/yggdrasil-test' do
       puts '-- add'
       Yggdrasil.command %w{add A /tmp/yggdrasil-test/B}
     end
 
-    puts "-- commit"
+    puts '-- commit'
     FileUtils.cd '/tmp/yggdrasil-test' do
       Yggdrasil.command %w{commit --username hoge --password foo},
                         "0\nY\nadd A and B\n"
@@ -38,11 +38,11 @@ describe Yggdrasil, "commit" do
   end
 
   it 'should commit modified file' do
-    puts "---- should commit modified file"
-    puts "-- modify"
+    puts '---- should commit modified file'
+    puts '-- modify'
     `echo hoge >> /tmp/yggdrasil-test/A`
 
-    puts "-- commit"
+    puts '-- commit'
     Yggdrasil.command %w{commit / --username hoge --password foo},
                       "0\nY\nmodify A\n"
 
@@ -53,11 +53,11 @@ describe Yggdrasil, "commit" do
   end
 
   it 'should commit with multi line comment' do
-    puts "---- should commit with multi line comment"
-    puts "-- modify"
+    puts '---- should commit with multi line comment'
+    puts '-- modify'
     `echo foo >> /tmp/yggdrasil-test/B`
 
-    puts "-- commit"
+    puts '-- commit'
     Yggdrasil.command %w{commit / --username hoge --password foo},
                       "Y\ntest commit\\\nmodify B\n"
 
@@ -69,7 +69,7 @@ describe Yggdrasil, "commit" do
   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{commit /tmp --username hoge},
@@ -82,7 +82,7 @@ describe Yggdrasil, "commit" do
   end
 
   it 'should commit specified file only' do
-    puts "---- should commit specified file only"
+    puts '---- should commit specified file only'
     `echo A >> /tmp/yggdrasil-test/A`
     `echo B >> /tmp/yggdrasil-test/B`
 
@@ -97,7 +97,7 @@ describe Yggdrasil, "commit" do
   end
 
   it 'should not commit deleted file' do
-    puts "---- should not commit deleted file"
+    puts '---- should not commit deleted file'
     `rm -f /tmp/yggdrasil-test/A`
 
     Yggdrasil.command %w{commit --username hoge --password foo -m delete},
@@ -109,7 +109,7 @@ describe Yggdrasil, "commit" do
   end
 
   it 'should commit deleted file' do
-    puts "---- should commit deleted file"
+    puts '---- should commit deleted file'
     `echo hoge > /tmp/yggdrasil-test/A`
     `rm -f /tmp/yggdrasil-test/B`
 
@@ -124,7 +124,7 @@ describe Yggdrasil, "commit" do
   end
 
   it 'should commit all files at once' do
-    puts "---- should commit all files at once"
+    puts '---- should commit all files at once'
 
     `echo HOGE >> /tmp/yggdrasil-test/A`
     `rm -f /tmp/yggdrasil-test/B`

data/spec/diff_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe Yggdrasil, "diff" do
+describe Yggdrasil, 'diff' do
   it '-------- diff' do
     puts '-------- diff'
     prepare_environment
@@ -12,9 +12,9 @@ describe Yggdrasil, "diff" do
   end
 
   it 'should success diff (absolute/relative path)' do
-    puts "---- should success diff (absolute/relative path)"
+    puts '---- should success diff (absolute/relative path)'
     out = catch_out do
-      FileUtils.cd "/tmp/yggdrasil-test" do
+      FileUtils.cd '/tmp/yggdrasil-test' do
         Yggdrasil.command(%w{diff /tmp/yggdrasil-test/A B --username hoge --password foo})
       end
     end
@@ -39,9 +39,9 @@ EOS
   end
 
   it 'should success (no path)' do
-    puts "---- should success (no path)"
+    puts '---- should success (no path)'
     out = catch_out do
-      FileUtils.cd "/tmp/yggdrasil-test" do
+      FileUtils.cd '/tmp/yggdrasil-test' do
         Yggdrasil.command %w{diff --username hoge --password foo}
       end
     end
@@ -66,9 +66,9 @@ EOS
   end
 
   it 'should success (-r)' do
-    puts "---- should success (-r)"
+    puts '---- should success (-r)'
     out = catch_out do
-      FileUtils.cd "/tmp/yggdrasil-test" do
+      FileUtils.cd '/tmp/yggdrasil-test' do
         Yggdrasil.command %w{diff -r 2:3 A --username hoge --password foo}
       end
     end
@@ -84,9 +84,9 @@ EOS
   end
 
   it 'should success (--revision)' do
-    puts "---- should success (--revision)"
+    puts '---- should success (--revision)'
     out = catch_out do
-      FileUtils.cd "/tmp/yggdrasil-test" do
+      FileUtils.cd '/tmp/yggdrasil-test' do
         Yggdrasil.command %w{diff --revision 3 A --username hoge --password foo}
       end
     end
@@ -103,17 +103,17 @@ EOS
   end
 
   it 'should error: diff with incorrect option' do
-    puts "---- should error: diff with incorrect option"
+    puts '---- should error: diff with incorrect option'
     cmd = %w{diff --hoge --username hoge --password foo}
 
     err = catch_err do
-      FileUtils.cd "/" do
+      FileUtils.cd '/' do
         lambda{Yggdrasil.command cmd}.should raise_error(SystemExit)
       end
     end
     err.sub!(%r{/\S*svn}, 'svn')
     err.should == <<"EOS"
-#{File.basename($0)} error: command failure: svn diff --no-auth-cache --non-interactive --username hoge --password foo --hoge
+#{File.basename($0)} error: command failure: svn ...
 command output:
 svn: invalid option: --hoge
 Type 'svn help' for usage.

data/spec/help_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe Yggdrasil, "help" do
+describe Yggdrasil, 'help' do
   puts '-------- help'
 
   show_subcommands = <<"EOS"
@@ -16,18 +16,15 @@ Available subcommands:
    diff (di)
    help (?, h)
    init
-   init-server
    list (ls)
    log
-   results
    revert
-   server
    status (stat, st)
    update
    version
 
 Yggdrasil is a subversion wrapper to manage server configurations and conditions.
-You should type 'yggdrasil init' at first.
+At first, you should type '#{File.basename($0)} init' to create config file.
 
 EOS
 
@@ -286,33 +283,16 @@ usage: #{File.basename($0)} check [OPTIONS...]
   For example, mount status, number of specific process and etc. can be checked
   by setting up executable files in ~/.yggdrasil/checker/
 
-  if the server is registered, the yggdrasil server receive and record the results.
+  If the yggdrasil server is registered,
+  this subcommand send the result to yggdrasil server
+  and yggdrasil server record the results for all managed servers.
+  Type 'yggserve help', if you need to know about yggdrasil server.
 
 Valid options:
   --username ARG           : specify a username ARG
   --password ARG           : specify a password ARG
   --non-interactive        : do no interactive prompting
 
-EOS
-  end
-
-  it 'should show help of init-server' do
-    puts '---- should show help of init-server'
-    out = catch_out{Yggdrasil.command %w{help init-server}}
-    out.should == <<"EOS"
-init-server: setup server configuration.
-usage: #{File.basename($0)} init-server [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
 
@@ -326,19 +306,6 @@ usage: #{File.basename($0)} server [OPTIONS...]
 Valid options:
   --daemon                 : daemon mode
 
-EOS
-  end
-
-  it 'should show help of results' do
-    puts '---- should show help of results'
-    out = catch_out{Yggdrasil.command %w{help results}}
-    out.should == <<"EOS"
-results: display the result of yggdrasil check command.
-usage: #{File.basename($0)} results [OPTIONS...]
-
-Valid options:
-  --limit ARG              : minutes from the final report, to judge the host not be alive
-
 EOS
   end
 end

data/spec/init_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe Yggdrasil, "init" do
+describe Yggdrasil, 'init' do
   it '-------- init' do
     puts '-------- init'
     prepare_environment
@@ -80,7 +80,7 @@ describe Yggdrasil, "init" do
     Yggdrasil.command %w{init --debug} +
                           %w{--repo private}
 
-    File.exist?("/tmp/yggdrasil-test/.yggdrasil/config").should be_true
+    File.exist?('/tmp/yggdrasil-test/.yggdrasil/config').should be_true
   end
 
   it 'should success: create config file (interactive)' do
@@ -90,11 +90,11 @@ describe Yggdrasil, "init" do
     `rm -rf /tmp/yggdrasil-test/svn-repo`
     `svnadmin create /tmp/yggdrasil-test/svn-repo`
 
-    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
@@ -112,21 +112,21 @@ EOS
           "Y\n"
       end
     out.should == \
-      "Input svn repo URL: "\
+      'Input svn repo URL: '\
       "check SVN access...\n"\
-      "Input svn username: "\
+      'Input svn username: '\
       "Input svn password: \n"\
       "SVN access OK: svn://localhost/tmp/yggdrasil-test/svn-repo\n"\
       "not exist directory(s): mng-repo/host-name\n"\
-      "make directory(s)? [Yn]: "
+      'make directory(s)? [Yn]: '
   end
 
   it 'should make checker example at init' do
     puts "\n---- should make checker example at init"
-    dir = "/tmp/yggdrasil-test/.yggdrasil/checker"
+    dir = '/tmp/yggdrasil-test/.yggdrasil/checker'
     File.directory?(dir).should be_true
 
-    example_checker = dir + "/gem_list"
+    example_checker = dir + '/gem_list'
     File.executable?(example_checker).should be_true
   end
 
@@ -134,23 +134,23 @@ EOS
     puts '---- should success init subcommand with server option'
     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}
     fork do
-      Yggdrasil.command %w{server --debug}
+      YggdrasilServer.command %w{debug}
     end
 
     sleep 1
     Yggdrasil.command %w{init --debug --server localhost:4000},
                       "Y\nhoge\nfoo\n"
 
-    File.exist?("/tmp/yggdrasil-test/.yggdrasil/config").should be_true
+    File.exist?('/tmp/yggdrasil-test/.yggdrasil/config').should be_true
 
-    sock = TCPSocket.open("localhost", 4000)
-    sock.puts("quit")
+    sock = TCPSocket.open('localhost', 4000)
+    sock.puts('quit')
     sock.close
     Process.waitall
   end

data/spec/list_spec.rb

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