yggdrasil 0.0.5 → 0.0.6

data/lib/yggdrasil/diff.rb

@@ -5,8 +5,7 @@ class Yggdrasil
     args = parse_options(args,
         {'--username'=>:username, '--password'=>:password, '-r'=>:revision, '--revision'=>:revision})
 
-    input_user_pass unless @anon_access
-
+    get_user_pass_if_need_to_read_repo
     sync_mirror
 
     paths = Array.new
@@ -20,7 +19,7 @@ class Yggdrasil
     end
 
     cmd_arg = "#@svn diff --no-auth-cache --non-interactive"
-    cmd_arg += " --username #{@options[:username]} --password #{@options[:password]}" unless @anon_access
+    cmd_arg += username_password_options_to_read_repo
     cmd_arg += " -r #{@options[:revision]}" if @options.has_key?(:revision)
     cmd_arg += ' '+paths.join(' ')
     FileUtils.cd @mirror_dir do

data/lib/yggdrasil/help.rb

@@ -1,33 +1,36 @@
 class Yggdrasil
 
-  HELP_SUBCOMMANDS = <<EOS
-usage: #{CMD} <subcommand> [options] [args]
+
+  # @param [Array] args
+  def help(args)
+    if args.size == 0
+      puts <<EOS
+usage: #@base_cmd <subcommand> [options] [args]
 Yggdrasil version #{VERSION}
-Type '#{CMD} help <subcommand>' for help on a specific subcommand.
+Type '#@base_cmd 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
-
-  # @param [Array] args
-  def Yggdrasil.help(args)
-    if args.size == 0 then
-      puts HELP_SUBCOMMANDS
     elsif args.size != 1 then
       error "too many arguments."
     else
@@ -35,13 +38,31 @@ EOS
         when 'add'
           puts <<"EOS"
 add: Add files to management list (add to subversion)
-usage #{CMD} add [FILES...]
+usage #@base_cmd add [FILES...]
+
+EOS
+        when 'check', 'c'
+          puts <<"EOS"
+check (c): check updating of managed files and the execution output of a commands.
+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.
+  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
         when 'cleanup'
           puts <<"EOS"
 cleanup: clean up the working copy
-usage: #{CMD} cleanup [OPTIONS...]
+usage: #@base_cmd cleanup [OPTIONS...]
 
 Valid options:
   --username ARG           : specify a username ARG
@@ -51,7 +72,7 @@ EOS
         when 'commit', 'ci'
           puts <<"EOS"
 commit (ci): Send changes from your local file to the repository.
-usage: #{CMD} commit [OPTIONS...] [FILES...]
+usage: #@base_cmd commit [OPTIONS...] [FILES...]
 
 Valid options:
   --username ARG           : specify a username ARG
@@ -63,7 +84,7 @@ EOS
         when 'diff', 'di'
           puts <<"EOS"
 diff (di): Display the differences between two revisions or paths.
-usage: #{CMD} diff [OPTIONS...] [PATH...]
+usage: #@base_cmd diff [OPTIONS...] [PATH...]
 
 Valid options:
   --username ARG           : specify a username ARG
@@ -81,24 +102,45 @@ EOS
         when 'help', '?', 'h'
           puts <<"EOS"
 help (?,h): Describe the usage of this program or its subcommands.
-usage: #{CMD} help [SUBCOMMAND]
+usage: #@base_cmd help [SUBCOMMAND]
 
 EOS
         when 'init'
           puts <<"EOS"
 init: Check environment and initialize configuration.
-usage: #{CMD} init [OPTIONS...]
+usage: #@base_cmd 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
+        when 'init-server'
+          puts <<"EOS"
+init-server: setup server configuration.
+usage: #@base_cmd 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
         when 'list', 'ls'
           puts <<"EOS"
 list (ls): List directory entries in the repository.
-usage: #{CMD} list [OPTIONS...] [PATH...]
+usage: #@base_cmd list [OPTIONS...] [PATH...]
 
 Valid options:
   --username ARG           : specify a username ARG
