yggdrasil 0.0.18 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d0a852b76b256c47b03cb8831f46f042455143ff
+  data.tar.gz: 2e7a725be79c156d187a5a691c17bdbcc6eafd8c
+SHA512:
+  metadata.gz: 7b1b14ec6ca4298b9d9abe9cc6983b0be6fd5f012dc233c9ee76f8a1dcedad91956676a91af60e82323cf5fbf3db308545fc43e5772e977e6d3cbba7fe6d7fae
+  data.tar.gz: 06a39e94184bd6d53513e6897ae45ab05b2111c3c97057d244ebdeac27e18d3d3088c7d9230903f73217618e56f07cc3ad500448afa1776b939cfbef1acb1a9e

data/lib/yggdrasil.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'socket'
 
 require 'yggdrasil_common'
 
@@ -11,7 +12,6 @@ require 'yggdrasil/cleanup'
 require 'yggdrasil/diff'
 require 'yggdrasil/list'
 require 'yggdrasil/log'
-require 'yggdrasil/update'
 require 'yggdrasil/check'
 
 class Yggdrasil
@@ -43,8 +43,6 @@ class Yggdrasil
         new.list(args[1..-1])
       when 'log'
         new.log(args[1..-1])
-      when 'update', 'up', 'revert'
-        new.update(args[1..-1])
       when 'version', '--version', '-v'
         new(false).version
       else
@@ -68,8 +66,11 @@ class Yggdrasil
     error 'need "svn" in config file' unless (@svn = configs[:svn])
     error 'need "repo" in config file' unless (@repo = configs[:repo])
     @anon_access = (configs[:anon_access] == 'read')
-    @options ||= Hash.new
-    @options[:server] = configs[:server] if configs.has_key?(:server)
+
+    if configs.has_key?(:server)
+      @server = configs[:server]
+      get_server_configs(@server)
+    end
   end
 
   protected
@@ -188,49 +189,62 @@ class Yggdrasil
   end
 
   def username_password_options_to_read_repo
-    if @options.has_key?(:ro_password)
-      " --username #{@options[:ro_username]} --password #{@options[:ro_password]}"
+    if defined?(@ro_password)
+      " --username #{@ro_username} --password #{@ro_password}"
     else
       ''
     end
   end
 
   def get_user_pass_if_need_to_read_repo
+    @username = @options[:username] if @options.has_key?(:username)
+    @password = @options[:password] if @options.has_key?(:password)
     unless @anon_access
-      get_server_config if !@options.has_key?(:ro_username) && @options.has_key?(:server)
-      input_user_pass unless @options.has_key?(:ro_password)
+      input_user_pass unless defined?(@ro_password)
     end
-    @options[:ro_username] = @options[:username] if @options.has_key?(:username)
-    @options[:ro_password] = @options[:password] if @options.has_key?(:password)
+    @ro_username = @username if @username
+    @ro_password = @password if @password
   end
 
-  def get_server_config(need_repo = false)
-    if /^(.+):(\d+)$/ =~ @options[:server]
+  def get_server_configs(host_port)
+    if /^(.+):(\d+)$/ =~ host_port
       host = $1
       port = $2
 
-      if need_repo
-        # get repo
-        sock = TCPSocket.open(host, port)
-        error "can not connect to server: #{host}:#{port}" if sock.nil?
-        sock.puts 'get_repo'
-        rcv = sock.gets
-        error 'can not get repo from server' if rcv.nil?
-        @options[:repo] = rcv.chomp
-        sock.close
-      end
-
-      #get read-only username/password
+      # connect
       sock = TCPSocket.open(host, port)
       error "can not connect to server: #{host}:#{port}" if sock.nil?
-      sock.puts('get_ro_id_pw')
-      username = sock.gets
-      unless username.nil?
-        @options[:ro_username] = username.chomp
-        password = sock.gets
-        error 'can not get ro_password' if password.nil?
-        @options[:ro_password] = password.chomp
+
+      # send GET with key string
+      key_str = Time.now.strftime('%H:%M:%S')
+      sock.puts "get_configs #{key_str}"
+      rcv = sock.read
+      error 'can not get configs from server' if rcv.nil?
+      msg = obfuscate(rcv, key_str).split("\n")
+
+      # repo
+      error 'can not get repo from server' if msg.size < 1
+      config_repo = @repo
+      server_repo = msg[0]
+      if server_repo =~ /\{HOST\}/
+        @hostname = Socket.gethostname
+        server_repo.gsub!(/\{HOST\}/, @hostname)
+      end
+      if server_repo =~ /\{host\}/
+        @hostname = Socket.gethostname.split('.')[0]
+        server_repo.gsub!(/\{host\}/, @hostname)
       end
+      if config_repo && config_repo != server_repo
+        error "mismatch repo config with server setting.\n" +
+                  "config: #{config_repo}\n" +
+                  "server: #{server_repo}"
+      end
+      @repo = server_repo
+      # username
+      @ro_username = msg[1] if msg.size >= 2
+      # password
+      @ro_password = msg[2] if msg.size >= 3
+
       sock.close
     else
       error "invalid host:port '#{@options[:server]}'"

data/lib/yggdrasil/add.rb

@@ -28,7 +28,9 @@ class Yggdrasil
         end
         cmd = "#{@svn} add #{mirror_path}"
         cmd += ' ' + @arg_options.join(' ') if @arg_options.size != 0
