facets 1.8.0 → 1.8.8

data/lib/facets/more/times.rb

@@ -13,13 +13,22 @@
 #
 # == SPECIAL THANKS
 #
-# Thanks to Richard Kilmer for the orignal work and
-# Alexander Kellett for suggesting it for Facets.
+# Thanks to Richard Kilmer for the orignal work and Alexander Kellett
+# for suggesting it for Facets.
+#
+# Thanks to Dave Hoover and Ryan Platte for the Weekdays implementation.
 #
 # == Author(s)
 #
 # * Rich Kilmer
 # * Thomas Sawyer
+# * Dave Hoover
+# * Ryan Platte
+#
+# CREDIT Rich Kilmer
+# CREDIT Thomas Sawyer
+# CREDIT Dave Hoover
+# CREDIT Ryan Platte
 #
 # == Developer Notes
 #
@@ -98,8 +107,55 @@ class Numeric
   alias_method :from_now, :after # Reads best without arguments: 10.minutes.from_now
   alias_method :later, :after    # Reads best without arguments: 10.minutes.later
 
+  # Works with day in terms of weekdays.
+  def weekdays
+    Weekdays.new(self)
+  end
+  alias :weekday :weekdays
+
+end
+
+
+# The Weekdays class provides useful weekday terminology to Numeric.
+
+class Weekdays
+  WEEKDAYS = 1..5 # Monday is wday 1
+  ONE_DAY = 60 * 60 * 24
+
+  def initialize(n)
+    @n = n
+  end
+
+  def ago(time = ::Time.now)
+    step :down, time
+  end
+  alias :until :ago
+  alias :before :ago
+
+  def since(time = ::Time.now)
+    step :up, time
+  end
+  alias :from_now :since
+  alias :after :since
+
+  private
+
+  def step(direction, original_time)
+    result = original_time
+    time = ONE_DAY
+
+    compare = direction == :up ? ">" : "<"
+    time *= -1 if direction == :down
+
+    @n.times do
+      result += time until result.send(compare, original_time) && WEEKDAYS.member?(result.wday)
+      original_time = result
+    end
+    result
+  end
 end
 
+
 class Time
 
   NEVER = Time.mktime(2038)
@@ -267,61 +323,91 @@ end
 
 =begin testing
 
-require 'test/unit'
-#require 'mega/multiplier'
+  require 'test/unit'
+  #require 'mega/multiplier'
 
-class TC_Numeric < Test::Unit::TestCase
+  class NumericTest < Test::Unit::TestCase
 
-  #def test_micro_seconds
-  #  assert_equal( 0.000001, 1.microsecond )
-  #end
+    #def test_micro_seconds
+    #  assert_equal( 0.000001, 1.microsecond )
+    #end
 
-  #def test_milli_seconds
-  #  assert_equal( 0.001, 1.millisecond )
-  #end
+    #def test_milli_seconds
+    #  assert_equal( 0.001, 1.millisecond )
+    #end
 
-  def test_seconds
-    assert_equal( 60**0, 1.seconds )
-  end
+    def test_seconds
+      assert_equal( 60**0, 1.seconds )
+    end
 
-  def test_minutes
-    assert_equal( 60**1, 1.minutes )
-  end
+    def test_minutes
+      assert_equal( 60**1, 1.minutes )
+    end
 
-  def test_hours
-    assert_equal( 60**2, 1.hours )
-  end
+    def test_hours
+      assert_equal( 60**2, 1.hours )
+    end
 
-  def test_days
-    assert_equal( 24*(60**2), 1.days )
-  end
+    def test_days
+      assert_equal( 24*(60**2), 1.days )
+    end
 
-  def test_weeks
-    assert_equal( 7*24*(60**2), 1.weeks )
-  end
+    def test_weeks
+      assert_equal( 7*24*(60**2), 1.weeks )
+    end
 