@@ -117,7 +159,7 @@ EOS
         when 'log'
           puts <<"EOS"
 log: Show the log messages for a set of revision(s) and/or file(s).
-usage: #{CMD} log [OPTIONS...] [PATH]
+usage: #@base_cmd log [OPTIONS...] [PATH]
 
 Valid options:
   --username ARG           : specify a username ARG
@@ -132,31 +174,49 @@ Valid options:
                                 'PREV'       revision just before COMMITTED
 
 EOS
-        when 'status', 'stat', 'st'
+        when 'results'
           puts <<"EOS"
-status (stat, st): Print the status of managed files and directories.
-usage: #{CMD} status [OPTIONS...] [PATH...]
+results: display the result of yggdrasil check command.
+usage: #@base_cmd results [OPTIONS...]
 
 Valid options:
-  --username ARG           : specify a username ARG
-  --password ARG           : specify a password ARG
+  --limit ARG              : minutes from the final report, to judge the host not be alive
 
 EOS
         when 'revert'
           puts <<"EOS"
 revert: Restore pristine working copy file (undo most local edits).
-usage: #{CMD} revert [PATH...]
+usage: #@base_cmd revert [OPTIONS...] [PATH...]
 
 Valid options:
   --username ARG           : specify a username ARG
   --password ARG           : specify a password ARG
   --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'
+          puts <<"EOS"
+status (stat, st): Print the status of managed files and directories.
+usage: #@base_cmd status [OPTIONS...] [PATH...]
+
+Valid options:
+  --username ARG           : specify a username ARG
+  --password ARG           : specify a password ARG
+
 EOS
         when 'update'
           puts <<"EOS"
 update (up): Bring changes from the repository into the local files.
-usage: #{CMD} update [PATH...]
+usage: #@base_cmd update [OPTIONS...] [PATH...]
 
 Valid options:
   --username ARG           : specify a username ARG
@@ -175,7 +235,7 @@ EOS
         when 'version', '--version'
           puts <<"EOS"
 version: See the program version
-usage: #{CMD} version
+usage: #@base_cmd version
 
 EOS
         else

data/lib/yggdrasil/init.rb

@@ -5,7 +5,12 @@ class Yggdrasil
 
     args = parse_options(args,
         {'--username'=>:username, '--password'=>:password,
-         '--repo'=>:repo, '--parents'=>:parents?, '--non-interactive'=>:non_interactive?})
+         '--repo'=>:repo, '--parents'=>:parents?,
+         '--non-interactive'=>:non_interactive?,
+         '--server'=>:server })
+    @options[:ro_username] = @options[:username] if @options.has_key?(:username)
+    @options[:ro_password] = @options[:password] if @options.has_key?(:password)
+
     if args.size != 0
       error "invalid arguments: #{args.join(',')}"
     end
@@ -19,29 +24,34 @@ class Yggdrasil
 
     error "already exist config file: #@config_file" if File.exist?(@config_file)
 
-    until @options.has_key?(:repo) do
-      print "Input svn repo URL: "
-      input = $stdin.gets
+    get_server_config(true) if @options.has_key?(:server)
+
+    init_get_repo_interactive unless @options.has_key?(:repo)
 
-      unless /^(http:|file:|svn:)/ =~ input
-        puts "ERROR: Invalid URL."
-        redo
-      end
-      @options[:repo] = input
-    end
     @options[:repo].chomp!
     @options[:repo].chomp!('/')
+    @options[:repo].gsub!(/\{HOST\}/, Socket.gethostname)
+    if @options[:repo] == "private"
+      Dir.mkdir @config_dir, 0755 unless File.exist?(@config_dir)
+      repo_dir = "#@config_dir/private_repo"
+      system3 "svnadmin create #{repo_dir}"
+      @options[:repo] = "file://#{repo_dir}"
+    end
 
