yggdrasil 0.0.4 → 0.0.5

data/lib/yggdrasil.rb

@@ -71,13 +71,14 @@ class Yggdrasil
   protected
   # @param [String] msg
   def Yggdrasil.error(msg)
-    puts "#{CMD} error: #{msg}"
-    puts
+    $stderr.puts "#{CMD} error: #{msg}"
+    $stderr.puts
     exit 1
   end
 
-  def Yggdrasil.parse_options(args, valid_params)
-    options = Hash.new
+  def parse_options(args, valid_params)
+    valid_params['--debug'] = :debug? # common
+    @options ||= Hash.new
     pos = 0
     while args.size > pos
       if valid_params.has_key?(args[pos])
@@ -85,35 +86,37 @@ class Yggdrasil
         option_key = valid_params[option_note]
         args = args[0...pos]+args[pos+1..-1]
         if option_key.to_s[-1] == '?'
-          options[option_key] = true
+          @options[option_key] = true
         else
           error "Not enough arguments provided: #{option_note}" unless args.size > pos
           option_value = args[pos].dup
           args = args[0...pos]+args[pos+1..-1]
-          options[option_key] = option_value
+          @options[option_key] = option_value
         end
         next
       end
       pos += 1
     end
-    return args, options
+    args
   end
 
-  def Yggdrasil.input_user_pass(options)
-    until options.has_key?(:username) do
+  def input_user_pass
+    until @options.has_key?(:username) do
+      error "Can't get username or password" if @options.has_key?(:non_interactive?)
       print "Input svn username: "
       input = $stdin.gets
-      options[:username] = input.chomp
+      @options[:username] = input.chomp
     end
-    until options.has_key?(:password) do
+    until @options.has_key?(:password) do
+      error "Can't get username or password" if @options.has_key?(:non_interactive?)
       print "Input svn password: "
       #input = `sh -c 'read -s hoge;echo $hoge'`
       system3 'stty -echo', false
       input = $stdin.gets
       system3 'stty echo', false
-      options[:password] = input.chomp
+      puts
+      @options[:password] = input.chomp
     end
-    return options
   end
 
   def initialize(exist_config = true)
@@ -127,6 +130,7 @@ class Yggdrasil
     ENV["PATH"] = configs[:path]
     @svn = configs[:svn]
     @repo = configs[:repo]
+    @anon_access = (configs[:anon_access] == 'read')
   end
 
   # load config value from config file
@@ -139,28 +143,30 @@ class Yggdrasil
           l += 1
           next if /^\s*#.*$/ =~ line  # comment line
           if /^\s*(\S+)\s*=\s*(\S+).*$/ =~ line
-            configs[$1.to_sym] = $2
+            key, val = $1, $2
+            key.gsub!(/-/, '_')
+            configs[key.to_sym] = val
           else
-            puts "#{CMD} error: syntax error. :#@config_file(#{l})"
-            exit 1
+            error "syntax error. :#@config_file(#{l})"
           end
         end
       end
     rescue
-      puts "#{CMD} error: can not open config file: #@config_file"
-      exit 1
+      error "can not open config file: #@config_file"
     end
     configs
   end
 
-  def sync_mirror(options)
+  def sync_mirror
     updates = Array.new
     FileUtils.cd @mirror_dir do
-      out = system3("#@svn ls #@repo -R --no-auth-cache --non-interactive" +
-                           " --username '#{options[:username]}' --password '#{options[:password]}'")
+      cmd = "#@svn ls #@repo -R --no-auth-cache --non-interactive"
+      cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless @anon_access
+      out = system3(cmd)
       files = out.split(/\n/)
-      out = system3("#@svn status -q --no-auth-cache --non-interactive" +
-                           " --username '#{options[:username]}' --password '#{options[:password]}'")
+      cmd = "#@svn status -q --no-auth-cache --non-interactive"
+      cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless @anon_access
+      out = system3(cmd)
       out.split(/\n/).each do |line|
         files << $1 if /^.*\s(\S+)\s*$/ =~ line
       end
@@ -172,13 +178,16 @@ class Yggdrasil
                       " --no-auth-cache --non-interactive"
         elsif File.file?("/#{file}")
           if !File.exist?("#@mirror_dir/#{file}")
-            system3 "#@svn revert #{file}"
+            cmd = "#@svn revert #{file}"
+            cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless @anon_access
+            system3 cmd
           end
           FileUtils.copy_file "/#{file}", "#@mirror_dir/#{file}"
         end
       end
