yggdrasil 0.0.5 → 0.0.6

data/README.md

@@ -1,6 +1,6 @@
 # Yggdrasil
 
-Yggdrasil is a subversion wrapper to manage configuration files.
+Yggdrasil is a subversion wrapper to manage server configurations and conditions.
 
 ## Installation
 

data/lib/yggdrasil.rb

@@ -1,5 +1,8 @@
 require 'fileutils'
-require "open3"
+
+require "yggdrasil_common"
+require "yggdrasil_server"
+
 require "yggdrasil/version"
 require "yggdrasil/help"
 require "yggdrasil/init"
@@ -12,6 +15,7 @@ require "yggdrasil/log"
 require "yggdrasil/status"
 require "yggdrasil/update"
 require "yggdrasil/revert"
+require "yggdrasil/check"
 
 class Yggdrasil
 
@@ -20,12 +24,14 @@ class Yggdrasil
     ENV['LANG'] = 'en_US.UTF-8'
 
     if args.size == 0
-      Yggdrasil::help([])
+      new(false).help([])
       return
     end
     case args[0]
       when 'add'
         new.add(args[1..-1])
+      when 'check', 'c'
+        new.check(args[1..-1])
       when 'cleanup'
         new.cleanup(args[1..-1])
       when 'commit', 'ci'
@@ -33,139 +39,64 @@ class Yggdrasil
       when 'diff', 'di'
         new.diff(args[1..-1])
       when 'help', 'h', '?'
-        help(args[1..-1])
+        new(false).help(args[1..-1])
       when 'init'
         new(false).init(args[1..-1])
+      when 'init-server'
+        YggdrasilServer.new(false).init_server(args[1..-1])
       when 'list', 'ls'
         new.list(args[1..-1])
       when 'log'
         new.log(args[1..-1])
-      when 'status', 'stat', 'st'
-        new.status(args[1..-1])
+      when 'results'
+        YggdrasilServer.new.results(args[1..-1])
       when 'revert'
         new.revert(args[1..-1])
+      when 'server'
+        YggdrasilServer.new.server(args[1..-1])
+      when 'status', 'stat', 'st'
+        new.status(args[1..-1])
       when 'update'
         new.update(args[1..-1])
       when 'version', '--version'
-        version
+        new(false).version
       else
-        error "Unknown subcommand: '#{args[0]}'"
-    end
-  end
-
-  # @param [String] cmd
-  def Yggdrasil.system3(cmd, err_exit=true)
-    out = `#{cmd} 2>&1`
-    stat = $?
-
-    unless stat.success?
-      return nil unless err_exit
-      $stderr.puts "#{CMD} error: command failure: #{cmd}"
-      $stderr.puts "command output:"
-      $stderr.puts out
-      exit stat.exitstatus
-    end
-    return out
-  end
-
-  protected
-  # @param [String] msg
-  def Yggdrasil.error(msg)
-    $stderr.puts "#{CMD} error: #{msg}"
-    $stderr.puts
-    exit 1
-  end
-
-  def parse_options(args, valid_params)
-    valid_params['--debug'] = :debug? # common
-    @options ||= Hash.new
-    pos = 0
-    while args.size > pos
-      if valid_params.has_key?(args[pos])
-        option_note = args[pos]
-        option_key = valid_params[option_note]
-        args = args[0...pos]+args[pos+1..-1]
-        if option_key.to_s[-1] == '?'
-          @options[option_key] = true
-        else
-          error "Not enough arguments provided: #{option_note}" unless args.size > pos
-          option_value = args[pos].dup
-          args = args[0...pos]+args[pos+1..-1]
-          @options[option_key] = option_value
-        end
-        next
-      end
-      pos += 1
-    end
-    args
-  end
-
-  def input_user_pass
-    until @options.has_key?(:username) do
-      error "Can't get username or password" if @options.has_key?(:non_interactive?)
-      print "Input svn username: "
-      input = $stdin.gets
-      @options[:username] = input.chomp
-    end
-    until @options.has_key?(:password) do
-      error "Can't get username or password" if @options.has_key?(:non_interactive?)
-      print "Input svn password: "
-      #input = `sh -c 'read -s hoge;echo $hoge'`
-      system3 'stty -echo', false
-      input = $stdin.gets
-      system3 'stty echo', false
-      puts
-      @options[:password] = input.chomp
+        $stderr .puts "Unknown subcommand: '#{args[0]}'"
+        exit 1
     end
   end
 
   def initialize(exist_config = true)
+    @base_cmd = File::basename($0)
     @current_dir = `readlink -f .`.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"
 
     return unless exist_config
