yggdrasil 0.0.11 → 0.0.12

data/lib/yggdrasil/add.rb

@@ -2,7 +2,9 @@ class Yggdrasil
 
   # @param [Array] args
   def add(args)
-    while (arg = args.shift)
+    parse_options(args, {})
+    while (arg = @arg_paths.shift)
+
       file_path = system3("readlink -f #{arg}").chomp
       unless File.exist?(file_path)
         puts "no such file: #{file_path}"
@@ -18,7 +20,9 @@ class Yggdrasil
         else
           Dir.mkdir mirror_path
         end
-        puts system3("#@svn add #{mirror_path}")
+        cmd = "#@svn add #{mirror_path}"
+        cmd += ' ' + @arg_options.join(' ') if @arg_options.size != 0
+        puts system3(cmd)
       end
     end
   end

data/lib/yggdrasil/check.rb

@@ -4,54 +4,53 @@ require 'stringio'
 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(',')}"
+    parse_options(args,
+                  {'--username'=>:username, '--password'=>:password,
+                   '--non-interactive'=>:non_interactive?})
+    @arg_paths << '/' if @arg_paths.size == 0
+    get_user_pass_if_need_to_read_repo
+
+    exec_checker
+
+    updates = sync_mirror
+    matched_updates = select_updates(updates, @arg_paths)
+    if matched_updates.size == 0
+      puts 'no files.'
+      return
     end
 