-      out = system3("#@svn status -q --no-auth-cache --non-interactive" +
-                        " --username '#{options[:username]}' --password '#{options[:password]}'")
+      cmd = "#@svn status -q --no-auth-cache --non-interactive"
+      cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless @anon_access
+      out = system3(cmd)
       out.split(/\n/).each do |line|
         updates << $1 if /^.*\s(\S+)\s*$/ =~ line
       end
@@ -219,8 +228,8 @@ class Yggdrasil
     matched_updates.sort.uniq
   end
 
-  def confirm_updates(updates, options)
-    until options.has_key?(:non_interactive?)
+  def confirm_updates(updates)
+    until @options.has_key?(:non_interactive?)
       puts
       (0...updates.size).each do |i|
         puts "#{i}:#{updates[i]}"

data/lib/yggdrasil/add.rb

@@ -3,8 +3,7 @@ class Yggdrasil
   # @param [Array] args
   def add(args)
     while (arg = args.shift)
-      file_path = `readlink -f #{arg}`.chomp
-      exit $?.exitstatus unless $?.success?
+      file_path = system3("readlink -f #{arg}").chomp
       unless File.exist?(file_path)
         puts "no such file: #{file_path}"
         next

data/lib/yggdrasil/cleanup.rb

@@ -2,18 +2,17 @@ class Yggdrasil
 
   # @param [Array] args
   def cleanup(args)
-    args, options = parse_options(args, {'--username'=>:username, '--password'=>:password})
+    args = parse_options(args, {'--username'=>:username, '--password'=>:password})
     if args.size != 0
       error "invalid arguments: #{args.join(',')}"
     end
 
-    options = input_user_pass(options)
+    input_user_pass unless @anon_access
 
     system3 "rm -rf #@mirror_dir"
 
-    system3 "#@svn checkout"\
-                 " --no-auth-cache --non-interactive"\
-                 " --username '#{options[:username]}' --password '#{options[:password]}'"\
-                 " #@repo #@mirror_dir"
+    cmd = "#@svn checkout --no-auth-cache --non-interactive #@repo #@mirror_dir"
+    cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless @anon_access
+    system3 cmd
   end
 end

data/lib/yggdrasil/commit.rb

@@ -2,19 +2,19 @@ class Yggdrasil
 
   # @param [Array] args
   def commit(args)
-    target_paths, options = parse_options(args,
+    target_paths = parse_options(args,
         {'--username'=>:username, '--password'=>:password,
          '-m'=>:message, '--message'=>:message, '--non-interactive'=>:non_interactive?})
-    options = input_user_pass(options)
+    input_user_pass
 
-    updates = sync_mirror(options)
+    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,options) do |relative_path|
+    confirmed_updates = confirm_updates(matched_updates) do |relative_path|
       FileUtils.cd @mirror_dir do
         puts system3("#@svn diff --no-auth-cache --non-interactive #{relative_path}")
       end
@@ -22,16 +22,16 @@ class Yggdrasil
     return unless confirmed_updates
     return if confirmed_updates.size == 0
 
-    until options.has_key?(:message) do
+    until @options.has_key?(:message) do
       print "Input log message: "
       input = $stdin.gets
-      options[:message] = input.chomp
+      @options[:message] = input.chomp
     end
 
     FileUtils.cd @mirror_dir do
-      puts system3 "#@svn commit -m '#{options[:message]}'"\
+      puts system3 "#@svn commit -m '#{@options[:message]}'"\
                    " --no-auth-cache --non-interactive"\
-                   " --username '#{options[:username]}' --password '#{options[:password]}'"\
+                   " --username '#{@options[:username]}' --password '#{@options[:password]}'"\
                    " #{confirmed_updates.join(' ')}"
     end
   end

data/lib/yggdrasil/diff.rb

@@ -2,11 +2,12 @@ class Yggdrasil
 
   # @param [Array] args
   def diff(args)
