yggdrasil 0.0.5 → 0.0.6

data/spec/commit_spec.rb

@@ -52,6 +52,22 @@ describe Yggdrasil, "commit" do
     res.should == "hoge\nhoge\n"
   end
 
+  it 'should commit with multi line comment' do
+    puts "---- should commit with multi line comment"
+    puts "-- modify"
+    `echo foo >> /tmp/yggdrasil-test/B`
+
+    puts "-- commit"
+    Yggdrasil.command %w{commit / --username hoge --password foo},
+                      "Y\ntest commit\\\nmodify B\n"
+
+    puts "\n-- check commit message"
+    res = `svn log -r HEAD --xml file:///tmp/yggdrasil-test/svn-repo/mng-repo/host-name`
+    puts res
+    res =~ /<msg>(.*)<\/msg>/m
+    $1.should == "test commit\nmodify B"
+  end
+
   it 'should accept password interactive' do
     puts "---- should accept password interactive"
     `echo A >> /tmp/yggdrasil-test/A`
@@ -77,7 +93,7 @@ describe Yggdrasil, "commit" do
     puts "\n-- check committed file 'tmp/yggdrasil-test/B'"
     res = `svn cat file:///tmp/yggdrasil-test/svn-repo/mng-repo/host-name/tmp/yggdrasil-test/B`
     puts res
-    res.should == "foo\nB\n"
+    res.should == "foo\nfoo\nB\n"
   end
 
   it 'should not commit deleted file' do
@@ -108,7 +124,7 @@ describe Yggdrasil, "commit" do
   end
 
   it 'should commit all files at once' do
-    puts "---- should revert 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/help_spec.rb

@@ -10,19 +10,23 @@ Type '#{File.basename($0)} help <subcommand>' for help on a specific subcommand.
 
 Available subcommands:
    add
+   check (c)
    cleanup
    commit (ci)
    diff (di)
    help (?, h)
    init
+   init-server
    list (ls)
    log
-   status (stat, st)
+   results
    revert
+   server
+   status (stat, st)
    update
    version
 
-Yggdrasil is a configuration management tool by Subversion.
+Yggdrasil is a subversion wrapper to manage server configurations and conditions.
 You should type 'yggdrasil init' at first.
 
 EOS
@@ -56,7 +60,7 @@ EOS
     err = catch_err do
       lambda{Yggdrasil.command(%w{hoge})}.should raise_error(SystemExit)
     end
-    err.should == "#{File.basename($0)} error: Unknown subcommand: 'hoge'\n\n"
+    err.should == "Unknown subcommand: 'hoge'\n"
   end
 
   help_help = <<"EOS"
@@ -97,9 +101,16 @@ init: Check environment and initialize configuration.
 usage: #{File.basename($0)} init [OPTIONS...]
 
 Valid options:
-  --repo ARG               : specify svn repository
+  --repo ARG               : specify svn repository URL
+                             ARG could be any of the following:
+                             file:///*   : local repository
+                             svn://*     : svn access repository
+                             http(s)://* : http access repository
+                             private     : make local repository in ~/.yggdrasil
   --username ARG           : specify a username ARG
   --password ARG           : specify a password ARG
+  --server ARG             : specify a server address and port
+                             e.g. 192.168.1.35:4000
 
 EOS
   end
@@ -230,7 +241,7 @@ EOS
     out = catch_out{Yggdrasil.command %w{help update}}
     out.should == <<"EOS"
 update (up): Bring changes from the repository into the local files.
-usage: #{File.basename($0)} update [PATH...]
+usage: #{File.basename($0)} update [OPTIONS...] [PATH...]
 
 Valid options:
   --username ARG           : specify a username ARG
@@ -253,13 +264,79 @@ EOS
     out = catch_out{Yggdrasil.command %w{help revert}}
     out.should == <<"EOS"
 revert: Restore pristine working copy file (undo most local edits).