-  def test_fortnights
-    assert_equal( 14*24*(60**2), 1.fortnights )
-  end
+    def test_fortnights
+      assert_equal( 14*24*(60**2), 1.fortnights )
+    end
 
-  def test_months
-    assert_equal( 30*24*(60**2), 1.months )
-  end
+    def test_months
+      assert_equal( 30*24*(60**2), 1.months )
+    end
 
-  def test_years
-    assert_equal( 365*24*(60**2), 1.years )
-  end
+    def test_years
+      assert_equal( 365*24*(60**2), 1.years )
+    end
 
-  def test_before
-    t = Time.now
-    assert_equal( t - 1.day, 1.day.before(t) )
-  end
+    def test_before
+      t = Time.now
+      assert_equal( t - 1.day, 1.day.before(t) )
+    end
+
+    def test_after
+      t = Time.now
+      assert_equal( t + 1.day, 1.day.after(t) )
+    end
 
-  def test_after
-    t = Time.now
-    assert_equal( t + 1.day, 1.day.after(t) )
   end
 
-end
+  class WeekdaysTest < Test::Unit::TestCase
+
+    MONDAY = Time.at(1165250000)
+    THURSDAY = Time.at(1165500000)
+    FRIDAY = Time.at(1165606025)
+
+    def test_weekday_after_monday
+      assert_equal 2, 1.weekday.since(MONDAY).wday
+    end
+
+    def test_weekday_after_friday
+      assert_equal 1, 1.weekday.after(FRIDAY).wday
+    end
+
+    def test_weekdays_before_friday
+      assert_equal 2, 3.weekdays.before(FRIDAY).wday
+    end
+
+    #def test_weekday_before_today
+    #  Time.expects(:now).returns(THURSDAY)
+    #  assert_equal 3, 1.weekday.ago.wday
+    #end
+
+    #def test_weekdays_after_today
+    #  Time.expects(:now).returns(MONDAY)
+    #  assert_equal 3, 2.weekday.from_now.wday
+    #end
+
+  end
 
 =end

data/lib/facets/more/uploadutils.rb

@@ -1,6 +1,9 @@
 # = uploadutils.rb
 #
-# TODO Incorporate password into scp and ftp.
+# TODO Incorporate password into scp and ftp ?
+#
+# TODO rsync needs --delete option
+#++
 
 require 'openssl'
 require 'shellwords'
@@ -44,6 +47,248 @@ require 'tmpdir'
 module UploadUtils
 
   module_function
