yggdrasil 0.0.12 → 0.0.13

data/lib/yggdrasil/check.rb

@@ -14,56 +14,65 @@ class Yggdrasil
 
     updates = sync_mirror
     matched_updates = select_updates(updates, @arg_paths)
-    if matched_updates.size == 0
-      puts 'no files.'
-      return
-    end
 
-    confirmed_updates = confirm_updates(matched_updates) do |relative_path|
+    check_result = String.new
+    if matched_updates.size != 0
+      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 += username_password_options_to_read_repo
+          puts system3(cmd)
+        end
+      end
+      return unless confirmed_updates
+      return if confirmed_updates.size == 0
+
+      ##############  add status information to check_result
       FileUtils.cd @mirror_dir do
-        cmd = "#@svn diff --no-auth-cache --non-interactive #{relative_path}"
+        cmd = "#@svn status -quN --no-auth-cache --non-interactive"
         cmd += username_password_options_to_read_repo
-        puts system3(cmd)
+        cmd += " #{confirmed_updates.join(' ')}"
+        check_result = system3(cmd)
       end
-    end
-    return unless confirmed_updates
-    return if confirmed_updates.size == 0
-
-    check_result = String.new
-    FileUtils.cd @mirror_dir do
-      cmd = "#@svn status -quN --no-auth-cache --non-interactive"
-      cmd += username_password_options_to_read_repo
-      cmd += " #{confirmed_updates.join(' ')}"
-      check_result = system3(cmd)
-    end
-    check_result.gsub!(/^Status against revision:.*\n/, '')
-    check_result.chomp!
-    result_array = check_result.split("\n")
-    result_array.sort!.uniq!
-    check_result = result_array.join("\n")
-
-    if check_result == ''
-      puts 'yggdrasil check: OK!'
-    else
+      check_result.gsub!(/^Status against revision:.*\n/, '')
+      check_result.chomp!
+      result_array = check_result.split("\n")
+      result_array.sort!.uniq!
+      check_result = result_array.join("\n")
       check_result << "\n\n"
+
+      ##############  add diff information to check_result
       cmd = "#@svn diff --no-auth-cache --non-interactive"
       cmd += username_password_options_to_read_repo
       cmd += " #{confirmed_updates.join(' ')}"
       FileUtils.cd @mirror_dir do
         check_result << system3(cmd)
       end
-      puts check_result
     end
 
-    if /^(.+):(\d+)$/ =~ @options[:server]
-      host = $1
-      port = $2
-      # put check_result to server
-      sock = TCPSocket.open(host, port)
-      error "can not connect to server: #{host}:#{port}" if sock.nil?
-      sock.puts "put_result #{Socket.gethostname}"
-      sock.puts check_result
-      sock.close
+    if @arg_paths.size == 1 && @arg_paths[0] == '/'
+      if /^(.+):(\d+)$/ =~ @options[:server]
+        host = $1
+        port = $2
+        # put check_result to server
+        sock = TCPSocket.open(host, port)
+        error "can not connect to server: #{host}:#{port}" if sock.nil?
+        sock.puts "put_result #{Socket.gethostname}"
+        sock.puts check_result
+        sock.close
+      end
+      if check_result == ''
+        puts 'Yggdrasil check: OK.'
+      else
+        puts check_result
+        puts "\nYggdrasil check: NG!!!"
+      end
+    else
+      if check_result == ''
+        puts 'no files.'
+      else
+        puts check_result
+      end
     end
   end
 end

data/lib/yggdrasil/help.rb

@@ -119,6 +119,7 @@ Valid options:
   --password ARG           : specify a password ARG
   --server ARG             : specify a server address and port
                              e.g. 192.168.1.35:4000
+                             see also 'yggserve help'
 
 EOS
         when 'list', 'ls' ########################################### list (ls)

data/lib/yggdrasil/version.rb

@@ -1,5 +1,5 @@
 class Yggdrasil
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 
   def version
     puts <<"EOS"

data/lib/yggdrasil_server/server.rb

@@ -6,7 +6,10 @@ class YggdrasilServer
       error "invalid arguments: #{(@arg_options+@arg_paths).join(', ')}"
     end
 
-    puts "Start: yggdrasil server (port:#@port)"
+    ctime = Time.now
+    $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
     s0 = TCPServer.open(@port.to_i)
     loop do
@@ -15,8 +18,9 @@ class YggdrasilServer
       ctime = Time.now
       if msg && msg.chomp! != MESSAGE_QUIT
         msg.chomp!
