yggdrasil 0.0.9 → 0.0.10

data/lib/yggdrasil.rb

@@ -37,7 +37,7 @@ class Yggdrasil
         new.commit(args[1..-1])
       when 'diff', 'di'
         new.diff(args[1..-1])
-      when 'help', '--help', 'h', '?'
+      when 'help', '--help', 'h', '-h', '?'
         new(false).help(args[1..-1])
       when 'init'
         new(false).init(args[1..-1])
@@ -51,7 +51,7 @@ class Yggdrasil
         new.status(args[1..-1])
       when 'update'
         new.update(args[1..-1])
-      when 'version', '--version'
+      when 'version', '--version', '-v'
         new(false).version
       else
         $stderr .puts "Unknown subcommand: '#{args[0]}'"

data/lib/yggdrasil/check.rb

@@ -1,4 +1,5 @@
 require 'find'
+require 'stringio'
 
 class Yggdrasil
 

data/lib/yggdrasil/help.rb

@@ -37,7 +37,8 @@ add: Add files to management list (add to subversion)
 usage #@base_cmd add [FILES...]
 
 EOS
-        when 'check', 'c'
+
+        when 'check', 'c' ########################################### check (c)
           puts <<"EOS"
 check (c): check updating of managed files and the execution output of a commands.
 usage: #@base_cmd check [OPTIONS...]
@@ -58,7 +59,7 @@ Valid options:
   --non-interactive        : do no interactive prompting
 
 EOS
-        when 'cleanup'
+        when 'cleanup' ################################################ cleanup
           puts <<"EOS"
 cleanup: clean up the working copy
 usage: #@base_cmd cleanup [OPTIONS...]
@@ -68,7 +69,7 @@ Valid options:
   --password ARG           : specify a password ARG
 
 EOS
-        when 'commit', 'ci'
+        when 'commit', 'ci' ####################################### commit (ci)
           puts <<"EOS"
 commit (ci): Send changes from your local file to the repository.
 usage: #@base_cmd commit [OPTIONS...] [FILES...]
@@ -80,7 +81,7 @@ Valid options:
   --non-interactive        : do no interactive prompting
 
 EOS
-        when 'diff', 'di'
+        when 'diff', 'di' ########################################### diff (di)
           puts <<"EOS"
 diff (di): Display the differences between two revisions or paths.
 usage: #@base_cmd diff [OPTIONS...] [PATH...]
@@ -98,13 +99,13 @@ Valid options:
                                 'PREV'       revision just before COMMITTED
 
 EOS
-        when 'help', '?', 'h'
+        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]
 
 EOS
-        when 'init'
+        when 'init' ###################################################### init
           puts <<"EOS"
 init: Check environment and initialize configuration.
 usage: #@base_cmd init [OPTIONS...]
@@ -122,7 +123,7 @@ Valid options:
                              e.g. 192.168.1.35:4000
 
 EOS
-        when 'list', 'ls'
+        when 'list', 'ls' ########################################### list (ls)
           puts <<"EOS"
 list (ls): List directory entries in the repository.
 usage: #@base_cmd list [OPTIONS...] [PATH...]
@@ -141,7 +142,7 @@ Valid options:
   -R [--recursive]         : descend recursively
 
 EOS
-        when 'log'
+        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]
@@ -159,7 +160,7 @@ Valid options:
                                 'PREV'       revision just before COMMITTED
 
 EOS
-        when 'revert'
+        when 'revert' ################################################## revert
           puts <<"EOS"
 revert: Restore pristine working copy file (undo most local edits).
 usage: #@base_cmd revert [OPTIONS...] [PATH...]
@@ -170,16 +171,8 @@ Valid options:
   --non-interactive        : do no interactive prompting
 
 EOS
-        when 'server'
-          puts <<"EOS"
-server: receive tcp connection in order to unify the setup and to record check results.
-usage: #@base_cmd server [OPTIONS...]
 
-Valid options:
-  --daemon                 : daemon mode
-
-EOS
-        when 'status', 'stat', 'st'
+        when 'status', 'stat', 'st' ######################### status (stat, st)
           puts <<"EOS"
 status (stat, st): Print the status of managed files and directories.
 usage: #@base_cmd status [OPTIONS...] [PATH...]
