synchronized with date2 3.5.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf
parent
91c798b670
commit
720a23df0a
16
lib/date.rb
16
lib/date.rb
@ -1,12 +1,12 @@
|
||||
#
|
||||
# date.rb - date and time library
|
||||
#
|
||||
# Author: Tadayoshi Funaba 1998-2002
|
||||
# Author: Tadayoshi Funaba 1998-2004
|
||||
#
|
||||
# Documentation: William Webber <william@williamwebber.com>
|
||||
#
|
||||
#--
|
||||
# $Id: date.rb,v 2.8 2002-06-08 00:39:51+09 tadf Exp $
|
||||
# $Id: date.rb,v 2.11 2004-01-19 04:56:12+09 tadf Exp $
|
||||
#++
|
||||
#
|
||||
# == Overview
|
||||
@ -817,13 +817,7 @@ class Date
|
||||
|
||||
private :hour, :min, :sec, :sec_fraction
|
||||
|
||||
def zone
|
||||
['Z',
|
||||
format('%+.2d%02d',
|
||||
(@of / (1.to_r/24)).to_i,
|
||||
(@of.abs % (1.to_r/24) / (1.to_r/1440)).to_i)
|
||||
][@of<=>0]
|
||||
end
|
||||
def zone() strftime('%Z') end
|
||||
|
||||
private :zone
|
||||
|
||||
@ -1266,9 +1260,7 @@ class DateTime < Date
|
||||
a = i.to_a[0..5].reverse
|
||||
jd = civil_to_jd(*(a[0,3] << sg))
|
||||
fr = time_to_day_fraction(*(a[3,3])) + i.usec.to_r/86400000000
|
||||
d = Time.gm(*i.to_a).to_i - i.to_i
|
||||
d += d / d.abs if d.nonzero?
|
||||
of = (d / 60).to_r/1440
|
||||
of = i.utc_offset.to_r/86400
|
||||
new0(jd_to_ajd(jd, fr, of), of, sg)
|
||||
end
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# format.rb: Written by Tadayoshi Funaba 1999-2003
|
||||
# $Id: format.rb,v 2.9 2003-04-19 19:19:35+09 tadf Exp $
|
||||
# format.rb: Written by Tadayoshi Funaba 1999-2004
|
||||
# $Id: format.rb,v 2.12 2004-01-19 05:43:28+09 tadf Exp $
|
||||
|
||||
class Date
|
||||
|
||||
@ -501,8 +501,14 @@ class Date
|
||||
when '%x'; o << strftime('%m/%d/%y')
|
||||
when '%Y'; o << '%.4d' % year
|
||||
when '%y'; o << '%02d' % (year % 100)
|
||||
when '%Z'; o << zone
|
||||
when '%z'; o << zone # ID
|
||||
when '%Z'; o << (if offset.zero? then 'Z' else strftime('%z') end)
|
||||
when '%z' # ID
|
||||
o << if offset < 0 then '-' else '+' end
|
||||
of = offset.abs
|
||||
hh, fr = of.divmod(1.to_r/24)
|
||||
mm = fr / (1.to_r/1440)
|
||||
o << '%02d' % hh
|
||||
o << '%02d' % mm
|
||||
when '%%'; o << '%'
|
||||
when '%+'; o << strftime('%a %b %e %H:%M:%S %Z %Y') # TZ
|
||||
when '%1'; o << '%d' % jd
|
||||
|
||||
149
sample/cal.rb
149
sample/cal.rb
@ -1,13 +1,14 @@
|
||||
#! /usr/bin/env ruby
|
||||
|
||||
# cal.rb: Written by Tadayoshi Funaba 1998-2002
|
||||
# $Id: cal.rb,v 2.4 2002-06-08 00:40:29+09 tadf Exp $
|
||||
# cal.rb: Written by Tadayoshi Funaba 1998-2004
|
||||
# $Id: cal.rb,v 2.7 2004-01-10 23:52:51+09 tadf Exp $
|
||||
|
||||
require 'date'
|
||||
require 'getopts'
|
||||
|
||||
$tab =
|
||||
{
|
||||
class Cal
|
||||
|
||||
START =
|
||||
{
|
||||
'cn' => true, # China
|
||||
'de' => 2342032, # Germany (protestant states)
|
||||
'dk' => 2342032, # Denmark
|
||||
@ -27,85 +28,127 @@ $tab =
|
||||
'us' => 2361222, # United States
|
||||
'os' => false, # (old style)
|
||||
'ns' => true # (new style)
|
||||
}
|
||||
}
|
||||
|
||||
$cc = 'gb'
|
||||
DEFAULT_START = 'gb'
|
||||
|
||||
def usage
|
||||
warn 'usage: cal [-c iso3166] [-jmty] [[month] year]'
|
||||
exit 1
|
||||
end
|
||||
def initialize
|
||||
opt_j; opt_m; opt_t; opt_y; opt_c
|
||||
end
|
||||
|
||||
def pict(y, m, sg)
|
||||
d = (1..31).detect{|d| Date.valid_date?(y, m, d, sg)}
|
||||
fi = Date.new(y, m, d, sg)
|
||||
fi -= (fi.jd - $k + 1) % 7
|
||||
def opt_j(flag=false) @opt_j = flag end
|
||||
def opt_m(flag=false) @opt_m = flag end
|
||||
def opt_t(flag=false) @opt_t = flag end
|
||||
def opt_y(flag=false) @opt_y = flag end
|
||||
|
||||
def opt_c(arg=DEFAULT_START) @start = START[arg] end
|
||||
|
||||
def set_params
|
||||
@dw = if @opt_j then 3 else 2 end
|
||||
@mw = (@dw + 1) * 7 - 1
|
||||
@mn = if @opt_j then 2 else 3 end
|
||||
@tw = (@mw + 2) * @mn - 2
|
||||
@k = if @opt_m then 1 else 0 end
|
||||
@da = if @opt_j then :yday else :mday end
|
||||
end
|
||||
|
||||
def pict(y, m)
|
||||
d = (1..31).detect{|d| Date.valid_date?(y, m, d, @start)}
|
||||
fi = Date.new(y, m, d, @start)
|
||||
fi -= (fi.jd - @k + 1) % 7
|
||||
|
||||
ve = (fi..fi + 6).collect{|cu|
|
||||
%w(S M Tu W Th F S)[cu.wday]
|
||||
}
|
||||
ve += (fi..fi + 41).collect{|cu|
|
||||
if cu.mon == m then cu.send($da) end.to_s
|
||||
if cu.mon == m then cu.send(@da) end.to_s
|
||||
}
|
||||
|
||||
ve = ve.collect{|e| e.rjust($dw)}
|
||||
ve = ve.collect{|e| e.rjust(@dw)}
|
||||
|
||||
gr = group(ve, 7)
|
||||
gr = trans(gr) if $OPT_t
|
||||
gr = trans(gr) if @opt_t
|
||||
ta = gr.collect{|xs| xs.join(' ')}
|
||||
|
||||
ca = %w(January February March April May June July
|
||||
August September October November December)[m - 1]
|
||||
ca = ca + ' ' + y.to_s if not $OPT_y
|
||||
ca = ca.center($mw)
|
||||
ca = ca + ' ' + y.to_s if not @opt_y
|
||||
ca = ca.center(@mw)
|
||||
|
||||
ta.unshift(ca)
|
||||
end
|
||||
end
|
||||
|
||||
def group(xs, n)
|
||||
def group(xs, n)
|
||||
(0..xs.size / n - 1).collect{|i| xs[i * n, n]}
|
||||
end
|
||||
end
|
||||
|
||||
def trans(xs)
|
||||
def trans(xs)
|
||||
(0..xs[0].size - 1).collect{|i| xs.collect{|x| x[i]}}
|
||||
end
|
||||
end
|
||||
|
||||
def unite(xs)
|
||||
if xs.empty? then [] else xs[0] + unite(xs[1..-1]) end
|
||||
end
|
||||
def stack(xs)
|
||||
if xs.empty? then [] else xs[0] + stack(xs[1..-1]) end
|
||||
end
|
||||
|
||||
def block(xs, n)
|
||||
unite(group(xs, n).collect{|ys| trans(ys).collect{|zs| zs.join(' ')}})
|
||||
end
|
||||
def block(xs, n)
|
||||
stack(group(xs, n).collect{|ys| trans(ys).collect{|zs| zs.join(' ')}})
|
||||
end
|
||||
|
||||
def unlines(xs)
|
||||
def unlines(xs)
|
||||
xs.collect{|x| x + "\n"}.join
|
||||
end
|
||||
|
||||
def monthly(y, m)
|
||||
unlines(pict(y, m))
|
||||
end
|
||||
|
||||
def addmon(y, m, n)
|
||||
y, m = (y * 12 + (m - 1) + n).divmod(12)
|
||||
return y, m + 1
|
||||
end
|
||||
|
||||
def yearly(y)
|
||||
y.to_s.center(@tw) + "\n\n" +
|
||||
unlines(block((0..11).collect{|n| pict(*addmon(y, 1, n))}, @mn)) + "\n"
|
||||
end
|
||||
|
||||
def print(y, m)
|
||||
set_params
|
||||
if @opt_y then yearly(y) else monthly(y, m) end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
usage unless getopts('jmty', "c:#{$cc}")
|
||||
if __FILE__ == $0
|
||||
|
||||
y, m = ARGV.values_at(1, 0).compact.collect{|x| x.to_i}
|
||||
$OPT_y ||= (y and not m)
|
||||
require 'getopts'
|
||||
|
||||
to = Date.today
|
||||
y ||= to.year
|
||||
m ||= to.mon
|
||||
def usage
|
||||
warn 'usage: cal [-c iso3166] [-jmty] [[month] year]'
|
||||
exit 1
|
||||
end
|
||||
|
||||
usage unless m >= 1 and m <= 12
|
||||
usage unless y >= -4712
|
||||
usage if (sg = $tab[$OPT_c]).nil?
|
||||
usage unless getopts('jmty', "c:#{Cal::DEFAULT_START}")
|
||||
|
||||
$dw = if $OPT_j then 3 else 2 end
|
||||
$mw = ($dw + 1) * 7 - 1
|
||||
$mn = if $OPT_j then 2 else 3 end
|
||||
$tw = ($mw + 2) * $mn - 2
|
||||
y, m = ARGV.values_at(1, 0).compact.collect{|x| x.to_i}
|
||||
$OPT_y ||= (y and not m)
|
||||
|
||||
$k = if $OPT_m then 1 else 0 end
|
||||
$da = if $OPT_j then :yday else :mday end
|
||||
to = Date.today
|
||||
y ||= to.year
|
||||
m ||= to.mon
|
||||
|
||||
print(if not $OPT_y
|
||||
unlines(pict(y, m, sg))
|
||||
else
|
||||
y.to_s.center($tw) + "\n\n" +
|
||||
unlines(block((1..12).collect{|m| pict(y, m, sg)}, $mn)) + "\n"
|
||||
end)
|
||||
usage unless m >= 1 and m <= 12
|
||||
usage unless y >= -4712
|
||||
usage if Cal::START[$OPT_c].nil?
|
||||
|
||||
cal = Cal.new
|
||||
|
||||
cal.opt_j($OPT_j)
|
||||
cal.opt_m($OPT_m)
|
||||
cal.opt_t($OPT_t)
|
||||
cal.opt_y($OPT_y)
|
||||
cal.opt_c($OPT_c)
|
||||
|
||||
print cal.print(y, m)
|
||||
|
||||
end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user