-    # execute checker
-    `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(.*)$}
-            file_body = $1
-            system3("#{file} > #@checker_result_dir#{file_body}")
-          end
-        end
+    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 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)
+      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 << "\n\n"
-      cmd_arg = "#@svn diff --no-auth-cache --non-interactive -r HEAD"
-      cmd_arg += username_password_options_to_read_repo
+      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_arg)
+        check_result << system3(cmd)
       end
       puts check_result
     end

data/lib/yggdrasil/cleanup.rb

@@ -2,9 +2,9 @@ class Yggdrasil
 
   # @param [Array] args
   def cleanup(args)
-    args = parse_options(args, {'--username'=>:username, '--password'=>:password})
-    if args.size != 0
-      error "invalid arguments: #{args.join(',')}"
+    parse_options(args, {'--username'=>:username, '--password'=>:password})
+    if @arg_options.size+@arg_paths.size != 0
+      error "invalid arguments: #{(@arg_options+@arg_paths).join(', ')}"
     end
 
     get_user_pass_if_need_to_read_repo

data/lib/yggdrasil/commit.rb

@@ -2,15 +2,18 @@ class Yggdrasil
 
   # @param [Array] args
   def commit(args)
-    target_paths = parse_options(args,
+    parse_options(args,
         {'--username'=>:username, '--password'=>:password,
          '-m'=>:message, '--message'=>:message, '--non-interactive'=>:non_interactive?})
+    @arg_paths << '/' if @arg_paths.size == 0
     get_user_pass_if_need_to_read_repo
 
+    exec_checker
+
     updates = sync_mirror
-    matched_updates = select_updates(updates, target_paths)
+    matched_updates = select_updates(updates, @arg_paths)
     if matched_updates.size == 0
-      puts "\nno files."
+      puts 'no files.'
       return
     end
 
@@ -43,10 +46,11 @@ class Yggdrasil
 
     input_user_pass
     FileUtils.cd @mirror_dir do
-      puts system3 "#@svn commit -m '#{@options[:message]}'"\
-                   ' --no-auth-cache --non-interactive'\
-                   " --username '#{@options[:username]}' --password '#{@options[:password]}'"\
-                   " #{confirmed_updates.join(' ')}"
+      cmd = "#@svn commit -N -m '#{@options[:message]}'"\
+            ' --no-auth-cache --non-interactive'\
+            " --username '#{@options[:username]}' --password '#{@options[:password]}'"\
+            " #{confirmed_updates.join(' ')}"
+      puts system3(cmd)
     end
   end
 end

data/lib/yggdrasil/diff.rb

@@ -2,26 +2,39 @@ class Yggdrasil
 
   # @param [Array] args
   def diff(args)
-    args = parse_options(args,
-        {'--username'=>:username, '--password'=>:password, '-r'=>:revision, '--revision'=>:revision})
+    parse_options(args,
+                  {'--username'=>:username, '--password'=>:password,
+                   '-r'=>:revision, '--revision'=>:revision})
+    @arg_paths << '/' if @arg_paths.size == 0
 
     get_user_pass_if_need_to_read_repo
+    exec_checker
     sync_mirror
 
     paths = Array.new
-    if args.size == 0
-      paths << @current_dir.sub(%r{^/*}, '')
-    else
-      args.each do |path|
-        path = "#@current_dir/#{path}" unless %r{^/} =~ path
-        paths << path.sub(%r{^/*}, '')
+    err_paths = Array.new
+    @arg_paths.each do |path|
+      if %r{^/(.*)$} =~ path
+        mirror_file = $1
+        mirror_file = '.' if mirror_file == ''
+      else
+        mirror_file = @current_dir.sub(/^\//,'') + '/' + path
       end
+      if File.exist?(@mirror_dir+'/'+mirror_file)
+        paths << mirror_file
+      else
+        err_paths << mirror_file
+      end
+    end
+    if err_paths.size != 0
+      error "following files are not managed.\n"+err_paths.join("\n")
     end
 
     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[:revision]}" if @options.has_key?(:revision)
-    cmd_arg += ' '+paths.join(' ')
+    cmd_arg += ' ' + paths.join(' ')
     FileUtils.cd @mirror_dir do
       puts system3(cmd_arg)
     end

data/lib/yggdrasil/help.rb

@@ -10,7 +10,7 @@ Type '#@base_cmd help <subcommand>' for help on a specific subcommand.
 
 Available subcommands:
    add
-   check (c)
+   check (c, status, stat, st)
    cleanup
    commit (ci)
    diff (di)
@@ -18,9 +18,7 @@ Available subcommands:
    init
    list (ls)
    log
-   revert
-   status (stat, st)
-   update
+   update (up, revert)
    version
 
 Yggdrasil is a subversion wrapper to manage server configurations and conditions.
@@ -38,9 +36,9 @@ usage #@base_cmd add [FILES...]
 
 EOS
 
-        when 'check', 'c' ########################################### check (c)
+        when 'check', 'c', 'status', 'stat', 'st' # check (c, status, stat, st)
           puts <<"EOS"
-check (c): check updating of managed files and the execution output of a commands.
+check (c, status, stat, st): 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
@@ -158,49 +156,22 @@ Valid options:
                                 'BASE'       base rev of item's working copy
                                 'COMMITTED'  last commit at or before BASE
                                 'PREV'       revision just before COMMITTED
+  -q [--quiet]             : print nothing, or only summary information
+  -v [--verbose]           : print extra information
 
 EOS
-        when 'revert' ################################################## revert
+        when 'update', 'up', 'revert' ##################### update (up, revert)
           puts <<"EOS"
-revert: Restore pristine working copy file (undo most local edits).
-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 '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...]
-
-Valid options:
-  --username ARG           : specify a username ARG
-  --password ARG           : specify a password ARG
-
-EOS
-        when 'update' ################################################## update
-          puts <<"EOS"
-update (up): Bring changes from the repository into the local files.
+update (up, revert): Set the files to the contents of the newest repository.
 usage: #@base_cmd update [OPTIONS...] [PATH...]
 
 Valid options:
   --username ARG           : specify a username ARG
   --password ARG           : specify a password ARG
-  -r [--revision] ARG      : ARG (some commands also take ARG1:ARG2 range)
-                             A revision argument can be one of:
-                                NUMBER       revision number
-                                '{' DATE '}' revision at start of the date
-                                'HEAD'       latest in repository
-                                'BASE'       base rev of item's working copy
-                                'COMMITTED'  last commit at or before BASE
-                                'PREV'       revision just before COMMITTED
   --non-interactive        : do no interactive prompting
 
 EOS
+
         when 'version', '--version', '-v' ######################## version (-v)
           puts <<"EOS"
 version: See the program version

data/lib/yggdrasil/init.rb

@@ -5,7 +5,7 @@ class Yggdrasil
   # @param [Array] args
   def init(args)
 
-    args = parse_options(args,
+    parse_options(args,
         {'--username'=>:username, '--password'=>:password,
          '--repo'=>:repo, '--parents'=>:parents?,
          '--non-interactive'=>:non_interactive?,
@@ -13,8 +13,8 @@ class Yggdrasil
     @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(',')}"
+    if @arg_options.size+@arg_paths.size != 0
+      error "invalid arguments: #{(@arg_options+@arg_paths).join(', ')}"
     end
 
     out = system3 'which svn'

data/lib/yggdrasil/list.rb

@@ -2,21 +2,20 @@ class Yggdrasil
 
   # @param [Array] args
   def list(args)
-    args = parse_options(args,
+    parse_options(args,
         {'--username'=>:username, '--password'=>:password,
          '-r'=>:revision, '--revision'=>:revision,
          '-R'=>:recursive?, '--recursive'=>:recursive?})
-
+    if @arg_paths.size == 0
+      @arg_paths << '/'
+      @options[:recursive?] = true
+    end
     get_user_pass_if_need_to_read_repo
 
     repos = Array.new
-    if args.size == 0
-      repos << @repo + @current_dir
-    else
-      args.each do |path|
-        path = "#@current_dir/#{path}" unless %r{^/} =~ path
-        repos << @repo+path
-      end
+    @arg_paths.each do |path|
+      path = "#@current_dir/#{path}" unless %r{^/} =~ path
+      repos << @repo+path
     end
 
     cmd_arg = "#@svn list --no-auth-cache --non-interactive"

data/lib/yggdrasil/log.rb

@@ -2,44 +2,43 @@ class Yggdrasil
 
   # @param [Array] args
   def log(args)
-    args = parse_options(args,
+    parse_options(args,
                          {'--username'=>:username, '--password'=>:password,
                           '-r'=>:revision, '--revision'=>:revision})
+    @arg_paths << '/' if @arg_paths.size == 0
+
     get_user_pass_if_need_to_read_repo
 
-    ext_options = Array.new
     paths = Array.new
-    args.each do |arg|
-      if /^-/ =~ arg
-        ext_options << arg
+    err_paths = Array.new
+    @arg_paths.each do |path|
+      if %r{^/(.*)$} =~ path
+        mirror_file = $1
+        mirror_file = '.' if mirror_file == ''
       else
-        paths << arg
+        mirror_file = @current_dir.sub(/^\//,'') + '/' + path
       end
-    end
-
-    if paths.size == 0
-      dir = @mirror_dir + @current_dir
-      error 'current directory is not managed.' unless File.exist?(dir)
-      paths << dir
-    else
-      paths.collect! do |path|
-        if %r{^/} =~ path
-          @mirror_dir + path
-        else
-          @mirror_dir + @current_dir + '/' + path
-        end
+      if File.exist?(@mirror_dir+'/'+mirror_file)
+        paths << mirror_file
+      else
+        err_paths << mirror_file
       end
     end
+    if err_paths.size != 0
+      error "following files are not managed.\n"+err_paths.join("\n")
+    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
+    cmd_arg += ' ' + @arg_options.join(' ') if @arg_options.size != 0
     if @options.has_key?(:revision)
       cmd_arg += " -r #{@options[:revision]}"
     else
       cmd_arg += ' -r HEAD:1'
     end
     cmd_arg += ' ' + paths.join(' ')
-    puts system3(cmd_arg)
+    FileUtils.cd @mirror_dir do
+      puts system3(cmd_arg)
+    end
   end
 end

data/lib/yggdrasil/update.rb

@@ -2,66 +2,50 @@ class Yggdrasil
 
   # @param [Array] args
   def update(args)
-    target_paths = parse_options(args,
-                                 {'--username'=>:username, '--password'=>:password,
-                                  '-r'=>:revision, '--revision'=>:revision,
-                                  '--non-interactive'=>:non_interactive?})
+    parse_options(args,
+                  {'--username'=>:username, '--password'=>:password,
+                   '--non-interactive'=>:non_interactive?})
+    @arg_paths << '/' if @arg_paths.size == 0
     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_password_options_to_read_repo
-      out = system3(cmd)
-      out.split(/\n/).each do |line|
-        if /^.*\*.*\s(\S+)\s*$/ =~ line
-          updates << ['', $1]
-        end
-      end
-    end
-
-    matched_updates = select_updates(updates, target_paths)
+    updates = sync_mirror
+    matched_updates = select_updates(updates, @arg_paths)
     if matched_updates.size == 0
-      puts "\nno files."
+      puts 'no files.'
       return
     end
 
     confirmed_updates = confirm_updates(matched_updates) do |relative_path|
       FileUtils.cd @mirror_dir do
-        cmd = "#@svn diff"
-        cmd += ' --no-auth-cache --non-interactive'
+        cmd = "#@svn diff --no-auth-cache --non-interactive #{relative_path}"
         cmd += username_password_options_to_read_repo
-        if @options.has_key?(:revision)
-          cmd += " --old=#{relative_path} --new=#{relative_path}@#{@options[:revision]}"
-        else
-          cmd += " --old=#{relative_path} --new=#{relative_path}@HEAD"
-        end
         puts system3(cmd)
       end
     end
-    # res == 'Y' or --non-interactive
-
     return unless confirmed_updates
-    return if confirmed_updates == 0 # no files to update
+    return if confirmed_updates.size == 0
 
-    cmd_arg = "#@svn update --no-auth-cache --non-interactive"
-    cmd_arg += username_password_options_to_read_repo
-    if @options.has_key?(:revision)
-      cmd_arg += " -r #{@options[:revision]}"
-    else
-      cmd_arg += ' -r HEAD'
-    end
-    cmd_arg += ' ' + confirmed_updates.join(' ')
     FileUtils.cd @mirror_dir do
-      puts system3(cmd_arg)
+      cmd = "#@svn revert #{confirmed_updates.reverse.join(' ')}"
+      cmd += username_password_options_to_read_repo
+      system3 cmd
+
+      # make ls hash
+      cmd = "#@svn ls -R #@repo --no-auth-cache --non-interactive"
+      cmd += username_password_options_to_read_repo
+      out = system3(cmd)
+
+      ls_hash = Hash.new
+      out.split(/\n/).each {|relative| ls_hash[relative]=true}
 
       # reflect mirror to real file
-      confirmed_updates.each do |update_file|
-        if File.exist?(update_file)
-          FileUtils.copy_file "#@mirror_dir/#{update_file}", "/#{update_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}"
+          end
         else
-          system3 "rm -rf /#{update_file}"
+          system3 "rm -rf #{@mirror_dir + '/' + file}"
         end
       end
     end

data/lib/yggdrasil/version.rb

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

data/lib/yggdrasil.rb

@@ -11,9 +11,7 @@ require 'yggdrasil/cleanup'
 require 'yggdrasil/diff'
 require 'yggdrasil/list'
 require 'yggdrasil/log'
-require 'yggdrasil/status'
 require 'yggdrasil/update'
-require 'yggdrasil/revert'
 require 'yggdrasil/check'
 
 class Yggdrasil
@@ -29,7 +27,7 @@ class Yggdrasil
     case args[0]
       when 'add'
         new.add(args[1..-1])
-      when 'check', 'c'
+      when 'check', 'c', 'status', 'stat', 'st'
         new.check(args[1..-1])
       when 'cleanup'
         new.cleanup(args[1..-1])
@@ -45,11 +43,7 @@ class Yggdrasil
         new.list(args[1..-1])
       when 'log'
         new.log(args[1..-1])
-      when 'revert'
-        new.revert(args[1..-1])
-      when 'status', 'stat', 'st'
-        new.status(args[1..-1])
-      when 'update'
+      when 'update', 'up', 'revert'
         new.update(args[1..-1])
       when 'version', '--version', '-v'
         new(false).version
@@ -84,6 +78,9 @@ class Yggdrasil
   def sync_mirror
     updates = Array.new
     FileUtils.cd @mirror_dir do
+      cmd = "#@svn update --no-auth-cache --non-interactive"
+      cmd += username_password_options_to_read_repo
+      system3(cmd)
       cmd = "#@svn ls #@repo -R --no-auth-cache --non-interactive"
       cmd += username_password_options_to_read_repo
       out = system3(cmd)
@@ -164,6 +161,7 @@ class Yggdrasil
       end
       print 'OK? [Y|n|<num to diff>]:'
       res = $stdin.gets
+      puts
       return nil unless res
       res.chomp!
       return nil if res == 'n'
@@ -230,4 +228,28 @@ class Yggdrasil
       error "invalid host:port '#{@options[:server]}'"
     end
   end
+
+  def exec_checker
+    # execute checker
+    `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(.*)$}
+            file_body = $1
+            system3("#{file} > #@checker_result_dir#{file_body}")
+          end
+        end
+      end
+    end
+
+    # add checker result
+    result_files = Array.new
+    Find.find(@checker_result_dir) {|f| result_files << f}
+    stdout = $stdout
+    $stdout = StringIO.new
+    self.class.new.add result_files
+    $stdout = stdout
+  end
 end