-        puts system3(cmd)
+        out = system3(cmd)
+        out.gsub!(/ #{@mirror_dir}/, ' ')
+        puts out
       end
     end
   end

data/lib/yggdrasil/check.rb

@@ -58,13 +58,15 @@ class Yggdrasil
     end
 
     if @arg_paths.size == 1 && @arg_paths[0] == '/'
-      if /^(.+):(\d+)$/ =~ @options[:server]
+      if /^(.+):(\d+)$/ =~ @server
         host = $1
         port = $2
+        error 'no hostname' unless defined?(@hostname)
+
         # put check_result to server
         sock = TCPSocket.open(host, port)
         error "can not connect to server: #{host}:#{port}" if sock.nil?
-        sock.puts "put_result #{Socket.gethostname}"
+        sock.puts "put_result #{@hostname}"
         sock.puts check_result
         sock.close
       end

data/lib/yggdrasil/commit.rb

@@ -45,9 +45,9 @@ class Yggdrasil
 
     input_user_pass
     FileUtils.cd @mirror_dir do
-      cmd = "#{@svn} commit -m '#{@options[:message]}'"\
+      cmd = "#{@svn} commit -m \"#{@options[:message].gsub('"', '\"')}\""\
             ' --no-auth-cache --non-interactive'\
-            " --username '#{@options[:username]}' --password '#{@options[:password]}'"\
+            " --username '#{@username}' --password '#{@password}'"\
             " #{confirmed_updates.join(' ')}"
       puts system3(cmd)
     end

data/lib/yggdrasil/help.rb

@@ -18,7 +18,6 @@ Available subcommands:
    init
    list (ls)
    log
-   update (up, revert)
    version
 
 Yggdrasil is a subversion wrapper to manage server configurations and conditions.
@@ -161,18 +160,6 @@ Valid options:
   -q [--quiet]             : print nothing, or only summary information
   -v [--verbose]           : print extra information
 
-EOS
-        when 'update', 'up', 'revert' ##################### update (up, revert)
-          puts <<"EOS"
-update (up, revert): Set the files to the contents of the newest repository.
-usage: #{@base_cmd} update [OPTIONS...] [PATH...]
-
-Valid options:
-  --username ARG           : specify a username ARG
-  --password ARG           : specify a password ARG
-  --non-interactive        : do no interactive prompting
-  -r [--revision] ARG      : revision number
-
 EOS
 
         when 'version', '--version', '-v' ######################## version (-v)

data/lib/yggdrasil/init.rb

@@ -10,8 +10,8 @@ class Yggdrasil
          '--repo'=>:repo, '--parents'=>:parents?,
          '--non-interactive'=>:non_interactive?,
          '--force'=>:force?, '--server'=>:server })
-    @options[:ro_username] = @options[:username] if @options.has_key?(:username)
-    @options[:ro_password] = @options[:password] if @options.has_key?(:password)
+    @ro_username = @username = @options[:username] if @options.has_key?(:username)
+    @ro_password = @password = @options[:password] if @options.has_key?(:password)
 
     if @arg_options.size+@arg_paths.size != 0
       error "invalid arguments: #{(@arg_options+@arg_paths).join(', ')}"
@@ -43,28 +43,26 @@ class Yggdrasil
       end
     end
 
-    get_server_config(true) if @options.has_key?(:server)
+    @repo = @options[:repo] if @options.has_key?(:repo)
+    get_server_configs(@options[:server]) if @options.has_key?(:server)
+    init_get_repo_interactive unless defined?(@repo)
 
-    init_get_repo_interactive unless @options.has_key?(:repo)
-
-    @options[:repo].chomp!
-    @options[:repo].chomp!('/')
-    @options[:repo].gsub!(/\{HOST\}/, Socket.gethostname)
-    @options[:repo].gsub!(/\{host\}/, Socket.gethostname.split('.')[0])
-    if @options[:repo] == 'private'
+    @repo.chomp!
+    @repo.chomp!('/')
+    if @repo == 'private'
       Dir.mkdir @config_dir, 0755 unless File.exist?(@config_dir)
       repo_dir = "#{@config_dir}/private_repo"
       system3 "svnadmin create #{repo_dir}"
-      @options[:repo] = "file://#{repo_dir}"
+      @repo = "file://#{repo_dir}"
     end
 
     puts 'check SVN access...'
-    if @options.has_key?(:ro_username)
+    if defined?(@ro_username)
       anon_access = false
     else
       anon_access = true
     end
-    url_parts = @options[:repo].split('/')
+    url_parts = @repo.split('/')
     url_parts_num = url_parts.size
     url = ''
     loop do
@@ -74,7 +72,7 @@ class Yggdrasil
           url_parts_num = url_parts.size
           get_user_pass_if_need_to_read_repo
         else
-          error "can not access to '#{@options[:repo]}'."
+          error "can not access to '#{@repo}'."
         end
       end
       puts "url_parts_num=#{url_parts_num}" if @options[:debug?]
@@ -111,7 +109,7 @@ class Yggdrasil
       input_user_pass
       `rm -rf #{@mirror_dir}`
       system3 "#{svn} checkout -N --no-auth-cache --non-interactive" +
-                  " --username '#{@options[:ro_username]}' --password '#{@options[:ro_password]}'" +
+                  " --username '#{@ro_username}' --password '#{@ro_password}'" +
                   " #{url_parts[0...url_parts_num].join('/')} #{@mirror_dir}"
       add_paths = Array.new
       path = @mirror_dir