-usage: #{File.basename($0)} revert [PATH...]
+usage: #{File.basename($0)} revert [OPTIONS...] [PATH...]
+
+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 check' do
+    puts '---- should show help of check'
+    out = catch_out{Yggdrasil.command %w{help check}}
+    out.should == <<"EOS"
+check (c): check updating of managed files and the execution output of a commands.
+usage: #{File.basename($0)} check [OPTIONS...]
+
+  This subcommand execute the executable files in ~/.yggdrasil/checker/, and
+  the outputs are checked difference to repository with other managed files.
+  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.
 
 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 could be include {HOST} and it replace by client hostname
+                             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 server' do
+    puts '---- should show help of server'
+    out = catch_out{Yggdrasil.command %w{help server}}
+    out.should == <<"EOS"
+server: receive tcp connection in order to unify the setup and to record check results.
+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_server_spec.rb

@@ -0,0 +1,82 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Yggdrasil, "init-server" do
+  it '-------- init-server' do
+    puts '-------- init-server'
+    prepare_environment
+  end
+
+  it 'should error: "Not enough arguments provided"' 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)
+    end
+    err.should == "#{File.basename($0)} error: Not enough arguments provided: --repo\n\n"
+  end
+
+  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},
+                      "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
+    `cat /tmp/yggdrasil-test/.yggdrasil/server_config`.should == <<"EOS"
+port=4000
+repo=svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}
+ro_username=hoge
+ro_password=foo
+EOS
+  end
+
+  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} +
+                          %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
+    `cat /tmp/yggdrasil-test/.yggdrasil/server_config`.should == <<"EOS"
+port=4000
+repo=svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}
+ro_username=hoge
+ro_password=foo
+EOS
+  end
+
+  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} +
+                          %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
+    `cat /tmp/yggdrasil-test/.yggdrasil/server_config`.should == <<"EOS"
+port=4000
+repo=svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}
+EOS
+  end
+
+  it 'should error if argument have only password' do
+    `rm -rf /tmp/yggdrasil-test/.yggdrasil`
+    puts '---- should error if argument have only password'
+
+    err = catch_err do
+      args = %w{init-server} +
+          %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)
+    end
+    err.should == "#{File.basename($0)} error: --ro-password option need --ro-username, too.\n\n"
+  end
+end

data/spec/init_spec.rb

@@ -72,6 +72,17 @@ describe Yggdrasil, "init" do
                       "Y\n"
   end
 
+  it 'should success: create config file (private)' do
+    puts '---- should success: create config file (private)'
+    `rm -rf /tmp/yggdrasil-test/.yggdrasil`
+    `rm -rf /tmp/yggdrasil-test/svn-repo`
+
+    Yggdrasil.command %w{init --debug} +
+                          %w{--repo private}
+
+    File.exist?("/tmp/yggdrasil-test/.yggdrasil/config").should be_true
+  end
+
   it 'should success: create config file (interactive)' do
     puts '---- should success: create config file (interactive)'
     `pkill svnserve`
@@ -102,11 +113,45 @@ EOS
       end
     out.should == \
       "Input svn repo URL: "\
-      "SVN access test...\n"\
+      "check SVN access...\n"\
       "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]: "
   end
+
+  it 'should make checker example at init' do
+    puts "\n---- should make checker example at init"
+    dir = "/tmp/yggdrasil-test/.yggdrasil/checker"
+    File.directory?(dir).should be_true
+
+    example_checker = dir + "/gem_list"
+    File.executable?(example_checker).should be_true
+  end
+
+  it 'should success init subcommand with server option' do
+    puts '---- should success init subcommand with server option'
+    prepare_environment
+
+    Yggdrasil.command %w{init-server} +
+                          %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}
+    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
+
+    sock = TCPSocket.open("localhost", 4000)
+    sock.puts("quit")
+    sock.close
+    Process.waitall
+  end
 end

data/spec/list_spec.rb

@@ -38,8 +38,12 @@ describe Yggdrasil, "list" do
 
   it 'should show list (with options)' do
     puts '---- should show list (with options)'
