yggdrasil 0.0.14 → 0.0.15

data/lib/yggdrasil/help.rb

@@ -120,6 +120,7 @@ Valid options:
   --server ARG             : specify a server address and port
                              e.g. 192.168.1.35:4000
                              see also 'yggserve help'
+  --force                  : force operation to run
 
 EOS
         when 'list', 'ls' ########################################### list (ls)

data/lib/yggdrasil/init.rb

@@ -9,7 +9,7 @@ class Yggdrasil
         {'--username'=>:username, '--password'=>:password,
          '--repo'=>:repo, '--parents'=>:parents?,
          '--non-interactive'=>:non_interactive?,
-         '--server'=>:server })
+         '--force'=>:force?, '--server'=>:server })
     @options[:ro_username] = @options[:username] if @options.has_key?(:username)
     @options[:ro_password] = @options[:password] if @options.has_key?(:password)
 
@@ -24,7 +24,24 @@ class Yggdrasil
     error 'can not find version string: svn --version' unless /version (\d+\.\d+\.\d+) / =~ out
     svn_version=$1
 
-    error "already exist config file: #@config_file" if File.exist?(@config_file)
+    while File.exist?(@config_file)
+      if @options[:force?]
+        `rm -rf #@config_file`
+        break
+      end
+      puts "Already exist config file: #@config_file"
+      exit 1 if @options[:non_interactive?]
+      print "Overwrite? [Yn]:"
+      res = $stdin.gets
+      puts
+      return nil unless res
+      res.chomp!
+      return nil if res == 'n'
+      if res == 'Y'
+        `rm -rf #@config_file`
+        break
+      end
+    end
 
     get_server_config(true) if @options.has_key?(:server)
 
@@ -49,6 +66,7 @@ class Yggdrasil
     end
     url_parts = @options[:repo].split('/')
     url_parts_num = url_parts.size
+    url = ''
     loop do
       if url_parts_num < 3
         if anon_access
@@ -78,27 +96,31 @@ class Yggdrasil
 
     if url_parts_num != url_parts.size
       until @options[:parents?]
-        msg = "not exist directory(s): #{url_parts[url_parts_num...url_parts.size].join('/')}"
+        break if @options[:force?]
+        msg = "not exist directory(s) in repository: #{url_parts[url_parts_num...url_parts.size].join('/')}"
         error msg if @options[:non_interactive?]
         puts msg
-        print 'make directory(s)? [Yn]: '
+        print 'make directory(s)? [Yn]:'
         input = $stdin.gets
         error 'can not gets $stdin' if input.nil?
+        puts
         input.chomp!
         return if input == 'n'
         break if input == 'Y'
       end
       input_user_pass
       `rm -rf #@mirror_dir`
-      system3 "#{svn} checkout --no-auth-cache --non-interactive" +
+      system3 "#{svn} checkout -N --no-auth-cache --non-interactive" +
                   " --username '#{@options[:ro_username]}' --password '#{@options[:ro_password]}'" +
                   " #{url_parts[0...url_parts_num].join('/')} #@mirror_dir"
       add_paths = Array.new
       path = @mirror_dir
       while url_parts_num < url_parts.size
+        url += '/' + url_parts[url_parts_num]
         path += '/' + url_parts[url_parts_num]
         Dir.mkdir path
         system3 "#{svn} add #{path}"
+        puts "add #{url}"
         add_paths << path
         url_parts_num += 1
       end
@@ -135,10 +157,10 @@ class Yggdrasil
 
   def init_get_repo_interactive
     loop do
-      print 'Input svn repo URL: '
+      print 'Input svn repo URL:'
       input = $stdin.gets
       error 'can not input svn repo URL' unless input