-        printf "RCV[%04d-%02d-%02d %02d:%02d:%02d.%03d](#{sock.peeraddr[3]}): #{msg}\n",
+        $stdout.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
+        $stdout.flush
         msg_parts = msg.split
         if msg_parts.size != 0
           msg_cmd = msg_parts[0]
@@ -32,11 +36,18 @@ class YggdrasilServer
             send msg_cmd, sock, msg_arg_hash
           else
             puts "fail: number of arguments is mismatch: #{msg}"
+            $stdout.flush
           end
         end
       end
       sock.close
-      break if @options.has_key?(:debug?) && msg == MESSAGE_QUIT
+      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",
+                       ctime.year, ctime.month, ctime.day, ctime.hour, ctime.min, ctime.sec, (ctime.usec/1000).round
+        $stdout.flush
+        break
+      end
     end
     s0.close # MESSAGE_QUIT
   end

data/spec/check_spec.rb

@@ -95,6 +95,8 @@ Index: tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
 +++ tmp/yggdrasil-test/.yggdrasil/checker_result/hoge	(revision 0)
 @@ -0,0 +1 @@
 +hoge
+
+Yggdrasil check: NG!!!
 EOS
   end
 
@@ -127,6 +129,8 @@ Index: tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
 +++ tmp/yggdrasil-test/.yggdrasil/checker_result/hoge	(working copy)
 @@ -1 +0,0 @@
 -hoge
+
+Yggdrasil check: NG!!!
 EOS
   end
 
@@ -142,8 +146,8 @@ Committed revision 5.
 EOS
   end
 
-  it 'should record check result by yggdrasil server' do
-    puts "\n---- should record check result by yggdrasil server"
+  it 'should record check result by yggdrasil server (add)' do
+    puts "\n---- should record check result by yggdrasil server (add)"
 
     prepare_environment
 
@@ -186,6 +190,10 @@ A                0   tmp/yggdrasil-test/.yggdrasil
 A                0   tmp/yggdrasil-test/.yggdrasil/checker_result
 
 EOS
+  end
+
+  it 'should record check result by yggdrasil server (modify)' do
+    puts "\n---- should record check result by yggdrasil server (modify)"
 
     `echo hoge > /tmp/yggdrasil-test/A`
     Yggdrasil.command %w{add /tmp/yggdrasil-test/A}
@@ -195,6 +203,8 @@ EOS
     `echo foo >> /tmp/yggdrasil-test/A`
     Yggdrasil.command %w{check}, "Y\n"
 
+    files = Dir.entries('/tmp/yggdrasil-test/.yggdrasil/results')
+    result_files = files.select{|file| %r{^#{Socket.gethostname}} =~ file}
     `cat /tmp/yggdrasil-test/.yggdrasil/results/#{result_files[0]}`.should == <<"EOS"
 M                2   tmp/yggdrasil-test/A
 
@@ -206,7 +216,22 @@ Index: tmp/yggdrasil-test/A
  hoge
 +foo
 EOS
+  end
+
+  it 'should record check result by yggdrasil server (OK)' do
+    puts "\n---- should record check result by yggdrasil server (OK)"
+
+    Yggdrasil.command %w{commit --username hoge --password foo} +
+                          %w{-m HOGE --non-interactive}
+
+    Yggdrasil.command %w{check --non-interactive}
+
+    files = Dir.entries('/tmp/yggdrasil-test/.yggdrasil/results')
+    result_files = files.select{|file| %r{^#{Socket.gethostname}} =~ file}
+    `cat /tmp/yggdrasil-test/.yggdrasil/results/#{result_files[0]}`.should == "\n"
+  end
 
+  after(:all) do
     sock = TCPSocket.open('localhost', 4000)
     sock.puts('quit')
     sock.close

data/spec/help_spec.rb

@@ -106,6 +106,7 @@ Valid options:
   --password ARG           : specify a password ARG
   --server ARG             : specify a server address and port
                              e.g. 192.168.1.35:4000
+                             see also 'yggserve help'
 
 EOS
   end

data/spec/server_spec.rb

@@ -8,6 +8,19 @@ describe YggdrasilServer, 'server' do
   before(:all) do
     puts '-------- server'
     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
+      sleep 1
+    end
+
     YggdrasilServer.command %w{init} +
                           %w{--port 4000} +
                           %w{--repo svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}/} +

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yggdrasil
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2992744534865834849
+      hash: -2008035553517272387
 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: 2992744534865834849
+      hash: -2008035553517272387
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25