@@ -189,7 +182,7 @@ Valid options:
   --password ARG           : specify a password ARG
 
 EOS
-        when 'update'
+        when 'update' ################################################## update
           puts <<"EOS"
 update (up): Bring changes from the repository into the local files.
 usage: #@base_cmd update [OPTIONS...] [PATH...]
@@ -208,7 +201,7 @@ Valid options:
   --non-interactive        : do no interactive prompting
 
 EOS
-        when 'version', '--version'
+        when 'version', '--version', '-v' ######################## version (-v)
           puts <<"EOS"
 version: See the program version
 usage: #@base_cmd version

data/lib/yggdrasil/log.rb

@@ -7,28 +7,39 @@ class Yggdrasil
                           '-r'=>:revision, '--revision'=>:revision})
     get_user_pass_if_need_to_read_repo
 
-    if args.size == 0
+    ext_options = Array.new
+    paths = Array.new
+    args.each do |arg|
+      if /^-/ =~ arg
+        ext_options << arg
+      else
+        paths << arg
+      end
+    end
+
+    if paths.size == 0
       dir = @mirror_dir + @current_dir
       error 'current directory is not managed.' unless File.exist?(dir)
-      args << dir
+      paths << dir
     else
-      args.collect! do |arg|
-        if %r{^/} =~ arg
-          @mirror_dir + arg
+      paths.collect! do |path|
+        if %r{^/} =~ path
+          @mirror_dir + path
         else
-          @mirror_dir + @current_dir + '/' + arg
+          @mirror_dir + @current_dir + '/' + path
         end
       end
     end
 
     cmd_arg = "#@svn log --no-auth-cache --non-interactive"
     cmd_arg += username_password_options_to_read_repo
+    cmd_arg += ' ' + ext_options.join(' ') if ext_options.size != 0
     if @options.has_key?(:revision)
       cmd_arg += " -r #{@options[:revision]}"
     else
       cmd_arg += ' -r HEAD:1'
     end
-    cmd_arg += ' ' + args.join(' ')
+    cmd_arg += ' ' + paths.join(' ')
     puts system3(cmd_arg)
   end
 end

data/lib/yggdrasil/version.rb

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

data/lib/yggdrasil_server.rb

@@ -5,6 +5,7 @@ require 'yggdrasil_common'
 require 'yggdrasil_server/version'
 require 'yggdrasil_server/help'
 require 'yggdrasil_server/init'
+require 'yggdrasil_server/server'
 require 'yggdrasil_server/results'
 
 require 'yggdrasil_server/get_repo'
@@ -28,19 +29,19 @@ class YggdrasilServer
       return
     end
     case args[0]
-      when 'daemon'
+      when 'daemon', '-d'
         Process.daemon
         YggdrasilServer.new.server(args[1..-1])
-      when 'debug'
+      when 'debug', '--debug'
         args << '--debug'
         YggdrasilServer.new.server(args[1..-1])
-      when 'help', '--help', 'h', '?'
+      when 'help', '--help', 'h', '-h', '?'
         new(false).help(args[1..-1])
       when 'init'
         new(false).init_server(args[1..-1])
-      when 'results'
+      when 'results', 'res'
         YggdrasilServer.new.results(args[1..-1])
-      when 'version', '--version'
+      when 'version', '--version', '-v'
         new(false).version
       else
         $stderr .puts "Unknown subcommand: '#{args[0]}'"
@@ -63,48 +64,6 @@ class YggdrasilServer
     @ro_password = configs[:ro_password] if configs.has_key?(:ro_password)
   end
 
