automateit 0.70930 → 0.71003

data/CHANGES.txt

@@ -1,3 +1,10 @@
+0.71003:
+    Date: Wed, 03 Oct 2007 01:17:32 -0700
+    Desc:
+    - Fixed bug in #backup on JRuby because it lacks methods to query properties. It now copies the file and timestamp, but not the owner/group/mode because these can't be queried on JRuby.
+    - Improved #cp with new :preserve => :try option so that properties are preserved when possible, but no exception is thrown when these can't be preserved.
+    - Improved #touch with options for :like and :stamp options.
+
 0.70930:
     Date: Sun, 30 Sep 2007 15:10:43 -0700
     Desc:

data/lib/automateit.rb

@@ -15,7 +15,6 @@ require 'yaml'
 
 # Gems
 require 'rubygems'
-require 'open4'
 require 'erb'
 
 # Load ActiveSupport pieces individually to save ~0.5s

data/lib/automateit/account_manager/passwd.rb

@@ -55,6 +55,7 @@ class ::AutomateIt::AccountManager::Passwd < ::AutomateIt::AccountManager::BaseD
   def _passwd_raw(user, password, opts={})
     quiet = (opts[:quiet] or not log.info?)
 
+    require 'open4'
     return Open4::popen4("passwd %s 2>&1" % user) do |pid, sin, sout, serr|
       $expect_verbose = ! quiet
       2.times do

data/lib/automateit/package_manager/gem.rb

@@ -85,6 +85,7 @@ class AutomateIt::PackageManager::Gem < AutomateIt::PackageManager::BaseDriver
       uninstall_needed = false
       begin
         require 'expect'
+        require 'open4'
         exitstruct = Open4::popen4(cmd) do |pid, sin, sout, serr|
           $expect_verbose = opts[:quiet] ? false : true
 

data/lib/automateit/root.rb

@@ -1,7 +1,7 @@
 # See AutomateIt::Interpreter for usage information.
 module AutomateIt # :nodoc:
   # AutomateIt version
-  VERSION=Gem::Version.new("0.70930")
+  VERSION=Gem::Version.new("0.71003")
 
   # Instantiates a new Interpreter. See documentation for
   # Interpreter#setup.

data/lib/automateit/shell_manager.rb

@@ -195,8 +195,11 @@ class AutomateIt::ShellManager < AutomateIt::Plugin::Manager
   # +false+ if all are present.
   #
   # Options:
-  # * :preserve -- preserve file modification time and ownership, boolean.
-  # * :recursive -- copy files and directories recursively, boolean.
+  # * :preserve -- Preserve file modification time and ownership. Defaults to
+  #   false. Can be +true+, +false+, or :try. If :try, the properties will be
+  #   preserved if possible on the platform, whereas +true+ will raise an
+  #   exception if not available.
+  # * :recursive -- Copy files and directories recursively, boolean.
   def cp(sources, target, opts={}) dispatch(sources, target, opts) end
 
   # Copy the +sources+ to the +target+ recursively. Returns an array of
@@ -250,7 +253,11 @@ class AutomateIt::ShellManager < AutomateIt::Plugin::Manager
   # Create the +targets+ as files if needed and update their modification
   # time. Unlike most other commands provided by ShellManager, this one will
   # always modify the targets. Returns an array of targets modified.
-  def touch(targets) dispatch(targets) end
+  #
+  # Options:
+  # * :like -- Touch the targets like this file. Defaults to none.
+  # * :stamp -- Set the targets to the specified timestamp. Defaults to Time.now.
+  def touch(targets, opts={}) dispatch(targets, opts) end
 end
 
 # == ShellManager::BaseDriver

data/lib/automateit/shell_manager/portable.rb

@@ -49,7 +49,7 @@ class AutomateIt::ShellManager::Portable < AutomateIt::ShellManager::BaseDriver
       if is_dir
         cp_opts = {}
         cp_opts[:recursive] = true if is_dir
-        cp_opts[:preserve] = true if superuser?
+        cp_opts[:preserve] = :try
 
         source_children = _directory_contents(source)
         #puts "sc: %s" % source_children.inspect
@@ -210,8 +210,16 @@ class AutomateIt::ShellManager::Portable < AutomateIt::ShellManager::BaseDriver
       opt = opt.to_sym
       fu_opts[opt] = opts[opt] if opts[opt]
     end
-    #fu_opts[:verbose] = true
-    fu_opts_with_preserve = {:preserve => opts[:preserve]}.merge(fu_opts)
+
+    fu_opts_with_preserve = fu_opts.clone
+    fu_opts_with_preserve[:preserve] = \
+      if opts[:preserve] == :try
+        fsim = File::Stat.instance_methods
+        (fsim.include?("uid") and fsim.include?("gid") and
+         fsim.include?("mode") and fsim.include?("atime"))
+      else
+        opts[:preserve]
+      end
 
     changed = []
     sources_a = [sources].flatten