@@ -125,7 +123,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 '#{@username}' --password '#{@password}'" +
                   ' ' + add_paths.join(' ')
       system3 "rm -rf #{@mirror_dir}"
     end
@@ -135,15 +133,16 @@ class Yggdrasil
       f.puts "path=#{ENV['PATH']}\n"\
              "svn=#{svn}\n"\
              "svn_version=#{svn_version}\n"\
-             "repo=#{@options[:repo]}\n"\
+             "repo=#{@repo}\n"\
              "anon-access=#{anon_access ? 'read' : 'none'}\n"
+
       f.puts "server=#{@options[:server]}\n" if @options.has_key?(:server)
     end
 
     # make mirror dir
     `rm -rf #{@mirror_dir}`
-    cmd = "#{svn} checkout --no-auth-cache --non-interactive #{@options[:repo]} #{@mirror_dir}"
-    cmd += " --username '#{@options[:ro_username]}' --password '#{@options[:ro_password]}'" unless anon_access
+    cmd = "#{svn} checkout --no-auth-cache --non-interactive #{@repo} #{@mirror_dir}"
+    cmd += " --username '#{@ro_username}' --password '#{@ro_password}'" unless anon_access
     system3 cmd
 
     # make checker directory
@@ -159,7 +158,7 @@ class Yggdrasil
       error 'can not input svn repo URL' unless input
       puts
       if %r{^(http://|https://|file://|svn://|private)} =~ input
-        @options[:repo] = input
+        @repo = input
         break
       end
 

data/lib/yggdrasil/version.rb

@@ -1,5 +1,6 @@
 class Yggdrasil
-  VERSION = '0.0.18'
+  VERSION = '0.1.0'
+
 
   def version
     puts <<"EOS"

data/lib/yggdrasil_common.rb

@@ -64,16 +64,16 @@ module YggdrasilCommon
   end
 
   def input_user_pass
-    until @options.has_key?(:username) do
+    until defined?(@username)
       error 'Can\'t get username or password' if @options.has_key?(:non_interactive?)
       print 'Input svn username: '
       input = $stdin.gets
       error 'can not input username' unless input
       input.chomp!
       return if input.size == 0
-      @options[:username] = @options[:ro_username] = input
+      @username = @ro_username = input
     end
-    until @options.has_key?(:password) do
+    until defined?(@password)
       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'`
@@ -83,7 +83,7 @@ module YggdrasilCommon
       puts
       error 'can not input password' unless input
       input.chomp!
-      @options[:password] = @options[:ro_password] = input
+      @password = @ro_password = input
     end
   end
 
@@ -113,4 +113,32 @@ module YggdrasilCommon
     $stderr.puts
     exit 1
   end
+
+  def obfuscate(src_str, key_str)
+    seed = [0,0,0,0]
+    # make seed
+    (0...key_str.size).each do |i|
+      seed[3] = (seed[3]^key_str[i].ord)
+      seed = my_rand(seed)
+    end
+
+    # puts "seed = #{seed.inspect}"
+    res = String.new
+    (0...src_str.size).each do |i|
+      seed = my_rand(seed)
+      res += (src_str[i].ord ^ (seed[3] & 0xFF)).chr
+      # printf "c[%03d]:0x%02X->0x%02X (0x%02X)\n",i,src_str[i].ord,res[i].ord, seed[3] & 0xFF
+    end
+
+    res
+  end
+
+  def my_rand(seed)
+    t = (seed[0]^(seed[0]<<11))
+    seed[0] = seed[1]
+    seed[1] = seed[2]
+    seed[2] = seed[3]
+    seed[3] = (seed[3]^(seed[3]>>19))^(t^(t>>8))
+    seed
+  end
 end

data/lib/yggdrasil_server.rb

@@ -8,6 +8,7 @@ require 'yggdrasil_server/init'
 require 'yggdrasil_server/server'
 require 'yggdrasil_server/results'
 
+require 'yggdrasil_server/get_configs'
 require 'yggdrasil_server/get_repo'
 require 'yggdrasil_server/get_ro_id_pw'
 require 'yggdrasil_server/put_result'
@@ -15,6 +16,7 @@ require 'yggdrasil_server/put_result'
 class YggdrasilServer
   MESSAGE_QUIT = 'quit'
   MESSAGES = {
+      :get_configs => [:key_str],
       :get_repo => [],
       :get_ro_id_pw => [],
       :put_result => [:hostname],

data/lib/yggdrasil_server/get_configs.rb

@@ -0,0 +1,11 @@
+class YggdrasilServer
+  def get_configs(sock, arg_hash)
+    msg = @repo + "\n"
+    if @ro_username
+      msg += @ro_username + "\n"
+      msg += @ro_password + "\n"
+    end
+    sock.write obfuscate(msg, arg_hash[:key_str])
+    arg_hash
+  end
+end

data/lib/yggdrasil_server/help.rb

@@ -54,7 +54,7 @@ usage: #{@base_cmd} init [OPTIONS...]
 Valid options:
   --port ARG               : specify a TCP port number ARG
   --repo ARG               : URL of subversion repository
-                             ARG can contain {HOST} or a {host}
+                             ARG must contain {HOST} or {host}
                              {HOST} is replaced by client hostname with domain
                              {host} is replaced by client hostname without domain
                              e.g. svn://192.168.3.5/servers/{host}/ygg

data/lib/yggdrasil_server/init.rb

@@ -13,6 +13,8 @@ class YggdrasilServer
     if !@options.has_key?(:ro_username) && @options.has_key?(:ro_password)
       error '--ro-password option need --ro-username, too.'
     end
+    @ro_username = @options[:ro_username] if @options.has_key?(:ro_username)
+    @ro_password = @options[:ro_password] if @options.has_key?(:ro_password)
 
     until @options.has_key?(:port)
       print 'Input tcp port number: '
@@ -40,8 +42,12 @@ class YggdrasilServer
     end
     @options[:repo].chomp!
     @options[:repo].chomp!('/')
+    unless @options[:repo] =~ /\{HOST\}/ || @options[:repo] =~ /\{host\}/
+      error 'REPO must contain {HOST} or {host}'
+    end
+
 
-    unless @options.has_key?(:ro_password)
+    unless defined?(@ro_password)
       puts 'Input read-only username/password (clients use this to read repo).'
       puts 'ATTENTION! username/password are stored to disk unencrypted!'
       input_user_pass
@@ -52,9 +58,9 @@ class YggdrasilServer
     File.open(@server_config_file, 'w') do |f|
       f.write "port=#{@options[:port]}\n"\
               "repo=#{@options[:repo]}\n"
-      if @options.has_key?(:ro_password)
-        f.write "ro_username=#{@options[:ro_username]}\n"\
-                "ro_password=#{@options[:ro_password]}\n"
+      if defined?(@ro_password)
+        f.write "ro_username=#{@ro_username}\n"\
+                "ro_password=#{@ro_password}\n"
       end
     end
   end

data/lib/yggdrasil_server/results.rb

@@ -10,17 +10,41 @@ class YggdrasilServer
       error "invalid arguments: #{(@arg_options+@arg_paths).join(', ')}"
     end
 
-    return unless File.exist?(@results_dir)
+    error 'NO results directory' unless File.exist?(@results_dir)
+
+    repo_base = @repo
+    repo_base.gsub!(/\{HOST\}.*$/,'') if @repo =~ /\{HOST\}/
+    repo_base.gsub!(/\{host\}.*$/,'') if @repo =~ /\{host\}/
+
+    cmd = "svn ls #{repo_base} --no-auth-cache --non-interactive"
+    cmd += " --username #{@ro_username} --password #{@ro_password}" if @ro_username
+    out = system3(cmd)
+    repo_hosts = Hash.new
+    out.split(/\n/).each do |host|
+      next if host =~ /^[_\.]/
+      repo_hosts[host.gsub(/\/$/, '')] = true
+    end
+
     files = Dir.entries(@results_dir)
     alert = false
     files.each do |file|
       next if /^\./ =~ file
       absolute = "#{@results_dir}/#{file}"
+      host = file.gsub(/_[^_]+$/,'')
+      if repo_hosts.has_key?(host)
+        repo_hosts.delete host
+      else
+        # There is no host in the REPO
+        puts "Notice: delete result file (#{file})"
+        puts
+        File.unlink absolute # delete result file
+        next
+      end
       if @options.has_key?(:expire)
         stat = File.stat(absolute)
         if stat.mtime < (Time.now - @options[:expire].to_i * 60)
           alert = true
-          puts "######## #{file}: last check is too old: #{stat.mtime.to_s}"
+          puts "######## Expired: #{file} (#{stat.mtime.to_s})"
           puts
           next
         end
@@ -29,10 +53,18 @@ class YggdrasilServer
       buf = NKF::nkf('-wm0', buf)
       if buf.gsub(/\s*\n/m, '') != ''
         alert = true
-        puts "######## #{file} Mismatch:"
+        puts "######## Difference: #{file}"
         puts buf
       end
     end
+
+    repo_hosts.each do |k,v|
+      if v
+        alert = true
+        puts "######## No check result: #{k}"
+        puts
+      end
+    end
     exit 1 if alert
   end
 end

data/spec/add_spec.rb

@@ -18,10 +18,20 @@ describe Yggdrasil, 'add' do
 
   it 'should success: add exist files (relative)' do
     puts '---- should success: add exist files'
-    Yggdrasil.command %w{add Gemfile /etc/fstab}
+    out = catch_out do
+      Yggdrasil.command %w{add Gemfile /etc/fstab}
+    end
+    out.should == <<"EOS"
+A         /home
+A         /home/kusu
+A         /home/kusu/work
+A         /home/kusu/work/yggdrasil
+A         /home/kusu/work/yggdrasil/Gemfile
+A         /etc
+A         /etc/fstab
+EOS
+
     File.exist?("/tmp/yggdrasil-test/.yggdrasil/mirror#{`readlink -f Gemfile`.chomp}").should be_true
-  end
-  it 'should success: add exist files (absolute)' do
     File.exist?("/tmp/yggdrasil-test/.yggdrasil/mirror#{`readlink -f /etc/fstab`.chomp}").should be_true
   end
 end

data/spec/check_spec.rb

@@ -96,7 +96,6 @@ EOS
 
   it 'should execute checker and svn add the result' do
     puts "\n---- should execute checker and svn add the result"
-    `rm -f /tmp/yggdrasil-test/.yggdrasil/checker/gem_list`
     `echo 'echo hoge' > /tmp/yggdrasil-test/.yggdrasil/checker/hoge`
     `chmod +x /tmp/yggdrasil-test/.yggdrasil/checker/hoge`
 
@@ -285,6 +284,22 @@ EOS
     `cat /tmp/yggdrasil-test/.yggdrasil/results/#{result_files[0]}`.should == "\n"
   end
 
+  it 'should ERROR if repo config mismatch' do
+    puts "\n---- should ERROR if repo config mismatch"
+
+    `echo repo=hoge.hoge.com >> /tmp/yggdrasil-test/.yggdrasil/config`
+
+    err = catch_err do
+      lambda{Yggdrasil.command(%w{check --non-interactive})}.should raise_error(SystemExit)
+    end
+    err.should == <<"EOS"
+rspec error: mismatch repo config with server setting.
+config: hoge.hoge.com
+server: svn://localhost/tmp/yggdrasil-test/svn-repo/servers/yggdrasil-dev.kusu.myhome.cx
+
+EOS
+  end
+
   it 'should recover delete flag' do
     pending 'under construction...'
     puts "\n---- should recover delete flag"

data/spec/commit_spec.rb

@@ -288,4 +288,41 @@ Committed revision 14.
 EOS
   end
 
+  it 'should commit with quote character comment' do
+    puts '---- should commit with quote character comment'
+    `echo A >> /tmp/yggdrasil-test/A`
+
+    out = catch_out do
+      Yggdrasil.command %w{commit --debug} +
+                            %w{--username hoge --password foo} +
+                            %w{-m} + ["with quote<'>"],
+                        "Y\n"
+    end
+    out.should == <<EOS
+
+0:M tmp/yggdrasil-test/A
+1:M tmp/yggdrasil-test/B
+2:M tmp/yggdrasil-test/c/A
+OK? [Y|n|<num to diff>]:#{' '}
+Sending        tmp/yggdrasil-test/A
+Sending        tmp/yggdrasil-test/B
+Sending        tmp/yggdrasil-test/c/A
+Transmitting file data ...
+Committed revision 15.
+EOS
+
+    out = catch_out do
+      Yggdrasil.command %w{log -r HEAD --username hoge --password foo}
+    end
+    out.gsub!(%r{20..-..-.. .*20..\)}, '')
+    out.should == <<EOS
+------------------------------------------------------------------------
+r15 | hoge |  | 1 line
+
+with quote<'>
+------------------------------------------------------------------------
+EOS
+
+  end
+
 end

data/spec/help_spec.rb

@@ -18,7 +18,6 @@ Available subcommands:
    init
    list (ls)
    log
-   update (up, revert)
    version
 
 Yggdrasil is a subversion wrapper to manage server configurations and conditions.
@@ -50,12 +49,12 @@ EOS
     out.should == show_subcommands
   end
 
-  it 'should be unknown subcommand on "hoge"' do
-    puts '---- should be unknown subcommand on "hoge"'
+  it 'should be unknown subcommand on "revert"' do
+    puts '---- should be unknown subcommand on "revert"'
     err = catch_err do
-      lambda{Yggdrasil.command(%w{hoge})}.should raise_error(SystemExit)
+      lambda{Yggdrasil.command(%w{revert})}.should raise_error(SystemExit)
     end
-    err.should == "Unknown subcommand: 'hoge'\n"
+    err.should == "Unknown subcommand: 'revert'\n"
   end
 
   help_help = <<"EOS"
@@ -218,38 +217,6 @@ Valid options:
   -q [--quiet]             : print nothing, or only summary information
   -v [--verbose]           : print extra information
 
-EOS
-  end
-
-  it 'should show help of update' do
-    puts '---- should show help of update'
-    out = catch_out{Yggdrasil.command %w{help update}}
-    out.should == <<"EOS"
-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
-  --non-interactive        : do no interactive prompting
-  -r [--revision] ARG      : revision number
-
-EOS
-  end
-
-  it 'should show help of revert' do
-    puts '---- should show help of revert'
-    out = catch_out{Yggdrasil.command %w{help revert}}
-    out.should == <<"EOS"
-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
-  --non-interactive        : do no interactive prompting
-  -r [--revision] ARG      : revision number
-
 EOS
   end
 

data/spec/init_spec.rb

@@ -158,6 +158,14 @@ EOS
                       "Y\nhoge\nfoo\n"
 
     File.exist?('/tmp/yggdrasil-test/.yggdrasil/config').should be_true
+
+    config = `cat /tmp/yggdrasil-test/.yggdrasil/config`
+    config.should =~ /^path=/
+    config.should =~ /^svn=/
+    config.should =~ /^svn_version=/
+    config.should =~ /^repo=/
+    config.should =~ /^anon-access=/
+    config.should =~ /^server=/
   end
 
   it 'should success init subcommand with server option AGAIN' do
@@ -238,6 +246,7 @@ EOS
     sock = TCPSocket.open('localhost', 4000)
     sock.puts('quit')
     sock.close
+    `pkill svnserve`
     Process.waitall
   end
 end

data/spec/server_help_spec.rb

@@ -97,7 +97,7 @@ usage: #{File.basename($0)} init [OPTIONS...]
 Valid options:
   --port ARG               : specify a TCP port number ARG
   --repo ARG               : URL of subversion repository
-                             ARG can contain {HOST} or a {host}
+                             ARG must contain {HOST} or {host}
                              {HOST} is replaced by client hostname with domain
                              {host} is replaced by client hostname without domain
                              e.g. svn://192.168.3.5/servers/{host}/ygg

data/spec/server_results_spec.rb

@@ -33,7 +33,6 @@ describe YggdrasilServer, 'results' do
     Yggdrasil.command %w{init --debug --server localhost:4000} +
                           %w{--username hoge --password foo},
                       "Y\nhoge\nfoo\n"
-    `rm -f /tmp/yggdrasil-test/.yggdrasil/checker/gem_list`
 
     `echo hoge > /tmp/yggdrasil-test/A`
     Yggdrasil.command %w{add /tmp/yggdrasil-test/A}
@@ -44,31 +43,52 @@ describe YggdrasilServer, 'results' do
     Yggdrasil.command %w{check}
     sleep 1
     out = catch_out do
-      YggdrasilServer.command %w{results --expire 30}
+      YggdrasilServer.command %w{results --expire 30 --debug}
     end
     out.should == ''
   end
 
-  it 'should show results' do
-    puts '---- should show results'
+  it 'should not show alert (there is result file, but there is no host in the repo)' do
+    puts '---- should not show alert (there is result file, but there is no host in the repo)'
+
+    `echo hoge > /tmp/yggdrasil-test/.yggdrasil/results/removed-host_192.168.1.30`
+    sleep 1
+
+    out = catch_out do
+      YggdrasilServer.command %w{results --expire 30 --debug}
+    end
+    out.should == "Notice: delete result file (removed-host_192.168.1.30)\n\n"
+  end
+
+  it 'should show alert (there is no result, but it exist in the repo)' do
+    puts '---- should show alert (there is no result, but it exist in the repo)'
+
+    `rm -f /tmp/yggdrasil-test/.yggdrasil/results/*`
+
+    out = catch_out do
+      lambda{YggdrasilServer.command(%w{results --expire 30 --debug})}.should raise_error(SystemExit)
+    end
+    out.should == <<"EOS"
+######## No check result: #{Socket.gethostname}
+
+EOS
+
+  end
+
+  it 'should show alert (difference)' do
+    puts '---- should show alert (difference)'
 
     `echo foo >> /tmp/yggdrasil-test/A`
     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),
-               Time.local(2001, 5, 1, 0, 0, 0),
-               '/tmp/yggdrasil-test/.yggdrasil/results/hoge-old'
     sleep 1
 
     out = catch_out do
-      lambda{YggdrasilServer.command(%w{results --expire 30})}.should raise_error(SystemExit)
+      lambda{YggdrasilServer.command(%w{results --expire 30 --debug})}.should raise_error(SystemExit)
     end
     out.gsub! /[ ]+/, ' '
     out.should == <<"EOS"
-######## hoge-old: last check is too old: 2001-05-01 00:00:00 +0900
-
-######## #{Socket.gethostname}_127.0.0.1 Mismatch:
+######## Difference: #{Socket.gethostname}_127.0.0.1
 M 2 tmp/yggdrasil-test/A
 
 Index: tmp/yggdrasil-test/A
@@ -79,6 +99,24 @@ Index: tmp/yggdrasil-test/A
  hoge
 +foo
 
+EOS
+  end
+
+  it 'should show alert (expired)' do
+    puts '---- should show results'
+
+    File.utime Time.local(2001, 5, 22, 23, 59, 59),
+               Time.local(2001, 5, 1, 0, 0, 0),
+               "/tmp/yggdrasil-test/.yggdrasil/results/#{Socket.gethostname}_127.0.0.1"
+    sleep 1
+
+    out = catch_out do
+      lambda{YggdrasilServer.command(%w{results --expire 30 --debug})}.should raise_error(SystemExit)
+    end
+    out.gsub! /[ ]+/, ' '
+    out.should == <<"EOS"
+######## Expired: #{Socket.gethostname}_127.0.0.1 (2001-05-01 00:00:00 +0900)
+
 EOS
   end
 
@@ -86,13 +124,13 @@ EOS
     puts '---- should show s-jis results'
 
     `rm /tmp/yggdrasil-test/.yggdrasil/results/*`
-    `echo 'あいうえお' | nkf -s > /tmp/yggdrasil-test/.yggdrasil/results/hoge`
+    `echo 'あいうえお' | nkf -s > /tmp/yggdrasil-test/.yggdrasil/results/#{Socket.gethostname}_127.0.0.1`
 
     out = catch_out do
-      lambda{YggdrasilServer.command(%w{results})}.should raise_error(SystemExit)
+      lambda{YggdrasilServer.command(%w{results --debug})}.should raise_error(SystemExit)
     end
     out.should == <<"EOS"
-######## hoge Mismatch:
+######## Difference: #{Socket.gethostname}_127.0.0.1
 あいうえお
 EOS
   end

data/spec/spec_helper.rb

@@ -33,7 +33,6 @@ 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`
@@ -61,7 +60,7 @@ end
 
 def catch_err
   exit 1 unless block_given?
-  tmp_err = $stdout
+  tmp_err = $stderr
   $stderr = StringIO.new
   yield
   $stderr, tmp_err = tmp_err, $stderr

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: yggdrasil
 version: !ruby/object:Gem::Version
-  version: 0.0.18
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Tomohisa Kusukawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Yggdrasil is a subversion wrapper to manage configuration files.
@@ -71,10 +66,10 @@ files:
 - lib/yggdrasil/init.rb
 - lib/yggdrasil/list.rb
 - lib/yggdrasil/log.rb
-- lib/yggdrasil/update.rb
 - lib/yggdrasil/version.rb
 - lib/yggdrasil_common.rb
 - lib/yggdrasil_server.rb
+- lib/yggdrasil_server/get_configs.rb
 - lib/yggdrasil_server/get_repo.rb
 - lib/yggdrasil_server/get_ro_id_pw.rb
 - lib/yggdrasil_server/help.rb
@@ -92,45 +87,36 @@ files:
 - spec/init_spec.rb
 - spec/list_spec.rb
 - spec/log_spec.rb
-- spec/revert_spec.rb
 - spec/server_help_spec.rb
 - spec/server_init_spec.rb
 - spec/server_results_spec.rb
 - spec/server_spec.rb
 - spec/server_version_spec.rb
 - spec/spec_helper.rb
-- spec/update_spec.rb
 - spec/version_spec.rb
 - yggdrasil.gemspec
 homepage: https://github.com/tkusukawa/yggdrasil
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1911977696976218263
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1911977696976218263
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Type "ygg help" for usage.
 test_files:
 - spec/add_spec.rb
@@ -142,12 +128,10 @@ test_files:
 - spec/init_spec.rb
 - spec/list_spec.rb
 - spec/log_spec.rb
-- spec/revert_spec.rb
 - spec/server_help_spec.rb
 - spec/server_init_spec.rb
 - spec/server_results_spec.rb
 - spec/server_spec.rb
 - spec/server_version_spec.rb
 - spec/spec_helper.rb
-- spec/update_spec.rb
 - spec/version_spec.rb

data/lib/yggdrasil/update.rb

@@ -1,52 +0,0 @@
-class Yggdrasil
-
-  # @param [Array] args
-  def update(args)
-    parse_options(args,
-                  {'--username'=>:username, '--password'=>:password,
-                   '-r'=>:revision, '--revision'=>:revision,
-                   '--non-interactive'=>:non_interactive?})
-    @arg_paths << '/' if @arg_paths.size == 0
-    get_user_pass_if_need_to_read_repo
-
-    matched_updates = sync_mirror(@arg_paths)
-    if matched_updates.size == 0
-      puts 'no 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(' ')}"
-      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/spec/revert_spec.rb

@@ -1,152 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe Yggdrasil, 'revert' do
-  it '-------- revert' do
-    puts '-------- revert'
-    prepare_environment
-    init_yggdrasil
-  end
-
-
-  it 'should revert added files' do
-    puts '---- should commit added files'
-    `echo hoge > /tmp/yggdrasil-test/AA`
-    `echo foo > /tmp/yggdrasil-test/BB`
-    FileUtils.cd '/tmp/yggdrasil-test' do
-      puts '-- add'
-      Yggdrasil.command %w{add AA /tmp/yggdrasil-test/BB}
-
-      puts '-- revert'
-      Yggdrasil.command %w{revert --username hoge --password foo},
-                        "0\nY\n"
-    end
-
-    puts "\n-- check revert file (add)"
-    out = catch_out do
-      Yggdrasil.command %w{check /tmp/yggdrasil-test --non-interactive} +
-                            %w{--username hoge --password foo}
-    end
-    puts out
-    out.should == "3 files checked.\nYggdrasil check: OK.\n"
-  end
-
-  it 'should revert modified file' do
-    puts '---- should revert modified file'
-    puts '-- modify'
-    `echo hoge >> /tmp/yggdrasil-test/A`
-
-    puts '-- revert'
-    Yggdrasil.command %w{revert / --username hoge --password foo},
-                      "0\nY\n"
-
-    puts "\n-- check revert file (modify)"
-    out = catch_out do
-      Yggdrasil.command %w{check /tmp/yggdrasil-test --non-interactive} +
-                            %w{--username hoge --password foo}
-    end
-    puts out
-    out.should == "3 files checked.\nYggdrasil check: OK.\n"
-  end
-
-  it 'should accept password interactive' do
-    puts '---- should accept password interactive'
-    `echo A >> /tmp/yggdrasil-test/A`
-
-    Yggdrasil.command %w{revert /tmp/yggdrasil-test/A --username hoge},
-                      "foo\nY\n" # interactive input: password, Y/n
-
-    puts "\n-- check revert file"
-    out = catch_out do
-      Yggdrasil.command %w{check /tmp/yggdrasil-test --non-interactive} +
-                            %w{--username hoge --password foo}
-    end
-    puts out
-    out.should == "3 files checked.\nYggdrasil check: OK.\n"
-  end
-
-  it 'should revert specified file only' do
-    puts '---- should revert specified file only'
-    `echo A >> /tmp/yggdrasil-test/A`
-    `echo B >> /tmp/yggdrasil-test/B`
-
-    Yggdrasil.command %w{revert /tmp/yggdrasil-test/B} +
-                          %w{--username hoge --password foo},
-                      "0\nY\n"
-
-    puts "\n-- check revert file"
-    out = catch_out do
-      Yggdrasil.command %w{check /tmp/yggdrasil-test --non-interactive} +
-                            %w{--username hoge --password foo}
-    end
-    puts out
-    out.gsub!(%r{ +}, ' ')
-    out.should == <<"EOS"
-3 files checked.
-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
-
-Yggdrasil check: NG!!!
-EOS
-  end
-
-  it 'should not revert deleted file' do
-    puts '---- should not revert deleted file'
-    `rm -f /tmp/yggdrasil-test/A`
-
-    Yggdrasil.command %w{revert /} +
-                          %w{--username hoge --password foo},
-                      "0\nn\n"
-
-    puts "\n-- check status"
-    out = catch_out do
-      Yggdrasil.command %w{check /tmp/yggdrasil-test --non-interactive} +
-                            %w{--username hoge --password foo}
-    end
-    puts out
-    out.gsub!(%r{ +},' ')
-    out.should == <<"EOS"
-3 files checked.
-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
-
-Yggdrasil check: NG!!!
-EOS
-  end
-
-  it 'should revert all files at once' do
-    puts '---- should revert all files at once'
-
-    `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}
-
-    Yggdrasil.command %w{revert /} +
-                          %w{--username hoge --password foo},
-                      "0\nY\n"
-
-    puts "\n-- check status"
-    out = catch_out do
-      Yggdrasil.command %w{check /tmp/yggdrasil-test --non-interactive} +
-                            %w{--username hoge --password foo}
-    end
-    puts out
-    out.should == "3 files checked.\nYggdrasil check: OK.\n"
-  end
-end

