yggdrasil 0.0.6 → 0.0.7

data/lib/yggdrasil/help.rb

@@ -131,8 +131,10 @@ usage: #@base_cmd init-server [OPTIONS...]
 Valid options:
   --port ARG               : specify a TCP port number ARG
   --repo ARG               : URL of subversion repository
-                             ARG could be include {HOST} and it replace by client hostname
-                             e.g. svn://192.168.3.5/servers/{HOST}/ygg
+                             ARG can contain {HOST} or a {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
   --ro-username ARG        : specify a username ARG for read only
   --ro-password ARG        : specify a password ARG for read only
 

data/lib/yggdrasil/init.rb

@@ -31,6 +31,7 @@ class Yggdrasil
     @options[:repo].chomp!
     @options[:repo].chomp!('/')
     @options[:repo].gsub!(/\{HOST\}/, Socket.gethostname)
+    @options[:repo].gsub!(/\{host\}/, Socket.gethostname.split('.')[0])
     if @options[:repo] == "private"
       Dir.mkdir @config_dir, 0755 unless File.exist?(@config_dir)
       repo_dir = "#@config_dir/private_repo"

data/lib/yggdrasil/version.rb

@@ -1,5 +1,5 @@
 class Yggdrasil
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 
   def version
     puts <<"EOS"

data/lib/yggdrasil_server/results.rb

@@ -10,21 +10,25 @@ class YggdrasilServer
 
     return unless File.exist?(@results_dir)
     files = Dir.entries(@results_dir)
+    alert = false
     files.each do |file|
       next if /^\./ =~ file
       absolute = "#@results_dir/#{file}"
       if @options.has_key?(:limit)
         stat = File.stat(absolute)
         if stat.mtime < (Time.now - @options[:limit].to_i * 60)
-          puts "######## #{file} TOO OLD: #{stat.mtime.to_s}"
+          alert = true
+          puts "######## #{file}: last check is too old: #{stat.mtime.to_s}"
           next
         end
       end
       buf = File.read("#@results_dir/#{file}")
       if buf.gsub(/\s*\n/m, '') != ''
+        alert = true
         puts "######## #{file} Mismatch:"
         puts buf
       end
     end
+    exit 1 if alert
   end
 end

data/spec/help_spec.rb

@@ -306,8 +306,10 @@ usage: #{File.basename($0)} init-server [OPTIONS...]
 Valid options:
   --port ARG               : specify a TCP port number ARG
   --repo ARG               : URL of subversion repository
-                             ARG could be include {HOST} and it replace by client hostname
-                             e.g. svn://192.168.3.5/servers/{HOST}/ygg
+                             ARG can contain {HOST} or a {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
   --ro-username ARG        : specify a username ARG for read only
   --ro-password ARG        : specify a password ARG for read only
 

data/spec/results_spec.rb

@@ -25,34 +25,56 @@ describe Yggdrasil, "results" do
       Yggdrasil.command %w{server --debug}
     end
     sleep 1
+  end
+
+  it 'should show nothing if no change' 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}
+    Yggdrasil.command %w{check}
+    Yggdrasil.command %w{commit -m '1st' --username hoge --password foo /},
+                      "Y\n"
+
     Yggdrasil.command %w{check}
     sleep 1
+    out = catch_out do
+      Yggdrasil.command %w{results --limit 30}
+    end
+    out.should == ""
   end
 
   it 'should show results' do
     puts '---- should show results'
 
+    `echo foo >> /tmp/yggdrasil-test/A`
+    Yggdrasil.command %w{check}
+
     `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
-      Yggdrasil.command %w{results --limit 30}
+      lambda{Yggdrasil.command(%w{results --limit 30})}.should raise_error(SystemExit)
     end
 
     out.should == <<"EOS"
-######## hoge-old TOO OLD: 2001-05-01 00:00:00 +0900
+######## hoge-old: last check is too old: 2001-05-01 00:00:00 +0900
 ######## centos6_127.0.0.1 Mismatch:
-A                0   tmp/yggdrasil-test
-A                0   tmp/yggdrasil-test/.yggdrasil
-A                0   tmp/yggdrasil-test/.yggdrasil/checker_result
-A                0   tmp
+M                2   tmp/yggdrasil-test/A
 
+Index: tmp/yggdrasil-test/A
+===================================================================
+--- tmp/yggdrasil-test/A	(revision 2)
++++ tmp/yggdrasil-test/A	(working copy)
+@@ -1 +1,2 @@
+ hoge
++foo
 EOS
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yggdrasil
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3274723067433011809
+      hash: 1646321919012648459
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3274723067433011809
+      hash: 1646321919012648459
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25