-    puts "SVN access test..."
+    puts "check SVN access..."
+    if @options.has_key?(:ro_username)
+      anon_access = false
+    else
+      anon_access = true
+    end
     url_parts = @options[:repo].split('/')
     url_parts_num = url_parts.size
-    anon_access = true
     loop do
       if url_parts_num < 3
         if anon_access
           anon_access = false
           url_parts_num = url_parts.size
-          input_user_pass
+          get_user_pass_if_need_to_read_repo
         else
           error "can not access to '#{@options[:repo]}'."
         end
@@ -51,7 +61,7 @@ class Yggdrasil
       url = url_parts[0...url_parts_num].join('/')
       puts "try url=#{url}" if @options[:debug?]
       cmd = "#{svn} ls --no-auth-cache --non-interactive #{url}"
-      cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless anon_access
+      cmd += username_password_options_to_read_repo
       ret = system3(cmd, false)
       unless ret.nil?
         puts "SVN access OK: #{url}"
@@ -95,17 +105,43 @@ class Yggdrasil
       system3 "rm -rf #@mirror_dir"
     end
 
+    # make config file
     File.open(@config_file, "w") do |f|
-      f.write "path=#{ENV['PATH']}\n"\
-              "svn=#{svn}\n"\
-              "svn_version=#{svn_version}\n"\
-              "repo=#{@options[:repo]}\n"\
-              "anon-access=#{anon_access ? 'read' : 'none'}\n"
-      end
+      f.puts "path=#{ENV['PATH']}\n"\
+             "svn=#{svn}\n"\
+             "svn_version=#{svn_version}\n"\
+             "repo=#{@options[:repo]}\n"\
+             "anon-access=#{anon_access ? 'read' : 'none'}\n"
+      f.puts "server=#{@options[:server]}\n" if @options.has_key?(:server)
+    end
 
+    # make mirror dir
     `rm -rf #@mirror_dir`
     cmd = "#{svn} checkout --no-auth-cache --non-interactive #{@options[:repo]} #@mirror_dir"
     cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless anon_access
     system3 cmd
+
+    # make checker dir and checker example
+    Dir.mkdir @checker_dir, 0755 unless File.exist?(@checker_dir)
+    FileUtils.cd @checker_dir do
+      `echo 'gem list' > gem_list`
+      `chmod +x gem_list`
+    end
+  end
+
+
+  def init_get_repo_interactive
+    loop do
+      print "Input svn repo URL: "
+      input = $stdin.gets
+      error "can not input svn repo URL" unless input
+
+      if %r{^(http://|https://|file://|svn://|private)} =~ input
+        @options[:repo] = input
+        break
+      end
+
+      puts "ERROR: Invalid URL."
+    end
   end
 end

data/lib/yggdrasil/list.rb

@@ -7,8 +7,7 @@ class Yggdrasil
          '-r'=>:revision, '--revision'=>:revision,
          '-R'=>:recursive?, '--recursive'=>:recursive?})
 
-    input_user_pass unless @anon_access
-
+    get_user_pass_if_need_to_read_repo
     sync_mirror
 
     repos = Array.new
@@ -22,7 +21,7 @@ class Yggdrasil
     end
 
     cmd_arg = "#@svn list --no-auth-cache --non-interactive"
-    cmd_arg += " --username #{@options[:username]} --password #{@options[:password]}" unless @anon_access
+    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?)
     cmd_arg += ' ' + repos.join(' ')

data/lib/yggdrasil/log.rb

@@ -5,7 +5,7 @@ class Yggdrasil
     args = parse_options(args,
                          {'--username'=>:username, '--password'=>:password,
                           '-r'=>:revision, '--revision'=>:revision})
-    input_user_pass unless @anon_access
+    get_user_pass_if_need_to_read_repo
 
     if args.size == 0
       dir = @mirror_dir + @current_dir
@@ -22,7 +22,7 @@ class Yggdrasil
     end
 
     cmd_arg = "#@svn log --verbose --no-auth-cache --non-interactive"