-    out = catch_out{Yggdrasil.command(%w{list -R --revision 2 --recursive /tmp} +
+    out = catch_out{Yggdrasil.command(%w{list -R --revision 2 /tmp} +
                                              %w{--username hoge --password foo})}
     out.should == "yggdrasil-test/\nyggdrasil-test/A\nyggdrasil-test/B\n"
+
+    out = catch_out{Yggdrasil.command(%w{list --revision 2 --recursive /tmp} +
+                                          %w{--username hoge --password foo})}
+    out.should == "yggdrasil-test/\nyggdrasil-test/A\nyggdrasil-test/B\n"
   end
 end

data/spec/results_spec.rb

@@ -0,0 +1,66 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Yggdrasil, "results" do
+  before(:all) do
+    puts '-------- results'
+    prepare_environment
+
+    sock = 0
+    begin
+      sock = TCPSocket.open("localhost", 4000)
+    rescue
+      puts "OK. no server"
+    else
+      puts "NG. zombie server. try quit"
+      sock.puts("quit")
+      sock.close
+    end
+
+    Yggdrasil.command %w{init-server} +
+                          %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}
+    end
+    sleep 1
+    Yggdrasil.command %w{init --debug --server localhost:4000} +
+                          %w{--username hoge --password foo},
+                      "Y\nhoge\nfoo\n"
+    `rm -f /tmp/yggdrasil-test/.yggdrasil/checker/gem_list`
+    Yggdrasil.command %w{check}
+    sleep 1
+  end
+
+  it 'should show results' do
+    puts '---- should show results'
+
+    `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"
+
+    out = catch_out do
+      Yggdrasil.command %w{results --limit 30}
+    end
+
+    out.should == <<"EOS"
+######## hoge-old TOO OLD: 2001-05-01 00:00:00 +0900
+######## centos6_127.0.0.1 Mismatch:
+A                0   tmp/yggdrasil-test
+A                0   tmp/yggdrasil-test/.yggdrasil
+A                0   tmp/yggdrasil-test/.yggdrasil/checker_result
+A                0   tmp
+
+EOS
+  end
+
+  after(:all) do
+    sleep 1
+    sock = TCPSocket.open("localhost", 4000)
+    sock.puts("quit")
+    sock.close
+    Process.waitall
+  end
+end

data/spec/server_spec.rb

@@ -0,0 +1,158 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require 'timeout'
+require 'socket'
+
+describe Yggdrasil, "server" do
+
+  before(:all) do
+    puts '-------- server'
+    prepare_environment
+    Yggdrasil.command %w{init-server} +
+                          %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"
+
+    fork do
+      # client behavior
+      sleep 1
+      sock = TCPSocket.open("localhost", 4000)
+      sock.puts("quit")
+      sock.close
+      exit
+    end
+
+    timeout 5 do
+      Yggdrasil.command %w{server --debug}
+    end
+
+    Process.waitall
+  end
+
+  it "should response repository URL" do
+    puts "---- should response repository URL"
+
+    fork do
+      sleep 1
+      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}"
+      sock.close
+
+      sock = TCPSocket.open("localhost", 4000)
+      sock.puts("quit")
+      sock.close
+      exit
+    end
+
+    timeout 5 do
+      Yggdrasil.command %w{server --debug}
+    end
+
+    Process.waitall
+  end
+
+  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")
+      username = sock.gets
+      username.should_not be_nil
+      username.chomp.should == "hoge"
+
+      password = sock.gets
+      password.should_not be_nil
+      password.chomp.should == "foo"
+      sock.close
+
+      sock = TCPSocket.open("localhost", 4000)
+      sock.puts("quit")
+      sock.close
+      exit
+    end
+
+    timeout 5 do
+      Yggdrasil.command %w{server --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"
+
+    fork do
+      sleep 1
+      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.close
+      exit
+    end
+
+    timeout 5 do
+      Yggdrasil.command %w{server --debug}
+    end
+
+    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
+EOS
+
+    Process.waitall
+  end
+
+  it "should not response get_ro_id_pw" do
+    puts "---- should not response get_ro_id_pw"
+    prepare_environment
+    Yggdrasil.command %w{init-server} +
+                          %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.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")
+      username = sock.gets
+      username.should be_nil
+      sock.close
+
+      sock = TCPSocket.open("localhost", 4000)
+      sock.puts("quit")
+      sock.close
+      exit
+    end
+
+    timeout 5 do
+      Yggdrasil.command %w{server --debug}
+    end
+
+    Process.waitall
+  end
+end