yggdrasil 0.1.0 → 0.1.1

data/lib/yggdrasil.rb

@@ -253,31 +253,28 @@ class Yggdrasil
 
   def exec_checker
     # execute checker
+    add_files = Array.new
     `rm -rf #{@checker_result_dir}`
-    Dir.mkdir @checker_result_dir, 0755
+    FileUtils.mkdir_p @checker_result_dir
     if File.exist?(@checker_dir)
       Find.find(@checker_dir) do |file|
         if File.file?(file) && File.executable?(file)
-          if file =~ %r{^#{@checker_dir}(.*)$}
-            file_body = $1
-            system3("#{file} > #{@checker_result_dir}#{file_body}")
-          end
+          next unless file =~ %r{^#{@checker_dir}(.*)$}
+          target = $1
+          next if target =~ %r{/\.} # except dot file
+
+          FileUtils.mkdir_p File.dirname("#{@checker_result_dir}#{target}")
+          system3("#{file} > #{@checker_result_dir}#{target}", false)
+          add_files << file
+          add_files << "#{@checker_result_dir}#{target}"
         end
       end
     end
 
-    # add checker script and checker result
-    result_files = Array.new
-    Find.find(@checker_dir) do |f|
-      result_files << f if File.file?(f) && File.executable?(f)
-    end
-    Find.find(@checker_result_dir) do |f|
-      result_files << f if File.file?(f)
-    end
-    if result_files.size != 0
+    if add_files.size != 0
       stdout = $stdout
       $stdout = StringIO.new
-      self.class.new.add result_files
+      self.class.new.add add_files
       $stdout = stdout
     end
   end

data/lib/yggdrasil/version.rb

@@ -1,5 +1,5 @@
 class Yggdrasil
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 
 
   def version

data/lib/yggdrasil_server/results.rb

@@ -26,6 +26,10 @@ class YggdrasilServer
     end
 
     files = Dir.entries(@results_dir)
+    files.sort! do |a, b|
+      File.stat("#{@results_dir}/#{b}").mtime.strftime('%Y%m%d%H%M%S') <=>
+          File.stat("#{@results_dir}/#{a}").mtime.strftime('%Y%m%d%H%M%S')
+    end
     alert = false
     files.each do |file|
       next if /^\./ =~ file

data/spec/check_spec.rb

@@ -130,6 +130,50 @@ Index: tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
 @@ -0,0 +1 @@
 +hoge
 
+Yggdrasil check: NG!!!
+EOS
+  end
+
+  it 'should not fail yggdrasil by checker failure' do
+    puts "\n---- should not fail yggdrasil by checker failure"
+    `echo 'hoge hoge' > /tmp/yggdrasil-test/.yggdrasil/checker/hoge`
+    `chmod +x /tmp/yggdrasil-test/.yggdrasil/checker/hoge`
+
+    cmd = %w{check --username hoge --password foo --non-interactive}
+    out = catch_out {Yggdrasil.command(cmd, "Y\n")}
+
+    `echo 'echo hoge' > /tmp/yggdrasil-test/.yggdrasil/checker/hoge`
+    `chmod +x /tmp/yggdrasil-test/.yggdrasil/checker/hoge`
+
+    out.gsub! /[ ]+/, ' '
+    out.should == <<"EOS"
+9 files checked.
+A 0 tmp/yggdrasil-test/.yggdrasil
+A 0 tmp/yggdrasil-test/.yggdrasil/checker
+A 0 tmp/yggdrasil-test/.yggdrasil/checker/hoge
+A 0 tmp/yggdrasil-test/.yggdrasil/checker_result
+A 0 tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
+
+Index: tmp/yggdrasil-test/.yggdrasil/checker/hoge
+===================================================================
+--- tmp/yggdrasil-test/.yggdrasil/checker/hoge	(revision 0)
++++ tmp/yggdrasil-test/.yggdrasil/checker/hoge	(revision 0)
+@@ -0,0 +1 @@
++hoge hoge
+
+Property changes on: tmp/yggdrasil-test/.yggdrasil/checker/hoge
+___________________________________________________________________
+Added: svn:executable
+ + *
+
+
+Index: tmp/yggdrasil-test/.yggdrasil/checker_result/hoge
+===================================================================
+--- tmp/yggdrasil-test/.yggdrasil/checker_result/hoge	(revision 0)
++++ tmp/yggdrasil-test/.yggdrasil/checker_result/hoge	(revision 0)
+@@ -0,0 +1 @@
++/tmp/yggdrasil-test/.yggdrasil/checker/hoge: line 1: hoge: command not found
+
 Yggdrasil check: NG!!!
 EOS
   end
@@ -298,6 +342,8 @@ config: hoge.hoge.com
 server: svn://localhost/tmp/yggdrasil-test/svn-repo/servers/yggdrasil-dev.kusu.myhome.cx
 
 EOS
+    `grep -v repo=hoge.hoge.com < /tmp/yggdrasil-test/.yggdrasil/config > /tmp/yggdrasil-test/.yggdrasil/config_`
+    `mv /tmp/yggdrasil-test/.yggdrasil/config_ /tmp/yggdrasil-test/.yggdrasil/config`
   end
 
   it 'should recover delete flag' do
@@ -326,6 +372,29 @@ EOS
     out = catch_out {Yggdrasil.command(cmd, "q\n")}
     out.should == <<"EOS"
 
+EOS
+  end
+
+  it 'should ignore .(dot) files' do
+    puts "\n---- should ignore .(dot) files"
+
+    `echo 'echo hoge' > /tmp/yggdrasil-test/.yggdrasil/checker/.aaa`
+    `chmod +x /tmp/yggdrasil-test/.yggdrasil/checker/.aaa`
+
+    `mkdir -p /tmp/yggdrasil-test/.yggdrasil/checker/.bbb`
+    `echo 'echo hoge' > /tmp/yggdrasil-test/.yggdrasil/checker/.bbb/hoge`
+    `chmod +x /tmp/yggdrasil-test/.yggdrasil/checker/.bbb/hoge`
+
+    `mkdir -p /tmp/yggdrasil-test/.yggdrasil/checker/ccc`
+    `echo 'echo ccc' > /tmp/yggdrasil-test/.yggdrasil/checker/ccc/.ccc`
+    `chmod +x /tmp/yggdrasil-test/.yggdrasil/checker/ccc/.ccc`
+
+    cmd = %w{check --username hoge --password foo --non-interactive}
+    out = catch_out {Yggdrasil.command cmd}
+
+    out.should == <<"EOS"
+3 files checked.
+Yggdrasil check: OK.
 EOS
   end
 

data/spec/server_results_spec.rb

@@ -135,6 +135,19 @@ EOS
 EOS
   end
 
+  it 'should delete older result file' do
+    puts '---- should delete older result file'
+
+    `echo '' > /tmp/yggdrasil-test/.yggdrasil/results/#{Socket.gethostname}_192.168.1.1`
+    sleep 1
+    `echo '' > /tmp/yggdrasil-test/.yggdrasil/results/#{Socket.gethostname}_127.0.0.1`
+    sleep 1
+
+    out = catch_out do
+      YggdrasilServer.command %w{results --expire 30 --debug}
+    end
+    out.should == "Notice: delete result file (#{Socket.gethostname}_192.168.1.1)\n\n"
+  end
 
   after(:all) do
     sleep 1

metadata

@@ -1,41 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: yggdrasil
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
+  prerelease: 
 platform: ruby
 authors:
 - Tomohisa Kusukawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2014-09-23 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.
@@ -97,26 +102,33 @@ files:
 - 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: -3000571352953116803
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3000571352953116803
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Type "ygg help" for usage.
 test_files:
 - spec/add_spec.rb

checksums.yaml

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