yggdrasil 0.0.3 → 0.0.4

data/README.md

@@ -14,7 +14,7 @@ And you have to install subversion:
 
 Prepare subversion repository and initialize Yggdrasil:
 
-    $ svnadmin create ~/svn-repo
+    (e.g.)$ svnadmin create ~/svn-repo
     $ yggdrasil init --repo file://$HOME/svn-repo
 
   You should use svn-server if you have.
@@ -23,7 +23,7 @@ Prepare subversion repository and initialize Yggdrasil:
 
 Add configuration files:
 
-    $ yggdrasil add ~/.bashrc  ..etc
+    $ yggdrasil add /etc/hosts /etc/fstab   ..etc
 
 Check modify and/or delete:
 

data/lib/yggdrasil/add.rb

@@ -10,15 +10,16 @@ class Yggdrasil
         next
       end
       mirror_path = @mirror_dir
-      file_path.split('/')[1..-1].each do |part|
-        mirror_path += '/'+part
+      file_path_parts = file_path.split('/')[1..-1]
+      file_path_parts.each do |part|
+        mirror_path += "/#{part}"
         next if File.exist?(mirror_path)
-        if mirror_path == @mirror_dir+file_path
+        if part.equal?(file_path_parts[-1])
           FileUtils.copy file_path, mirror_path
         else
           Dir.mkdir mirror_path
         end
-        puts system3("#@svn add --no-auth-cache --non-interactive #{mirror_path}")
+        puts system3("#@svn add #{mirror_path}")
       end
     end
   end

data/lib/yggdrasil/diff.rb

@@ -10,11 +10,11 @@ class Yggdrasil
 
     paths = Array.new
     if args.size == 0
