rubygems-update 0.8.10 → 0.8.11

data/lib/rubygems/specification.rb

@@ -1,7 +1,13 @@
-require 'date'
+require 'time'
 require 'rubygems'
 require 'rubygems/version'
 
+class Time
+  def self.today
+    Time.parse Time.now.strftime("%Y-%m-%d")
+  end
+end
+
 module Gem
   
   ##
@@ -74,6 +80,9 @@ module Gem
     # List of _all_ attributes and default values: [[:name, nil], [:bindir, 'bin'], ...]
     @@attributes = []
 
+    # List of array attributes
+    @@array_attributes = []
+
     # Map of attribute names to default values.
     @@default_value = {}
 
@@ -99,6 +108,10 @@ module Gem
       @@required_attributes.include? name.to_sym
     end
 
+    def self.array_attributes
+      @@array_attributes.dup
+    end
+
     # ------------------------- Infrastructure class methods.
 
     # A list of Specification instances that have been defined in this Ruby instance.
@@ -130,6 +143,7 @@ module Gem
     # Same as :attribute, but ensures that values assigned to the
     # attribute are array values by applying :to_a to the value.
     def self.array_attribute(name)
+      @@array_attributes << name
       @@attributes << [name, []]
       @@default_value[name] = []
       module_eval %{
@@ -222,6 +236,10 @@ module Gem
     attribute :has_rdoc,               false
     attribute :required_ruby_version,  Gem::Version::Requirement.default
     attribute :platform,               Gem::Platform::RUBY
+
+    attribute :signing_key,            nil
+    attribute :cert_chain,             nil
+
     array_attribute :authors
     array_attribute :files
     array_attribute :test_files
@@ -276,23 +294,22 @@ module Gem
     end
 
     overwrite_accessor :date= do |date|
-      # We want to end up with a Date object.  If _date_ responds to :to_str, or :day,
-      # :month, and :year, it is duly converted.  Otherwise, today's date is used. 
-      if date.respond_to? :to_str
-        date = Date.parse(date.to_str)
-      elsif [:year, :month, :day].all? { |m| date.respond_to? m }
-        date = Date.new(date.year, date.month, date.day)
+      # We want to end up with a Time object with one-day resolution.  This is
+      # the cleanest, most-readable, faster-than-using-Date way to do it.
+      case date
+      when String then
+        @date = Time.parse date
+      when Time then
+        @date = Time.parse date.strftime("%Y-%m-%d")
+      when Date then
+        @date = Time.parse date.to_s
       else
-        date = nil
+        @date = Time.today
       end
-      @date = date || Date.today
     end
 
     overwrite_accessor :date do
-      # Legacy gems might have a Time object directly loaded from the YAML.  We fix it here.
-      unless @date.is_a? Date
-        self.date = @date
-      end
+      self.date = nil if @date.nil?  # HACK Sets the default value for date
       @date
     end
 
@@ -352,15 +369,16 @@ module Gem
     # ------------------------- Constructors.
     
     ##
-    # Specification constructor.  Assigns the default values to the attributes, adds this
-    # spec to the list of loaded specs (see Specification.list), and yields itself for
-    # further initialization.
+    # Specification constructor.  Assigns the default values to the
+    # attributes, adds this spec to the list of loaded specs (see
+    # Specification.list), and yields itself for further initialization.
     #
     def initialize
-      # Each attribute has a default value (possibly nil).  Here, we initialize all
-      # attributes to their default value.  This is done through the accessor
-      # methods, so special behaviours will be honored.  Furthermore, we take a
-      # _copy_ of the default so each specification instance has its own empty
+      # Each attribute has a default value (possibly nil).  Here, we
+      # initialize all attributes to their default value.  This is done
+      # through the accessor methods, so special behaviours will be honored.
+      # Furthermore, we take a _copy_ of the default so each specification
+      # instance has its own empty
       # arrays, etc.
       @@attributes.each do |name, default|
         self.send "#{name}=", copy_of(default)
@@ -430,11 +448,12 @@ module Gem
     end
     
     ##
-    # Returns the full name (name-version) of this Gem.  Platform information is included
-    # (name-version-platform) if it is specified (and not the default Ruby platform).
+    # Returns the full name (name-version) of this Gem.  Platform information
+    # is included (name-version-platform) if it is specified (and not the
+    # default Ruby platform).
     #
     def full_name
-      if platform == Gem::Platform::RUBY
+      if platform == Gem::Platform::RUBY || platform.nil?
         "#{@name}-#{@version}"
       else
         "#{@name}-#{@version}-#{platform}"
@@ -490,16 +509,17 @@ module Gem
     
     # ------------------------- Export methods (YAML and Ruby code).
     
-    # Returns an array of attribute names to be used when generating a YAML representation
-    # of this object.  If an attribute still has its default value, it is omitted.
+    # Returns an array of attribute names to be used when generating a YAML
+    # representation of this object.  If an attribute still has its default
+    # value, it is omitted.
     def to_yaml_properties
       mark_version
       @@attributes.map { |name, default| "@#{name}" }
     end
 
-    # Returns a Ruby code representation of this specification, such that it can be
-    # eval'ed and reconstruct the same specification later.  Attributes that still have
-    # their default values are omitted.
+    # Returns a Ruby code representation of this specification, such that it
+    # can be eval'ed and reconstruct the same specification later.  Attributes
+    # that still have their default values are omitted.
     def to_ruby
       mark_version
       result = "Gem::Specification.new do |s|\n"

data/post-install.rb

@@ -51,7 +51,8 @@ def install_windows_batch_files
     target = File.join(bindir, File.basename(f))
     if is_windows_platform
       File.open(target+".cmd", "w") do |file|
-        file.puts "@ruby #{target} %1 %2 %3 %4 %5 %6 %7 %8 %9"
+	ruby_cmd = Gem.ruby rescue 'ruby'
+        file.puts %{@"#{ruby_cmd}" "#{target}" %1 %2 %3 %4 %5 %6 %7 %8 %9}
       end
     end
   end

data/scripts/gemdoc.rb

@@ -35,7 +35,7 @@ def table_of_contents
   out.gsub(/^\s+(\w+)/) {
     cmd_name = $1
     "  [http://rubygems.rubyforge.org/wiki/wiki.pl?GemReference##{cmd_name} -]  #{cmd_name}"
-  }.gsub(/RubyGems/, '<nowiki>RubyGems</nowiki>')
+  }
 end
 
 while line = gets