-    args, options = parse_options(args,
+    args = parse_options(args,
         {'--username'=>:username, '--password'=>:password, '-r'=>:revision, '--revision'=>:revision})
-    options = input_user_pass(options)
 
-    sync_mirror options
+    input_user_pass unless @anon_access
+
+    sync_mirror
 
     paths = Array.new
     if args.size == 0
@@ -19,8 +20,8 @@ class Yggdrasil
     end
 
     cmd_arg = "#@svn diff --no-auth-cache --non-interactive"
-    cmd_arg += " --username #{options[:username]} --password #{options[:password]}"
-    cmd_arg += " -r #{options[:revision]}" if options.has_key?(:revision)
+    cmd_arg += " --username #{@options[:username]} --password #{@options[:password]}" unless @anon_access
+    cmd_arg += " -r #{@options[:revision]}" if @options.has_key?(:revision)
     cmd_arg += ' '+paths.join(' ')
     FileUtils.cd @mirror_dir do
       puts system3(cmd_arg)

data/lib/yggdrasil/help.rb

@@ -111,9 +111,7 @@ Valid options:
                                 'BASE'       base rev of item's working copy
                                 'COMMITTED'  last commit at or before BASE
                                 'PREV'       revision just before COMMITTED
-  -R [--recursive]         : descend recursively, same as --depth=infinity
-  --depth ARG              : limit operation by depth ARG ('empty', 'files',
-                            'immediates', or 'infinity')
+  -R [--recursive]         : descend recursively
 
 EOS
         when 'log'
@@ -142,8 +140,6 @@ usage: #{CMD} status [OPTIONS...] [PATH...]
 Valid options:
   --username ARG           : specify a username ARG
   --password ARG           : specify a password ARG
-  --depth ARG              : limit operation by depth ARG ('empty', 'files',
-                            'immediates', or 'infinity')
 
 EOS
         when 'revert'

data/lib/yggdrasil/init.rb

@@ -3,9 +3,9 @@ class Yggdrasil
   # @param [Array] args
   def init(args)
 
-    args, options = parse_options(args,
+    args = parse_options(args,
         {'--username'=>:username, '--password'=>:password,
-         '--repo'=>:repo, '--parents'=>:parents?, '--debug'=>:debug?})
+         '--repo'=>:repo, '--parents'=>:parents?, '--non-interactive'=>:non_interactive?})
     if args.size != 0
       error "invalid arguments: #{args.join(',')}"
     end
@@ -14,18 +14,12 @@ class Yggdrasil
     svn = out.chomp
 
     out = system3 'svn --version'
-    unless /version (\d+\.\d+\.\d+) / =~ out
-      puts "#{CMD} error: can not find version string: svn --version"
-      exit 1
-    end
+    error "can not find version string: svn --version" unless /version (\d+\.\d+\.\d+) / =~ out
     svn_version=$1
 
-    if File.exist?(@config_file)
-      puts "#{CMD} error: already exist config file: #@config_file"
-      exit 1
-    end
+    error "already exist config file: #@config_file" if File.exist?(@config_file)
 
-    until options.has_key?(:repo) do
+    until @options.has_key?(:repo) do
       print "Input svn repo URL: "
       input = $stdin.gets
 
@@ -33,27 +27,32 @@ class Yggdrasil
         puts "ERROR: Invalid URL."
         redo
       end
-      options[:repo] = input
+      @options[:repo] = input
     end
-    options[:repo].chomp!
-    options[:repo].chomp!('/')
-
-    options = input_user_pass(options)
+    @options[:repo].chomp!
+    @options[:repo].chomp!('/')
 
     puts "SVN access test..."
-    url_parts = options[:repo].split('/')
+    url_parts = @options[:repo].split('/')
     url_parts_num = url_parts.size
+    anon_access = true
     loop do
-      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
+        if anon_access
+          anon_access = false
+          url_parts_num = url_parts.size
+          input_user_pass
+        else
+          error "can not access to '#{@options[:repo]}'."
+        end
       end
+      puts "url_parts_num=#{url_parts_num}" if @options[:debug?]
+
       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)
+      puts "try url=#{url}" if @options[:debug?]
+      cmd = "#{svn} ls --no-auth-cache --non-interactive #{url}"
+      cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless anon_access
+      ret = system3(cmd, false)
       unless ret.nil?
         puts "SVN access OK: #{url}"
         break
@@ -65,18 +64,21 @@ class Yggdrasil
     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('/')}"
+      until @options[:parents?]
+        msg = "not exist directory(s): #{url_parts[url_parts_num...url_parts.size].join('/')}"
+        error msg if @options[:non_interactive?]
+        puts msg
         print "make directory(s)? [Yn]: "
         input = $stdin.gets
-        exit 1 if input.nil?
+        error "can not gets $stdin" if input.nil?
         input.chomp!
         return if input == 'n'
         break if input == 'Y'
       end
+      input_user_pass
       `rm -rf #@mirror_dir`
       system3 "#{svn} checkout --no-auth-cache --non-interactive" +