data/spec/update_spec.rb

@@ -1,88 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe Yggdrasil, 'update' do
-  it '-------- update' do
-    puts '-------- update'
-    prepare_environment
-    init_yggdrasil
-
-    puts '-- make another working copy'
-    puts `svn co file:///tmp/yggdrasil-test/svn-repo/mng-repo/host-name /tmp/yggdrasil-test/svn-work`
-  end
-
-  it 'should success update (related/absolute path)' do
-    puts '---- should success update (related/absolute path)'
-    puts '-- commit on another working copy'
-    `echo A:related/absolute path > /tmp/yggdrasil-test/svn-work/tmp/yggdrasil-test/A`
-    `echo B:related/absolute path > /tmp/yggdrasil-test/svn-work/tmp/yggdrasil-test/B`
-    `svn commit -m 'another commit' /tmp/yggdrasil-test/svn-work/`
-
-    FileUtils.cd '/tmp/yggdrasil-test' do
-      Yggdrasil.command %w{update A /tmp/yggdrasil-test/B} +
-                            %w{--username hoge --password foo},
-                        "0\nY\n"
-    end
-    `cat /tmp/yggdrasil-test/A`.should == "A:related/absolute path\n"
-    `cat /tmp/yggdrasil-test/B`.should == "B:related/absolute path\n"
-  end
-
-  it 'should success update (only one file)' do
-    puts '---- should success update (only one file)'
-
-    puts '-- commit on another working copy'
-    `echo A:only one file > /tmp/yggdrasil-test/svn-work/tmp/yggdrasil-test/A`
-    `echo B:only one file > /tmp/yggdrasil-test/svn-work/tmp/yggdrasil-test/B`
-    `svn commit -m 'another commit' /tmp/yggdrasil-test/svn-work/tmp/yggdrasil-test`
-
-    Yggdrasil.command %w{update /tmp/yggdrasil-test/A} +
-                          %w{--username hoge --password foo --non-interactive}
-
-    `cat /tmp/yggdrasil-test/A`.should == "A:only one file\n"
-    `cat /tmp/yggdrasil-test/B`.should == "B:related/absolute path\n"
-  end
-
-  it 'should success update (parent path)' do
-    puts '---- should success update (parent path)'
-    puts '-- commit on another working copy'
-    `echo A:parent path > /tmp/yggdrasil-test/svn-work/tmp/yggdrasil-test/A`
-    `echo B:parent path > /tmp/yggdrasil-test/svn-work/tmp/yggdrasil-test/B`
-    `svn commit -m 'another commit' /tmp/yggdrasil-test/svn-work/tmp/yggdrasil-test`
-
-    Yggdrasil.command %w{update /tmp} +
-                          %w{--username hoge --password foo},
-                      "1\nY\n"
-    `cat /tmp/yggdrasil-test/A`.should == "A:parent path\n"
-    `cat /tmp/yggdrasil-test/B`.should == "B:parent path\n"
-  end
-
-  it 'should success update (no path)' do
-    puts '---- should success update (no path)'
-    puts '-- commit on another working copy'
-    `echo A:no path > /tmp/yggdrasil-test/svn-work/tmp/yggdrasil-test/A`
-    `echo B:no path > /tmp/yggdrasil-test/svn-work/tmp/yggdrasil-test/B`
-    `svn commit -m 'another commit' /tmp/yggdrasil-test/svn-work/tmp/yggdrasil-test`
-
-    FileUtils.cd '/tmp' do
-      Yggdrasil.command %w{update} +
-                            %w{--username hoge --password foo --non-interactive}
-    end
-    `cat /tmp/yggdrasil-test/A`.should == "A:no path\n"
-    `cat /tmp/yggdrasil-test/B`.should == "B:no path\n"
-  end
-
-  it 'should success update with revision' do
-    puts '---- should success update with revision'
-    `echo A:hoge > /tmp/yggdrasil-test/A`
-    `echo B:hoge > /tmp/yggdrasil-test/B`
-    Yggdrasil.command %w{commit} +
-                      %w{-m hoge} +
-                      %w{--username hoge --password foo --non-interactive}
-
-    FileUtils.cd '/tmp' do
-      Yggdrasil.command %w{update} +
-                            %w{-r 4 --username hoge --password foo --non-interactive}
-    end
-    `cat /tmp/yggdrasil-test/A`.should == "A:related/absolute path\n"
-    `cat /tmp/yggdrasil-test/B`.should == "B:related/absolute path\n"
-  end
-end