data/lib/yggdrasil_common.rb

@@ -51,7 +51,16 @@ module YggdrasilCommon
       end
       pos += 1
     end
-    args
+    @arg_options = Array.new
+    @arg_paths = Array.new
+    args.each do |arg|
+      if /^-/ =~ arg
+        @arg_options << arg
+      else
+        @arg_paths << arg
+      end
+    end
+    nil
   end
 
   def input_user_pass
@@ -86,11 +95,11 @@ module YggdrasilCommon
     unless stat.success?
       return nil unless err_exit
       if @options[:debug?]
-        cmd_disp = cmd
+        cmd_display = cmd
       else
-        cmd_disp = (cmd.split)[0]+' ...'
+        cmd_display = (cmd.split)[0]+' ...'
       end
-      $stderr.puts "#@base_cmd error: command failure: #{cmd_disp}"
+      $stderr.puts "#@base_cmd error: command failure: #{cmd_display}"
       $stderr.puts 'command output:'
       $stderr.puts out
       exit stat.exitstatus

data/lib/yggdrasil_server/init.rb

@@ -3,11 +3,11 @@ class YggdrasilServer
   # @param [Array] args
   def init_server(args)
 
-    args = parse_options(args,
-                         {'--port'=>:port, '--repo'=>:repo,
-                          '--ro-username'=>:ro_username, '--ro-password'=>:ro_password})
-    if args.size != 0
-      error "invalid arguments: #{args.join(',')}"
+    parse_options(args,
+                  {'--port'=>:port, '--repo'=>:repo,
+                   '--ro-username'=>:ro_username, '--ro-password'=>:ro_password})
+    if @arg_options.size+@arg_paths.size != 0
+      error "invalid arguments: #{(@arg_options+@arg_paths).join(', ')}"
     end
 
     if !@options.has_key?(:ro_username) && @options.has_key?(:ro_password)

data/lib/yggdrasil_server/results.rb

@@ -2,10 +2,10 @@ class YggdrasilServer
 
   # @param [Array] args
   def results(args)
-    args = parse_options(args, {'--expire'=>:expire})
+    parse_options(args, {'--expire'=>:expire})
 
-    if args.size != 0
-      error "invalid arguments: #{args.join(',')}"
+    if @arg_options.size+@arg_paths.size != 0
+      error "invalid arguments: #{(@arg_options+@arg_paths).join(', ')}"
     end
 
     return unless File.exist?(@results_dir)