-                  " --username '#{options[:username]}' --password '#{options[:password]}'" +
+                  " --username '#{@options[:username]}' --password '#{@options[:password]}'" +
                   " #{url_parts[0...url_parts_num].join('/')} #@mirror_dir"
       add_paths = Array.new
       path = @mirror_dir
@@ -88,7 +90,7 @@ class Yggdrasil
         url_parts_num += 1
       end
       system3 "#{svn} commit -m 'yggdrasil init' --no-auth-cache --non-interactive" +
-                  " --username '#{options[:username]}' --password '#{options[:password]}'" +
+                  " --username '#{@options[:username]}' --password '#{@options[:password]}'" +
                   ' ' + add_paths.join(' ')
       system3 "rm -rf #@mirror_dir"
     end
@@ -97,13 +99,13 @@ class Yggdrasil
       f.write "path=#{ENV['PATH']}\n"\
               "svn=#{svn}\n"\
               "svn_version=#{svn_version}\n"\
-              "repo=#{options[:repo]}\n"
-    end
+              "repo=#{@options[:repo]}\n"\
+              "anon-access=#{anon_access ? 'read' : 'none'}\n"
+      end
 
     `rm -rf #@mirror_dir`
-    system3 "#{svn} checkout"\
-            " --no-auth-cache --non-interactive"\
-            " --username '#{options[:username]}' --password '#{options[:password]}'"\
-            " #{options[:repo]} #@mirror_dir"
+    cmd = "#{svn} checkout --no-auth-cache --non-interactive #{@options[:repo]} #@mirror_dir"
+    cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless anon_access
+    system3 cmd
   end
 end

data/lib/yggdrasil/list.rb

@@ -2,14 +2,14 @@ class Yggdrasil
 
   # @param [Array] args
   def list(args)
-    args, options = parse_options(args,
+    args = parse_options(args,
         {'--username'=>:username, '--password'=>:password,
          '-r'=>:revision, '--revision'=>:revision,
-         '-R'=>:recursive?, '--recursive'=>:recursive?,
-         '--depth'=>:depth})
-    options = input_user_pass(options)
+         '-R'=>:recursive?, '--recursive'=>:recursive?})
 
-    sync_mirror options
+    input_user_pass unless @anon_access
+
+    sync_mirror
 
     repos = Array.new
     if args.size == 0
@@ -22,10 +22,9 @@ class Yggdrasil
     end
 
     cmd_arg = "#@svn list --no-auth-cache --non-interactive"
-    cmd_arg += " --username #{options[:username]} --password #{options[:password]}"
-    cmd_arg += " -r #{options[:revision]}" if options.has_key?(:revision)
-    cmd_arg += " -R" if options.has_key?(:recursive?)
-    cmd_arg += " --depth #{options[:depth]}" if options.has_key?(:depth)
+    cmd_arg += " --username #{@options[:username]} --password #{@options[:password]}" unless @anon_access
+    cmd_arg += " -r #{@options[:revision]}" if @options.has_key?(:revision)
+    cmd_arg += " -R" if @options.has_key?(:recursive?)
     cmd_arg += ' ' + repos.join(' ')
     FileUtils.cd @mirror_dir do
       puts system3(cmd_arg)

data/lib/yggdrasil/log.rb

@@ -2,10 +2,10 @@ class Yggdrasil
 
   # @param [Array] args
   def log(args)
-    args, options = parse_options(args,
-                                  {'--username'=>:username, '--password'=>:password,
-                                   '-r'=>:revision, '--revision'=>:revision})
-    options = input_user_pass(options)
+    args = parse_options(args,
+                         {'--username'=>:username, '--password'=>:password,
+                          '-r'=>:revision, '--revision'=>:revision})
+    input_user_pass unless @anon_access
 
     if args.size == 0
       dir = @mirror_dir + @current_dir
@@ -22,9 +22,9 @@ class Yggdrasil
     end
 
     cmd_arg = "#@svn log --verbose --no-auth-cache --non-interactive"
-    cmd_arg += " --username #{options[:username]} --password #{options[:password]}"
-    if options.has_key?(:revision)
-      cmd_arg += " -r #{options[:revision]}"
+    cmd_arg += " --username #{@options[:username]} --password #{@options[:password]}" unless @anon_access
+    if @options.has_key?(:revision)
+      cmd_arg += " -r #{@options[:revision]}"
     else
       cmd_arg += " -r HEAD:1"
     end

data/lib/yggdrasil/revert.rb

@@ -2,21 +2,23 @@ class Yggdrasil
 
   # @param [Array] args
   def revert(args)