+
+  #
+  # Upload via given protocol.
+  #
+
+  def upload( protocol, opts )
+    send(protocol.to_s.downcase,opts)
+  end
+
+  #
+  # Use ftp to upload files.
+  #
+
+  def ftp( keys )
+    keys = keys.to_openhash
+
+    # set transfer rules
+    if keys.stage
+      trans = stage_transfer(keys.stage)
+    else
+      files(keys.dir, keys.copy).each do |from|
+        trans << [from,from]
+      end
+    end
+
+    # append location of publication dir to from
+    dir = keys.dir
+    trans.collect!{ |from,to| [File.join(dir,from), to] }
+
+    if keys.dryrun
+      puts "ftp open #{keys.user}@#{keys.host}:#{keys.root}/"
+      keys.trans.each do |f, t|
+        puts "ftp put #{f} #{t}"
+      end
+    else
+      require 'net/ftp'
+      Net::FTP.open(keys.host) do |ftp|
+        ftp.login(keys.user) #password?
+        ftp.chdir(keys.root)
+        keys.trans.each do |f, t|
+          puts "ftp #{f} #{t}" unless keys.quiet
+          ftp.putbinaryfile( f, t, 1024 )
+        end
+      end
+    end
+  end
+
+  #
+  # Use sftp to upload files.
+  #
+
+  def sftp( keys )
+    keys = keys.to_openobject
+
+    # set transfer rules
+    if keys.stage
+      trans = stage_transfer(keys.stage)
+    else
+      files(keys.dir, keys.copy).each do |from|
+        trans << [from,from]
+      end
+    end
+
+    # append location of publication dir to from
+    dir = keys.dir
+    trans.collect!{ |from,to| [File.join(dir,from), to] }
+
+    if keys.dryrun
+      puts "sftp open #{keys.user}@#{keys.host}:#{keys.root}/"
+      keys.trans.each do |f,t|
+        puts "sftp put #{f} #{t}"
+      end
+    else
+      require 'net/sftp'
+      Net::SFTP.start(keys.host, keys.user, keys.pass) do |sftp|
+        #sftp.login( user )
+        sftp.chdir(keys.root)
+        keys.trans.each do |f,t|
+          puts "sftp #{f} #{t}" unless keys.quiet
+          sftp.put_file(f,t) #, 1024 )
+        end
+      end
+    end
+  end
+
+  #
+  # Use rsync to upload files.
+  #
+
+  def rsync( keys )
+    keys = keys.to_openobject
+
+    flags = []
+    flags << "-n" if keys.dryrun
+    flags << "-q" if keys.quiet
+    flags << "-v" if keys.verbose
+    flags << "--progress" unless keys.quiet
+    flags = flags.join(' ').strip
+    flags = ' ' + flags unless flags.empty?
+
+    manfile = '.publish.mainfest'
+
+    if keys.stage
+      dir = stage_linkdir(keys.dir, keys.stage)
+      Dir.chdir(dir) do
+        cpy = files(keys.copy)
+      end
+      manifest = File.join(dir,manfile)
+      cmd = %{rsync#{flags} -L -arz --files-from='#{manifest}' #{dir} #{keys.user}@#{keys.host}:/#{keys.root}}
+    else
+      dir = keys.dir
+      cpy = files(dir, keys.copy)
+      manifest = File.join(dir,manfile)
+      cmd = %{rsync#{flags} -arz --files-from='#{manifest}' #{dir} #{keys.user}@#{keys.host}:/#{keys.root}}
+    end
+
+    #Dir.chdir(keys.dir) do
+      begin
+        File.open(manifest, 'w'){ |f| f << cpy.join("\n") }
+        ENV['RSYNC_PASSWORD'] = keys.pass if keys.pass
+        puts cmd unless keys.quiet
+        system cmd
+      ensure
+        ENV.delete('RSYNC_PASSWORD') if keys.pass
+      end
+    #end
+
+  end
+
+  # private (can't do b/c of module_function)
+
+  # parse publishing options.
+
+  def upload_parameters( keys )
+    keys = OpenObject.new(keys)
+
+    keys.copy = keys.copy || '**/*'
+    keys.host = keys.host || keys.domain
+    keys.user = keys.user || keys.username
+    keys.root = keys.root || '/'
+    #keys.pass = keys.pass || keys.password
+
+    # validate
+    raise ArgumentError, "missing publish parameter -- host" unless keys.host
+    raise ArgumentError, "missing publish parameter -- user" unless keys.user
+    raise ArgumentError, "missing publish parameter -- copy" unless keys.copy
+    #raise ArgumentError, "missing publish parameter -- root" unless keys.root
+
+    #keys.root = '' if keys.root.nil?
+    #keys.root = keys.root[1..-1] if keys.root[0,1] == '/'
+    keys.root = '' if opts.root.nil?
+    keys.root.sub!(/^\//,'')
+
+    if String===keys.copy and File.directory?(keys.copy)
+      copy = File.join(keys.copy, '*')
+    end
+    keys.copy = [keys.copy].flatten.compact
+
+#     trans = []
+#     keys.copy.each do |from|
+#       #from, to = *Shellwords.shellwords(c)
+#       #to = from if to.nil?
+#       #to = to[1..-1] if to[0,1] == '/'
+#       from.sub('*','**/*') unless from =~ /\*\*/
+#       files = Dir.glob(from)
+#       files.each do |f|
+#         #t = File.join(to,File.basename(f))
+#         #t = t[1..-1] if t[0,1] == '/'
+#         trans << [f,f]
+#       end
+#     end
+#     keys.trans = trans
+
+    return keys
+  end
+
+  # Put together the list of files to copy.
+
+  def files( dir, copy )
+    Dir.chdir(dir) do
+      del, add = copy.partition{ |f| /^[-]/ =~ f }
+
+      # remove - and + prefixes
+      del.collect!{ |f| f.sub(/^[-]/,'') }
+      add.collect!{ |f| f.sub(/^[+]/,'') }
+
+      del.concat(must_exclude)
+
+      files = []
+      add.each{ |g| files += Dir.multiglob_recurse(g) }
+      del.each{ |g| files -= Dir.multiglob_recurse(g) }
+
+      files.collect!{ |f| f.sub(/^\//,'') }
+
+      return files
+    end
+  end
+
+  # Combine three part stage list into a two part from->to list.
+  #
+  # Using the stage list of three space separated fields.
+  #
+  #   fromdir file todir
+  #
+  # This is used to generate a from -> to list of the form:
+  #
+  #  fromdir/file todir/file
+  #
+
+  def stage_transfer( list )
+    trans = []
+    list.each do |line|
+      trans << Shellwords.shellwords(line)
+    end
+
+    trans.collect! do |from, base, to|
+      file = File.join(from,base)
+      to = File.join(to,base)
+      [from, to]
+    end
+  end
+
+  # When using stage options this will create temporary linked location.
+
+  def stage_linkdir( dir, list )
+    folder = File.join(Dir.tmpdir, 'ratchets', 'project', object_id.abs.to_s)
+    FileUtils.mkdir_p(folder)
+
+    Dir.chdir(dir) do
+      stage_transfer(list).each do |file, to|
+        link = File.join(folder,to)
+        FileUtils.ln_s(link,file)
+      end
+    end
+
+    return folder
+  end
+
+
+=begin
+
+
   #--
   # SHELLS OUT! Need net/scp library to fix.
   #++
@@ -134,49 +379,7 @@ module UploadUtils
     end
   end
 
-  # private (can't do b/c of module_function)
-
-  # parse publishing options.
-
-  def upload_parameters( keys )
-    keys = OpenHash.new(keys)
-
-    keys.copy = keys.copy || '**/*'
-    keys.host = keys.host || keys.domain
-    keys.user = keys.user || keys.username
-    keys.pass = keys.pass || keys.password
-
-    # validate
-    raise ArgumentError, "missing publish parameter -- host" unless keys.host
-    raise ArgumentError, "missing publish parameter -- user" unless keys.user
-    raise ArgumentError, "missing publish parameter -- copy" unless keys.copy
-    raise ArgumentError, "missing publish parameter -- root" unless keys.root
-
-    keys.root = '' if keys.root.nil?
-    keys.root = keys.root[1..-1] if keys.root[0,1] == '/'
-
-    if String===keys.copy and File.directory?(keys.copy)
-      copy = File.join(keys.copy, '*')
-    end
-    keys.copy = [keys.copy].flatten.compact
-
-    trans = []
-    keys.copy.each do |from|
-      #from, to = *Shellwords.shellwords(c)
-      #to = from if to.nil?
-      #to = to[1..-1] if to[0,1] == '/'
-      from.sub('*','**/*') unless from =~ /\*\*/
-      files = Dir.glob(from)
-      files.each do |f|
-        #t = File.join(to,File.basename(f))
-        #t = t[1..-1] if t[0,1] == '/'
-        trans << [f,f]
-      end
-    end
-    keys.trans = trans
 
-    return keys
-  end
 
   # Creates a stage from which the whole directory can be uploaded.
   # This is needed for scp and rsync which have to shelled out,
@@ -204,4 +407,6 @@ module UploadUtils
     FileUtils.rm_r(tmpdir)  # now remove the temp dir
   end
 
+=end
+
 end