yggdrasil 0.0.1 → 0.0.2

data/README.md

@@ -18,23 +18,29 @@ Or install it yourself as:
 
 ## Usage
 
-* Install subversion
+Install subversion:
+
     $ sudo yum install subversion
 
-* Prepare subversion repository and init Yggdrasil.
+Prepare subversion repository and init Yggdrasil:
+
     $ svnadmin create ~/svn-repo
     $ yggdrasil init --repo file://$HOME/svn-repo
+
   You should use svn-server if you have.
   In that case, the configuration files of
   all the servers can be managed on the unification.
 
-* Add configuration files
+Add configuration files:
+
     $ yggdrasil add ~/.bashrc  ..etc
 
-* Check modify and/or delete
+Check modify and/or delete:
+
     $ yggdrasil status /
 
-* Refer Help
+Refer Help:
+
     $ yggdrasil help
 
 ## Environment

data/lib/yggdrasil/commit.rb

@@ -9,6 +9,10 @@ class Yggdrasil
 
     updates = sync_mirror(options)
     matched_updates = select_updates(updates, target_paths)
+    if matched_updates.size == 0
+      puts "\nno files."
+      return
+    end
 
     confirmed_updates = confirm_updates(matched_updates,options) do |relative_path|
       FileUtils.cd @mirror_dir do

data/lib/yggdrasil/init.rb

@@ -65,11 +65,12 @@ class Yggdrasil
     end
 
     Dir.mkdir config_dir, 0755
-    File.write config_dir+'/config',
-               "path=#{ENV['PATH']}\n"\
-               "svn=#{svn}\n"\
-               "svn_version=#{svn_version}\n"\
-               "repo=#{options[:repo]}\n"
+    File.open(config_dir+'/config', "w") do |f|
+      f.write "path=#{ENV['PATH']}\n"\
+              "svn=#{svn}\n"\
+              "svn_version=#{svn_version}\n"\
+              "repo=#{options[:repo]}\n"
+    end
 
     ret = system3 "#{svn} checkout"\
                        " --no-auth-cache --non-interactive"\

data/lib/yggdrasil/revert.rb

@@ -9,6 +9,10 @@ class Yggdrasil
 
     updates = sync_mirror(options)
     matched_updates = select_updates(updates, target_paths)
+    if matched_updates.size == 0
+      puts "\nno files."
+      return
+    end
 
     confirmed_updates = confirm_updates(matched_updates,options) do |relative_path|
       FileUtils.cd @mirror_dir do

data/lib/yggdrasil/update.rb

@@ -19,6 +19,10 @@ class Yggdrasil
     end
 
     matched_updates = select_updates(updates, target_paths)
+    if matched_updates.size == 0
+      puts "\nno files."
+      return
+    end
 
     confirmed_updates = confirm_updates(matched_updates,options) do |relative_path|
       FileUtils.cd @mirror_dir do

data/lib/yggdrasil/version.rb

@@ -1,5 +1,5 @@
 class Yggdrasil
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
   CMD = File::basename($0)
 
   def Yggdrasil.version

data/lib/yggdrasil.rb

@@ -54,13 +54,10 @@ class Yggdrasil
   end
 
   # @param [String] cmd
-  def Yggdrasil.system3(cmd, err_exit=true, stdin=nil)
-    if stdin.nil?
-      out,stat = Open3.capture2e cmd
-    else
-      out,stat = Open3.capture2e cmd, :stdin_data=>stdin
-    end
-    unless stat.success?
+  def Yggdrasil.system3(cmd, err_exit=true)
+    out = `#{cmd}`
+
+    unless $?.success?
       return nil unless err_exit
       $stderr.puts "#{CMD} error: command failure: #{cmd}"
       $stderr.puts "command output:"

data/spec/init_spec.rb

@@ -55,13 +55,19 @@ describe Yggdrasil, "init" do
     `rm -rf /tmp/yggdrasil-test/.yggdrasil`
     `rm -rf /tmp/yggdrasil-test/svn-repo`
     `svnadmin create /tmp/yggdrasil-test/svn-repo`
-    Yggdrasil.system3 'cat > /tmp/yggdrasil-test/svn-repo/conf/passwd', true, "[users]\nhoge = foo"
-    Yggdrasil.system3 'cat > /tmp/yggdrasil-test/svn-repo/conf/svnserve.conf', true, <<"EOS"
+
+    File.open("/tmp/yggdrasil-test/svn-repo/conf/passwd", "w") do |f|
+      f.write "[users]\nhoge = foo"
+    end
+
+    File.open("/tmp/yggdrasil-test/svn-repo/conf/svnserve.conf", "w") do |f|
+      f.write <<"EOS"
 [general]
 anon-access = none
 auth-access = write
 password-db = passwd
 EOS
+    end
     `svnserve -d`
 
     out = catch_stdout do

data/spec/spec_helper.rb

@@ -12,13 +12,18 @@ def prepare_environment
   `svnadmin create /tmp/yggdrasil-test/svn-repo`
 
   puts '-- launch svnserve'
-  Yggdrasil.system3 'cat > /tmp/yggdrasil-test/svn-repo/conf/passwd', true, "[users]\nhoge = foo"
-  Yggdrasil.system3 'cat > /tmp/yggdrasil-test/svn-repo/conf/svnserve.conf', true, <<"EOS"
+
+  File.open("/tmp/yggdrasil-test/svn-repo/conf/passwd", "w") do |f|
+    f.write "[users]\nhoge = foo"
+  end
+  File.open("/tmp/yggdrasil-test/svn-repo/conf/svnserve.conf", "w") do |f|
+    f.write <<"EOS"
 [general]
 anon-access = none
 auth-access = write
 password-db = passwd
 EOS
+  end
   `svnserve -d`
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yggdrasil
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -98,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3458326500549019830
+      hash: 690263660522178421
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3458326500549019830
+      hash: 690263660522178421
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23