yggdrasil 0.0.17 → 0.0.18

data/lib/yggdrasil.rb

@@ -55,12 +55,12 @@ class Yggdrasil
 
   def initialize(exist_config = true)
     @base_cmd = File::basename($0)
-    @current_dir = `readlink -f .`.chomp
+    @current_dir = `pwd`.chomp
     @config_dir = "#{ENV['HOME']}/.yggdrasil"
-    @config_file = "#@config_dir/config"
-    @mirror_dir = "#@config_dir/mirror"
-    @checker_dir = "#@config_dir/checker"
-    @checker_result_dir = "#@config_dir/checker_result"
+    @config_file = "#{@config_dir}/config"
+    @mirror_dir = "#{@config_dir}/mirror"
+    @checker_dir = "#{@config_dir}/checker"
+    @checker_result_dir = "#{@config_dir}/checker_result"
 
     return unless exist_config
     configs = read_config(@config_file)
@@ -95,7 +95,7 @@ class Yggdrasil
     @target_file_num = 0
     FileUtils.cd @mirror_dir do
       files = Array.new
-      cmd = "#@svn ls #@repo -R --no-auth-cache --non-interactive"
+      cmd = "#{@svn} ls #{@repo} -R --no-auth-cache --non-interactive"
       cmd += username_password_options_to_read_repo
       out = system3(cmd)
       ls_files = out.split(/\n/)
@@ -103,12 +103,12 @@ class Yggdrasil
         ls_files.each do |ls_file|
           files << ls_file if ls_file.match("^#{target_relative}")
         end
-        cmd = "#@svn update --no-auth-cache --non-interactive"
+        cmd = "#{@svn} update --no-auth-cache --non-interactive"
         cmd += " -r #{@options[:revision]}" if @options.has_key?(:revision)
         cmd += username_password_options_to_read_repo
         cmd += ' '+target_relative
         system3(cmd)
-        cmd = "#@svn status -q --no-auth-cache --non-interactive"
+        cmd = "#{@svn} status -q --no-auth-cache --non-interactive"
         cmd += username_password_options_to_read_repo
         cmd += ' '+target_relative
         out = system3(cmd)
@@ -121,24 +121,31 @@ class Yggdrasil
       @target_file_num = files.size
       files.each do |file|
         if !File.exist?("/#{file}")
-          system3 "#@svn delete #{file} --force" +
+          system3 "#{@svn} delete #{file} --force" +
                       ' --no-auth-cache --non-interactive'
         elsif File.file?("/#{file}")
-          if !File.exist?("#@mirror_dir/#{file}")
-            cmd = "#@svn revert #{file}"
+          if !File.exist?("#{@mirror_dir}/#{file}")
+            cmd = "#{@svn} revert #{file}"
             system3 cmd
           end
-          #FileUtils.copy_file "/#{file}", "#@mirror_dir/#{file}"
-          `cp -fd /#{file} #@mirror_dir/#{file}`
+          FileUtils.copy_file "/#{file}", "#{@mirror_dir}/#{file}"
+          #`cp -fd /#{file} #@mirror_dir/#{file}`
         end
       end
-      cmd = "#@svn status -qu --no-auth-cache --non-interactive"
+      cmd = "#{@svn} status -qu --no-auth-cache --non-interactive"
       cmd += username_password_options_to_read_repo
       out = system3(cmd)
       out.split(/\n/).each do |line|
         next if /^Status against revision/ =~ line
         if /^(.).*\s(\S+)\s*$/ =~ line
-          updates << [$1, $2]
+          stat = $1
+          file = $2
+          files.each do |target|
+            if file =~ /^#{target}/ || target =~ /^#{file}/
+              updates << [stat, file]
+              break
+            end
+          end
         end
       end
     end
@@ -232,14 +239,14 @@ class Yggdrasil
 
   def exec_checker
     # execute checker
-    `rm -rf #@checker_result_dir`
+    `rm -rf #{@checker_result_dir}`
     Dir.mkdir @checker_result_dir, 0755
     if File.exist?(@checker_dir)
       Find.find(@checker_dir) do |file|
         if File.file?(file) && File.executable?(file)