-
+      puts
       if %r{^(http://|https://|file://|svn://|private)} =~ input
         @options[:repo] = input
         break

data/lib/yggdrasil/version.rb

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

data/lib/yggdrasil_common.rb

@@ -66,16 +66,17 @@ module YggdrasilCommon
   def input_user_pass
     until @options.has_key?(:username) do
       error 'Can\'t get username or password' if @options.has_key?(:non_interactive?)
-      print 'Input svn username: '
+      print 'Input svn username:'
       input = $stdin.gets
       error 'can not input username' unless input
+      puts
       input.chomp!
       return if input.size == 0
       @options[:username] = @options[:ro_username] = input
     end
     until @options.has_key?(:password) do
       error 'Can\'t get username or password' if @options.has_key?(:non_interactive?)
-      print 'Input svn password: '
+      print 'Input svn password:'
       #input = `sh -c 'read -s hoge;echo $hoge'`
       system3 'stty -echo', false
       input = $stdin.gets

data/spec/help_spec.rb

@@ -107,6 +107,7 @@ Valid options:
   --server ARG             : specify a server address and port
                              e.g. 192.168.1.35:4000
                              see also 'yggserve help'
+  --force                  : force operation to run
 
 EOS
   end

data/spec/init_spec.rb

@@ -33,8 +33,10 @@ describe Yggdrasil, 'init' do
           %w{--non-interactive}
       lambda{Yggdrasil.command(cmd_args)}.should raise_error(SystemExit)
     end
-    err.should ==
-        "#{File.basename($0)} error: not exist directory(s): mng-repo/host-name\n\n"
+    err.should == <<"EOS"
+#{File.basename($0)} error: not exist directory(s) in repository: mng-repo/host-name
+
+EOS
   end
 
   it 'should error: need password' do
@@ -112,14 +114,17 @@ EOS
           "foo\n"\
           "Y\n"
       end
-    out.should == \
-      'Input svn repo URL: '\
-      "check SVN access...\n"\
-      'Input svn username: '\
-      "Input svn password: \n"\
-      "SVN access OK: svn://localhost/tmp/yggdrasil-test/svn-repo\n"\
-      "not exist directory(s): mng-repo/host-name\n"\
-      'make directory(s)? [Yn]: '
+    out.should == <<"EOS"
+Input svn repo URL:
+check SVN access...
+Input svn username:
+Input svn password:
+SVN access OK: svn://localhost/tmp/yggdrasil-test/svn-repo
+not exist directory(s) in repository: mng-repo/host-name
+make directory(s)? [Yn]:
+add svn://localhost/tmp/yggdrasil-test/svn-repo/mng-repo
+add svn://localhost/tmp/yggdrasil-test/svn-repo/mng-repo/host-name
+EOS
   end
 
   it 'should make checker example at init' do
@@ -161,6 +166,71 @@ EOS
     File.exist?('/tmp/yggdrasil-test/.yggdrasil/config').should be_true
   end
 
+  it 'should alert and cancel: already exist config file' do
+    puts '---- should alert and cancel: already exist config file'
+    out = catch_out do
+      cmd_args = %w{init --repo file:///tmp/yggdrasil-test/hoge --username hoge --password foo}
+      Yggdrasil.command cmd_args, "n\n"
+    end
+    out.should == <<"EOS"
+Already exist config file: /tmp/yggdrasil-test/.yggdrasil/config
+Overwrite? [Yn]:
+EOS
+  end
+
+  it 'should alert and overwrite: already exist config file' do
+    puts '---- should alert and overwrite: already exist config file'
+    out = catch_out do
+      cmd_args = %w{init --repo private}
+      Yggdrasil.command cmd_args, "Y\n"
+    end
+    out.should == <<"EOS"
+Already exist config file: /tmp/yggdrasil-test/.yggdrasil/config
+Overwrite? [Yn]:
+check SVN access...
+SVN access OK: file:///tmp/yggdrasil-test/.yggdrasil/private_repo
+EOS
+    config = `cat /tmp/yggdrasil-test/.yggdrasil/config | grep repo=`
+    config.should == <<"EOS"
+repo=file:///tmp/yggdrasil-test/.yggdrasil/private_repo
+EOS
+  end
+
+  it 'should error --non-interactive: already exist config file' do
+    puts '---- should error --non-interactive: already exist config file'
+    out = catch_out do
+      cmd_args = %w{init --repo file:///tmp/yggdrasil-test/svn-repo}+
+          %w{--username hoge --password foo} +
+          %w{--non-interactive}
+      lambda{Yggdrasil.command(cmd_args)}.should raise_error(SystemExit)
+    end
+    out.should == <<"EOS"
+Already exist config file: /tmp/yggdrasil-test/.yggdrasil/config
+EOS
+    config = `cat /tmp/yggdrasil-test/.yggdrasil/config | grep repo=`
+    config.should == <<"EOS"
+repo=file:///tmp/yggdrasil-test/.yggdrasil/private_repo
+EOS
+  end
+
+  it 'should do --force: already exist config file' do
+    puts '---- should do --force: already exist config file'
+    out = catch_out do
+      cmd_args = %w{init}+
+          %w{--repo svn://localhost/tmp/yggdrasil-test/svn-repo/servers/hoge/} +
+          %w{--username hoge --password foo}+
+          %w{--non-interactive --force}
+      Yggdrasil.command cmd_args
+    end
+    out.should == <<"EOS"
+check SVN access...
+SVN access OK: svn://localhost/tmp/yggdrasil-test/svn-repo/servers
+add svn://localhost/tmp/yggdrasil-test/svn-repo/servers/hoge
+EOS
+    config = `cat /tmp/yggdrasil-test/.yggdrasil/config | grep repo=`
+    config.should == "repo=svn://localhost/tmp/yggdrasil-test/svn-repo/servers/hoge\n"
+  end
+
   after(:all) do
     sock = TCPSocket.open('localhost', 4000)
     sock.puts('quit')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yggdrasil
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-04-22 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: 1459074757574721274
+      hash: 4459761969192795769
 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: 1459074757574721274
+      hash: 4459761969192795769
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25