-    cmd_arg += " --username #{@options[:username]} --password #{@options[:password]}" unless @anon_access
+    cmd_arg += username_password_options_to_read_repo
     if @options.has_key?(:revision)
       cmd_arg += " -r #{@options[:revision]}"
     else

data/lib/yggdrasil/revert.rb

@@ -5,7 +5,7 @@ class Yggdrasil
     target_paths = parse_options(args,
                                  {'--username'=>:username, '--password'=>:password,
                                   '--non-interactive'=>:non_interactive?})
-    input_user_pass unless @anon_access
+    get_user_pass_if_need_to_read_repo
 
     updates = sync_mirror
     matched_updates = select_updates(updates, target_paths)
@@ -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 += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless @anon_access
+        cmd += username_password_options_to_read_repo
         puts system3(cmd)
       end
     end
@@ -27,12 +27,12 @@ class Yggdrasil
 
     FileUtils.cd @mirror_dir do
       cmd = "#@svn revert #{confirmed_updates.reverse.join(' ')}"
-      cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless @anon_access
+      cmd += username_password_options_to_read_repo
       system3 cmd
 
       # make ls hash
       cmd = "#@svn ls -R #@repo --no-auth-cache --non-interactive"
-      cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless @anon_access
+      cmd += username_password_options_to_read_repo
       out = system3(cmd)
 
       ls_hash = Hash.new

data/lib/yggdrasil/status.rb

@@ -4,7 +4,7 @@ class Yggdrasil
   def status(args)
     args = parse_options(args,
                          {'--username'=>:username, '--password'=>:password})
-    input_user_pass unless @anon_access
+    get_user_pass_if_need_to_read_repo
 
     sync_mirror
 
@@ -19,7 +19,7 @@ class Yggdrasil
     end
 
     cmd_arg = "#@svn status#{paths} -qu --no-auth-cache --non-interactive"
-    cmd_arg += " --username #{@options[:username]} --password #{@options[:password]}" unless @anon_access
+    cmd_arg += username_password_options_to_read_repo
     FileUtils.cd @mirror_dir do
       out = system3(cmd_arg)
       print out.gsub(/^Status against revision:.*\n/, '')

data/lib/yggdrasil/update.rb

@@ -6,16 +6,18 @@ class Yggdrasil
                                  {'--username'=>:username, '--password'=>:password,
                                   '-r'=>:revision, '--revision'=>:revision,
                                   '--non-interactive'=>:non_interactive?})
-    input_user_pass unless @anon_access
+    get_user_pass_if_need_to_read_repo
     sync_mirror
 
     updates = Array.new
     FileUtils.cd @mirror_dir do
       cmd = "#@svn status -qu --no-auth-cache --non-interactive"
-      cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless @anon_access
+      cmd += username_password_options_to_read_repo
       out = system3(cmd)
       out.split(/\n/).each do |line|
-        updates << $1 if /^.*\*.*\s(\S+)\s*$/ =~ line
+        if /^.*\*.*\s(\S+)\s*$/ =~ line
+          updates << ['', $1]
+        end
       end
     end
 
@@ -29,7 +31,7 @@ class Yggdrasil
       FileUtils.cd @mirror_dir do
         cmd = "#@svn diff"
         cmd += " --no-auth-cache --non-interactive"
-        cmd += " --username #{@options[:username]} --password #{@options[:password]}" unless @anon_access
+        cmd += username_password_options_to_read_repo
         if @options.has_key?(:revision)
           cmd += " --old=#{relative_path} --new=#{relative_path}@#{@options[:revision]}"
         else
@@ -44,7 +46,7 @@ class Yggdrasil
     return if confirmed_updates == 0 # no files to update
 
     cmd_arg = "#@svn update --no-auth-cache --non-interactive"
-    cmd_arg += " --username #{@options[:username]} --password #{@options[:password]}" unless @anon_access
+    cmd_arg += username_password_options_to_read_repo
     if @options.has_key?(:revision)
       cmd_arg += " -r #{@options[:revision]}"
     else