@@ -454,9 +462,48 @@ class AutomateIt::ShellManager::Portable < AutomateIt::ShellManager::BaseDriver
   end
 
   # See ShellManager#touch
-  def touch(targets)
-    log.info(PEXEC+"touch #{String === targets ? targets : targets.join(' ')}")
-    FileUtils.touch(targets, _fileutils_opts)
-    return targets
+  def touch(targets, opts={})
+    like = opts.delete(:like)
+    stamp = opts.delete(:stamp)
+    quiet = opts.delete(:quiet) == true ? true : false
+    time = \
+      if stamp
+        stamp
+      elsif like
+        begin
+          File.stat(like).mtime
+        rescue Errno::ENOENT => e
+          if preview?
+            Time.now
+          else
+            raise e
+          end
+        end
+      else
+        Time.now
+      end
+
+    unless quiet
+      msg = PEXEC << "touch"
+      msg << " --reference %s" % like if like
+      msg << " --stamp %s" % stamp if stamp
+      msg << " " << [targets].flatten.join(" ")
+      log.info(msg)
+    end
+
+    results = []
+    for target in [targets].flatten
+      begin
+        stat = File.stat(target)
+        next if stat.mtime.to_i == time.to_i
+      rescue Errno::ENOENT
+        File.open(target, "a"){} unless preview?
+      end
+      File.utime(time, time, target) unless preview?
+      results << target
+    end
+
+    return false if results.empty?
+    return targets.is_a?(String) ? results.first : results
   end
 end

data/spec/integration/shell_manager_spec.rb

@@ -371,6 +371,10 @@ describe AutomateIt::ShellManager, " in general" do
       File.exists?(dir).should be_false
     end
   end
+end
+
+describe AutomateIt::ShellManager, " when touching files" do
+  it_should_behave_like "AutomateIt::ShellManager"
 
   it "should create files and change their timestamps (touch)" do
     @m.mktempdircd do
@@ -386,6 +390,79 @@ describe AutomateIt::ShellManager, " in general" do
       before.should <= after
     end
   end
+
+  it "should touch files with a specific timestamp (touch)" do
+    @m.mktempdircd do
+      target = "foo"
+      stamp = Time.now - 60
+      stamp.should_not == Time.now
+
+      @m.touch(target, :stamp => stamp).should == target
+      stat = File.stat(target)
+      stamp.to_i.should == stat.mtime.to_i
+
+      @m.touch(target, :stamp => stamp).should be_false
+    end
+  end
+
+  it "should touch files with a timestamp like other files (touch)" do
+    @m.mktempdircd do
+      source = "foo"
+      target = "bar"
+      stamp = Time.now - 60
+      stamp.should_not == Time.now
+      @m.touch(source, :stamp => stamp)
+
+      @m.touch(target, :like => source).should == target
+      stat = File.stat(target)
+      stamp.to_i.should == stat.mtime.to_i
+
+      @m.touch(target, :like => source).should be_false
+    end
+  end
+
+  it "should not change timestamps in preview mode (touch)" do
+    @m.mktempdircd do
+      target = "foo"
+      @m.touch(target)
+      stamp = File.stat(target).mtime
+
+      begin
+        @m.preview = true
+        @m.touch(target)
+        File.stat(target).mtime.to_i == stamp.to_i
+      ensure
+        @m.preview = false
+      end
+    end
+  end
+
+  it "should raise errors when setting timestamps like non-existing files (touch)" do
+    @m.mktempdircd do
+      source = "source"
+      target = "target"
+      File.exists?(source).should be_false
+      File.exists?(target).should be_false
+
+      lambda { @m.touch(target, :like => source) }.should raise_error(Errno::ENOENT)
+    end
+  end
+
+  it "should not raise errors when setting timestamps like non-existing files in preview mode (touch)" do
+    @m.mktempdircd do
+      source = "source"
+      target = "target"
+      File.exists?(source).should be_false
+      File.exists?(target).should be_false
+
+      begin
+        @m.preview = true
+        @m.touch(target, :like => source).should == target
+      ensure
+        @m.preview = false
+      end
+    end
+  end
 end
 
 describe AutomateIt::ShellManager, " when managing modes" do
@@ -428,7 +505,7 @@ describe AutomateIt::ShellManager, " when managing modes" do
       end
     end
 
-    #it "should set the default mask (umask)" # TODO 
+    #it "should set the default mask (umask)" # TODO
   end
 
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: automateit
 version: !ruby/object:Gem::Version 
-  version: "0.70930"
-date: 2007-10-01 00:00:00 -07:00
+  version: "0.71003"
+date: 2007-10-04 00:00:00 -07:00
 summary: AutomateIt is an open-source tool for automating the setup and maintenance of UNIX-like systems
 require_paths: 
 - lib