yggdrasil 0.0.11 → 0.0.12

data/lib/yggdrasil_server/server.rb

@@ -1,9 +1,9 @@
 class YggdrasilServer
 
   def server(args)
-    args = parse_options(args, {'--debug'=>:debug?})
-    if args.size != 0
-      error "invalid arguments: #{args.join(',')}"
+    parse_options(args, {'--debug'=>:debug?})
+    if @arg_options.size+@arg_paths.size != 0
+      error "invalid arguments: #{(@arg_options+@arg_paths).join(', ')}"
     end
 
     puts "Start: yggdrasil server (port:#@port)"

data/spec/check_spec.rb

@@ -6,6 +6,76 @@ describe Yggdrasil, 'check' do
     puts '-------- check'
     prepare_environment
     init_yggdrasil
+    `rm -f /tmp/yggdrasil-test/A`
+    `echo foo >> /tmp/yggdrasil-test/B`
+    `echo bar > /tmp/yggdrasil-test/C`
+    Yggdrasil.command(%w{add /tmp/yggdrasil-test/C})
+  end
+
+  it 'should display check result by "check"' do
+    cmd = %w{check --username hoge --password foo}
+    out = catch_out {Yggdrasil.command(cmd, "n\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>]:
+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.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>]:
+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.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>]:
+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.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>]:
+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.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>]:
+EOS
+
+    `echo hoge > /tmp/yggdrasil-test/A`
+    `echo hoge >> /tmp/yggdrasil-test/A`
+    `echo foo > /tmp/yggdrasil-test/B`
+    `echo foo >> /tmp/yggdrasil-test/B`
+    `rm -f /tmp/yggdrasil-test/C`
   end
 
   it 'should execute checker and svn add the result' do
@@ -14,12 +84,10 @@ describe Yggdrasil, 'check' do
     `echo 'echo hoge' > /tmp/yggdrasil-test/.yggdrasil/checker/hoge`
     `chmod +x /tmp/yggdrasil-test/.yggdrasil/checker/hoge`
 
-    cmd = %w{check --username hoge --password foo}
-    out = catch_out {Yggdrasil.command(cmd)}
+    cmd = %w{check --username hoge --password foo --non-interactive}
+    out = catch_out {Yggdrasil.command(cmd, "Y\n")}
     out.should == <<"EOS"
-A                0   tmp/yggdrasil-test/.yggdrasil/checker_result
 A                0   tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
-A                0   tmp/yggdrasil-test/.yggdrasil
 
 Index: tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
 ===================================================================
@@ -36,8 +104,6 @@ EOS
     out = catch_out {Yggdrasil.command cmd}
 
     out.should == <<"EOS"
-Adding         tmp/yggdrasil-test/.yggdrasil
-Adding         tmp/yggdrasil-test/.yggdrasil/checker_result
 Adding         tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
 Transmitting file data .
 Committed revision 4.
@@ -48,8 +114,11 @@ 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)}
+    out = catch_out {Yggdrasil.command(cmd, "Y\n")}
     out.should == <<"EOS"
+
+0:D tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
+OK? [Y|n|<num to diff>]:
 D                4   tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
 
 Index: tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
@@ -103,7 +172,7 @@ EOS
                           %w{--username hoge --password foo},
                       "Y\nhoge\nfoo\n"
     `rm -f /tmp/yggdrasil-test/.yggdrasil/checker/gem_list`
-    Yggdrasil.command %w{check}
+    Yggdrasil.command %w{check --non-interactive}
 
     sleep 1
     File.exist?('/tmp/yggdrasil-test/.yggdrasil/results').should be_true