@@ -52,7 +52,7 @@ while line = gets
     when "!toc"
       puts table_of_contents()
     when "!toc-link"
-      puts "''[http://rubygems.rubyforge.org/wiki/wiki.pl?GemReference#toc ^ Table of Contents]''"
+      puts "\"Table of Contents\":http://docs.rubygems.org/read/chapter/10#toc"
     when "!version"
       puts Gem::RubyGemsPackageVersion
     end

data/scripts/specdoc.rb

@@ -18,14 +18,14 @@ end
 
   # Returns a link to the given anchor on the page.
 def _link(attribute, text=nil)
-  link = "http://rubygems.rubyforge.org/wiki/wiki.pl?GemspecReference##{attribute}"
-  "[#{link} #{text || attribute}]"
+  link = "##{attribute}"
+  %{<a href="#{link}">#{text || attribute}</a>}
 end
 
 def _themed_toc_more_vspace
   SECTIONS.each do |s|
-    puts "\n'''#{s['name']}'''"
-    puts s['attributes'].map { |a|
+    puts "\n* *#{s['name']}*"
+    puts s['attributes'].collect { |a|
       ": #{_link(a, '#')} #{a}"
     }
   end
@@ -33,14 +33,13 @@ end
 
 def _themed_toc_less_vspace
   SECTIONS.each do |s|
-    puts "\n''#{s['name']}''"
-    print ": "
-    puts s['attributes'].map { |a| _link(a) }.join(SEPSTRING)
+    puts "\n* *#{s['name']}:* "
+    puts s['attributes'].collect { |a| _link(a) }.join(SEPSTRING)
   end
 end
 
 def timestamp
-  puts ":<i>Last generated: #{Time.now.strftime '%Y-%m-%d %H:%M:%S %Z (%A)'}</i>"
+  puts "p(((. <em>Last generated: #{Time.now.strftime '%Y-%m-%d %H:%M:%S %Z (%A)'}</em>"
 end
 
   # Prints a thematic table of contents, drawing from the structure in the YAML file.
@@ -51,24 +50,24 @@ end
   # Prints an alphabetical table of contents in a fairly compact yet readable way, with all
   # Wiki formatting included.
 def alpha_toc
-  attributes = SECTIONS.map { |s| s['attributes'] }.flatten
+  attributes = SECTIONS.collect { |s| s['attributes'] }.flatten
     # -> ['author', 'autorequire', ...]
   attr_map = attributes.partition_by { |a| a[0,1] }
     # -> { 'a' => ['author', ...], 'b' => ... }
-  attributes = attr_map.map { |letter, attrs|
+  attributes = attr_map.collect { |letter, attrs|
     [letter.upcase, attrs.sort]
   }.sort_by { |l, _| l }
     # -> [ ['A', ['author', ...], ...]
-  attributes = attributes.map { |letter, attrs|
-    "'''#{letter}'''&nbsp;" << attrs.map { |a| _link(a) }.join(SEPSTRING)
+  attributes = attributes.collect { |letter, attrs|
+    "* *#{letter}* " << attrs.collect { |a| _link(a) }.join(SEPSTRING)
   } # -> [ 'A author | autorequire', 'B bindir', ...]
-  puts attributes.join(' ')
+  puts attributes.join("\n")
 end
 
   # Print the "important" table of contents, which consists of the attributes given as
   # arguments.
 def important_toc(*attributes)
-  puts attributes.map { |a| _link(a) }.join(SEPSTRING)
+  puts attributes.collect { |a| _link(a) }.join(SEPSTRING)
 end
 
   # Returns text like "Optional; default = 'bin'", with Wiki formatting.
@@ -76,9 +75,10 @@ def _metadata(attribute)
   type = attribute.klass || "Unknown"
   required = 
     case attribute.mandatory
-    when nil, false then 'Optional'
-    when '?' then 'Required???'
-    else "'''Required'''"
+    when nil, false
+      '<em>Optional</em>'
+    else
+      '<em>Required</em>'
     end
   default_str =
     case attribute.default
@@ -88,8 +88,8 @@ def _metadata(attribute)
     else attribute.default.inspect
     end
   default_str = ";   default = #{default_str}" unless default_str.empty?
-  result = sprintf "''Type: %s;   %s%s''", type, required, default_str
-  result.gsub(/ /, '&nbsp;')
+  result = sprintf "<em>Type: %s;   %s%s</em>", type, required, default_str
+#  result.gsub(/ /, '&nbsp;')
 end
 
   # Turns 'L(section)' into a link to that section.
@@ -103,13 +103,14 @@ end
   # * the description, usage, and notes for that attribute
   # * a link to the table of contents
 def attribute_survey
-  heading    = proc { |str| "\n\n== [\##{str}] #{str} ==" }
-  subheading = proc { |str| "\n=== #{str} ===\n\n" }
+  heading    = proc { |str| %{\n\nh3. <a name="#{str}">#{str}</a>\n\n} }
+  subheading = proc { |str| "\n\nh4. #{str}\n\n" }
   pre        = proc { |str| "<pre>\n#{str}\n</pre>\n" }
   para       = proc { |str| str.gsub(/\n/, "\n\n") }
-  toclink    = "\n''#{_link('toc', '^ Table of Contents')}''"
+  toclink    = "\n<em>Goto #{_link('toc', 'Table of Contents')}</em>"
   ATTRIBUTES.sort_by { |a| a['name'] }.each do |a|
     a = OpenStruct.new(a)
+    puts "\n----\n"
     puts heading[a.name]
     puts _metadata(a)
     puts subheading['Description']
@@ -127,9 +128,9 @@ end
   # Checks to see that all the attributes are documented.  Warn on STDERR of any
   # discrepencies.
 def _check_attribute_completeness
-  documented_attributes = ATTRIBUTES.map { |a| a['name'].to_s }
+  documented_attributes = ATTRIBUTES.collect { |a| a['name'].to_s }
     # ^ The attributes documented in specdoc.yaml.
-  coded_attributes      = Gem::Specification.attribute_names.map { |a| a.to_s }
+  coded_attributes      = Gem::Specification.attribute_names.collect { |a| a.to_s }
     # ^ The attributes defined in specification.rb.
   missing = coded_attributes - documented_attributes
   unless missing.empty?

data/scripts/upload_gemdoc.rb

@@ -0,0 +1,134 @@
+#!/usr/bin/env ruby
+
+require 'mechanize'
+require 'fileutils'
+
+DOC = {}
+UPDATED = {}
+MISSING = []
+
+$page_count = 0
+
+def save_page(page)
+  $page_count += 1
+  page_name = "logs/page_%03d.html" % $page_count
+  open(page_name, "w") do |f| f.puts page.body end
+end
+
+def read_document
+  open("scripts/gemdoc.hieraki") do |f|
+    name = nil
+    f.each do |line|
+      if line =~ /^==/
+	line =~ /gem\s+(\S+)/ or fail "Illformatted Document Line [#{line.chomp}]"
+	name = $1
+	DOC[name] = ''
+      else
+	next if name.nil?
+	DOC[name] << line
+      end
+    end
+  end
+end
+
+def get_credentials
+  unless File.exist?(".hieraki_author.rb")
+    print "Hieraki Author Name: "
+    author = gets.chomp
+    print "Hieraki Password: "
+    password = gets.chomp
+    open(".hieraki_author.rb", "w") do |f|
+      f.puts "module Hieraki"
+      f.puts "  Author = '#{author}'"
+      f.puts "  Password = '#{password}'"
+      f.puts "end"
+    end
+  end
+  
+  load "./.hieraki_author.rb"
+end
+
+def create_agent
+  FileUtils.mkdir "logs" unless File.exist?("logs")
+  logfile = open("logs/update_hieraki.log", "w") 
+  $agent = WWW::Mechanize.new { |a| a.log = Logger.new(logfile) }
+end
+
+def login_to_hieraki
+  puts "*** Getting Start Page"
+  start_page = $agent.get("http://docs.rubygems.org")
+  save_page(start_page)
+  
+  puts "*** Going to Login Page"
+  login_link = start_page.links.find { |l| l.node.text =~ /login/i }
+  login_page = $agent.click(login_link)
+  save_page(login_page)
+  
+  puts "*** Attempting to Log In"
+  login_form = login_page.forms.first
+  login_form.fields.find { |f| f.name == 'login' }.value = Hieraki::Author
+  login_form.fields.find { |f| f.name == 'password' }.value = Hieraki::Password
+  author_page = $agent.submit(login_form)
+  fail "Unsuccessful Login -- check .hieraki_author.rb file" if author_page.body =~ /unsuccessful/
+  save_page(author_page)
+  author_page
+end
+
+
+def goto_command_reference_page(page)
+  puts "*** Going to Command Reference Book"
+  link = page.links.find { |l| l.node.text =~ /command reference/i }
+  ref_page = $agent.click(link)
+  save_page(ref_page)
+  
+  puts "*** Going to Command Reference Chapter"
+  link = ref_page.links.find { |l| l.node.text =~ /command reference/i && l.href =~ /chapter/ }
+  cmdref_page = $agent.click(link)
+  save_page(cmdref_page)
+  cmdref_page
+end
+
+def update_command_docs(cmdref_page)
+  cmdref_page.links.select { |l| l.node.text == "edit" }.each do |l|
+    edit_page = $agent.click(l)
+    save_page(edit_page)
+    edit_form = edit_page.forms.first
+    title = edit_form.fields.find { |f| f.name = 'page_title'}.value
+    if title =~ /gem\s([a-z]+)/
+      name = $1
+      if DOC[name]
+	body_field = edit_form.fields.find { |f| f.name == 'page[body]'}
+	body_field.value = DOC[name]
+	puts "*** Updating gem #{name} page"
+	$agent.submit(edit_form)
+	UPDATED[name] = true
+      else
+	MISSING << name
+      end
+    end
+  end
+end
+
+
+def check_missing
+  (DOC.keys - UPDATED.keys).sort.each do |name|
+    puts "No page found for 'gem #{name}'"
+  end
+  MISSING.each do |name|
+    puts "No data found for 'gem #{name}' page"
+  end
+end
+
+def upload_gemdoc_main(args)
+  create_agent
+  get_credentials
+  read_document
+  page = login_to_hieraki
+  cmdref_page = goto_command_reference_page(page)
+  update_command_docs(cmdref_page)
+  check_missing
+end
+
+if __FILE__ == $0 then
+  upload_gemdoc_main(ARGV)
+end

data/setup.rb

@@ -1142,8 +1142,8 @@ class Installer
           w.print first.sub(/\A\#!\s*\S+/, '#! ' + config('rubypath'))
           w.write r.read
         }
-        move_file tmpfile, File.basename(path)
       }
+      move_file tmpfile, File.basename(path)
     ensure
       File.unlink tmpfile if File.exist?(tmpfile)
     end