-          if file =~ %r{^#@checker_dir(.*)$}
+          if file =~ %r{^#{@checker_dir}(.*)$}
             file_body = $1
-            system3("#{file} > #@checker_result_dir#{file_body}")
+            system3("#{file} > #{@checker_result_dir}#{file_body}")
           end
         end
       end

data/lib/yggdrasil/add.rb

@@ -3,9 +3,15 @@ class Yggdrasil
   # @param [Array] args
   def add(args)
     parse_options(args, {})
+    error "invalid options: #{(@arg_options).join(', ')}" if @arg_options.size != 0
+
     while (arg = @arg_paths.shift)
 
-      file_path = system3("readlink -f #{arg}").chomp
+      if arg =~ /^\//
+        file_path = arg
+      else
+        file_path = `pwd`.chomp + '/' + arg
+      end
       unless File.exist?(file_path)
         puts "no such file: #{file_path}"
         next
@@ -16,11 +22,11 @@ class Yggdrasil
         mirror_path += "/#{part}"
         next if File.exist?(mirror_path)
         if part.equal?(file_path_parts[-1]) && File.file?(file_path)
-          FileUtils.copy file_path, mirror_path
+          FileUtils.copy_file file_path, mirror_path
         else
           Dir.mkdir mirror_path
         end
-        cmd = "#@svn add #{mirror_path}"
+        cmd = "#{@svn} add #{mirror_path}"
         cmd += ' ' + @arg_options.join(' ') if @arg_options.size != 0
         puts system3(cmd)
       end

data/lib/yggdrasil/check.rb

@@ -20,7 +20,7 @@ class Yggdrasil
     if matched_updates.size != 0
       confirmed_updates = confirm_updates(matched_updates, %w{A q}) do |relative_path|
         FileUtils.cd @mirror_dir do
-          cmd = "#@svn diff --no-auth-cache --non-interactive #{relative_path}"
+          cmd = "#{@svn} diff --no-auth-cache --non-interactive #{relative_path}"
           cmd += username_password_options_to_read_repo
           puts system3(cmd)
         end
@@ -30,7 +30,7 @@ class Yggdrasil
 
       ##############  add status information to check_result
       FileUtils.cd @mirror_dir do
-        cmd = "#@svn status -quN --no-auth-cache --non-interactive"
+        cmd = "#{@svn} status -quN --no-auth-cache --non-interactive"
         cmd += username_password_options_to_read_repo
         cmd += " #{confirmed_updates.join(' ')}"
         check_result = system3(cmd)
@@ -48,7 +48,7 @@ class Yggdrasil
           if result_line =~ /\s(\S+)$/
             result_path = $1
             next if File.directory?(result_path)
-            cmd = "#@svn diff --no-auth-cache --non-interactive"
+            cmd = "#{@svn} diff --no-auth-cache --non-interactive"
             cmd += username_password_options_to_read_repo
             cmd += ' '+result_path
             check_result << system3(cmd) +"\n"

data/lib/yggdrasil/cleanup.rb

@@ -9,9 +9,9 @@ class Yggdrasil
 
     get_user_pass_if_need_to_read_repo
 
-    system3 "rm -rf #@mirror_dir"
+    system3 "rm -rf #{@mirror_dir}"
 
-    cmd = "#@svn checkout --no-auth-cache --non-interactive #@repo #@mirror_dir"
+    cmd = "#{@svn} checkout --no-auth-cache --non-interactive #{@repo} #{@mirror_dir}"
     cmd += username_password_options_to_read_repo
     system3 cmd
   end

data/lib/yggdrasil/commit.rb

@@ -18,7 +18,7 @@ class Yggdrasil
 
     confirmed_updates = confirm_updates(matched_updates) do |relative_path|
       FileUtils.cd @mirror_dir do
-        cmd = "#@svn diff --no-auth-cache --non-interactive #{relative_path}"
+        cmd = "#{@svn} diff --no-auth-cache --non-interactive #{relative_path}"
         cmd += username_password_options_to_read_repo
         puts system3(cmd)
       end
@@ -45,7 +45,7 @@ class Yggdrasil
 
     input_user_pass
     FileUtils.cd @mirror_dir do
-      cmd = "#@svn commit -m '#{@options[:message]}'"\
+      cmd = "#{@svn} commit -m '#{@options[:message]}'"\
             ' --no-auth-cache --non-interactive'\
             " --username '#{@options[:username]}' --password '#{@options[:password]}'"\
             " #{confirmed_updates.join(' ')}"

data/lib/yggdrasil/diff.rb

@@ -30,7 +30,7 @@ class Yggdrasil
       error "following files are not managed.\n"+err_paths.join("\n")
     end
 
-    cmd_arg = "#@svn diff --no-auth-cache --non-interactive"
+    cmd_arg = "#{@svn} diff --no-auth-cache --non-interactive"
     cmd_arg += username_password_options_to_read_repo
     cmd_arg += ' ' + @arg_options.join(' ') if @arg_options.size != 0
     cmd_arg += " -r #{@options[:diff_rev]}" if @options.has_key?(:diff_rev)

data/lib/yggdrasil/help.rb

@@ -4,9 +4,9 @@ class Yggdrasil
   def help(args)
     if args.size == 0
       puts <<EOS
-usage: #@base_cmd <subcommand> [options] [args]
+usage: #{@base_cmd} <subcommand> [options] [args]
 Yggdrasil version #{VERSION}
-Type '#@base_cmd help <subcommand>' for help on a specific subcommand.
+Type '#{@base_cmd} help <subcommand>' for help on a specific subcommand.
 
 Available subcommands:
    add
@@ -22,7 +22,7 @@ Available subcommands:
    version
 
 Yggdrasil is a subversion wrapper to manage server configurations and conditions.
-At first, you should type '#@base_cmd init' to create config file.
+At first, you should type '#{@base_cmd} init' to create config file.
 
 EOS
     elsif args.size != 1 then
@@ -32,14 +32,14 @@ EOS
         when 'add'
           puts <<"EOS"
 add: Add files to management list (add to subversion)
-usage #@base_cmd add [FILES...]
+usage #{@base_cmd} add [FILES...]
 
 EOS
 
         when 'check', 'c', 'status', 'stat', 'st' # check (c, status, stat, st)
           puts <<"EOS"
 check (c, status, stat, st): check updating of managed files and the execution output of a commands.
-usage: #@base_cmd check [OPTIONS...]
+usage: #{@base_cmd} check [OPTIONS...]
 
   This subcommand execute the executable files in ~/.yggdrasil/checker/, and
   the outputs are checked difference to repository with other managed files.
@@ -60,7 +60,7 @@ EOS
         when 'cleanup' ################################################ cleanup
           puts <<"EOS"
 cleanup: clean up the working copy
-usage: #@base_cmd cleanup [OPTIONS...]
+usage: #{@base_cmd} cleanup [OPTIONS...]
 
 Valid options:
   --username ARG           : specify a username ARG
@@ -70,7 +70,7 @@ EOS
         when 'commit', 'ci' ####################################### commit (ci)
           puts <<"EOS"
 commit (ci): Send changes from your local file to the repository.
-usage: #@base_cmd commit [OPTIONS...] [FILES...]
+usage: #{@base_cmd} commit [OPTIONS...] [FILES...]
 
 Valid options:
   --username ARG           : specify a username ARG
@@ -82,7 +82,7 @@ EOS
         when 'diff', 'di' ########################################### diff (di)
           puts <<"EOS"
 diff (di): Display the differences between two revisions or paths.
-usage: #@base_cmd diff [OPTIONS...] [PATH...]
+usage: #{@base_cmd} diff [OPTIONS...] [PATH...]
 
 Valid options:
   --username ARG           : specify a username ARG
@@ -100,13 +100,13 @@ EOS
         when 'help', '--help', 'h', '-h', '?' ###################### help (?,h)
           puts <<"EOS"
 help (?,h): Describe the usage of this program or its subcommands.
-usage: #@base_cmd help [SUBCOMMAND]
+usage: #{@base_cmd} help [SUBCOMMAND]
 
 EOS
         when 'init' ###################################################### init
           puts <<"EOS"
 init: Check environment and initialize configuration.
-usage: #@base_cmd init [OPTIONS...]
+usage: #{@base_cmd} init [OPTIONS...]
 
 Valid options:
   --repo ARG               : specify svn repository URL
@@ -126,7 +126,7 @@ EOS
         when 'list', 'ls' ########################################### list (ls)
           puts <<"EOS"
 list (ls): List directory entries in the repository.
-usage: #@base_cmd list [OPTIONS...] [PATH...]
+usage: #{@base_cmd} list [OPTIONS...] [PATH...]
 
 Valid options:
   --username ARG           : specify a username ARG
@@ -145,7 +145,7 @@ EOS
         when 'log' ######################################################## log
           puts <<"EOS"
 log: Show the log messages for a set of revision(s) and/or file(s).
-usage: #@base_cmd log [OPTIONS...] [PATH]
+usage: #{@base_cmd} log [OPTIONS...] [PATH]
 
 Valid options:
   --username ARG           : specify a username ARG
@@ -165,7 +165,7 @@ EOS
         when 'update', 'up', 'revert' ##################### update (up, revert)
           puts <<"EOS"
 update (up, revert): Set the files to the contents of the newest repository.
-usage: #@base_cmd update [OPTIONS...] [PATH...]
+usage: #{@base_cmd} update [OPTIONS...] [PATH...]
 
 Valid options:
   --username ARG           : specify a username ARG
@@ -178,7 +178,7 @@ EOS
         when 'version', '--version', '-v' ######################## version (-v)
           puts <<"EOS"
 version: See the program version
-usage: #@base_cmd version
+usage: #{@base_cmd} version
 
 EOS
         else

data/lib/yggdrasil/init.rb

@@ -26,11 +26,11 @@ class Yggdrasil
 
     while File.exist?(@config_file)
       if @options[:force?]
-        `rm -rf #@config_file`
+        `rm -rf #{@config_file}`
         break
       end
-      error "Already exist config file. use --force to ignore" if @options[:non_interactive?]
-      puts "Already exist config file: #@config_file"
+      error 'Already exist config file. use --force to ignore' if @options[:non_interactive?]
+      puts "Already exist config file: #{@config_file}"
       print 'Overwrite? [Yn]: '
       res = $stdin.gets
       puts
@@ -38,7 +38,7 @@ class Yggdrasil
       res.chomp!
       return nil if res == 'n'
       if res == 'Y'
-        `rm -rf #@config_file`
+        `rm -rf #{@config_file}`
         break
       end
     end
@@ -53,7 +53,7 @@ class Yggdrasil
     @options[:repo].gsub!(/\{host\}/, Socket.gethostname.split('.')[0])
     if @options[:repo] == 'private'
       Dir.mkdir @config_dir, 0755 unless File.exist?(@config_dir)
-      repo_dir = "#@config_dir/private_repo"
+      repo_dir = "#{@config_dir}/private_repo"
       system3 "svnadmin create #{repo_dir}"
       @options[:repo] = "file://#{repo_dir}"
     end
@@ -109,10 +109,10 @@ class Yggdrasil
         break if input == 'Y'
       end
       input_user_pass
-      `rm -rf #@mirror_dir`
+      `rm -rf #{@mirror_dir}`
       system3 "#{svn} checkout -N --no-auth-cache --non-interactive" +
                   " --username '#{@options[:ro_username]}' --password '#{@options[:ro_password]}'" +
-                  " #{url_parts[0...url_parts_num].join('/')} #@mirror_dir"
+                  " #{url_parts[0...url_parts_num].join('/')} #{@mirror_dir}"
       add_paths = Array.new
       path = @mirror_dir
       while url_parts_num < url_parts.size
@@ -127,7 +127,7 @@ class Yggdrasil
       system3 "#{svn} commit -m 'yggdrasil init' --no-auth-cache --non-interactive" +
                   " --username '#{@options[:username]}' --password '#{@options[:password]}'" +
                   ' ' + add_paths.join(' ')
-      system3 "rm -rf #@mirror_dir"
+      system3 "rm -rf #{@mirror_dir}"
     end
 
     # make config file
@@ -141,8 +141,8 @@ class Yggdrasil
     end
 
     # make mirror dir
-    `rm -rf #@mirror_dir`
-    cmd = "#{svn} checkout --no-auth-cache --non-interactive #{@options[:repo]} #@mirror_dir"
+    `rm -rf #{@mirror_dir}`
+    cmd = "#{svn} checkout --no-auth-cache --non-interactive #{@options[:repo]} #{@mirror_dir}"
     cmd += " --username '#{@options[:ro_username]}' --password '#{@options[:ro_password]}'" unless anon_access
     system3 cmd
 
@@ -152,7 +152,7 @@ class Yggdrasil
 
 
   def init_get_repo_interactive
-    error "need --repo or --server" if @options[:non_interactive?]
+    error 'need --repo or --server' if @options[:non_interactive?]
     loop do
       print 'Input svn repo URL: '
       input = $stdin.gets

data/lib/yggdrasil/list.rb

@@ -14,11 +14,11 @@ class Yggdrasil
 
     repos = Array.new
     @arg_paths.each do |path|
-      path = "#@current_dir/#{path}" unless %r{^/} =~ path
+      path = "#{@current_dir}/#{path}" unless %r{^/} =~ path
       repos << @repo+path
     end
 
-    cmd_arg = "#@svn list --no-auth-cache --non-interactive"
+    cmd_arg = "#{@svn} list --no-auth-cache --non-interactive"
     cmd_arg += username_password_options_to_read_repo
     cmd_arg += " -r #{@options[:revision]}" if @options.has_key?(:revision)
     cmd_arg += ' -R' if @options.has_key?(:recursive?)

data/lib/yggdrasil/log.rb

@@ -28,7 +28,7 @@ class Yggdrasil
       error "following files are not managed.\n"+err_paths.join("\n")
     end
 
-    cmd_arg = "#@svn log --no-auth-cache --non-interactive"
+    cmd_arg = "#{@svn} log --no-auth-cache --non-interactive"
     cmd_arg += username_password_options_to_read_repo
     cmd_arg += ' ' + @arg_options.join(' ') if @arg_options.size != 0
     if @options.has_key?(:revision)

data/lib/yggdrasil/update.rb

@@ -17,7 +17,7 @@ class Yggdrasil
 
     confirmed_updates = confirm_updates(matched_updates) do |relative_path|
       FileUtils.cd @mirror_dir do
-        cmd = "#@svn diff --no-auth-cache --non-interactive #{relative_path}"
+        cmd = "#{@svn} diff --no-auth-cache --non-interactive #{relative_path}"
         cmd += username_password_options_to_read_repo
         puts system3(cmd)
       end
@@ -26,11 +26,11 @@ class Yggdrasil
     return if confirmed_updates.size == 0
 
     FileUtils.cd @mirror_dir do
-      cmd = "#@svn revert #{confirmed_updates.reverse.join(' ')}"
+      cmd = "#{@svn} revert #{confirmed_updates.reverse.join(' ')}"
       system3 cmd
 
       # make ls hash
-      cmd = "#@svn ls -R #@repo --no-auth-cache --non-interactive"
+      cmd = "#{@svn} ls -R #{@repo} --no-auth-cache --non-interactive"
       cmd += username_password_options_to_read_repo
       out = system3(cmd)
 
@@ -40,8 +40,8 @@ class Yggdrasil
       # reflect mirror to real file
       confirmed_updates.each do |file|
         if ls_hash.has_key?(file)
-          if File.file?("#@mirror_dir/#{file}")
-            FileUtils.copy_file "#@mirror_dir/#{file}", "/#{file}"
+          if File.file?("#{@mirror_dir}/#{file}")
+            FileUtils.copy_file "#{@mirror_dir}/#{file}", "/#{file}"
           end
         else
           system3 "rm -rf #{@mirror_dir + '/' + file}"

data/lib/yggdrasil/version.rb

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

data/lib/yggdrasil_common.rb

@@ -69,7 +69,6 @@ module YggdrasilCommon
       print 'Input svn username: '
       input = $stdin.gets
       error 'can not input username' unless input
-      puts
       input.chomp!
       return if input.size == 0
       @options[:username] = @options[:ro_username] = input
@@ -100,7 +99,7 @@ module YggdrasilCommon
       else
         cmd_display = (cmd.split)[0]+' ...'
       end
-      $stderr.puts "#@base_cmd error: command failure: #{cmd_display}"
+      $stderr.puts "#{@base_cmd} error: command failure: #{cmd_display}"
       $stderr.puts 'command output:'
       $stderr.puts out
       exit stat.exitstatus
@@ -110,7 +109,7 @@ module YggdrasilCommon
 
   # @param [String] msg
   def error(msg)
-    $stderr.puts "#@base_cmd error: #{msg}"
+    $stderr.puts "#{@base_cmd} error: #{msg}"
     $stderr.puts
     exit 1
   end

data/lib/yggdrasil_server.rb

@@ -51,10 +51,10 @@ class YggdrasilServer
 
   def initialize(exist_config = true)
     @base_cmd = File::basename($0)
-    @current_dir = `readlink -f .`.chomp
+    @current_dir = `pwd`.chomp
     @config_dir = "#{ENV['HOME']}/.yggdrasil"
-    @server_config_file = "#@config_dir/server_config"
-    @results_dir = "#@config_dir/results"
+    @server_config_file = "#{@config_dir}/server_config"
+    @results_dir = "#{@config_dir}/results"
 
     return unless exist_config
     configs = read_config(@server_config_file)

data/lib/yggdrasil_server/help.rb

@@ -6,9 +6,9 @@ class YggdrasilServer
   def help(args)
     if args.size == 0
       puts <<EOS
-usage: #@base_cmd <subcommand> [options] [args]
+usage: #{@base_cmd} <subcommand> [options] [args]
 Yggdrasil version #{Yggdrasil::VERSION}
-Type '#@base_cmd help <subcommand>' for help on a specific subcommand.
+Type '#{@base_cmd} help <subcommand>' for help on a specific subcommand.
 
 Available subcommands:
    daemon
@@ -21,7 +21,7 @@ Available subcommands:
 Yggdrasil server is a TCP server
 to receive/record the yggdrasil check result of all managed servers.
 
-At first, you should type '#@base_cmd init' to create config file.
+At first, you should type '#{@base_cmd} init' to create config file.
 
 EOS
     elsif args.size != 1 then
@@ -43,13 +43,13 @@ EOS
         when 'help', '--help', 'h', '-h', '?' ###################### help (h,?)
           puts <<"EOS"
 help (?,h): Describe the usage of this program or its subcommands.
-usage: #@base_cmd help [SUBCOMMAND]
+usage: #{@base_cmd} help [SUBCOMMAND]
 
 EOS
         when 'init' ###################################################### init
           puts <<"EOS"
 init: setup yggdrasil server configuration.
-usage: #@base_cmd init [OPTIONS...]
+usage: #{@base_cmd} init [OPTIONS...]
 
 Valid options:
   --port ARG               : specify a TCP port number ARG
@@ -65,7 +65,7 @@ EOS
         when 'results', 'res' ################################### results (res)
           puts <<"EOS"
 results: display the result of yggdrasil check command.
-usage: #@base_cmd results [OPTIONS...]
+usage: #{@base_cmd} results [OPTIONS...]
 
 Valid options:
   --expire ARG              : minutes from the final report, to judge the host not be alive
@@ -74,7 +74,7 @@ EOS
         when 'version', '--version', '-v' ######################## version (-v)
           puts <<"EOS"
 version: See the program version
-usage: #@base_cmd version
+usage: #{@base_cmd} version
 
 EOS
         else

data/lib/yggdrasil_server/put_result.rb

@@ -6,7 +6,7 @@ class YggdrasilServer
     end
     # make result file
     Dir.mkdir @results_dir, 0755 unless File.exist?(@results_dir)
-    result_file = "#@results_dir/#{arg_hash[:hostname]}_#{sock.peeraddr[3]}"
+    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|
       f.write result_string

data/lib/yggdrasil_server/results.rb

@@ -1,3 +1,5 @@
+require 'nkf'
+
 class YggdrasilServer
 
   # @param [Array] args
@@ -13,7 +15,7 @@ class YggdrasilServer
     alert = false
     files.each do |file|
       next if /^\./ =~ file
-      absolute = "#@results_dir/#{file}"
+      absolute = "#{@results_dir}/#{file}"
       if @options.has_key?(:expire)
         stat = File.stat(absolute)
         if stat.mtime < (Time.now - @options[:expire].to_i * 60)
@@ -23,7 +25,8 @@ class YggdrasilServer
           next
         end
       end
-      buf = File.read("#@results_dir/#{file}")
+      buf = File.read("#{@results_dir}/#{file}")
+      buf = NKF::nkf('-wm0', buf)
       if buf.gsub(/\s*\n/m, '') != ''
         alert = true
         puts "######## #{file} Mismatch:"

data/lib/yggdrasil_server/server.rb

@@ -7,7 +7,7 @@ class YggdrasilServer
     end
 
     ctime = Time.now
-    $stdout.printf "Start: yggdrasil server (port:#@port)[%04d-%02d-%02d %02d:%02d:%02d.%03d]\n",
+    $stdout.printf "Start: yggdrasil server (port:#{@port})[%04d-%02d-%02d %02d:%02d:%02d.%03d]\n",
            ctime.year, ctime.month, ctime.day, ctime.hour, ctime.min, ctime.sec, (ctime.usec/1000).round
     $stdout.flush
     TCPServer.do_not_reverse_lookup = true
@@ -43,7 +43,7 @@ class YggdrasilServer
       sock.close
       if @options.has_key?(:debug?) && msg == MESSAGE_QUIT
         ctime = Time.now
-        $stdout.printf "Quit: yggdrasil server (port:#@port)[%04d-%02d-%02d %02d:%02d:%02d.%03d]\n",
+        $stdout.printf "Quit: yggdrasil server (port:#{@port})[%04d-%02d-%02d %02d:%02d:%02d.%03d]\n",
                        ctime.year, ctime.month, ctime.day, ctime.hour, ctime.min, ctime.sec, (ctime.usec/1000).round
         $stdout.flush
         break

data/lib/yggdrasil_server/version.rb

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

data/spec/check_spec.rb

@@ -286,7 +286,7 @@ EOS
   end
 
   it 'should recover delete flag' do
-    pending "under construction..."
+    pending 'under construction...'
     puts "\n---- should recover delete flag"
 
     `mkdir /tmp/yggdrasil-test/c`

data/spec/commit_spec.rb

@@ -155,4 +155,137 @@ describe Yggdrasil, 'commit' do
     puts res
     res.should == "A\n"
   end
+
+  it 'should commit symbolic link files' do
+    puts '---- should commit symbolic link files'
+    `ln -s /tmp/yggdrasil-test/A /tmp/yggdrasil-test/B`
+    `ln -s /tmp/yggdrasil-test /tmp/yggdrasil-test/c`
+
+puts '1'
+    Yggdrasil.command %w{add /tmp/yggdrasil-test/B /tmp/yggdrasil-test/c/A}
+puts '2'
+
+    out = catch_out {Yggdrasil.command %w{c --username hoge --password foo}}
+    out.should == <<"EOS"
+
+0:A tmp/yggdrasil-test/B
+1:A tmp/yggdrasil-test/c
+2:A tmp/yggdrasil-test/c/A
+OK? [A|q|<num to diff>]:#{' '}
+EOS
+    puts '3'
+
+    Yggdrasil.command %w{commit -m addSymbolicLinks --debug} +
+                          %w{--username hoge --password foo},
+                      "Y\n"
+    puts '4'
+
+    res = `svn ls file:///tmp/yggdrasil-test/svn-repo/mng-repo/host-name/tmp/yggdrasil-test`
+    puts res
+    res.should == "A\nB\nc/\n"
+    puts '5'
+
+    out = catch_out {Yggdrasil.command %w{c --username hoge --password foo}}
+    out.should == <<"EOS"
+6 files checked.
+Yggdrasil check: OK.
+EOS
+
+    `echo hoge >> /tmp/yggdrasil-test/A`
+
+    out = catch_out {Yggdrasil.command %w{c --username hoge --password foo}}
+    out.should == <<"EOS"
+
+0:M tmp/yggdrasil-test/A
+1:M tmp/yggdrasil-test/B
+2:M tmp/yggdrasil-test/c/A
+OK? [A|q|<num to diff>]:#{' '}
+EOS
+
+    Yggdrasil.command %w{commit -m addSymbolicLinks --debug} +
+                          %w{--username hoge --password foo},
+                      "Y\n"
+
+    out = catch_out {Yggdrasil.command %w{c --username hoge --password foo}}
+    out.should == <<"EOS"
+6 files checked.
+Yggdrasil check: OK.
+EOS
+
+  end
+
+  it 'should commit only specified files' do
+    puts '---- should commit only specified files'
+
+    `echo hoge >> /tmp/yggdrasil-test/A`
+
+    out = catch_out {Yggdrasil.command %w{c --username hoge --password foo}}
+    out.should == <<"EOS"
+
+0:M tmp/yggdrasil-test/A
+1:M tmp/yggdrasil-test/B
+2:M tmp/yggdrasil-test/c/A
+OK? [A|q|<num to diff>]:#{' '}
+EOS
+
+    out = catch_out do
+      Yggdrasil.command %w{commit -m absolutePath --debug /tmp/yggdrasil-test/A} +
+                            %w{--username hoge --password foo},
+                        "Y\n"
+    end
+    out.should == <<"EOS"
+
+0:M tmp/yggdrasil-test/A
+OK? [Y|n|<num to diff>]:#{' '}
+Sending        tmp/yggdrasil-test/A
+Transmitting file data .
+Committed revision 12.
+EOS
+
+    out = catch_out {Yggdrasil.command %w{c --username hoge --password foo}}
+    out.should == <<"EOS"
+
+0:M tmp/yggdrasil-test/B
+1:M tmp/yggdrasil-test/c/A
+OK? [A|q|<num to diff>]:#{' '}
+EOS
+
+    out = catch_out do
+      FileUtils.cd '/tmp/yggdrasil-test' do
+        Yggdrasil.command %w{commit -m absolutePath --debug c} +
+                              %w{--username hoge --password foo},
+                          "Y\n"
+      end
+    end
+    out.should == <<"EOS"
+
+0:M tmp/yggdrasil-test/c/A
+OK? [Y|n|<num to diff>]:#{' '}
+Sending        tmp/yggdrasil-test/c/A
+Transmitting file data .
+Committed revision 13.
+EOS
+
+    out = catch_out {Yggdrasil.command %w{c --username hoge --password foo}}
+    out.should == <<"EOS"
+
+0:M tmp/yggdrasil-test/B
+OK? [A|q|<num to diff>]:#{' '}
+EOS
+
+    out = catch_out do
+      Yggdrasil.command %w{commit -m absolutePath --debug} +
+                            %w{--username hoge --password foo},
+                        "Y\n"
+    end
+    out.should == <<"EOS"
+
+0:M tmp/yggdrasil-test/B
+OK? [Y|n|<num to diff>]:#{' '}
+Sending        tmp/yggdrasil-test/B
+Transmitting file data .
+Committed revision 14.
+EOS
+  end
+
 end

data/spec/init_spec.rb

@@ -125,8 +125,7 @@ EOS
     out.should == <<"EOS"
 Input svn repo URL:#{' '}
 check SVN access...
-Input svn username:#{' '}
-Input svn password:#{' '}
+Input svn username:#{' '}Input svn password:#{' '}
 SVN access OK: svn://localhost/tmp/yggdrasil-test/svn-repo
 not exist directory(s) in repository: mng-repo/host-name
 make directory(s)? [Yn]:#{' '}

data/spec/server_results_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require File.dirname(__FILE__) + '/spec_helper'
 require 'yggdrasil_server'
 
@@ -81,6 +82,22 @@ Index: tmp/yggdrasil-test/A
 EOS
   end
 
+  it 'should show s-jis results' do
+    puts '---- should show s-jis results'
+
+    `rm /tmp/yggdrasil-test/.yggdrasil/results/*`
+    `echo 'あいうえお' | nkf -s > /tmp/yggdrasil-test/.yggdrasil/results/hoge`
+
+    out = catch_out do
+      lambda{YggdrasilServer.command(%w{results})}.should raise_error(SystemExit)
+    end
+    out.should == <<"EOS"
+######## hoge Mismatch:
+あいうえお
+EOS
+  end
+
+
   after(:all) do
     sleep 1
     sock = TCPSocket.open('localhost', 4000)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yggdrasil
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-11 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 522662544395152176
+      hash: 1911977696976218263
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 522662544395152176
+      hash: 1911977696976218263
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25