yggdrasil 0.0.13 → 0.0.14

data/README.md

@@ -63,7 +63,7 @@ Prepare yggdrasil client to report check results to yggdrasil server, every day:
 
     $ crontab -e
     add following line(you should check path by 'which ygg')
-    17 5 * * * $GEMPATH/ygg check
+    17 5 * * * $GEMPATH/ygg check --non-interactive
 
 Check updates of configurations/conditions on host:$YGG_SERVER:
 

data/lib/yggdrasil/update.rb

@@ -27,7 +27,6 @@ class Yggdrasil
 
     FileUtils.cd @mirror_dir do
       cmd = "#@svn revert #{confirmed_updates.reverse.join(' ')}"
-      cmd += username_password_options_to_read_repo
       system3 cmd
 
       # make ls hash

data/lib/yggdrasil/version.rb

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

data/lib/yggdrasil.rb

@@ -100,7 +100,6 @@ class Yggdrasil
         elsif File.file?("/#{file}")
           if !File.exist?("#@mirror_dir/#{file}")
             cmd = "#@svn revert #{file}"
-            cmd += username_password_options_to_read_repo
             system3 cmd
           end
           #FileUtils.copy_file "/#{file}", "#@mirror_dir/#{file}"

data/lib/yggdrasil_server/results.rb

@@ -19,6 +19,7 @@ class YggdrasilServer
         if stat.mtime < (Time.now - @options[:expire].to_i * 60)
           alert = true
           puts "######## #{file}: last check is too old: #{stat.mtime.to_s}"
+          puts
           next
         end
       end

data/spec/check_spec.rb

@@ -86,8 +86,9 @@ EOS
 
     cmd = %w{check --username hoge --password foo --non-interactive}
     out = catch_out {Yggdrasil.command(cmd, "Y\n")}
+    out.gsub! /[ ]+/, ' '
     out.should == <<"EOS"
-A                0   tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
+A 0 tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
 
 Index: tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
 ===================================================================
@@ -117,11 +118,12 @@ EOS
     `rm -f /tmp/yggdrasil-test/.yggdrasil/checker/hoge`
     cmd = %w{check --username hoge --password foo}
     out = catch_out {Yggdrasil.command(cmd, "Y\n")}
+    out.gsub! /[ ]+/, ' '
     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
+D 4 tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
 
 Index: tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
 ===================================================================
@@ -183,11 +185,13 @@ EOS
     files = Dir.entries('/tmp/yggdrasil-test/.yggdrasil/results')
     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
+    out = `cat /tmp/yggdrasil-test/.yggdrasil/results/#{result_files[0]}`
+    out.gsub! /[ ]+/, ' '
+    out.should == <<"EOS"
+A 0 tmp
+A 0 tmp/yggdrasil-test
+A 0 tmp/yggdrasil-test/.yggdrasil
+A 0 tmp/yggdrasil-test/.yggdrasil/checker_result
 
 EOS
   end
@@ -205,8 +209,10 @@ EOS
 
     files = Dir.entries('/tmp/yggdrasil-test/.yggdrasil/results')
     result_files = files.select{|file| %r{^#{Socket.gethostname}} =~ file}
-    `cat /tmp/yggdrasil-test/.yggdrasil/results/#{result_files[0]}`.should == <<"EOS"
-M                2   tmp/yggdrasil-test/A
+    out = `cat /tmp/yggdrasil-test/.yggdrasil/results/#{result_files[0]}`
+    out.gsub! /[ ]+/, ' '
+    out.should == <<"EOS"
+M 2 tmp/yggdrasil-test/A
 
 Index: tmp/yggdrasil-test/A
 ===================================================================

data/spec/server_results_spec.rb

@@ -63,11 +63,12 @@ describe YggdrasilServer, 'results' do
     out = catch_out do
       lambda{YggdrasilServer.command(%w{results --expire 30})}.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:
-M                2   tmp/yggdrasil-test/A
+M 2 tmp/yggdrasil-test/A
 
 Index: tmp/yggdrasil-test/A
 ===================================================================

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yggdrasil
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2008035553517272387
+      hash: 1459074757574721274
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2008035553517272387
+      hash: 1459074757574721274
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25