-  def server(args)
-    args = parse_options(args, {'--debug'=>:debug?})
-    if args.size != 0
-      error "invalid arguments: #{args.join(',')}"
-    end
-
-    puts "Start: yggdrasil server (port:#@port)"
-    TCPServer.do_not_reverse_lookup = true
-    s0 = TCPServer.open(@port.to_i)
-    loop do
-      sock = s0.accept
-      msg = sock.gets # first line
-      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",
-               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]
-          part_names = MESSAGES[msg_cmd.to_sym]
-          if (msg_parts.size - 1) == part_names.size
-            # make hash of args
-            msg_arg_hash = Hash.new
-            (0...part_names.size).each do |i|
-              msg_arg_hash[part_names[i]] = msg_parts[i+1]
-            end
-
-            # execute request (msg_cmd == method name)
-            send msg_cmd, sock, msg_arg_hash
-          else
-            puts "fail: number of arguments is mismatch: #{msg}"
-          end
-        end
-      end
-      sock.close
-      break if @options.has_key?(:debug?) && msg == MESSAGE_QUIT
-    end
-    s0.close # MESSAGE_QUIT
-  end
-
   protected
   include YggdrasilCommon
 end
-

data/lib/yggdrasil_server/help.rb

@@ -28,25 +28,25 @@ EOS
       error 'too many arguments.'
     else
       case args[0]
-        when 'daemon'
+        when 'daemon', '-d' ####################################### daemon (-d)
           puts <<"EOS"
 daemon: launch TCP server by daemon mode.
 usage: #{File.basename($0)} daemon
 
 EOS
-        when 'debug'
+        when 'debug', '--debug' ######################################### debug
           puts <<"EOS"
 debug: launch TCP server by debug mode.
 usage: #{File.basename($0)} debug
 
 EOS
-        when 'help', '?', 'h'
+        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]
 
 EOS
-        when 'init'
+        when 'init' ###################################################### init
           puts <<"EOS"
 init: setup yggdrasil server configuration.
 usage: #@base_cmd init [OPTIONS...]
@@ -62,7 +62,7 @@ Valid options:
   --ro-password ARG        : specify a password ARG for read only
 
 EOS
-        when 'results'
+        when 'results', 'res' ################################### results (res)
           puts <<"EOS"
 results: display the result of yggdrasil check command.
 usage: #@base_cmd results [OPTIONS...]
@@ -71,7 +71,7 @@ Valid options:
   --expire ARG              : minutes from the final report, to judge the host not be alive
 
 EOS
-        when 'version', '--version'
+        when 'version', '--version', '-v' ######################## version (-v)
           puts <<"EOS"
 version: See the program version
 usage: #@base_cmd version

data/lib/yggdrasil_server/server.rb

@@ -0,0 +1,43 @@
+class YggdrasilServer
+
+  def server(args)
+    args = parse_options(args, {'--debug'=>:debug?})
+    if args.size != 0
+      error "invalid arguments: #{args.join(',')}"
+    end
+
+    puts "Start: yggdrasil server (port:#@port)"
+    TCPServer.do_not_reverse_lookup = true
+    s0 = TCPServer.open(@port.to_i)
+    loop do
+      sock = s0.accept
+      msg = sock.gets # first line
+      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",
+               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]
+          part_names = MESSAGES[msg_cmd.to_sym]
+          if (msg_parts.size - 1) == part_names.size
+            # make hash of args
+            msg_arg_hash = Hash.new
+            (0...part_names.size).each do |i|
+              msg_arg_hash[part_names[i]] = msg_parts[i+1]
+            end
+
+            # execute request (msg_cmd == method name)
+            send msg_cmd, sock, msg_arg_hash
+          else
+            puts "fail: number of arguments is mismatch: #{msg}"
+          end
+        end
+      end
+      sock.close
+      break if @options.has_key?(:debug?) && msg == MESSAGE_QUIT
+    end
+    s0.close # MESSAGE_QUIT
+  end
+end

data/spec/help_spec.rb

@@ -293,19 +293,6 @@ Valid options:
   --password ARG           : specify a password ARG
   --non-interactive        : do no interactive prompting
 
-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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yggdrasil
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-10 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -83,6 +83,7 @@ files:
 - lib/yggdrasil_server/init.rb
 - lib/yggdrasil_server/put_result.rb
 - lib/yggdrasil_server/results.rb
+- lib/yggdrasil_server/server.rb
 - lib/yggdrasil_server/version.rb
 - spec/add_spec.rb
 - spec/check_spec.rb
@@ -118,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -670785694215858000
+      hash: 896107728749250326
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,10 +128,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -670785694215858000
+      hash: 896107728749250326
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Type "ygg help" for usage.