yggdrasil 0.0.15 → 0.0.16

data/lib/yggdrasil.rb

@@ -75,24 +75,50 @@ class Yggdrasil
   protected
   include YggdrasilCommon
 
-  def sync_mirror
+  def sync_mirror(target_paths)
+    target_relatives = Array.new
+    if  target_paths.size == 0
+      target_relatives << @current_dir.sub(%r{^/*},'')
+    else
+      target_paths.each do |path|
+        if %r{^/} =~ path
+          target_relatives << path.sub(%r{^/*},'') # cut first '/'
+        else
+          target_relatives << @current_dir.sub(%r{^/*},'') + '/' + path
+        end
+        f = '/'+target_relatives[-1]
+        error "no such file of directory:#{f}" unless File.exist?(f)
+      end
+    end
+
     updates = Array.new
+    @target_file_num = 0
     FileUtils.cd @mirror_dir do
-      cmd = "#@svn update --no-auth-cache --non-interactive"
-      cmd += username_password_options_to_read_repo
-      system3(cmd)
+      files = Array.new
       cmd = "#@svn ls #@repo -R --no-auth-cache --non-interactive"
       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_password_options_to_read_repo
-      out = system3(cmd)
-      out.split(/\n/).each do |line|
-        files << $1 if /^.*\s(\S+)\s*$/ =~ line
+      ls_files = out.split(/\n/)
+      target_relatives.each do |target_relative|
+        ls_files.each do |ls_file|
+          files << ls_file if ls_file.match("^#{target_relative}")
+        end
+        cmd = "#@svn update --no-auth-cache --non-interactive"
+        cmd += " -r #{@options[:revision]}" if @options.has_key?(:revision)
+        cmd += username_password_options_to_read_repo
+        cmd += ' '+target_relative
+        system3(cmd)
+        cmd = "#@svn status -q --no-auth-cache --non-interactive"
+        cmd += username_password_options_to_read_repo
+        cmd += ' '+target_relative
+        out = system3(cmd)
+        out.split(/\n/).each do |line|
+          files << $1 if /^.*\s(\S+)\s*$/ =~ line
+        end
       end
       files.sort!
       files.uniq!
+      @target_file_num = files.size
       files.each do |file|
         if !File.exist?("/#{file}")
           system3 "#@svn delete #{file} --force" +
@@ -116,58 +142,34 @@ class Yggdrasil
         end
       end
     end
-    updates
+    updates.sort.uniq
   end
 
-  def select_updates(updates, target_paths)
-
-    target_relatives = Array.new
-    if  target_paths.size == 0
-      target_relatives << @current_dir.sub(%r{^/*},'')
-    else
-      target_paths.each do |path|
-        if %r{^/} =~ path
-          target_relatives << path.sub(%r{^/*},'') # cut first '/'
-        else
-          target_relatives << @current_dir.sub(%r{^/*},'') + '/' + path
-        end
-      end
-    end
-
-    # search updated files in the specified dir
-    cond = '^'+target_relatives.join('|^') # make reg exp
-    matched_updates = Array.new
-    updates.each do |update|
-      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[1].match("^#{update[1]}/")
-      end
-    end
-    matched_updates += parents
-    matched_updates.sort.uniq
-  end
-
-  def confirm_updates(updates)
+  def confirm_updates(updates, yes_no=%w{Y n})
+    Signal.trap('INT') {
+      puts
+      exit 1
+    }
+    display_list = true
     until @options.has_key?(:non_interactive?)
       puts
-      (0...updates.size).each do |i|
-        puts "#{i}:#{updates[i][0]} #{updates[i][1]}"
+      if display_list
+        (0...updates.size).each do |i|
+          puts "#{i}:#{updates[i][0]} #{updates[i][1]}"
+        end
+        display_list = false
       end
-      print 'OK? [Y|n|<num to diff>]:'
+      print "OK? [#{yes_no[0]}|#{yes_no[1]}|<num to diff>]: "
       res = $stdin.gets
       puts
       return nil unless res
       res.chomp!
-      return nil if res == 'n'
-      break if res == 'Y'
-      next unless updates[res.to_i]
-      if /^\d+$/ =~ res
+      break if res == yes_no[0]
+      return nil if res == yes_no[1]
+      if /^\d+$/ =~ res && updates[res.to_i]
         yield updates[res.to_i][1]
+      else
+        display_list = true
       end
     end
     # res == 'Y'
@@ -243,12 +245,15 @@ class Yggdrasil
       end
     end
 
-    # add checker result
+    # add checker script and 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
+    Find.find(@checker_dir) {|f| result_files << f unless f == @checker_dir}
+    Find.find(@checker_result_dir) {|f| result_files << f unless f == @checker_result_dir}
+    if result_files.size != 0
+      stdout = $stdout
+      $stdout = StringIO.new
+      self.class.new.add result_files
+      $stdout = stdout
+    end
   end
 end

data/lib/yggdrasil/check.rb

@@ -7,17 +7,18 @@ class Yggdrasil
     parse_options(args,
                   {'--username'=>:username, '--password'=>:password,
                    '--non-interactive'=>:non_interactive?})
+    error "invalid options: #{(@arg_options).join(', ')}" if @arg_options.size != 0
+
     @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)
+    matched_updates = sync_mirror(@arg_paths)
 
     check_result = String.new
     if matched_updates.size != 0
-      confirmed_updates = confirm_updates(matched_updates) do |relative_path|
+      confirmed_updates = confirm_updates(matched_updates, %w{A q}) 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
@@ -42,11 +43,17 @@ class Yggdrasil
       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)
+        result_array.each do |result_line|
+          if result_line =~ /\s(\S+)$/
+            result_path = $1
+            next if File.directory?(result_path)
+            cmd = "#@svn diff --no-auth-cache --non-interactive"
+            cmd += username_password_options_to_read_repo
+            cmd += ' '+result_path
+            check_result << system3(cmd) +"\n"
+          end
+        end
       end
     end
 
@@ -61,18 +68,15 @@ class Yggdrasil
         sock.puts check_result
         sock.close
       end
-      if check_result == ''
-        puts 'Yggdrasil check: OK.'
-      else
-        puts check_result
-        puts "\nYggdrasil check: NG!!!"
-      end
+    end
+
+    puts @target_file_num.to_s + ' files checked.'
+    return if @target_file_num == 0
+    if check_result == ''
+      puts 'Yggdrasil check: OK.'
     else
-      if check_result == ''
-        puts 'no files.'
-      else
-        puts check_result
-      end
+      puts check_result
+      puts 'Yggdrasil check: NG!!!'
     end
   end
 end

data/lib/yggdrasil/commit.rb

@@ -10,8 +10,7 @@ class Yggdrasil
 
     exec_checker
 
-    updates = sync_mirror
-    matched_updates = select_updates(updates, @arg_paths)
+    matched_updates = sync_mirror(@arg_paths)
     if matched_updates.size == 0
       puts 'no files.'
       return
@@ -46,7 +45,7 @@ class Yggdrasil
 
     input_user_pass
     FileUtils.cd @mirror_dir do
-      cmd = "#@svn commit -N -m '#{@options[:message]}'"\
+      cmd = "#@svn commit -m '#{@options[:message]}'"\
             ' --no-auth-cache --non-interactive'\
             " --username '#{@options[:username]}' --password '#{@options[:password]}'"\
             " #{confirmed_updates.join(' ')}"

data/lib/yggdrasil/diff.rb

@@ -4,12 +4,12 @@ class Yggdrasil
   def diff(args)
     parse_options(args,
                   {'--username'=>:username, '--password'=>:password,
-                   '-r'=>:revision, '--revision'=>:revision})
+                   '-r'=>:diff_rev, '--revision'=>:diff_rev})
     @arg_paths << '/' if @arg_paths.size == 0
 
     get_user_pass_if_need_to_read_repo
     exec_checker
-    sync_mirror
+    sync_mirror(@arg_paths)
 
     paths = Array.new
     err_paths = Array.new
@@ -33,7 +33,7 @@ class Yggdrasil
     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 += " -r #{@options[:diff_rev]}" if @options.has_key?(:diff_rev)
     cmd_arg += ' ' + paths.join(' ')
     FileUtils.cd @mirror_dir do
       puts system3(cmd_arg)

data/lib/yggdrasil/help.rb

@@ -171,6 +171,7 @@ Valid options:
   --username ARG           : specify a username ARG
   --password ARG           : specify a password ARG
   --non-interactive        : do no interactive prompting
+  -r [--revision] ARG      : revision number
 
 EOS
 

data/lib/yggdrasil/init.rb

@@ -29,9 +29,9 @@ class Yggdrasil
         `rm -rf #@config_file`
         break
       end
+      error "Already exist config file. use --force to ignore" if @options[:non_interactive?]
       puts "Already exist config file: #@config_file"
-      exit 1 if @options[:non_interactive?]
-      print "Overwrite? [Yn]:"
+      print 'Overwrite? [Yn]: '
       res = $stdin.gets
       puts
       return nil unless res
@@ -100,7 +100,7 @@ class Yggdrasil
         msg = "not exist directory(s) in repository: #{url_parts[url_parts_num...url_parts.size].join('/')}"
         error msg if @options[:non_interactive?]
         puts msg
-        print 'make directory(s)? [Yn]:'
+        print 'make directory(s)? [Yn]: '
         input = $stdin.gets
         error 'can not gets $stdin' if input.nil?
         puts
@@ -146,18 +146,15 @@ class Yggdrasil
     cmd += " --username '#{@options[:ro_username]}' --password '#{@options[:ro_password]}'" unless anon_access
     system3 cmd
 
-    # make checker dir and checker example
+    # make checker directory
     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
+    error "need --repo or --server" if @options[:non_interactive?]
     loop do
-      print 'Input svn repo URL:'
+      print 'Input svn repo URL: '
       input = $stdin.gets
       error 'can not input svn repo URL' unless input
       puts

data/lib/yggdrasil/update.rb

@@ -4,12 +4,12 @@ class Yggdrasil
   def update(args)
     parse_options(args,
                   {'--username'=>:username, '--password'=>:password,
+                   '-r'=>:revision, '--revision'=>:revision,
                    '--non-interactive'=>:non_interactive?})
     @arg_paths << '/' if @arg_paths.size == 0
     get_user_pass_if_need_to_read_repo
 
-    updates = sync_mirror
-    matched_updates = select_updates(updates, @arg_paths)
+    matched_updates = sync_mirror(@arg_paths)
     if matched_updates.size == 0
       puts 'no files.'
       return

data/lib/yggdrasil/version.rb

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

data/lib/yggdrasil_common.rb

@@ -66,7 +66,7 @@ module YggdrasilCommon
   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:'
+      print 'Input svn username: '
       input = $stdin.gets
       error 'can not input username' unless input
       puts
@@ -76,7 +76,7 @@ module YggdrasilCommon
     end
     until @options.has_key?(:password) do
       error 'Can\'t get username or password' if @options.has_key?(:non_interactive?)
-      print 'Input svn password:'
+      print 'Input svn password: '
       #input = `sh -c 'read -s hoge;echo $hoge'`
       system3 'stty -echo', false
       input = $stdin.gets

data/spec/check_spec.rb

@@ -14,61 +14,61 @@ describe Yggdrasil, 'check' do
 
   it 'should display check result by "check"' do
     cmd = %w{check --username hoge --password foo}
-    out = catch_out {Yggdrasil.command(cmd, "n\n")}
+    out = catch_out {Yggdrasil.command(cmd, "q\n")}
     out.should == <<"EOS"
 
 0:A tmp/yggdrasil-test/C
 1:D tmp/yggdrasil-test/A
 2:M tmp/yggdrasil-test/B
-OK? [Y|n|<num to diff>]:
+OK? [A|q|<num to diff>]:#{' '}
 EOS
   end
 
   it 'should display check result by "c"' do
     cmd = %w{c --username hoge --password foo}
-    out = catch_out {Yggdrasil.command(cmd, "n\n")}
+    out = catch_out {Yggdrasil.command(cmd, "q\n")}
     out.should == <<"EOS"
 
 0:A tmp/yggdrasil-test/C
 1:D tmp/yggdrasil-test/A
 2:M tmp/yggdrasil-test/B
-OK? [Y|n|<num to diff>]:
+OK? [A|q|<num to diff>]:#{' '}
 EOS
   end
 
   it 'should display check result by "status"' do
     cmd = %w{status --username hoge --password foo}
-    out = catch_out {Yggdrasil.command(cmd, "n\n")}
+    out = catch_out {Yggdrasil.command(cmd, "q\n")}
     out.should == <<"EOS"
 
 0:A tmp/yggdrasil-test/C
 1:D tmp/yggdrasil-test/A
 2:M tmp/yggdrasil-test/B
-OK? [Y|n|<num to diff>]:
+OK? [A|q|<num to diff>]:#{' '}
 EOS
   end
 
   it 'should display check result by "stat"' do
     cmd = %w{stat --username hoge --password foo}
-    out = catch_out {Yggdrasil.command(cmd, "n\n")}
+    out = catch_out {Yggdrasil.command(cmd, "q\n")}
     out.should == <<"EOS"
 
 0:A tmp/yggdrasil-test/C
 1:D tmp/yggdrasil-test/A
 2:M tmp/yggdrasil-test/B
-OK? [Y|n|<num to diff>]:
+OK? [A|q|<num to diff>]:#{' '}
 EOS
   end
 
   it 'should display check result by "st"' do
     cmd = %w{st --username hoge --password foo}
-    out = catch_out {Yggdrasil.command(cmd, "n\n")}
+    out = catch_out {Yggdrasil.command(cmd, "q\n")}
     out.should == <<"EOS"
 
 0:A tmp/yggdrasil-test/C
 1:D tmp/yggdrasil-test/A
 2:M tmp/yggdrasil-test/B
-OK? [Y|n|<num to diff>]:
+OK? [A|q|<num to diff>]:#{' '}
 EOS
 
     `echo hoge > /tmp/yggdrasil-test/A`
@@ -78,6 +78,22 @@ EOS
     `rm -f /tmp/yggdrasil-test/C`
   end
 
+  it 'should fail by spell miss of path' do
+    cmd = %w{st --username hoge --password foo /hoge}
+    err = catch_err do
+      lambda{Yggdrasil.command(cmd)}.should raise_error(SystemExit)
+    end
+    err.should == "#{File.basename($0)} error: no such file of directory:/hoge\n\n"
+  end
+
+  it 'should fail by spell miss of option' do
+    cmd = %w{st --username hoge --password foo --hoge}
+    err = catch_err do
+      lambda{Yggdrasil.command(cmd)}.should raise_error(SystemExit)
+    end
+    err.should == "#{File.basename($0)} error: invalid options: --hoge\n\n"
+  end
+
   it 'should execute checker and svn add the result' do
     puts "\n---- should execute checker and svn add the result"
     `rm -f /tmp/yggdrasil-test/.yggdrasil/checker/gem_list`
@@ -88,8 +104,26 @@ EOS
     out = catch_out {Yggdrasil.command(cmd, "Y\n")}
     out.gsub! /[ ]+/, ' '
     out.should == <<"EOS"
+10 files checked.
+A 0 tmp/yggdrasil-test/.yggdrasil
+A 0 tmp/yggdrasil-test/.yggdrasil/checker
+A 0 tmp/yggdrasil-test/.yggdrasil/checker/hoge
+A 0 tmp/yggdrasil-test/.yggdrasil/checker_result
 A 0 tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
 
+Index: tmp/yggdrasil-test/.yggdrasil/checker/hoge
+===================================================================
+--- tmp/yggdrasil-test/.yggdrasil/checker/hoge	(revision 0)
++++ tmp/yggdrasil-test/.yggdrasil/checker/hoge	(revision 0)
+@@ -0,0 +1 @@
++echo hoge
+
+Property changes on: tmp/yggdrasil-test/.yggdrasil/checker/hoge
+___________________________________________________________________
+Added: svn:executable
+ + *
+
+
 Index: tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
 ===================================================================
 --- tmp/yggdrasil-test/.yggdrasil/checker_result/hoge	(revision 0)
@@ -107,8 +141,12 @@ EOS
     out = catch_out {Yggdrasil.command cmd}
 
     out.should == <<"EOS"
+Adding         tmp/yggdrasil-test/.yggdrasil
+Adding         tmp/yggdrasil-test/.yggdrasil/checker
+Adding         tmp/yggdrasil-test/.yggdrasil/checker/hoge
+Adding         tmp/yggdrasil-test/.yggdrasil/checker_result
 Adding         tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
-Transmitting file data .
+Transmitting file data ..
 Committed revision 4.
 EOS
   end
@@ -117,14 +155,24 @@ EOS
     puts "\n---- should delete result if checker deleted"
     `rm -f /tmp/yggdrasil-test/.yggdrasil/checker/hoge`
     cmd = %w{check --username hoge --password foo}
-    out = catch_out {Yggdrasil.command(cmd, "Y\n")}
+    out = catch_out {Yggdrasil.command(cmd, "A\n")}
     out.gsub! /[ ]+/, ' '
     out.should == <<"EOS"
 
-0:D tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
-OK? [Y|n|<num to diff>]:
+0:D tmp/yggdrasil-test/.yggdrasil/checker/hoge
+1:D tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
+OK? [A|q|<num to diff>]:#{' '}
+9 files checked.
+D 4 tmp/yggdrasil-test/.yggdrasil/checker/hoge
 D 4 tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
 
+Index: tmp/yggdrasil-test/.yggdrasil/checker/hoge
+===================================================================
+--- tmp/yggdrasil-test/.yggdrasil/checker/hoge	(revision 4)
++++ tmp/yggdrasil-test/.yggdrasil/checker/hoge	(working copy)
+@@ -1 +0,0 @@
+-echo hoge
+
 Index: tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
 ===================================================================
 --- tmp/yggdrasil-test/.yggdrasil/checker_result/hoge	(revision 4)
@@ -142,6 +190,7 @@ EOS
     out = catch_out {Yggdrasil.command cmd}
 
     out.should == <<"EOS"
+Deleting       tmp/yggdrasil-test/.yggdrasil/checker/hoge
 Deleting       tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
 
 Committed revision 5.
@@ -177,10 +226,10 @@ EOS
     Yggdrasil.command %w{init --debug --server localhost:4000} +
                           %w{--username hoge --password foo},
                       "Y\nhoge\nfoo\n"
-    `rm -f /tmp/yggdrasil-test/.yggdrasil/checker/gem_list`
+
     Yggdrasil.command %w{check --non-interactive}
 
-    sleep 1
+    sleep 2
     File.exist?('/tmp/yggdrasil-test/.yggdrasil/results').should be_true
     files = Dir.entries('/tmp/yggdrasil-test/.yggdrasil/results')
     result_files = files.select{|file| %r{^#{Socket.gethostname}} =~ file}
@@ -188,10 +237,6 @@ EOS
     out = `cat /tmp/yggdrasil-test/.yggdrasil/results/#{result_files[0]}`
     out.gsub! /[ ]+/, ' '
     out.should == <<"EOS"
-A 0 tmp
-A 0 tmp/yggdrasil-test
-A 0 tmp/yggdrasil-test/.yggdrasil
-A 0 tmp/yggdrasil-test/.yggdrasil/checker_result
 
 EOS
   end
@@ -205,8 +250,9 @@ EOS
                       "Y\nHOGE\n"
 
     `echo foo >> /tmp/yggdrasil-test/A`
-    Yggdrasil.command %w{check}, "Y\n"
+    Yggdrasil.command %w{check}, "A\n"
 
+    sleep 1
     files = Dir.entries('/tmp/yggdrasil-test/.yggdrasil/results')
     result_files = files.select{|file| %r{^#{Socket.gethostname}} =~ file}
     out = `cat /tmp/yggdrasil-test/.yggdrasil/results/#{result_files[0]}`
@@ -221,6 +267,7 @@ Index: tmp/yggdrasil-test/A
 @@ -1 +1,2 @@
  hoge
 +foo
+
 EOS
   end
 
@@ -232,11 +279,41 @@ EOS
 
     Yggdrasil.command %w{check --non-interactive}
 
+    sleep 1
     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
 
+  it 'should recover delete flag' do
+    pending "under construction..."
+    puts "\n---- should recover delete flag"
+
+    `mkdir /tmp/yggdrasil-test/c`
+    `echo bar > /tmp/yggdrasil-test/c/C`
+
+    Yggdrasil.command %w{add /tmp/yggdrasil-test/c/C}
+    Yggdrasil.command %w{commit --username hoge --password foo} +
+                          %w{-m BAR --non-interactive}
+
+    `mv /tmp/yggdrasil-test/c /tmp/yggdrasil-test/cc`
+    cmd = %w{c --username hoge --password foo}
+    out = catch_out {Yggdrasil.command(cmd, "q\n")}
+    out.should == <<"EOS"
+
+0:D tmp/yggdrasil-test/c
+1:D tmp/yggdrasil-test/c/C
+OK? [A|q|<num to diff>]:#{' '}
+EOS
+
+    `mv /tmp/yggdrasil-test/cc /tmp/yggdrasil-test/c`
+    cmd = %w{c --username hoge --password foo}
+    out = catch_out {Yggdrasil.command(cmd, "q\n")}
+    out.should == <<"EOS"
+
+EOS
+  end
+
   after(:all) do
     sock = TCPSocket.open('localhost', 4000)
     sock.puts('quit')

data/spec/commit_spec.rb

@@ -105,7 +105,7 @@ describe Yggdrasil, 'commit' do
     puts "\n-- check file exists on repo"
     res = `svn ls file:///tmp/yggdrasil-test/svn-repo/mng-repo/host-name/tmp/yggdrasil-test`
     puts res
-    res.should == ".yggdrasil/\nA\nB\n"
+    res.should == "A\nB\n"
   end
 
   it 'should commit deleted file' do
@@ -120,7 +120,7 @@ describe Yggdrasil, 'commit' do
     puts "\n-- check committed delete file"
     res = `svn ls file:///tmp/yggdrasil-test/svn-repo/mng-repo/host-name/tmp/yggdrasil-test`
     puts res
-    res.should == ".yggdrasil/\nA\n"
+    res.should == "A\n"
   end
 
   it 'should commit all files at once' do
@@ -139,7 +139,20 @@ describe Yggdrasil, 'commit' do
     puts "\n-- check committed delete file"
     res = `svn ls file:///tmp/yggdrasil-test/svn-repo/mng-repo/host-name/tmp/yggdrasil-test`
     puts res
-    res.should == ".yggdrasil/\nA\nc/\n"
+    res.should == "A\nc/\n"
   end
 
+  it 'should commit deleted directory' do
+    puts '---- should commit deleted directory'
+    `rm -rf /tmp/yggdrasil-test/c`
+
+    Yggdrasil.command %w{commit -m delete --debug} +
+                          %w{--username hoge --password foo},
+                      "0\n1\nY\n"
+
+    puts "\n-- check committed delete file"
+    res = `svn ls file:///tmp/yggdrasil-test/svn-repo/mng-repo/host-name/tmp/yggdrasil-test`
+    puts res
+    res.should == "A\n"
+  end
 end

data/spec/help_spec.rb

@@ -232,6 +232,7 @@ Valid options:
   --username ARG           : specify a username ARG
   --password ARG           : specify a password ARG
   --non-interactive        : do no interactive prompting
+  -r [--revision] ARG      : revision number
 
 EOS
   end
@@ -247,6 +248,7 @@ Valid options:
   --username ARG           : specify a username ARG
   --password ARG           : specify a password ARG
   --non-interactive        : do no interactive prompting
+  -r [--revision] ARG      : revision number
 
 EOS
   end

data/spec/init_spec.rb

@@ -15,6 +15,14 @@ describe Yggdrasil, 'init' do
     err.should == "#{File.basename($0)} error: Not enough arguments provided: --repo\n\n"
   end
 
+  it 'should error: "no --repo at --non-interactive"' do
+    puts '---- should error: "no --repo at --non-interactive"'
+    err = catch_err do
+      lambda{Yggdrasil.command(%w{init --non-interactive})}.should raise_error(SystemExit)
+    end
+    err.should == "#{File.basename($0)} error: need --repo or --server\n\n"
+  end
+
   it 'should error: can not access to SVN server' do
     puts '---- should error: can not access to SVN server'
     `rm -rf /tmp/yggdrasil-test/.yggdrasil`
@@ -115,25 +123,22 @@ EOS
           "Y\n"
       end
     out.should == <<"EOS"
-Input svn repo URL:
+Input svn repo URL:#{' '}
 check SVN access...
-Input svn username:
-Input svn password:
+Input svn username:#{' '}
+Input svn password:#{' '}
 SVN access OK: svn://localhost/tmp/yggdrasil-test/svn-repo
 not exist directory(s) in repository: mng-repo/host-name
-make directory(s)? [Yn]:
+make directory(s)? [Yn]:#{' '}
 add svn://localhost/tmp/yggdrasil-test/svn-repo/mng-repo
 add svn://localhost/tmp/yggdrasil-test/svn-repo/mng-repo/host-name
 EOS
   end
 
-  it 'should make checker example at init' do
-    puts "\n---- should make checker example at init"
+  it 'should make checker directory at init' do
+    puts "\n---- should make checker directory at init"
     dir = '/tmp/yggdrasil-test/.yggdrasil/checker'
     File.directory?(dir).should be_true
-
-    example_checker = dir + '/gem_list'
-    File.executable?(example_checker).should be_true
   end
 
   it 'should success init subcommand with server option' do
@@ -174,7 +179,7 @@ EOS
     end
     out.should == <<"EOS"
 Already exist config file: /tmp/yggdrasil-test/.yggdrasil/config
-Overwrite? [Yn]:
+Overwrite? [Yn]:#{' '}
 EOS
   end
 
@@ -186,7 +191,7 @@ EOS
     end
     out.should == <<"EOS"
 Already exist config file: /tmp/yggdrasil-test/.yggdrasil/config
-Overwrite? [Yn]:
+Overwrite? [Yn]:#{' '}
 check SVN access...
 SVN access OK: file:///tmp/yggdrasil-test/.yggdrasil/private_repo
 EOS
@@ -198,15 +203,14 @@ EOS
 
   it 'should error --non-interactive: already exist config file' do
     puts '---- should error --non-interactive: already exist config file'
-    out = catch_out do
+    err = catch_err do
       cmd_args = %w{init --repo file:///tmp/yggdrasil-test/svn-repo}+
           %w{--username hoge --password foo} +
           %w{--non-interactive}
       lambda{Yggdrasil.command(cmd_args)}.should raise_error(SystemExit)
     end
-    out.should == <<"EOS"
-Already exist config file: /tmp/yggdrasil-test/.yggdrasil/config
-EOS
+    err.should == "#{File.basename($0)} error: Already exist config file. use --force to ignore\n\n"
+
     config = `cat /tmp/yggdrasil-test/.yggdrasil/config | grep repo=`
     config.should == <<"EOS"
 repo=file:///tmp/yggdrasil-test/.yggdrasil/private_repo

data/spec/list_spec.rb

@@ -22,7 +22,7 @@ describe Yggdrasil, 'list' do
                           %w{--username hoge --password foo}
       end
     end
-    out.should == ".yggdrasil/\nA\nB\n"
+    out.should == "A\nB\n"
   end
 
   it 'should show list (no path)' do
@@ -36,8 +36,6 @@ describe Yggdrasil, 'list' do
     out.should == <<"EOS"
 tmp/
 tmp/yggdrasil-test/
-tmp/yggdrasil-test/.yggdrasil/
-tmp/yggdrasil-test/.yggdrasil/checker_result/
 tmp/yggdrasil-test/A
 tmp/yggdrasil-test/B
 EOS
@@ -49,8 +47,6 @@ EOS
                                           %w{--username hoge --password foo})}
     out.should == <<"EOS"
 yggdrasil-test/
-yggdrasil-test/.yggdrasil/
-yggdrasil-test/.yggdrasil/checker_result/
 yggdrasil-test/A
 yggdrasil-test/B
 EOS
@@ -62,8 +58,6 @@ EOS
                                           %w{--username hoge --password foo})}
     out.should == <<"EOS"
 yggdrasil-test/
-yggdrasil-test/.yggdrasil/
-yggdrasil-test/.yggdrasil/checker_result/
 yggdrasil-test/A
 yggdrasil-test/B
 EOS

data/spec/revert_spec.rb

@@ -27,7 +27,7 @@ describe Yggdrasil, 'revert' do
                             %w{--username hoge --password foo}
     end
     puts out
-    out.should == "no files.\n"
+    out.should == "3 files checked.\nYggdrasil check: OK.\n"
   end
 
   it 'should revert modified file' do
@@ -45,7 +45,7 @@ describe Yggdrasil, 'revert' do
                             %w{--username hoge --password foo}
     end
     puts out
-    out.should == "no files.\n"
+    out.should == "3 files checked.\nYggdrasil check: OK.\n"
   end
 
   it 'should accept password interactive' do
@@ -61,7 +61,7 @@ describe Yggdrasil, 'revert' do
                             %w{--username hoge --password foo}
     end
     puts out
-    out.should == "no files.\n"
+    out.should == "3 files checked.\nYggdrasil check: OK.\n"
   end
 
   it 'should revert specified file only' do
@@ -81,6 +81,7 @@ describe Yggdrasil, 'revert' do
     puts out
     out.gsub!(%r{ +}, ' ')
     out.should == <<"EOS"
+3 files checked.
 M 3 tmp/yggdrasil-test/A
 
 Index: tmp/yggdrasil-test/A
@@ -91,6 +92,8 @@ Index: tmp/yggdrasil-test/A
  hoge
  hoge
 +A
+
+Yggdrasil check: NG!!!
 EOS
   end
 
@@ -110,6 +113,7 @@ EOS
     puts out
     out.gsub!(%r{ +},' ')
     out.should == <<"EOS"
+3 files checked.
 D 3 tmp/yggdrasil-test/A
 
 Index: tmp/yggdrasil-test/A
@@ -119,6 +123,8 @@ Index: tmp/yggdrasil-test/A
 @@ -1,2 +0,0 @@
 -hoge
 -hoge
+
+Yggdrasil check: NG!!!
 EOS
   end
 
@@ -141,6 +147,6 @@ EOS
                             %w{--username hoge --password foo}
     end
     puts out
-    out.should == "no files.\n"
+    out.should == "3 files checked.\nYggdrasil check: OK.\n"
   end
 end

data/spec/server_results_spec.rb

@@ -77,6 +77,7 @@ Index: tmp/yggdrasil-test/A
 @@ -1 +1,2 @@
  hoge
 +foo
+
 EOS
   end
 

data/spec/update_spec.rb

@@ -69,4 +69,20 @@ describe Yggdrasil, 'update' do
     `cat /tmp/yggdrasil-test/A`.should == "A:no path\n"
     `cat /tmp/yggdrasil-test/B`.should == "B:no path\n"
   end
+
+  it 'should success update with revision' do
+    puts '---- should success update with revision'
+    `echo A:hoge > /tmp/yggdrasil-test/A`
+    `echo B:hoge > /tmp/yggdrasil-test/B`
+    Yggdrasil.command %w{commit} +
+                      %w{-m hoge} +
+                      %w{--username hoge --password foo --non-interactive}
+
+    FileUtils.cd '/tmp' do
+      Yggdrasil.command %w{update} +
+                            %w{-r 4 --username hoge --password foo --non-interactive}
+    end
+    `cat /tmp/yggdrasil-test/A`.should == "A:related/absolute path\n"
+    `cat /tmp/yggdrasil-test/B`.should == "B:related/absolute path\n"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yggdrasil
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4459761969192795769
+      hash: -1313669213311713118
 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: 4459761969192795769
+      hash: -1313669213311713118
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25