-    target_paths, options = parse_options(args,
-                                  {'--username'=>:username, '--password'=>:password,
-                                   '--non-interactive'=>:non_interactive?})
-    options = input_user_pass(options)
+    target_paths = parse_options(args,
+                                 {'--username'=>:username, '--password'=>:password,
+                                  '--non-interactive'=>:non_interactive?})
+    input_user_pass unless @anon_access
 
-    updates = sync_mirror(options)
+    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,options) do |relative_path|
+    confirmed_updates = confirm_updates(matched_updates) do |relative_path|
       FileUtils.cd @mirror_dir do
-        puts system3("#@svn diff --no-auth-cache --non-interactive #{relative_path}")
+        cmd = "#@svn diff --no-auth-cache --non-interactive #{relative_path}"
+        cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless @anon_access
+        puts system3(cmd)
       end
     end
 
@@ -24,11 +26,15 @@ class Yggdrasil
     return if confirmed_updates.size == 0
 
     FileUtils.cd @mirror_dir do
-      system3 "#@svn revert #{confirmed_updates.reverse.join(' ')}"
+      cmd = "#@svn revert #{confirmed_updates.reverse.join(' ')}"
+      cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless @anon_access
+      system3 cmd
 
       # make ls hash
-      out = system3("#@svn ls -R #@repo --no-auth-cache --non-interactive"\
-                           " --username '#{options[:username]}' --password '#{options[:password]}'")
+      cmd = "#@svn ls -R #@repo --no-auth-cache --non-interactive"
+      cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless @anon_access
+      out = system3(cmd)
+
       ls_hash = Hash.new
       out.split(/\n/).each {|relative| ls_hash[relative]=true}
 

data/lib/yggdrasil/status.rb

@@ -2,12 +2,11 @@ class Yggdrasil
 
   # @param [Array] args
   def status(args)
-    args, options = parse_options(args,
-        {'--username'=>:username, '--password'=>:password,
-        '--depth'=>:depth})
-    options = input_user_pass(options)
+    args = parse_options(args,
+                         {'--username'=>:username, '--password'=>:password})
+    input_user_pass unless @anon_access
 
-    sync_mirror options
+    sync_mirror
 
     paths = String.new
     if args.size == 0
@@ -20,8 +19,7 @@ class Yggdrasil
     end
 
     cmd_arg = "#@svn status#{paths} -qu --no-auth-cache --non-interactive"
-    cmd_arg += " --username #{options[:username]} --password #{options[:password]}"
-    cmd_arg += " --depth #{options[:depth]}" if options.has_key?(:depth)
+    cmd_arg += " --username #{@options[:username]} --password #{@options[:password]}" unless @anon_access
     FileUtils.cd @mirror_dir do
       out = system3(cmd_arg)
       print out.gsub(/^Status against revision:.*\n/, '')

data/lib/yggdrasil/update.rb

@@ -2,17 +2,18 @@ class Yggdrasil
 
   # @param [Array] args
   def update(args)
-    target_paths, options = parse_options(args,
-                                  {'--username'=>:username, '--password'=>:password,
-                                   '-r'=>:revision, '--revision'=>:revision,
-                                   '--non-interactive'=>:non_interactive?})
-    options = input_user_pass(options)
-    sync_mirror options
+    target_paths = parse_options(args,
+                                 {'--username'=>:username, '--password'=>:password,
+                                  '-r'=>:revision, '--revision'=>:revision,
+                                  '--non-interactive'=>:non_interactive?})
+    input_user_pass unless @anon_access
+    sync_mirror
 
     updates = Array.new
     FileUtils.cd @mirror_dir do
-      out = system3("#@svn status -qu --no-auth-cache --non-interactive" +
-                      " --username '#{options[:username]}' --password '#{options[:password]}'")
+      cmd = "#@svn status -qu --no-auth-cache --non-interactive"
+      cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless @anon_access
+      out = system3(cmd)
       out.split(/\n/).each do |line|
         updates << $1 if /^.*\*.*\s(\S+)\s*$/ =~ line
       end
@@ -24,13 +25,13 @@ class Yggdrasil
       return
     end
 
-    confirmed_updates = confirm_updates(matched_updates,options) do |relative_path|
+    confirmed_updates = confirm_updates(matched_updates) do |relative_path|
       FileUtils.cd @mirror_dir do
         cmd = "#@svn diff"
         cmd += " --no-auth-cache --non-interactive"