-      paths << @current_dir.sub(%r{^/}, '')
+      paths << @current_dir.sub(%r{^/*}, '')
     else
       args.each do |path|
         path = "#@current_dir/#{path}" unless %r{^/} =~ path
-        paths << path.sub(%r{^/}, '')
+        paths << path.sub(%r{^/*}, '')
       end
     end
 

data/lib/yggdrasil/init.rb

@@ -1,11 +1,11 @@
 class Yggdrasil
 
   # @param [Array] args
-  def Yggdrasil.init(args)
-    ENV['LANG'] = 'en_US.UTF-8'
+  def init(args)
 
     args, options = parse_options(args,
-        {'--repo'=>:repo, '--username'=>:username, '--password'=>:password})
+        {'--username'=>:username, '--password'=>:password,
+         '--repo'=>:repo, '--parents'=>:parents?, '--debug'=>:debug?})
     if args.size != 0
       error "invalid arguments: #{args.join(',')}"
     end
@@ -20,9 +20,8 @@ class Yggdrasil
     end
     svn_version=$1
 
-    config_dir =  ENV["HOME"] + '/.yggdrasil'
-    if File.exist?(config_dir)
-      puts "#{CMD} error: already exist .yggdrasil directory: #{config_dir}"
+    if File.exist?(@config_file)
+      puts "#{CMD} error: already exist config file: #@config_file"
       exit 1
     end
 
@@ -42,43 +41,69 @@ class Yggdrasil
     options = input_user_pass(options)
 
     puts "SVN access test..."
+    url_parts = options[:repo].split('/')
+    url_parts_num = url_parts.size
     loop do
-      ret = system3 "#{svn} ls --no-auth-cache --non-interactive"\
-                         " --username '#{options[:username]}' --password '#{options[:password]}'"\
-                         " #{options[:repo]}", false
-      unless ret.nil?
-        puts "SVN access: OK."
-        break
+      puts "url_parts_num=#{url_parts_num}" if options[:debug?]
+      if url_parts_num < 3
+        puts "SVN error: can not access to '#{options[:repo]}'."
+        exit 1
       end
-
-      ret = system3 "#{svn} mkdir --parents -m 'yggdrasil init'"\
-                         " --no-auth-cache --non-interactive"\
-                         " --username '#{options[:username]}' --password '#{options[:password]}'"\
-                         " #{options[:repo]}", false
+      url = url_parts[0...url_parts_num].join('/')
+      puts "try url=#{url}" if options[:debug?]
+      ret = system3("#{svn} ls --no-auth-cache --non-interactive" +
+                        " --username '#{options[:username]}' --password '#{options[:password]}'" +
+                        " #{url}", false)
       unless ret.nil?
-        puts "SVN mkdir: OK."
+        puts "SVN access OK: #{url}"
         break
       end
 
-      puts "SVN error: can not access to '#{options[:repo]}'."
-      exit 1
+      url_parts_num -= 1
     end
 
-    Dir.mkdir config_dir, 0755
-    File.open(config_dir+'/config', "w") do |f|
+    Dir.mkdir @config_dir, 0755 unless File.exist?(@config_dir)
+
+    if url_parts_num != url_parts.size
+      until options[:parents?]
+        puts "not exist directory(s): #{url_parts[url_parts_num...url_parts.size].join('/')}"
+        print "make directory(s)? [Yn]: "
+        input = $stdin.gets
+        exit 1 if input.nil?
+        input.chomp!
+        return if input == 'n'
+        break if input == 'Y'
+      end
+      `rm -rf #@mirror_dir`
+      system3 "#{svn} checkout --no-auth-cache --non-interactive" +
+                  " --username '#{options[:username]}' --password '#{options[:password]}'" +
+                  " #{url_parts[0...url_parts_num].join('/')} #@mirror_dir"
+      add_paths = Array.new
+      path = @mirror_dir
+      while url_parts_num < url_parts.size
+        path += '/' + url_parts[url_parts_num]
+        Dir.mkdir path
+        system3 "#{svn} add #{path}"
+        add_paths << path
+        url_parts_num += 1
+      end
+      system3 "#{svn} commit -m 'yggdrasil init' --no-auth-cache --non-interactive" +
+                  " --username '#{options[:username]}' --password '#{options[:password]}'" +
+                  ' ' + add_paths.join(' ')
+      system3 "rm -rf #@mirror_dir"
+    end
+
+    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"
     end
 
-    ret = system3 "#{svn} checkout"\
-                       " --no-auth-cache --non-interactive"\
-                       " --username '#{options[:username]}' --password '#{options[:password]}'"\
-                       " #{options[:repo]} #{config_dir+'/mirror'}", false
-    if ret.nil?
-      puts "SVN checkout: error."
-      exit 1
-    end
+    `rm -rf #@mirror_dir`
+    system3 "#{svn} checkout"\
+            " --no-auth-cache --non-interactive"\
+            " --username '#{options[:username]}' --password '#{options[:password]}'"\
+            " #{options[:repo]} #@mirror_dir"
   end
 end

data/lib/yggdrasil/list.rb

@@ -13,7 +13,7 @@ class Yggdrasil
 
     repos = Array.new
     if args.size == 0
-      repos << @repo+@current_dir
+      repos << @repo + @current_dir
     else
       args.each do |path|
         path = "#@current_dir/#{path}" unless %r{^/} =~ path

data/lib/yggdrasil/log.rb

@@ -8,15 +8,15 @@ class Yggdrasil
     options = input_user_pass(options)
 
     if args.size == 0
-      dir = @mirror_dir+@current_dir
+      dir = @mirror_dir + @current_dir
       error "current directory is not managed." unless File.exist?(dir)
       args << dir
     else
       args.collect! do |arg|
         if %r{^/} =~ arg
-          @mirror_dir+arg
+          @mirror_dir + arg
         else
-          @mirror_dir+@current_dir+'/'+arg
+          @mirror_dir + @current_dir + '/' + arg
         end
       end
     end

data/lib/yggdrasil/revert.rb

@@ -24,26 +24,22 @@ class Yggdrasil
     return if confirmed_updates.size == 0
 
     FileUtils.cd @mirror_dir do
-      system3 "#@svn revert"\
-                   " --no-auth-cache --non-interactive"\
-                   " --username '#{options[:username]}' --password '#{options[:password]}'"\
-                   " #{confirmed_updates.reverse.join(' ')}"
+      system3 "#@svn revert #{confirmed_updates.reverse.join(' ')}"
 
       # make ls hash
-      out = system3("#@svn ls --no-auth-cache --non-interactive"\
-                           " --username '#{options[:username]}' --password '#{options[:password]}'"\
-                           " --depth infinity #@repo")
+      out = system3("#@svn ls -R #@repo --no-auth-cache --non-interactive"\
+                           " --username '#{options[:username]}' --password '#{options[:password]}'")
       ls_hash = Hash.new
       out.split(/\n/).each {|relative| ls_hash[relative]=true}
 
       # reflect mirror to real 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
+          if File.file?("#@mirror_dir/#{file}")
+            FileUtils.copy_file "#@mirror_dir/#{file}", "/#{file}"
           end
         else
-          system3 "rm -rf #{@mirror_dir+'/'+file}"
+          system3 "rm -rf #{@mirror_dir + '/' + file}"
         end
       end
     end

data/lib/yggdrasil/status.rb

@@ -11,11 +11,11 @@ class Yggdrasil
 
     paths = String.new
     if args.size == 0
-      paths += ' '+@current_dir.sub(%r{^/}, '')
+      paths += ' '+@current_dir.sub(%r{^/*}, '')
     else
       args.each do |path|
         path = "#@current_dir/#{path}" unless %r{^/} =~ path
-        paths += ' ' + path.sub(%r{^/}, '')
+        paths += ' ' + path.sub(%r{^/*}, '')
       end
     end
 

data/lib/yggdrasil/update.rb

@@ -11,7 +11,7 @@ class Yggdrasil
 
     updates = Array.new
     FileUtils.cd @mirror_dir do
-      out = system3("#@svn status -qu --depth infinity --no-auth-cache --non-interactive" +
+      out = system3("#@svn status -qu --no-auth-cache --non-interactive" +
                       " --username '#{options[:username]}' --password '#{options[:password]}'")
       out.split(/\n/).each do |line|
         updates << $1 if /^.*\*.*\s(\S+)\s*$/ =~ line
@@ -56,7 +56,7 @@ class Yggdrasil
       # 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
+          FileUtils.copy_file "#@mirror_dir/#{update_file}", "/#{update_file}"
         else
           system3 "rm -rf /#{update_file}"
         end

data/lib/yggdrasil/version.rb

@@ -1,5 +1,5 @@
 class Yggdrasil
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
   CMD = File::basename($0)
 
   def Yggdrasil.version

data/lib/yggdrasil.rb

@@ -35,7 +35,7 @@ class Yggdrasil
       when 'help', 'h', '?'
         help(args[1..-1])
       when 'init'
-        init(args[1..-1])
+        new(false).init(args[1..-1])
       when 'list', 'ls'
         new.list(args[1..-1])
       when 'log'
@@ -55,9 +55,10 @@ class Yggdrasil
 
   # @param [String] cmd
   def Yggdrasil.system3(cmd, err_exit=true)
-    out = `#{cmd}`
+    out = `#{cmd} 2>&1`
+    stat = $?
 
-    unless $?.success?
+    unless stat.success?
       return nil unless err_exit
       $stderr.puts "#{CMD} error: command failure: #{cmd}"
       $stderr.puts "command output:"
@@ -115,47 +116,50 @@ class Yggdrasil
     return options
   end
 
-  def initialize
-
-    @config = read_config
-    ENV["PATH"] = @config[:path]
-    @svn = @config[:svn]
-    @repo = @config[:repo]
+  def initialize(exist_config = true)
     @current_dir = `readlink -f .`.chomp
-    @mirror_dir = ENV["HOME"]+"/.yggdrasil/mirror"
+    @config_dir = "#{ENV["HOME"]}/.yggdrasil"
+    @config_file = "#@config_dir/config"
+    @mirror_dir = "#@config_dir/mirror"
+
+    return unless exist_config
+    configs = read_config
+    ENV["PATH"] = configs[:path]
+    @svn = configs[:svn]
+    @repo = configs[:repo]
   end
 
   # load config value from config file
   def read_config
-    @config=Hash.new
+    configs = Hash.new
     begin
-      config_file = open("#{ENV['HOME']}/.yggdrasil/config")
+      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
+            configs[$1.to_sym] = $2
+          else
+            puts "#{CMD} error: syntax error. :#@config_file(#{l})"
+            exit 1
+          end
+        end
+      end
     rescue
-      puts "#{CMD} error: can not open config file: #{ENV['HOME']}/.yggdrasil/config"
+      puts "#{CMD} error: can not open config file: #@config_file"
       exit 1
     end
-    l = 0
-    while (line = config_file.gets)
-      l += 1
-      next if /^\s*#.*$/ =~ line  # comment line
-      if /^\s*(\S+)\s*=\s*(\S+).*$/ =~ line
-        @config[$1.to_sym] = $2
-      else
-        puts "#{CMD} error: syntax error. :#{ENV['HOME']}/.yggdrasil/config(#{l})"
-        exit 1
-      end
-    end
-    config_file.close
-    @config
+    configs
   end
 
   def sync_mirror(options)
     updates = Array.new
     FileUtils.cd @mirror_dir do
-      out = system3("#@svn ls #@repo --depth infinity --no-auth-cache --non-interactive" +
+      out = system3("#@svn ls #@repo -R --no-auth-cache --non-interactive" +
                            " --username '#{options[:username]}' --password '#{options[:password]}'")
       files = out.split(/\n/)
-      out = system3("#@svn status -q --depth infinity --no-auth-cache --non-interactive" +
+      out = system3("#@svn status -q --no-auth-cache --non-interactive" +
                            " --username '#{options[:username]}' --password '#{options[:password]}'")
       out.split(/\n/).each do |line|
         files << $1 if /^.*\s(\S+)\s*$/ =~ line
@@ -163,17 +167,17 @@ class Yggdrasil
       files.sort!
       files.uniq!
       files.each do |file|
-        if !File.exist?('/'+file)
+        if !File.exist?("/#{file}")
           system3 "#@svn delete #{file} --force" +
                       " --no-auth-cache --non-interactive"
-        elsif File.file?('/'+file)
-          if !File.exist?(@mirror_dir+'/'+file)
-            system3 "#@svn revert --no-auth-cache --non-interactive #{file}"
+        elsif File.file?("/#{file}")
+          if !File.exist?("#@mirror_dir/#{file}")
+            system3 "#@svn revert #{file}"
           end
-          FileUtils.copy_file '/'+file, @mirror_dir+'/'+file
+          FileUtils.copy_file "/#{file}", "#@mirror_dir/#{file}"
         end
       end
-      out = system3("#@svn status -q --depth infinity --no-auth-cache --non-interactive" +
+      out = system3("#@svn status -q --no-auth-cache --non-interactive" +
                         " --username '#{options[:username]}' --password '#{options[:password]}'")
       out.split(/\n/).each do |line|
         updates << $1 if /^.*\s(\S+)\s*$/ =~ line
@@ -186,13 +190,13 @@ class Yggdrasil
 
     target_relatives = Array.new
     if  target_paths.size == 0
-      target_relatives << @current_dir.sub(%r{^/},'')
+      target_relatives << @current_dir.sub(%r{^/*},'')
     else
       target_paths.each do |path|
         if %r{^/} =~ path
-          target_relatives << path.sub(%r{^/},'') # cut first '/'
+          target_relatives << path.sub(%r{^/*},'') # cut first '/'
         else
-          target_relatives << @current_dir.sub(%r{^/},'') + '/' + path
+          target_relatives << @current_dir.sub(%r{^/*},'') + '/' + path
         end
       end
     end

data/spec/add_spec.rb

@@ -9,10 +9,10 @@ describe Yggdrasil, "add" do
 
   it 'should warn: add non-exist files' do
     puts '---- should warn: add non-exist files'
-    out = catch_stdout{Yggdrasil.command %w{add hoge}}
+    out = catch_out_err{Yggdrasil.command %w{add hoge}}
     out.should == "no such file: #{`readlink -f hoge`}"
 
-    out = catch_stdout{Yggdrasil.command %w{add /etc/hoge}}
+    out = catch_out_err{Yggdrasil.command %w{add /etc/hoge}}
     out.should == "no such file: /etc/hoge\n"
   end
 

data/spec/commit_spec.rb

@@ -8,7 +8,7 @@ describe Yggdrasil, "commit" do
     puts '-- init'
     Yggdrasil.command %w{init} +
                           %w{--repo svn://localhost/tmp/yggdrasil-test/svn-repo/mng-repo/host-name/} +
-                          %w{--username hoge --password foo}
+                          %w{--username hoge --password foo --parents}
   end
 
   it 'should commit added files' do

data/spec/diff_spec.rb

@@ -13,7 +13,7 @@ describe Yggdrasil, "diff" do
 
   it 'should success diff (absolute/relative path)' do
     puts "---- should success diff (absolute/relative path)"
-    out = catch_stdout do
+    out = catch_out_err do
       FileUtils.cd "/tmp/yggdrasil-test" do
         Yggdrasil.command(%w{diff /tmp/yggdrasil-test/A B --username hoge --password foo})
       end
@@ -40,7 +40,7 @@ EOS
 
   it 'should success (no path)' do
     puts "---- should success (no path)"
-    out = catch_stdout do
+    out = catch_out_err do
       FileUtils.cd "/tmp/yggdrasil-test" do
         Yggdrasil.command %w{diff --username hoge --password foo}
       end
@@ -67,7 +67,7 @@ EOS
 
   it 'should success (-r)' do
     puts "---- should success (-r)"
-    out = catch_stdout do
+    out = catch_out_err do
       FileUtils.cd "/tmp/yggdrasil-test" do
         Yggdrasil.command %w{diff -r 2:3 A --username hoge --password foo}
       end
@@ -85,7 +85,7 @@ EOS
 
   it 'should success (--revision)' do
     puts "---- should success (--revision)"
-    out = catch_stdout do
+    out = catch_out_err do
       FileUtils.cd "/tmp/yggdrasil-test" do
         Yggdrasil.command %w{diff --revision 3 A --username hoge --password foo}
       end
@@ -99,6 +99,26 @@ Index: tmp/yggdrasil-test/A
  hoge
  hoge
 +HOGE
+EOS
+  end
+
+  it 'should error: diff with incorrect option' do
+    puts "---- should error: diff with incorrect option"
+    cmd = %w{diff --hoge --username hoge --password foo}
+
+    tmp_err = $stderr
+    $stderr = StringIO.new
+    FileUtils.cd "/" do
+      lambda{Yggdrasil.command cmd}.should raise_error(SystemExit)
+    end
+    out = $stderr.string
+    $stderr = tmp_err
+    out.sub!(%r{/\S*svn}, 'svn')
+    out.should == <<"EOS"
+rspec error: command failure: svn diff --no-auth-cache --non-interactive --username hoge --password foo --hoge
+command output:
+svn: invalid option: --hoge
+Type 'svn help' for usage.
 EOS
   end
 end

data/spec/help_spec.rb

@@ -29,31 +29,31 @@ EOS
 
   it 'should show subcommands on no subcommands' do
     puts '---- should show subcommands on no subcommands'
-    out = catch_stdout{Yggdrasil.command []}
+    out = catch_out_err{Yggdrasil.command []}
     out.should == show_subcommands
   end
 
   it 'should show subcommands on "help"' do
     puts '---- should show subcommands on "help"'
-    out = catch_stdout{Yggdrasil.command %w{help}}
+    out = catch_out_err{Yggdrasil.command %w{help}}
     out.should == show_subcommands
   end
 
   it 'should show subcommands on "h"' do
     puts '---- should show subcommands on "h"'
-    out = catch_stdout{Yggdrasil.command %w{h}}
+    out = catch_out_err{Yggdrasil.command %w{h}}
     out.should == show_subcommands
   end
 
   it 'should show subcommands on "?"' do
     puts '---- should show subcommands on "?"'
-    out = catch_stdout{Yggdrasil.command %w{?}}
+    out = catch_out_err{Yggdrasil.command %w{?}}
     out.should == show_subcommands
   end
 
   it 'should be unknown subcommand on "hoge"' do
     puts '---- should be unknown subcommand on "hoge"'
-    out = catch_stdout do
+    out = catch_out_err do
       lambda{Yggdrasil.command(%w{hoge})}.should raise_error(SystemExit)
     end
     out.should == "#{File.basename($0)} error: Unknown subcommand: 'hoge'\n\n"
@@ -67,13 +67,13 @@ EOS
 
   it 'should show help_help' do
     puts '---- should show help_help'
-    out = catch_stdout{Yggdrasil.command %w{help help}}
+    out = catch_out_err{Yggdrasil.command %w{help help}}
     out.should == help_help
   end
 
   it 'should error too many arguments' do
     puts '---- should error too many arguments'
-    out = catch_stdout do
+    out = catch_out_err do
       lambda{Yggdrasil.command(%w{help help help})}.should raise_error(SystemExit)
     end
     out.should == "#{File.basename($0)} error: too many arguments.\n\n"
@@ -81,7 +81,7 @@ EOS
 
   it 'should show help of version' do
     puts '---- should show help of version'
-    out = catch_stdout{Yggdrasil.command %w{help version}}
+    out = catch_out_err{Yggdrasil.command %w{help version}}
     out.should == <<"EOS"
 version: See the program version
 usage: #{File.basename($0)} version
@@ -91,7 +91,7 @@ EOS
 
   it 'should show help of init' do
     puts '---- should show help of init'
-    out = catch_stdout{Yggdrasil.command %w{help init}}
+    out = catch_out_err{Yggdrasil.command %w{help init}}
     out.should == <<"EOS"
 init: Check environment and initialize configuration.
 usage: #{File.basename($0)} init [OPTIONS...]
@@ -106,7 +106,7 @@ EOS
 
   it 'should show help of add' do
     puts '---- should show help of add'
-    out = catch_stdout{Yggdrasil.command %w{help add}}
+    out = catch_out_err{Yggdrasil.command %w{help add}}
     out.should == <<"EOS"
 add: Add files to management list (add to subversion)
 usage #{File.basename($0)} add [FILES...]
@@ -116,7 +116,7 @@ EOS
 
   it 'should show help of commit' do
     puts '---- should show help of commit'
-    out = catch_stdout{Yggdrasil.command %w{help commit}}
+    out = catch_out_err{Yggdrasil.command %w{help commit}}
     out.should == <<"EOS"
 commit (ci): Send changes from your local file to the repository.
 usage: #{File.basename($0)} commit [OPTIONS...] [FILES...]
@@ -132,7 +132,7 @@ EOS
 
   it 'should show help of cleanup' do
     puts '---- should show help of cleanup'
-    out = catch_stdout{Yggdrasil.command %w{help cleanup}}
+    out = catch_out_err{Yggdrasil.command %w{help cleanup}}
     out.should == <<"EOS"
 cleanup: clean up the working copy
 usage: #{File.basename($0)} cleanup [OPTIONS...]
@@ -146,7 +146,7 @@ EOS
 
   it 'should show help of diff' do
     puts '---- should show help of diff'
-    out = catch_stdout{Yggdrasil.command %w{help diff}}
+    out = catch_out_err{Yggdrasil.command %w{help diff}}
     out.should == <<"EOS"
 diff (di): Display the differences between two revisions or paths.
 usage: #{File.basename($0)} diff [OPTIONS...] [PATH...]
@@ -168,7 +168,7 @@ EOS
 
   it 'should show help of list' do
     puts '---- should show help of list'
-    out = catch_stdout{Yggdrasil.command %w{help list}}
+    out = catch_out_err{Yggdrasil.command %w{help list}}
     out.should == <<"EOS"
 list (ls): List directory entries in the repository.
 usage: #{File.basename($0)} list [OPTIONS...] [PATH...]
@@ -193,7 +193,7 @@ EOS
 
   it 'should show help of log' do
     puts '---- should show help of log'
-    out = catch_stdout{Yggdrasil.command %w{help log}}
+    out = catch_out_err{Yggdrasil.command %w{help log}}
     out.should == <<"EOS"
 log: Show the log messages for a set of revision(s) and/or file(s).
 usage: #{File.basename($0)} log [OPTIONS...] [PATH]
@@ -215,7 +215,7 @@ EOS
 
   it 'should show help of status' do
     puts '---- should show help of status'
-    out = catch_stdout{Yggdrasil.command %w{help status}}
+    out = catch_out_err{Yggdrasil.command %w{help status}}
     out.should == <<"EOS"
 status (stat, st): Print the status of managed files and directories.
 usage: #{File.basename($0)} status [OPTIONS...] [PATH...]
@@ -231,7 +231,7 @@ EOS
 
   it 'should show help of update' do
     puts '---- should show help of update'
-    out = catch_stdout{Yggdrasil.command %w{help update}}
+    out = catch_out_err{Yggdrasil.command %w{help update}}
     out.should == <<"EOS"
 update (up): Bring changes from the repository into the local files.
 usage: #{File.basename($0)} update [PATH...]
@@ -254,7 +254,7 @@ EOS
 
   it 'should show help of revert' do
     puts '---- should show help of revert'
-    out = catch_stdout{Yggdrasil.command %w{help revert}}
+    out = catch_out_err{Yggdrasil.command %w{help revert}}
     out.should == <<"EOS"
 revert: Restore pristine working copy file (undo most local edits).
 usage: #{File.basename($0)} revert [PATH...]

data/spec/init_spec.rb

@@ -8,7 +8,7 @@ describe Yggdrasil, "init" do
 
   it 'should error: "Not enough arguments provided"' do
     puts '---- should error: "Not enough arguments provided"'
-    out = catch_stdout do
+    out = catch_out_err do
       lambda{Yggdrasil.command(%w{init --repo})}.should raise_error(SystemExit)
     end
     out.should == "#{File.basename($0)} error: Not enough arguments provided: --repo\n\n"
@@ -17,7 +17,7 @@ describe Yggdrasil, "init" do
   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`
-    out = catch_stdout do
+    out = catch_out_err do
       cmd_args = %w{init --repo file:///tmp/yggdrasil-test/hoge --username hoge --password foo}
       lambda{Yggdrasil.command(cmd_args)}.should raise_error(SystemExit)
     end
@@ -29,7 +29,7 @@ describe Yggdrasil, "init" do
     `rm -rf /tmp/yggdrasil-test/.yggdrasil`
     `rm -rf /tmp/yggdrasil-test/svn-repo`
 
-    catch_stdout do # > /dev/null
+    catch_out_err do # > /dev/null
       cmd_args = %w{init --repo file:///tmp/yggdrasil-test/svn-repo/mng-repo/host-name/ --username hoge --password foo}
       lambda{Yggdrasil.command(cmd_args)}.should raise_error(SystemExit)
     end
@@ -41,12 +41,10 @@ describe Yggdrasil, "init" do
     `rm -rf /tmp/yggdrasil-test/svn-repo`
     `svnadmin create /tmp/yggdrasil-test/svn-repo`
 
-    out = catch_stdout do
-      Yggdrasil.command %w{init} +
-          %w{--repo file:///tmp/yggdrasil-test/svn-repo/mng-repo/host-name/} +
-          %w{--username hoge --password foo}
-    end
-    out.should == "SVN access test...\nSVN mkdir: OK.\n"
+    Yggdrasil.command %w{init --debug} +
+                          %w{--repo file:///tmp/yggdrasil-test/svn-repo/mng-repo/host-name/} +
+                          %w{--username hoge --password foo},
+                      "Y\n"
   end
 
   it 'should success: create config file (interactive)' do
@@ -70,17 +68,20 @@ EOS
     end
     `svnserve -d`
 
-    out = catch_stdout do
+    out = catch_out_err do
       Yggdrasil.command %w{init},
           "svn://localhost/tmp/yggdrasil-test/svn-repo/mng-repo/host-name/\n"\
           "hoge\n"\
-          "foo\n"
-    end
+          "foo\n"\
+          "Y\n"
+      end
     out.should == \
       "Input svn repo URL: "\
       "Input svn username: "\
       "Input svn password: "\
       "SVN access test...\n"\
-      "SVN mkdir: OK.\n"
+      "SVN access OK: svn://localhost/tmp/yggdrasil-test/svn-repo\n"\
+      "not exist directory(s): mng-repo/host-name\n"\
+      "make directory(s)? [Yn]: "
   end
 end

data/spec/list_spec.rb

@@ -9,14 +9,14 @@ describe Yggdrasil, "list" do
 
   it 'should show list (absolute path)' do
     puts '---- should show list (absolute path)'
-    out = catch_stdout{Yggdrasil.command(%w{list /tmp} +
+    out = catch_out_err{Yggdrasil.command(%w{list /tmp} +
                                          %w{--username hoge --password foo})}
     out.should == "yggdrasil-test/\n"
   end
 
   it 'should show list (relative path)' do
     puts '---- should show list (relative path)'
-    out = catch_stdout do
+    out = catch_out_err do
       FileUtils.cd "/tmp" do
         Yggdrasil.command %w{list yggdrasil-test}+
                           %w{--username hoge --password foo}
@@ -27,7 +27,7 @@ describe Yggdrasil, "list" do
 
   it 'should show list (no path)' do
     puts '---- should show list (no path)'
-    out = catch_stdout do
+    out = catch_out_err do
       FileUtils.cd "/tmp/yggdrasil-test" do
         Yggdrasil.command %w{list} +
                           %w{--username hoge --password foo}
@@ -38,8 +38,8 @@ describe Yggdrasil, "list" do
 
   it 'should show list (with options)' do
     puts '---- should show list (with options)'
-    out = catch_stdout{Yggdrasil.command(%w{list --revision 2 --recursive --depth infinity /tmp} +
-                                         %w{--username hoge --password foo})}
+    out = catch_out_err{Yggdrasil.command(%w{list -R --revision 2 --recursive /tmp} +
+                                             %w{--username hoge --password foo})}
     out.should == "yggdrasil-test/\nyggdrasil-test/A\nyggdrasil-test/B\n"
   end
 end

data/spec/log_spec.rb

@@ -9,7 +9,7 @@ describe Yggdrasil, "log" do
 
   it 'should show log (absolute path)' do
     puts '---- should show log (absolute path)'
-    out = catch_stdout{Yggdrasil.command(%w{log /tmp} +
+    out = catch_out_err{Yggdrasil.command(%w{log /tmp} +
                                          %w{--username hoge --password foo})}
     out.gsub!(%r{20..-..-.. .*20..\)}, '')
     out.should == <<"EOS"
@@ -35,7 +35,7 @@ EOS
 
   it 'should show log (relative path)' do
     puts '---- should show log (relative path)'
-    out = catch_stdout do
+    out = catch_out_err do
       FileUtils.cd "/tmp" do
         Yggdrasil.command %w{log yggdrasil-test}+
                           %w{--username hoge --password foo}
@@ -65,7 +65,7 @@ EOS
 
   it 'should show log (no path)' do
     puts '---- should show log (no path)'
-    out = catch_stdout do
+    out = catch_out_err do
       FileUtils.cd "/tmp/yggdrasil-test" do
         Yggdrasil.command %w{log} +
                           %w{--username hoge --password foo}
@@ -95,7 +95,7 @@ EOS
 
   it 'should show log (with options)' do
     puts '---- should show log (with options)'
-    out = catch_stdout{Yggdrasil.command(%w{log --revision 2 /tmp} +
+    out = catch_out_err{Yggdrasil.command(%w{log --revision 2 /tmp} +
                                          %w{--username hoge --password foo})}
     out.sub!(%r{20..-..-.. .*20..\)}, '')
     out.should == <<"EOS"

data/spec/revert_spec.rb

@@ -22,7 +22,7 @@ describe Yggdrasil, "revert" do
     end
 
     puts "\n-- check revert file (add)"
-    out = catch_stdout do
+    out = catch_out_err do
       Yggdrasil.command %w{status /tmp/yggdrasil-test} +
                             %w{--username hoge --password foo}
     end
@@ -40,7 +40,7 @@ describe Yggdrasil, "revert" do
                       "0\nY\n"
 
     puts "\n-- check revert file (modify)"
-    out = catch_stdout do
+    out = catch_out_err do
       Yggdrasil.command %w{status /tmp/yggdrasil-test} +
                             %w{--username hoge --password foo}
     end
@@ -56,7 +56,7 @@ describe Yggdrasil, "revert" do
                       "foo\nY\n" # interactive input: password, Y/n
 
     puts "\n-- check revert file"
-    out = catch_stdout do
+    out = catch_out_err do
       Yggdrasil.command %w{status /tmp/yggdrasil-test} +
                             %w{--username hoge --password foo}
     end
@@ -74,14 +74,13 @@ describe Yggdrasil, "revert" do
                       "0\nY\n"
 
     puts "\n-- check revert file"
-    out = catch_stdout do
+    out = catch_out_err do
       Yggdrasil.command %w{status /tmp/yggdrasil-test} +
                             %w{--username hoge --password foo}
     end
     puts out
-    out.should == <<"EOS"
-M                3   tmp/yggdrasil-test/A
-EOS
+    out.gsub!(%r{ +}, ' ')
+    out.should == "M 3 tmp/yggdrasil-test/A\n"
   end
 
   it 'should not revert deleted file' do
@@ -93,14 +92,14 @@ EOS
                       "0\nn\n"
 
     puts "\n-- check status"
-    out = catch_stdout do
+    out = catch_out_err do
       Yggdrasil.command %w{status /tmp/yggdrasil-test} +
                             %w{--username hoge --password foo}
     end
+    out.chomp!
     puts out
-    out.should == <<"EOS"
-D                3   tmp/yggdrasil-test/A
-EOS
+    out.gsub!(%r{\s+},' ')
+    out.should == "D 3 tmp/yggdrasil-test/A"
   end
 
   it 'should revert all files at once' do
@@ -117,7 +116,7 @@ EOS
                       "0\nY\n"
 
     puts "\n-- check status"
-    out = catch_stdout do
+    out = catch_out_err do
       Yggdrasil.command %w{status /tmp/yggdrasil-test} +
                             %w{--username hoge --password foo}
     end

data/spec/spec_helper.rb

@@ -32,7 +32,7 @@ def init_yggdrasil
   puts '-- init'
   Yggdrasil.command %w{init} +
                     %w{--repo svn://localhost/tmp/yggdrasil-test/svn-repo/mng-repo/host-name/} +
-                    %w{--username hoge --password foo}
+                    %w{--username hoge --password foo --parents}
   puts '-- add'
   `echo hoge > /tmp/yggdrasil-test/A`
   `echo foo  > /tmp/yggdrasil-test/B`
@@ -49,11 +49,11 @@ def init_yggdrasil
                     %w{--username hoge --password foo}
 end
 
-def catch_stdout
+def catch_out_err
   exit 1 unless block_given?
   tmp_out = $stdout
   $stdout = StringIO.new
   yield
-  $stdout,tmp_out = tmp_out, $stdout
+  $stdout, tmp_out = tmp_out, $stdout
   tmp_out.string
 end

data/spec/status_spec.rb

@@ -16,44 +16,47 @@ describe Yggdrasil, "status" do
 
   it 'should show status(absolute and relative)' do
     puts "---- should show status(absolute and relative)"
-    out = catch_stdout do
+    out = catch_out_err do
       FileUtils.cd "/tmp/yggdrasil-test" do
         Yggdrasil.command %w{status /tmp/yggdrasil-test/A B --username hoge --password foo}
       end
     end
+    out.gsub!(%r{ +}, ' ')
     out.should == <<"EOS"
-M                3   tmp/yggdrasil-test/A
-D                3   tmp/yggdrasil-test/B
+M 3 tmp/yggdrasil-test/A
+D 3 tmp/yggdrasil-test/B
 EOS
   end
 
   it 'should show status(/)' do
     puts "---- should show status(/)"
-    out = catch_stdout do
+    out = catch_out_err do
       FileUtils.cd "/tmp/yggdrasil-test" do
         Yggdrasil.command %w{status / --username hoge --password foo}
       end
     end
+    out.gsub!(%r{ +}, ' ')
     out.should == <<"EOS"
-M                3   tmp/yggdrasil-test/A
-D                3   tmp/yggdrasil-test/B
-A                0   tmp/yggdrasil-test/c/C
-A                0   tmp/yggdrasil-test/c
+M 3 tmp/yggdrasil-test/A
+D 3 tmp/yggdrasil-test/B
+A 0 tmp/yggdrasil-test/c/C
+A 0 tmp/yggdrasil-test/c
 EOS
   end
 
   it 'should show status (no path)' do
     puts "---- should show status (no path)"
-    out = catch_stdout do
+    out = catch_out_err do
       FileUtils.cd "/tmp/yggdrasil-test" do
         Yggdrasil.command %w{status --username hoge --password foo}
       end
     end
+    out.gsub!(%r{ +}, ' ')
     out.should == <<"EOS"
-M                3   tmp/yggdrasil-test/A
-D                3   tmp/yggdrasil-test/B
-A                0   tmp/yggdrasil-test/c/C
-A                0   tmp/yggdrasil-test/c
+M 3 tmp/yggdrasil-test/A
+D 3 tmp/yggdrasil-test/B
+A 0 tmp/yggdrasil-test/c/C
+A 0 tmp/yggdrasil-test/c
 EOS
   end
 end

data/spec/version_spec.rb

@@ -12,13 +12,13 @@ EOS
 
   it 'should show version on "version"' do
     puts '---- should show version on "version"'
-    out = catch_stdout{Yggdrasil.command %w{version}}
+    out = catch_out_err{Yggdrasil.command %w{version}}
     out.should == show_version
   end
 
   it 'should show version on "--version"' do
     puts '---- should show version on "--version"'
-    out = catch_stdout{Yggdrasil.command %w{--version}}
+    out = catch_out_err{Yggdrasil.command %w{--version}}
     out.should == show_version
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yggdrasil
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -98,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1446740146431344687
+      hash: -1095897170101989481
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1446740146431344687
+      hash: -1095897170101989481
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23