yggdrasil 0.0.8 → 0.0.9

data/lib/yggdrasil/check.rb

@@ -14,7 +14,7 @@ class Yggdrasil
     `rm -rf #@checker_result_dir`
     Dir.mkdir @checker_result_dir, 0755
     if File.exist?(@checker_dir)
-      Find.find(@checker_dir).each do |file|
+      Find.find(@checker_dir) do |file|
         if File.file?(file) && File.executable?(file)
           if file =~ %r{^#@checker_dir(.*)$}
             file_body = $1

data/lib/yggdrasil/init.rb

@@ -91,7 +91,7 @@ class Yggdrasil
       input_user_pass
       `rm -rf #@mirror_dir`
       system3 "#{svn} checkout --no-auth-cache --non-interactive" +
-                  " --username '#{@options[:username]}' --password '#{@options[:password]}'" +
+                  " --username '#{@options[:ro_username]}' --password '#{@options[:ro_password]}'" +
                   " #{url_parts[0...url_parts_num].join('/')} #@mirror_dir"
       add_paths = Array.new
       path = @mirror_dir
@@ -121,7 +121,7 @@ class Yggdrasil
     # make mirror dir
     `rm -rf #@mirror_dir`
     cmd = "#{svn} checkout --no-auth-cache --non-interactive #{@options[:repo]} #@mirror_dir"
-    cmd += " --username '#{@options[:username]}' --password '#{@options[:password]}'" unless anon_access
+    cmd += " --username '#{@options[:ro_username]}' --password '#{@options[:ro_password]}'" unless anon_access
     system3 cmd
 
     # make checker dir and checker example

data/lib/yggdrasil/log.rb

@@ -21,7 +21,7 @@ class Yggdrasil
       end
     end
 
-    cmd_arg = "#@svn log --verbose --no-auth-cache --non-interactive"
+    cmd_arg = "#@svn log --no-auth-cache --non-interactive"
     cmd_arg += username_password_options_to_read_repo
     if @options.has_key?(:revision)
       cmd_arg += " -r #{@options[:revision]}"

data/lib/yggdrasil/version.rb

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

data/spec/init_spec.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper'
+require 'yggdrasil_server'
 
 describe Yggdrasil, 'init' do
   it '-------- init' do
@@ -136,7 +137,7 @@ EOS
 
     YggdrasilServer.command %w{init} +
                           %w{--port 4000} +
-                          %w{--repo svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{HOST}/} +
+                          %w{--repo svn://localhost/tmp/yggdrasil-test/svn-repo/servers/{host}/} +
                           %w{--ro-username hoge} +
                           %w{--ro-password foo}
     fork do
@@ -148,7 +149,19 @@ EOS
                       "Y\nhoge\nfoo\n"
 
     File.exist?('/tmp/yggdrasil-test/.yggdrasil/config').should be_true
+  end
+
+  it 'should success init subcommand with server option AGAIN' do
+    puts '---- should success init subcommand with server option AGAIN'
+    `rm -rf /tmp/yggdrasil-test/.yggdrasil/config`
+
+    sleep 1
+    Yggdrasil.command %w{init --debug --server localhost:4000}
+
+    File.exist?('/tmp/yggdrasil-test/.yggdrasil/config').should be_true
+  end
 
+  after(:all) do
     sock = TCPSocket.open('localhost', 4000)
     sock.puts('quit')
     sock.close

data/spec/log_spec.rb

@@ -15,18 +15,10 @@ describe Yggdrasil, 'log' do
     out.should == <<"EOS"
 ------------------------------------------------------------------------
 r3 | hoge |  | 1 line
-Changed paths:
-   M /mng-repo/host-name/tmp/yggdrasil-test/A
-   M /mng-repo/host-name/tmp/yggdrasil-test/B
 
 modify
 ------------------------------------------------------------------------
 r2 | hoge |  | 1 line
-Changed paths:
-   A /mng-repo/host-name/tmp
-   A /mng-repo/host-name/tmp/yggdrasil-test
-   A /mng-repo/host-name/tmp/yggdrasil-test/A
-   A /mng-repo/host-name/tmp/yggdrasil-test/B
 
 add files
 ------------------------------------------------------------------------
@@ -45,18 +37,10 @@ EOS
     out.should == <<"EOS"
 ------------------------------------------------------------------------
 r3 | hoge |  | 1 line
-Changed paths:
-   M /mng-repo/host-name/tmp/yggdrasil-test/A
-   M /mng-repo/host-name/tmp/yggdrasil-test/B
 
 modify
 ------------------------------------------------------------------------
 r2 | hoge |  | 1 line
-Changed paths:
-   A /mng-repo/host-name/tmp
-   A /mng-repo/host-name/tmp/yggdrasil-test
-   A /mng-repo/host-name/tmp/yggdrasil-test/A
-   A /mng-repo/host-name/tmp/yggdrasil-test/B
 
 add files
 ------------------------------------------------------------------------
@@ -75,18 +59,10 @@ EOS
     out.should == <<"EOS"
 ------------------------------------------------------------------------
 r3 | hoge |  | 1 line
-Changed paths:
-   M /mng-repo/host-name/tmp/yggdrasil-test/A
-   M /mng-repo/host-name/tmp/yggdrasil-test/B
 
 modify
 ------------------------------------------------------------------------
 r2 | hoge |  | 1 line
-Changed paths:
-   A /mng-repo/host-name/tmp
-   A /mng-repo/host-name/tmp/yggdrasil-test
-   A /mng-repo/host-name/tmp/yggdrasil-test/A
-   A /mng-repo/host-name/tmp/yggdrasil-test/B
 
 add files
 ------------------------------------------------------------------------
@@ -101,11 +77,6 @@ EOS
     out.should == <<"EOS"
 ------------------------------------------------------------------------
 r2 | hoge |  | 1 line
-Changed paths:
-   A /mng-repo/host-name/tmp
-   A /mng-repo/host-name/tmp/yggdrasil-test
-   A /mng-repo/host-name/tmp/yggdrasil-test/A
-   A /mng-repo/host-name/tmp/yggdrasil-test/B
 
 add files
 ------------------------------------------------------------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yggdrasil
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2090364759273655235
+      hash: -670785694215858000
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2090364759273655235
+      hash: -670785694215858000
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25