-        cmd += " --username #{options[:username]} --password #{options[:password]}"
-        if options.has_key?(:revision)
-          cmd += " --old=#{relative_path} --new=#{relative_path}@#{options[:revision]}"
+        cmd += " --username #{@options[:username]} --password #{@options[:password]}" unless @anon_access
+        if @options.has_key?(:revision)
+          cmd += " --old=#{relative_path} --new=#{relative_path}@#{@options[:revision]}"
         else
           cmd += " --old=#{relative_path} --new=#{relative_path}@HEAD"
         end
@@ -43,9 +44,9 @@ class Yggdrasil
     return if confirmed_updates == 0 # no files to update
 
     cmd_arg = "#@svn update --no-auth-cache --non-interactive"
-    cmd_arg += " --username #{options[:username]} --password #{options[:password]}"
-    if options.has_key?(:revision)
-      cmd_arg += " -r #{options[:revision]}"
+    cmd_arg += " --username #{@options[:username]} --password #{@options[:password]}" unless @anon_access
+    if @options.has_key?(:revision)
+      cmd_arg += " -r #{@options[:revision]}"
     else
       cmd_arg += " -r HEAD"
     end

data/lib/yggdrasil/version.rb

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

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_out_err{Yggdrasil.command %w{add hoge}}
+    out = catch_out{Yggdrasil.command %w{add hoge}}
     out.should == "no such file: #{`readlink -f hoge`}"
 
-    out = catch_out_err{Yggdrasil.command %w{add /etc/hoge}}
+    out = catch_out{Yggdrasil.command %w{add /etc/hoge}}
     out.should == "no such file: /etc/hoge\n"
   end
 

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_out_err do
+    out = catch_out 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_out_err do
+    out = catch_out 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_out_err do
+    out = catch_out 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_out_err do
+    out = catch_out do
       FileUtils.cd "/tmp/yggdrasil-test" do
         Yggdrasil.command %w{diff --revision 3 A --username hoge --password foo}
       end
@@ -106,16 +106,14 @@ EOS
     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)
+    err = catch_err do
+      FileUtils.cd "/" do
+        lambda{Yggdrasil.command cmd}.should raise_error(SystemExit)
+      end
     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
+    err.sub!(%r{/\S*svn}, 'svn')
+    err.should == <<"EOS"
+#{File.basename($0)} 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.

data/spec/help_spec.rb

@@ -29,34 +29,34 @@ EOS
 
   it 'should show subcommands on no subcommands' do
     puts '---- should show subcommands on no subcommands'
-    out = catch_out_err{Yggdrasil.command []}
+    out = catch_out{Yggdrasil.command []}
     out.should == show_subcommands
   end
 
   it 'should show subcommands on "help"' do
     puts '---- should show subcommands on "help"'
-    out = catch_out_err{Yggdrasil.command %w{help}}
+    out = catch_out{Yggdrasil.command %w{help}}
     out.should == show_subcommands
   end
 
   it 'should show subcommands on "h"' do
     puts '---- should show subcommands on "h"'
-    out = catch_out_err{Yggdrasil.command %w{h}}
+    out = catch_out{Yggdrasil.command %w{h}}
     out.should == show_subcommands
   end
 
   it 'should show subcommands on "?"' do
     puts '---- should show subcommands on "?"'