-    configs = read_config
-    ENV["PATH"] = configs[:path]
-    @svn = configs[:svn]
-    @repo = configs[:repo]
+    configs = read_config(@config_file)
+    error "need 'path' in config file" unless (ENV["PATH"] = configs[:path])
+    error "need 'svn' in config file" unless (@svn = configs[:svn])
+    error "need 'repo' in config file" unless (@repo = configs[:repo])
     @anon_access = (configs[:anon_access] == 'read')
+    @options ||= Hash.new
+    @options[:server] = configs[:server] if configs.has_key?(:server)
   end
 
-  # load config value from config file
-  def read_config
-    configs = Hash.new
-    begin
-      File.open(@config_file) do |file|
-        l = 0
-        while (line = file.gets)
-          l += 1
-          next if /^\s*#.*$/ =~ line  # comment line
-          if /^\s*(\S+)\s*=\s*(\S+).*$/ =~ line
-            key, val = $1, $2
-            key.gsub!(/-/, '_')
-            configs[key.to_sym] = val
-          else
-            error "syntax error. :#@config_file(#{l})"
-          end
-        end
-      end
-    rescue
-      error "can not open config file: #@config_file"
-    end
-    configs
-  end
+  protected
+  include YggdrasilCommon
 
   def sync_mirror
     updates = Array.new
     FileUtils.cd @mirror_dir do
       cmd = "#@svn ls #@repo -R --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)
       files = out.split(/\n/)
       cmd = "#@svn status -q --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|
         files << $1 if /^.*\s(\S+)\s*$/ =~ line
@@ -179,17 +110,20 @@ class Yggdrasil
         elsif File.file?("/#{file}")
           if !File.exist?("#@mirror_dir/#{file}")
             cmd = "#@svn revert #{file}"
-            cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless @anon_access
+            cmd += username_password_options_to_read_repo
             system3 cmd
           end
           FileUtils.copy_file "/#{file}", "#@mirror_dir/#{file}"
         end
       end
-      cmd = "#@svn status -q --no-auth-cache --non-interactive"
-      cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless @anon_access
+      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|
-        updates << $1 if /^.*\s(\S+)\s*$/ =~ line
+        next if /^Status against revision/ =~ line
+        if /^(.).*\s(\S+)\s*$/ =~ line
+          updates << [$1, $2]
+        end
       end
     end
     updates
@@ -214,14 +148,14 @@ class Yggdrasil
     cond = '^'+target_relatives.join('|^') # make reg exp
     matched_updates = Array.new
     updates.each do |update|
-      matched_updates << update if update.match(cond)
+      matched_updates << update if update[1].match(cond)
     end
 
     # search parent updates of matched updates
     parents = Array.new
     updates.each do |update|
       matched_updates.each do |matched_update|
-        parents << update if matched_update.match("^#{update}/")
+        parents << update if matched_update[1].match("^#{update[1]}/")
       end
     end
     matched_updates += parents
@@ -232,7 +166,7 @@ class Yggdrasil
     until @options.has_key?(:non_interactive?)
       puts
       (0...updates.size).each do |i|
-        puts "#{i}:#{updates[i]}"
+        puts "#{i}:#{updates[i][0]} #{updates[i][1]}"
       end
       print "OK? [Y|n|<num to diff>]:"
       res = $stdin.gets
@@ -242,14 +176,64 @@ class Yggdrasil
       break if res == 'Y'
       next unless updates[res.to_i]
       if /^\d+$/ =~ res
-        yield updates[res.to_i]
+        yield updates[res.to_i][1]
       end
     end
     # res == 'Y'
-    updates
+    confirmed_updates = Array.new
+    updates.each do |e|
+      confirmed_updates << e[1]
+    end
+    confirmed_updates.sort.uniq
   end
 
-  def method_missing(action, *args)
-    Yggdrasil.__send__ action, *args
+  def username_password_options_to_read_repo
+    if @options.has_key?(:ro_password)
+      " --username #{@options[:ro_username]} --password #{@options[:ro_password]}"
+    else
+      ""
+    end
+  end
+
+  def get_user_pass_if_need_to_read_repo
+    unless @anon_access
+      get_server_config if !@options.has_key?(:ro_username) && @options.has_key?(:server)
+      input_user_pass unless @options.has_key?(:ro_password)
+    end
+    @options[:ro_username] = @options[:username] if @options.has_key?(:username)
+    @options[:ro_password] = @options[:password] if @options.has_key?(:password)
+  end
+
+  def get_server_config(need_repo = false)
+    if /^(.+):(\d+)$/ =~ @options[:server]
+      host = $1
+      port = $2
+
+      if need_repo
+        # get repo
+        sock = TCPSocket.open(host, port)
+        error "can not connect to server: #{host}:#{port}" if sock.nil?
+        sock.puts "get_repo"
+        rcv = sock.gets
+        error "can not get repo from server" if rcv.nil?
+        @options[:repo] = rcv.chomp
+        sock.close
+      end
+
+      #get read-only username/password
+      sock = TCPSocket.open(host, port)
+      error "can not connect to server: #{host}:#{port}" if sock.nil?
+      sock.puts("get_ro_id_pw")
+      username = sock.gets
+      unless username.nil?
+        @options[:ro_username] = username.chomp
+        password = sock.gets
+        error "can not get ro_password" if password.nil?
+        @options[:ro_password] = password.chomp
+      end
+      sock.close
+    else
+      error "invalid host:port '#{@options[:server]}'"
+    end
   end
 end