@@ -111,10 +180,10 @@ EOS
     result_files = files.select{|file| %r{^#{Socket.gethostname}} =~ file}
     result_files.size.should == 1
     `cat /tmp/yggdrasil-test/.yggdrasil/results/#{result_files[0]}`.should == <<"EOS"
+A                0   tmp
 A                0   tmp/yggdrasil-test
 A                0   tmp/yggdrasil-test/.yggdrasil
 A                0   tmp/yggdrasil-test/.yggdrasil/checker_result
-A                0   tmp
 
 EOS
 
@@ -124,7 +193,7 @@ EOS
                       "Y\nHOGE\n"
 
     `echo foo >> /tmp/yggdrasil-test/A`
-    Yggdrasil.command %w{check}
+    Yggdrasil.command %w{check}, "Y\n"
 
     `cat /tmp/yggdrasil-test/.yggdrasil/results/#{result_files[0]}`.should == <<"EOS"
 M                2   tmp/yggdrasil-test/A

data/spec/commit_spec.rb

@@ -22,7 +22,7 @@ describe Yggdrasil, 'commit' do
 
     puts '-- commit'
     FileUtils.cd '/tmp/yggdrasil-test' do
-      Yggdrasil.command %w{commit --username hoge --password foo},
+      Yggdrasil.command %w{commit --username hoge --password foo A B},
                         "0\nY\nadd A and B\n"
     end
 
@@ -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 == "A\nB\n"
+    res.should == ".yggdrasil/\nA\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 == "A\n"
+    res.should == ".yggdrasil/\nA\n"
   end
 
   it 'should commit all files at once' do
@@ -139,7 +139,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 == "A\nc/\n"
+    res.should == ".yggdrasil/\nA\nc/\n"
   end
 
 end

data/spec/help_spec.rb

@@ -10,7 +10,7 @@ Type '#{File.basename($0)} 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.
@@ -215,20 +213,8 @@ Valid options:
                                 'BASE'       base rev of item's working copy
                                 'COMMITTED'  last commit at or before BASE
                                 'PREV'       revision just before COMMITTED
-
-EOS
-  end
-
-  it 'should show help of status' do
-    puts '---- should show help of status'
-    out = catch_out{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...]
-
-Valid options:
-  --username ARG           : specify a username ARG
-  --password ARG           : specify a password ARG
+  -q [--quiet]             : print nothing, or only summary information
+  -v [--verbose]           : print extra information
 
 EOS
   end
@@ -237,20 +223,12 @@ EOS
     puts '---- should show help of update'
     out = catch_out{Yggdrasil.command %w{help update}}
     out.should == <<"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: #{File.basename($0)} 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
@@ -260,8 +238,8 @@ EOS
     puts '---- should show help of revert'
     out = catch_out{Yggdrasil.command %w{help revert}}
     out.should == <<"EOS"
-revert: Restore pristine working copy file (undo most local edits).
-usage: #{File.basename($0)} revert [OPTIONS...] [PATH...]
+update (up, revert): Set the files to the contents of the newest repository.
+usage: #{File.basename($0)} update [OPTIONS...] [PATH...]
 
 Valid options:
   --username ARG           : specify a username ARG
@@ -275,7 +253,7 @@ EOS
     puts '---- should show help of check'
     out = catch_out{Yggdrasil.command %w{help check}}
     out.should == <<"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: #{File.basename($0)} check [OPTIONS...]
 
   This subcommand execute the executable files in ~/.yggdrasil/checker/, and

data/spec/list_spec.rb

@@ -22,7 +22,7 @@ describe Yggdrasil, 'list' do
                           %w{--username hoge --password foo}
       end
     end
-    out.should == "A\nB\n"
+    out.should == ".yggdrasil/\nA\nB\n"
   end
 
   it 'should show list (no path)' do
@@ -33,17 +33,39 @@ describe Yggdrasil, 'list' do
                           %w{--username hoge --password foo}
       end
     end
-    out.should == "A\nB\n"
+    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
   end
 
-  it 'should show list (with options)' do
-    puts '---- should show list (with options)'
+  it 'should show list with options (1)' do
+    puts '---- should show list with options (1)'
     out = catch_out{Yggdrasil.command(%w{list -R --revision 2 /tmp} +
-                                             %w{--username hoge --password foo})}
-    out.should == "yggdrasil-test/\nyggdrasil-test/A\nyggdrasil-test/B\n"
+                                          %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
+  end
 
+  it 'should show list with options (2)' do
+    puts '---- should show list with options (2)'
     out = catch_out{Yggdrasil.command(%w{list --revision 2 --recursive /tmp} +
                                           %w{--username hoge --password foo})}
-    out.should == "yggdrasil-test/\nyggdrasil-test/A\nyggdrasil-test/B\n"
+    out.should == <<"EOS"
+yggdrasil-test/
+yggdrasil-test/.yggdrasil/
+yggdrasil-test/.yggdrasil/checker_result/
+yggdrasil-test/A
+yggdrasil-test/B
+EOS
   end
 end

data/spec/log_spec.rb

@@ -66,6 +66,10 @@ r2 | hoge |  | 1 line
 
 add files
 ------------------------------------------------------------------------
+r1 | hoge |  | 1 line
+
+yggdrasil init
+------------------------------------------------------------------------
 EOS
   end
 

data/spec/revert_spec.rb

@@ -23,11 +23,11 @@ describe Yggdrasil, 'revert' do
 
     puts "\n-- check revert file (add)"
     out = catch_out do
-      Yggdrasil.command %w{status /tmp/yggdrasil-test} +
+      Yggdrasil.command %w{check /tmp/yggdrasil-test --non-interactive} +
                             %w{--username hoge --password foo}
     end
     puts out
-    out.should == ''
+    out.should == "no files.\n"
   end
 
   it 'should revert modified file' do
@@ -41,11 +41,11 @@ describe Yggdrasil, 'revert' do
 
     puts "\n-- check revert file (modify)"
     out = catch_out do
-      Yggdrasil.command %w{status /tmp/yggdrasil-test} +
+      Yggdrasil.command %w{check /tmp/yggdrasil-test --non-interactive} +
                             %w{--username hoge --password foo}
     end
     puts out
-    out.should == ''
+    out.should == "no files.\n"
   end
 
   it 'should accept password interactive' do
@@ -57,11 +57,11 @@ describe Yggdrasil, 'revert' do
 
     puts "\n-- check revert file"
     out = catch_out do
-      Yggdrasil.command %w{status /tmp/yggdrasil-test} +
+      Yggdrasil.command %w{check /tmp/yggdrasil-test --non-interactive} +
                             %w{--username hoge --password foo}
     end
     puts out
-    out.should == ''
+    out.should == "no files.\n"
   end
 
   it 'should revert specified file only' do
@@ -75,12 +75,23 @@ describe Yggdrasil, 'revert' do
 
     puts "\n-- check revert file"
     out = catch_out do
-      Yggdrasil.command %w{status /tmp/yggdrasil-test} +
+      Yggdrasil.command %w{check /tmp/yggdrasil-test --non-interactive} +
                             %w{--username hoge --password foo}
     end
     puts out
     out.gsub!(%r{ +}, ' ')
-    out.should == "M 3 tmp/yggdrasil-test/A\n"
+    out.should == <<"EOS"
+M 3 tmp/yggdrasil-test/A
+
+Index: tmp/yggdrasil-test/A
+===================================================================
+--- tmp/yggdrasil-test/A	(revision 3)
++++ tmp/yggdrasil-test/A	(working copy)
+@@ -1,2 +1,3 @@
+ hoge
+ hoge
++A
+EOS
   end
 
   it 'should not revert deleted file' do
@@ -93,13 +104,22 @@ describe Yggdrasil, 'revert' do
 
     puts "\n-- check status"
     out = catch_out do
-      Yggdrasil.command %w{status /tmp/yggdrasil-test} +
+      Yggdrasil.command %w{check /tmp/yggdrasil-test --non-interactive} +
                             %w{--username hoge --password foo}
     end
-    out.chomp!
     puts out
-    out.gsub!(%r{\s+},' ')
-    out.should == 'D 3 tmp/yggdrasil-test/A'
+    out.gsub!(%r{ +},' ')
+    out.should == <<"EOS"
+D 3 tmp/yggdrasil-test/A
+
+Index: tmp/yggdrasil-test/A
+===================================================================
+--- tmp/yggdrasil-test/A	(revision 3)
++++ tmp/yggdrasil-test/A	(working copy)
+@@ -1,2 +0,0 @@
+-hoge
+-hoge
+EOS
   end
 
   it 'should revert all files at once' do
@@ -117,10 +137,10 @@ describe Yggdrasil, 'revert' do
 
     puts "\n-- check status"
     out = catch_out do
-      Yggdrasil.command %w{status /tmp/yggdrasil-test} +
+      Yggdrasil.command %w{check /tmp/yggdrasil-test --non-interactive} +
                             %w{--username hoge --password foo}
     end
     puts out
-    out.should == ''
+    out.should == "no files.\n"
   end
 end

data/spec/server_results_spec.rb

@@ -52,7 +52,7 @@ describe YggdrasilServer, 'results' do
     puts '---- should show results'
 
     `echo foo >> /tmp/yggdrasil-test/A`
-    Yggdrasil.command %w{check}
+    Yggdrasil.command %w{check --non-interactive}
 
     `echo hoge > /tmp/yggdrasil-test/.yggdrasil/results/hoge-old`
     File.utime Time.local(2001, 5, 22, 23, 59, 59),

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@ def init_yggdrasil
   Yggdrasil.command %w{init} +
                     %w{--repo svn://localhost/tmp/yggdrasil-test/svn-repo/mng-repo/host-name/} +
                     %w{--username hoge --password foo --parents}
+  `rm /tmp/yggdrasil-test/.yggdrasil/checker/gem_list`
   puts '-- add'
   `echo hoge > /tmp/yggdrasil-test/A`
   `echo foo  > /tmp/yggdrasil-test/B`

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yggdrasil
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -71,8 +71,6 @@ files:
 - lib/yggdrasil/init.rb
 - lib/yggdrasil/list.rb
 - lib/yggdrasil/log.rb
-- lib/yggdrasil/revert.rb
-- lib/yggdrasil/status.rb
 - lib/yggdrasil/update.rb
 - lib/yggdrasil/version.rb
 - lib/yggdrasil_common.rb
@@ -101,7 +99,6 @@ files:
 - spec/server_spec.rb
 - spec/server_version_spec.rb
 - spec/spec_helper.rb
-- spec/status_spec.rb
 - spec/update_spec.rb
 - spec/version_spec.rb
 - yggdrasil.gemspec
@@ -119,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1351395939162474937
+      hash: 2992744534865834849
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1351395939162474937
+      hash: 2992744534865834849
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -152,6 +149,5 @@ test_files:
 - spec/server_spec.rb
 - spec/server_version_spec.rb
 - spec/spec_helper.rb
-- spec/status_spec.rb
 - spec/update_spec.rb
 - spec/version_spec.rb

data/lib/yggdrasil/revert.rb

@@ -1,53 +0,0 @@
-class Yggdrasil
-
-  # @param [Array] args
-  def revert(args)
-    target_paths = parse_options(args,
-                                 {'--username'=>:username, '--password'=>:password,
-                                  '--non-interactive'=>:non_interactive?})
-    get_user_pass_if_need_to_read_repo
-
-    updates = sync_mirror
-    matched_updates = select_updates(updates, target_paths)
-    if matched_updates.size == 0
-      puts "\nno files."
-      return
-    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
-
-    FileUtils.cd @mirror_dir do
-      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 |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 #{@mirror_dir + '/' + file}"
-        end
-      end
-    end
-  end
-end

data/lib/yggdrasil/status.rb

@@ -1,28 +0,0 @@
-class Yggdrasil
-
-  # @param [Array] args
-  def status(args)
-    args = parse_options(args,
-                         {'--username'=>:username, '--password'=>:password})
-    get_user_pass_if_need_to_read_repo
-
-    sync_mirror
-
-    paths = String.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{^/*}, '')
-      end
-    end
-
-    cmd_arg = "#@svn status#{paths} -qu --no-auth-cache --non-interactive"
-    cmd_arg += username_password_options_to_read_repo
-    FileUtils.cd @mirror_dir do
-      out = system3(cmd_arg)
-      print out.gsub(/^Status against revision:.*\n/, '')
-    end
-  end
-end

data/spec/status_spec.rb

@@ -1,62 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe Yggdrasil, 'status' do
-  it '-------- status' do
-    puts '-------- status'
-    prepare_environment
-    init_yggdrasil
-
-    # modify and not commit yet
-    `echo HOGE >> /tmp/yggdrasil-test/A`
-    `rm -f /tmp/yggdrasil-test/B`
-    `mkdir /tmp/yggdrasil-test/c`
-    `echo bar > /tmp/yggdrasil-test/c/C`
-    Yggdrasil.command %w{add /tmp/yggdrasil-test/c/C}
-  end
-
-  it 'should show status(absolute and relative)' do
-    puts '---- should show status(absolute and relative)'
-    out = catch_out 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
-EOS
-  end
-
-  it 'should show status(/)' do
-    puts '---- should show status(/)'
-    out = catch_out 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
-EOS
-  end
-
-  it 'should show status (no path)' do
-    puts '---- should show status (no path)'
-    out = catch_out 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
-EOS
-  end
-end