-    out = catch_out_err{Yggdrasil.command %w{?}}
+    out = catch_out{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_out_err do
+    err = catch_err do
       lambda{Yggdrasil.command(%w{hoge})}.should raise_error(SystemExit)
     end
-    out.should == "#{File.basename($0)} error: Unknown subcommand: 'hoge'\n\n"
+    err.should == "#{File.basename($0)} error: Unknown subcommand: 'hoge'\n\n"
   end
 
   help_help = <<"EOS"
@@ -67,21 +67,21 @@ EOS
 
   it 'should show help_help' do
     puts '---- should show help_help'
-    out = catch_out_err{Yggdrasil.command %w{help help}}
+    out = catch_out{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_out_err do
+    err = catch_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"
+    err.should == "#{File.basename($0)} error: too many arguments.\n\n"
   end
 
   it 'should show help of version' do
     puts '---- should show help of version'
-    out = catch_out_err{Yggdrasil.command %w{help version}}
+    out = catch_out{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_out_err{Yggdrasil.command %w{help init}}
+    out = catch_out{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_out_err{Yggdrasil.command %w{help add}}
+    out = catch_out{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_out_err{Yggdrasil.command %w{help commit}}
+    out = catch_out{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_out_err{Yggdrasil.command %w{help cleanup}}
+    out = catch_out{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_out_err{Yggdrasil.command %w{help diff}}
+    out = catch_out{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_out_err{Yggdrasil.command %w{help list}}
+    out = catch_out{Yggdrasil.command %w{help list}}
     out.should == <<"EOS"
 list (ls): List directory entries in the repository.
 usage: #{File.basename($0)} list [OPTIONS...] [PATH...]
@@ -184,16 +184,14 @@ Valid options:
                                 'BASE'       base rev of item's working copy
                                 'COMMITTED'  last commit at or before BASE
                                 'PREV'       revision just before COMMITTED
-  -R [--recursive]         : descend recursively, same as --depth=infinity
-  --depth ARG              : limit operation by depth ARG ('empty', 'files',
-                            'immediates', or 'infinity')
+  -R [--recursive]         : descend recursively
 
 EOS
   end
 
   it 'should show help of log' do
     puts '---- should show help of log'
-    out = catch_out_err{Yggdrasil.command %w{help log}}
+    out = catch_out{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 +213,7 @@ EOS
 
   it 'should show help of status' do
     puts '---- should show help of status'
-    out = catch_out_err{Yggdrasil.command %w{help 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...]
@@ -223,15 +221,13 @@ usage: #{File.basename($0)} status [OPTIONS...] [PATH...]
 Valid options:
   --username ARG           : specify a username ARG
   --password ARG           : specify a password ARG
-  --depth ARG              : limit operation by depth ARG ('empty', 'files',
-                            'immediates', or 'infinity')
 
 EOS
   end
 
   it 'should show help of update' do
     puts '---- should show help of update'
-    out = catch_out_err{Yggdrasil.command %w{help update}}
+    out = catch_out{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 +250,7 @@ EOS
 
   it 'should show help of revert' do
     puts '---- should show help of revert'
-    out = catch_out_err{Yggdrasil.command %w{help 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 [PATH...]

data/spec/init_spec.rb

@@ -8,20 +8,44 @@ describe Yggdrasil, "init" do
 
   it 'should error: "Not enough arguments provided"' do
     puts '---- should error: "Not enough arguments provided"'
-    out = catch_out_err do
+    err = catch_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"
+    err.should == "#{File.basename($0)} error: Not enough arguments provided: --repo\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`
-    out = catch_out_err do
+    err = catch_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
-    out.should == "SVN access test...\nSVN error: can not access to 'file:///tmp/yggdrasil-test/hoge'.\n"
+    err.should == "#{File.basename($0)} error: can not access to 'file:///tmp/yggdrasil-test/hoge'.\n\n"
+  end
+
+  it 'should error: need username' do
+    puts '---- should error: need username'
+
+    err = catch_err do
+      cmd_args = %w{init --repo file:///tmp/yggdrasil-test/svn-repo/mng-repo/host-name/} +
+          %w{--non-interactive}
+      lambda{Yggdrasil.command(cmd_args)}.should raise_error(SystemExit)
+    end
+    err.should ==
+        "#{File.basename($0)} error: not exist directory(s): mng-repo/host-name\n\n"
+  end
+
+  it 'should error: need password' do
+    puts '---- should error: need password'
+
+    err = catch_err do
+      cmd_args = %w{init --repo file:///tmp/yggdrasil-test/svn-repo/mng-repo/host-name/} +
+          %w{--non-interactive --parents --username hoge }
+      lambda{Yggdrasil.command(cmd_args)}.should raise_error(SystemExit)
+    end
+    err.should ==
+        "#{File.basename($0)} error: Can't get username or password\n\n"
   end
 
   it 'should error: no valid repository' do
@@ -29,10 +53,11 @@ describe Yggdrasil, "init" do
     `rm -rf /tmp/yggdrasil-test/.yggdrasil`
     `rm -rf /tmp/yggdrasil-test/svn-repo`
 
-    catch_out_err do # > /dev/null
+    err = catch_err do
       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
+    err.should == "#{File.basename($0)} error: can not access to 'file:///tmp/yggdrasil-test/svn-repo/mng-repo/host-name'.\n\n"
   end
 
   it 'should success: create config file' do
@@ -68,7 +93,7 @@ EOS
     end
     `svnserve -d`
 
-    out = catch_out_err do
+    out = catch_out do
       Yggdrasil.command %w{init},
           "svn://localhost/tmp/yggdrasil-test/svn-repo/mng-repo/host-name/\n"\
           "hoge\n"\
@@ -77,9 +102,9 @@ EOS
       end
     out.should == \
       "Input svn repo URL: "\
-      "Input svn username: "\
-      "Input svn password: "\
       "SVN access test...\n"\
+      "Input svn username: "\
+      "Input svn password: \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]: "

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_out_err{Yggdrasil.command(%w{list /tmp} +
+    out = catch_out{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_out_err do
+    out = catch_out 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_out_err do
+    out = catch_out do
       FileUtils.cd "/tmp/yggdrasil-test" do
         Yggdrasil.command %w{list} +
                           %w{--username hoge --password foo}
@@ -38,7 +38,7 @@ describe Yggdrasil, "list" do
 
   it 'should show list (with options)' do
     puts '---- should show list (with options)'
-    out = catch_out_err{Yggdrasil.command(%w{list -R --revision 2 --recursive /tmp} +
+    out = catch_out{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

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_out_err{Yggdrasil.command(%w{log /tmp} +
+    out = catch_out{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_out_err do
+    out = catch_out 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_out_err do
+    out = catch_out 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_out_err{Yggdrasil.command(%w{log --revision 2 /tmp} +
+    out = catch_out{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_out_err do
+    out = catch_out 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_out_err do
+    out = catch_out 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_out_err do
+    out = catch_out do
       Yggdrasil.command %w{status /tmp/yggdrasil-test} +
                             %w{--username hoge --password foo}
     end
@@ -74,7 +74,7 @@ describe Yggdrasil, "revert" do
                       "0\nY\n"
 
     puts "\n-- check revert file"
-    out = catch_out_err do
+    out = catch_out do
       Yggdrasil.command %w{status /tmp/yggdrasil-test} +
                             %w{--username hoge --password foo}
     end
@@ -92,7 +92,7 @@ describe Yggdrasil, "revert" do
                       "0\nn\n"
 
     puts "\n-- check status"
-    out = catch_out_err do
+    out = catch_out do
       Yggdrasil.command %w{status /tmp/yggdrasil-test} +
                             %w{--username hoge --password foo}
     end
@@ -116,7 +116,7 @@ describe Yggdrasil, "revert" do
                       "0\nY\n"
 
     puts "\n-- check status"
-    out = catch_out_err do
+    out = catch_out do
       Yggdrasil.command %w{status /tmp/yggdrasil-test} +
                             %w{--username hoge --password foo}
     end

data/spec/spec_helper.rb

@@ -49,7 +49,7 @@ def init_yggdrasil
                     %w{--username hoge --password foo}
 end
 
-def catch_out_err
+def catch_out
   exit 1 unless block_given?
   tmp_out = $stdout
   $stdout = StringIO.new
@@ -57,3 +57,12 @@ def catch_out_err
   $stdout, tmp_out = tmp_out, $stdout
   tmp_out.string
 end
+
+def catch_err
+  exit 1 unless block_given?
+  tmp_err = $stdout
+  $stderr = StringIO.new
+  yield
+  $stderr, tmp_err = tmp_err, $stderr
+  tmp_err.string
+end

data/spec/status_spec.rb

@@ -16,7 +16,7 @@ describe Yggdrasil, "status" do
 
   it 'should show status(absolute and relative)' do
     puts "---- should show status(absolute and relative)"
-    out = catch_out_err do
+    out = catch_out do
       FileUtils.cd "/tmp/yggdrasil-test" do
         Yggdrasil.command %w{status /tmp/yggdrasil-test/A B --username hoge --password foo}
       end
@@ -30,7 +30,7 @@ EOS
 
   it 'should show status(/)' do
     puts "---- should show status(/)"
-    out = catch_out_err do
+    out = catch_out do
       FileUtils.cd "/tmp/yggdrasil-test" do
         Yggdrasil.command %w{status / --username hoge --password foo}
       end
@@ -46,7 +46,7 @@ EOS
 
   it 'should show status (no path)' do
     puts "---- should show status (no path)"
-    out = catch_out_err do
+    out = catch_out do
       FileUtils.cd "/tmp/yggdrasil-test" do
         Yggdrasil.command %w{status --username hoge --password foo}
       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_out_err{Yggdrasil.command %w{version}}
+    out = catch_out{Yggdrasil.command %w{version}}
     out.should == show_version
   end
 
   it 'should show version on "--version"' do
     puts '---- should show version on "--version"'
-    out = catch_out_err{Yggdrasil.command %w{--version}}
+    out = catch_out{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.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-19 00:00:00.000000000 Z
+date: 2013-01-23 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: -1095897170101989481
+      hash: -1085258469847408052
 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: -1095897170101989481
+      hash: -1085258469847408052
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23