data/lib/yggdrasil/add.rb

@@ -13,7 +13,7 @@ class Yggdrasil
       file_path_parts.each do |part|
         mirror_path += "/#{part}"
         next if File.exist?(mirror_path)
-        if part.equal?(file_path_parts[-1])
+        if part.equal?(file_path_parts[-1]) && File.file?(file_path)
           FileUtils.copy file_path, mirror_path
         else
           Dir.mkdir mirror_path

data/lib/yggdrasil/check.rb

@@ -0,0 +1,65 @@
+require 'find'
+
+class Yggdrasil
+
+  def check(args)
+    args = parse_options(args,
+                         {'--username'=>:username, '--password'=>:password,
+                          '--non-interactive'=>:non_interactive?})
+    if args.size != 0
+      error "invalid arguments: #{args.join(',')}"
+    end
+
+    # execute checker
+    `rm -rf #@checker_result_dir`
+    Dir.mkdir @checker_result_dir, 0755
+    Find.find(@checker_dir).each do |file|
+      if File.file?(file) && File.executable?(file)
+        if file =~ %r{^#@checker_dir(.*)$}
+          file_body = $1
+          system3("#{file} > #@checker_result_dir#{file_body}")
+        end
+      end
+    end
+
+    # add checker result
+    result_files = Array.new
+    Find.find(@checker_result_dir) {|f| result_files << f}
+    stdout = $stdout
+    $stdout = StringIO.new
+    add result_files
+    $stdout = stdout
+
+    get_user_pass_if_need_to_read_repo
+    sync_mirror
+
+    cmd_arg = "#@svn status -qu --no-auth-cache --non-interactive"
+    cmd_arg += username_password_options_to_read_repo
+    check_result = String.new
+    FileUtils.cd @mirror_dir do
+      check_result = system3(cmd_arg)
+    end
+    check_result.gsub!(/^Status against revision:.*\n/, '')
+    check_result.chomp!
+    if check_result != ""
+      check_result << "\n\n"
+      cmd_arg = "#@svn diff --no-auth-cache --non-interactive -r HEAD"
+      cmd_arg += username_password_options_to_read_repo
+      FileUtils.cd @mirror_dir do
+        check_result << system3(cmd_arg)
+      end
+    end
+    puts check_result
+
+    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
+  end
+end

data/lib/yggdrasil/cleanup.rb

@@ -7,12 +7,12 @@ class Yggdrasil
       error "invalid arguments: #{args.join(',')}"
     end
 
-    input_user_pass unless @anon_access
+    get_user_pass_if_need_to_read_repo
 
     system3 "rm -rf #@mirror_dir"
 
     cmd = "#@svn checkout --no-auth-cache --non-interactive #@repo #@mirror_dir"
-    cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless @anon_access
+    cmd += username_password_options_to_read_repo
     system3 cmd
   end
 end

data/lib/yggdrasil/commit.rb

@@ -5,7 +5,7 @@ class Yggdrasil
     target_paths = parse_options(args,
         {'--username'=>:username, '--password'=>:password,
          '-m'=>:message, '--message'=>:message, '--non-interactive'=>:non_interactive?})
-    input_user_pass
+    get_user_pass_if_need_to_read_repo
 
     updates = sync_mirror
     matched_updates = select_updates(updates, target_paths)
@@ -16,18 +16,32 @@ class Yggdrasil
 
     confirmed_updates = confirm_updates(matched_updates) do |relative_path|
       FileUtils.cd @mirror_dir do
-        puts system3("#@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
     end
     return unless confirmed_updates
     return if confirmed_updates.size == 0
 
-    until @options.has_key?(:message) do
+    message = ''
+    unless @options.has_key?(:message)
       print "Input log message: "
-      input = $stdin.gets
-      @options[:message] = input.chomp
+      loop do
+        input = $stdin.gets
+        error "can not input log message" unless input
+        input.chomp!
+        if input =~ /^(.*)\\$/
+          message += $1+"\n"
+        else
+          message += input
+          @options[:message] = message
+          break
+        end
+      end
     end
 
+    input_user_pass
     FileUtils.cd @mirror_dir do
       puts system3 "#@svn commit -m '#{@options[:message]}'"\
                    " --no-auth-cache --non-interactive"\