reap 4.3.2 → 4.3.3

data/data/reap/setup-3.4.1/test/test_installer.rb

@@ -0,0 +1,136 @@
+require 'setup'
+require 'fileutils'
+require 'stringio'
+require 'test/unit'
+
+class DummyConfig
+  def initialize(config)
+    @config = config
+  end
+
+  def [](key)
+    @config[key]
+  end
+
+  def no_harm?
+    false
+  end
+
+  def verbose?
+    false
+  end
+end
+
+class TestInstaller < Test::Unit::TestCase
+
+  include FileUtils
+
+  def setup
+    rm_rf %w(srcdir objdir)
+    mkdir %w(srcdir objdir)
+    Dir.chdir 'objdir'
+    $stderr, $orig_stderr = StringIO.new, $stderr
+  end
+
+  def teardown
+    $stderr = $orig_stderr
+    Dir.chdir '..'
+    rm_rf %w(srcdir objdir)
+  end
+
+  def setup_installer(config = {})
+    @installer = Installer.new(DummyConfig.new(config), '../srcdir', '.')
+  end
+
+  def do_update_shebang_line(id, str)
+    create id, str
+    @installer.update_shebang_line "../srcdir/#{id}"
+    read(id)
+  end
+
+  def create(filename, content)
+    File.open("../srcdir/#{filename}", 'wb') {|f|
+      f.write content
+    }
+  end
+
+  def read(filename)
+    path = File.exist?(filename) ? filename : "../srcdir/#{filename}"
+    File.open(path, 'rb') {|f|
+      return f.read
+    }
+  end
+
+  def test_update_shebang_line__never
+    setup_installer 'shebang' => 'never', 'rubypath' => 'ERROR'
+    assert_equal "#!/usr/local/bin/ruby\nprogram",
+        do_update_shebang_line('ruby', "#!/usr/local/bin/ruby\nprogram")
+    assert_equal "#! /usr/local/bin/ruby\nprogram",
+        do_update_shebang_line('ruby-sp', "#! /usr/local/bin/ruby\nprogram")
+    assert_equal "#!/usr/local/bin/ruby -Ke\nprogram",
+        do_update_shebang_line('ruby-arg', "#!/usr/local/bin/ruby -Ke\nprogram")
+    assert_equal "#!/usr/bin/ruby -n -p\nprogram",
+        do_update_shebang_line('ruby-args', "#!/usr/bin/ruby -n -p\nprogram")
+    assert_equal "#!/usr/bin/env ruby\nprogram",
+        do_update_shebang_line('env-ruby', "#!/usr/bin/env ruby\nprogram")
+    assert_equal "#!/usr/bin/env perl\nprogram",
+        do_update_shebang_line('env-noruby', "#!/usr/bin/env perl\nprogram")
+    assert_equal "#!/bin/sh\nprogram",
+        do_update_shebang_line('interp', "#!/bin/sh\nprogram")
+    assert_equal "#!/bin/sh -l -r -\nprogram",
+        do_update_shebang_line('interp-args', "#!/bin/sh -l -r -\nprogram")
+    assert_equal "program",
+        do_update_shebang_line('bare', "program")
+    assert_equal "\001\002\003\n\004\005\006",
+        do_update_shebang_line('binary', "\001\002\003\n\004\005\006")
+  end
+
+  def test_update_shebang_line__all
+    setup_installer 'shebang' => 'all', 'rubypath' => 'RUBYPATH'
+    assert_equal "#! RUBYPATH\nprogram",
+        do_update_shebang_line('ruby', "#!/usr/local/bin/ruby\nprogram")
+    assert_equal "#! RUBYPATH\nprogram",
+        do_update_shebang_line('ruby-sp', "#! /usr/local/bin/ruby\nprogram")
+    assert_equal "#! RUBYPATH -Ke\nprogram",
+        do_update_shebang_line('ruby-arg', "#!/usr/local/bin/ruby -Ke\nprogram")
+    assert_equal "#! RUBYPATH -n -p\nprogram",
+        do_update_shebang_line('ruby-args', "#!/usr/bin/ruby -n -p\nprogram")
+    assert_equal "#! RUBYPATH\nprogram",
+        do_update_shebang_line('env-ruby', "#!/usr/bin/env ruby\nprogram")
+    assert_equal "#! RUBYPATH\nprogram",
+        do_update_shebang_line('env-noruby', "#!/usr/bin/env perl\nprogram")
+    assert_equal "#! RUBYPATH\nprogram",
+        do_update_shebang_line('interp', "#!/bin/sh\nprogram")
+    assert_equal "#! RUBYPATH\nprogram",   # args removed
+        do_update_shebang_line('interp-args', "#!/bin/sh -l -r -\nprogram")
+    assert_equal "#! RUBYPATH\nprogram",
+        do_update_shebang_line('bare', "program")
+    assert_equal "#! RUBYPATH\n\001\002\003\n\004\005\006",
+        do_update_shebang_line('binary', "\001\002\003\n\004\005\006")
+  end
+
+  def test_update_shebang_line__ruby
+    setup_installer 'shebang' => 'ruby', 'rubypath' => 'RUBYPATH'
+    assert_equal "#! RUBYPATH\nprogram",
+        do_update_shebang_line('ruby', "#!/usr/local/bin/ruby\nprogram")
+    assert_equal "#! RUBYPATH\nprogram",
+        do_update_shebang_line('ruby-sp', "#! /usr/local/bin/ruby\nprogram")
+    assert_equal "#! RUBYPATH -Ke\nprogram",
+        do_update_shebang_line('ruby-arg', "#!/usr/local/bin/ruby -Ke\nprogram")
+    assert_equal "#! RUBYPATH -n -p\nprogram",
+        do_update_shebang_line('ruby-args', "#!/usr/bin/ruby -n -p\nprogram")
+    assert_equal "#! RUBYPATH\nprogram",
+        do_update_shebang_line('env-ruby', "#!/usr/bin/env ruby\nprogram")
+    assert_equal "#!/usr/bin/env perl\nprogram",
+        do_update_shebang_line('env-noruby', "#!/usr/bin/env perl\nprogram")
+    assert_equal "#!/bin/sh\nprogram",
+        do_update_shebang_line('interp', "#!/bin/sh\nprogram")
+    assert_equal "#!/bin/sh -l -r -\nprogram",
+        do_update_shebang_line('interp-args', "#!/bin/sh -l -r -\nprogram")
+    assert_equal "program",
+        do_update_shebang_line('bare', "program")
+    assert_equal "\001\002\003\n\004\005\006",
+        do_update_shebang_line('binary', "\001\002\003\n\004\005\006")
+  end
+
+end

data/lib/reap/bin/reap.rb

@@ -18,8 +18,9 @@ require 'reap/task/package'
 require 'reap/task/publish'
 require 'reap/task/info'
 require 'reap/task/install'
-require 'reap/task/noop'
-#require 'reap/task/webpublish'
+require 'reap/task/release'
+#require 'reap/task/noop'
+
 
 Reap.register
 

data/lib/reap/projectinfo.rb

@@ -69,6 +69,10 @@ class ProjectInfo
 #     #end
 #   end
 
+  def to_h
+    @info
+  end
+
   # not using at the moment
   def validate
     # required main parameters

data/lib/reap/task.rb

@@ -8,7 +8,13 @@ require 'facet/module/basename'
 require 'facet/module/attr_setter'
 
 require 'facet/filelist'
+require 'facet/openobject'
 
+#  _____        _     ___                  ___ _
+# |_   _|_ _ __| |__ | _ ) __ _ ___ ___   / __| |__ _ ______
+#   | |/ _` (_-< / / | _ \/ _` (_-</ -_) | (__| / _` (_-<_-<
+#   |_|\__,_/__/_\_\ |___/\__,_/__/\___|  \___|_\__,_/__/__/
+#
 
 # Base class for reap tasks.
 #
@@ -39,6 +45,7 @@ require 'facet/filelist'
 #     TASK: mytask
 #     message: Message text, if any.
 #
+
 module Reap
 
   @registry ||= {}
@@ -87,30 +94,30 @@ module Reap
 
     class << self
 
+      def inherited( base )
+        Reap.registry[base.task_name] = base
+      end
+
+      def task_name ; basename.downcase ; end
+
       def task_desc( text=nil, &block )
-        if text
-          @task_desc = proc { text }
-        elsif block_given?
-          @task_desc = block
-        else
-          @task_desc.call
-        end
+        return @task_desc = proc { text } if text
+        return @task_desc = block if block_given?
+        return @task_desc.call
       end
+      #def task_desc ; '(no desciption given)' ; end
 
       def task_help( text=nil, &block )
-        if text
-          @task_help = proc { text }
-        elsif block_given?
-          @task_help = block
-        else
-          @task_help.call
-        end
+        return @task_help = proc { text } if text
+        return @task_help = block if block_given?
+        return @task_help.call
       end
 
-      #def task_desc ; '(no desciption given)' ; end
-      def task_name ; basename.downcase ; end
+      def task_attr( name )
+        define_method(name) { @task }
+      end
 
-      def section_required( val ) ; @section_required = val ;end
+      def section_required( val ) ; @section_required = val ; end
       def section_required?       ; @section_required ; end
 
       def verify?
@@ -120,62 +127,82 @@ module Reap
         true
       end
 
-      def inherited( base )
-        Reap.registry[base.task_name] = base
-      end
+#       def master_attributes ; @master_attributes ||= [] ; end
+#
+#       # Use this DSL method to define master task attributes.
+#       def attr_master( *names )
+#         attr_accessor *names
+#         @master_attributes ||= []
+#         @master_attributes |= names.collect { |n| n.to_s }
+#       end
 
-      def master_attributes ; @master_attributes ||= [] ; end
+      # properties not to be looked up in master
+      # if they are not in regular task section
 
-      # Use this DSL method to define master task attributes.
-      def attr_master( *names )
-        attr_accessor *names
-        @master_attributes ||= []
-        @master_attributes |= names.collect { |n| n.to_s }
+      def task_only_properties ; @task_only_properties ||= [] ; end
+      def task_only_property( *names )
+        @task_only_properties ||= []
+        @task_only_properties |= names.collect { |n| n.to_s }
       end
 
-    end
+    end #<< class
 
     # instance methods
 
     def task_name ; self.class.task_name ; end
     def task_desc ; self.class.task_desc ; end
+    def task_help ; self.class.task_help ; end
 
     def section_required? ; self.class.section_required? ; end
 
     #def master ; ::ProjectInfo.info ; end
-    def master ; @master ; end
+    def master  ; @master  ; end
     def section ; @section ; end
+    def task    ; @task    ; end
 
-    #
     def initialize( *args )
-      @master = $PROJECT_INFO
-
-      sect = @master[task_name]
-      if sect.is_a?(Array)
-        @master[task_name].each do |sec|
-          set( sec )
-          init
-          run
+      @master = CascadingOpenObject.new( $PROJECT_INFO )
+      section = @master[task_name]
+      case section
+      when Array
+        section.each do |s|
+          initiate( s )
         end
       else
-        set( sect || {} )
-        init
-        run
+        initiate( section )
       end
     end
 
-    def set( sec )
-      @section = sec
+    # Per section
 
-      self.class.master_attributes.each do |k,v|
-        send( "#{k}=", @master[k] )
-      end
+    def initiate( section )
+      @section = CascadingOpenObject.new( section )
 
-      @section.each do |k,v|
-        send( "#{k}=", v )
-      end
+      task_properties = {}
+      #self.class.task_only_properties.each { |t| section[t] ||= nil }
+      task_properties = CascadingOpenObject.new( section )
+      task_properties.__parent__ = @master
+      @task = task_properties
+
+      init #task
+      run #task
     end
 
+#     def set( sec )
+# 
+#       #@task = @section #TaskProperties.new( @master, @section )
+# 
+#       #self.class.master_attributes.each do |k,v|
+#       #  send( "#{k}=", @master[k] )
+#       #end
+# 
+#       #@section.each do |k,v|
+#       #  send( "#{k}=", v )
+#       #end
+#     end
+
+    # the two primary methods
+
     def init
       raise "not implemented for '#{task_name}' task"
     end
@@ -184,7 +211,15 @@ module Reap
       raise "no action defined for task #{task_name}"
     end
 
-    # task support methods
+    # Task support methods
+
+    def use_subsection( name )
+      subsection = @section.__send__(name)
+      if subsection
+        subsection.__parent__ = @section
+        @task = subsection
+      end
+    end
 
     def sh( arg )
       puts arg
@@ -194,28 +229,3 @@ module Reap
   end #class Task
 
 end #module Reap
-
-
-##
-# Convenience methods for built-in rake tasks
-##
-# module RakeTask
-#   extend self
-#
-#   def gem_package_task(*args,&blk)
-#     ::Rake::GemPackageTask.new(*args,&blk)
-#   end
-#
-#   def package_task(*args,&blk)
-#     ::Rake::PackageTask.new(*args,&blk)
-#   end
-#
-#   def test_task(*args,&blk)
-#     ::Rake::TestTask.new(*args,&blk)
-#   end
-#
-#   def rdoc_task(*args,&blk)
-#     ::Rake::RDocTask.new(*args,&blk)
-#   end
-#
-# end

data/lib/reap/task/announce.rb

@@ -8,147 +8,193 @@ require 'facet/string/align_center'
 require 'facet/string/fold'
 require 'facet/string/word_wrap'
 
+#    _                                    _____        _
+#   /_\  _ _  _ _  ___ _  _ _ _  __ ___  |_   _|_ _ __| |__
+#  / _ \| ' \| ' \/ _ \ || | ' \/ _/ -_)   | |/ _` (_-< / /
+# /_/ \_\_||_|_||_\___/\_,_|_||_\__\___|   |_|\__,_/__/_\_\
+#
+
+# = Announcement Task
+
 class Reap::Announce < Reap::Task
 
+  section_required true
+
   task_desc "Send announcement email to ruby-talk or other address."
 
-  section_required true
+  task_help %{
+
+    reap announce
 
-  attr_accessor :title, :version, :summary, :description, :subject
-  attr_accessor :to, :from, :server, :port, :domain, :account
-  attr_accessor :authtype, :sectype
-  attr_accessor :links, :slogan, :memo, :file
+    Send an announcement to a mailaing list or other email address.
+
+      to           Email address to send announcemnt.
+      from         Email address sent from.
+      subject      Subject of email message.
+      server       Email server to route message.
+      port         Email server's port.
+      domain       Email server's domain name.
+      account      Email account name.
+      type         Login type, either plain, cram_md5 or login.
+      secure       Uses TLS security, true or false?
+
+  }
+
+  task_attr :ann
+
+  #attr_accessor :title, :version, :summary, :description, :subject
+  #attr_accessor :to, :from, :server, :port, :domain, :account
+  #attr_accessor :type, :secure
+  #attr_accessor :links, :slogan, :memo, :file
 
   def init
-    @to       = (@to || 'ruby-talk@ruby-lang.org').to_s.strip
-    @from     = (@from || master['email']).to_s.strip
-    @server   = @server.to_s.strip
-    @port     = (@port || 25).to_i
-    @domain   = @domain.to_s.strip if @domain
-    @account  = @account.to_s.strip
-    @authtype = (@authtype || 'plain').to_s.strip  #cram_md5 #plain #login
-    #@sectype  = @sectype
+    ann.to       = (ann.to || 'ruby-talk@ruby-lang.org').to_s.strip
+    ann.from     = (ann.from || master['email']).to_s.strip
+    ann.server   = ann.server.to_s.strip
+    ann.port     = (ann.port || 25).to_i
+    ann.domain   = ann.domain.to_s.strip if ann.domain
+    ann.account  = ann.account.to_s.strip
+    ann.type     = (ann.type || 'plain').to_s.strip  #cram_md5 #plain #login
+
+    raise "server is a require announce field" if ann.server.empty?
+    raise "account is a require announce field" if ann.account.empty?
 
-    raise "server is a require announce field" if @server.empty?
-    raise "account is a require announce field" if @account.empty?
+    ann.title       ||= master.title
+    ann.version     ||= master.version || master.date
+    ann.links       ||= []
+    ann.subject     ||= "[ANN] #{ann.title}, v#{ann.version}"
 
-    @title       ||= master['title']
-    @version     ||= master['version'] || master['date']
-    @summary     ||= master['summary']
-    @description ||= master['description']
-    @links       ||= []
-    @subject     ||= "[ANN] #{@title}, v#{@version}"
+    ann.address = ann.to  # TODO
 
-    @address = @to  # TODO
+    #raise "DOMAIN is a required field" if ann.domain.empty?
+  end
+
+  def run
+    message = build_message
 
-    #raise "DOMAIN is a required field" if @domain.empty?
+    puts "\n#{message}\n\n"
+    print "Send? [y/N] "
+    until inp = $stdin.gets[0,1] ; sleep 1 ; end
+
+    unless inp.downcase == 'y'
+      puts "Reap announce task canceled."
+      exit 0
+    end
+
+    # ask for password
+    print "Password for #{ann.account}: "
+    until passwd = $stdin.gets.strip ; sleep 1 ; end
+
+    mail = %Q{
+      |From: #{ann.from}
+      |To: #{ann.address}
+      |Subject: #{ann.subject}
+      |
+      |#{message}
+      }.margin
+    begin
+      # --- Send using SMTP object and an adaptor
+      Net::SMTP.enable_tls if Net::SMTP.respond_to?(:enable_tls) and ann.secure # == :tls
+      Net::SMTP.start(ann.server, ann.port, ann.domain, ann.account, passwd, ann.type) do |s|
+        s.send_message mail, ann.from, ann.address
+      end
+      puts "Email sent successfully to #{ann.address}."
+    rescue => e
+      puts "Email delivery failed."
+      puts e
+    end
+
+  end
+
+private
+
+  def build_message
 
     # header
     announce = %Q{
       |
       |A N N O U N C I N G
       |
-      |#{title}, v#{version}
+      |#{ann.title}, v#{ann.version}
       |
-      |#{summary}
+      |#{ann.summary}
       |
+      |#{ann.homepage}
       }.margin.align_center(66)
 
     # abstract
     abstract = ''
-    if @description
+    if ann.description
       abstract << "\n\n"
-      abstract << "ABSTRACT: #{@description}"
+      abstract << "ABSTRACT\n------------->\n\n#{ann.description}"
       abstract << "\n"
     end
 
     # more info
     info = ''
-    unless @links.empty?
-      info << "\n"
-      info << "For More Information".center(67)
-      info << "\n"
-      @links.each{ |mi| info << "#{mi}".center(67) << "\n" }
+    unless ann.links.empty?
+      info << "\n\n"
+      info << "\nRELATED LINKS\n------------------>\n\n" #.center(67)
+      ann.links.each{ |mi| info << "#{mi}" << "\n" } #.center(67) << "\n" }
       info << "\n"
     end
 
     # slogan
     slogan = ''
-    if @slogan
+    if ann.slogan
       slogan << "\n\n"
-      slogan << @slogan.center(67)
+      slogan << ann.slogan.center(67)
       slogan << "\n\n"
     end
 
     # memo
     memo = ''
-    if @memo
+    if ann.memo
       memo = ''
-      memo << "\n---\n" #<< ('-' * 72) << "\n"
-      memo << "(Memo)\n\n"
-      memo << @memo.fold(true) #.word_wrap(67)
+      #memo << "\n---\n" #<< ('-' * 72) << "\n"
+      memo << "\nRELEASE MEMO\n----------------->\n\n"
+      memo << ann.memo.strip.fold(true) #.word_wrap(67)
       #memo << "\n"
     end
 
     # msg file
     msg = ''
-    if @file and File.file?( @file )
-      msg << "\n---\n" #<< ("-" * 68) << "\n"
-      msg << "(from #{@file})\n\n"
-      mg = ''
-      File.open( @file ) { |f| mg << f.gets(nil) }
-      msg << mg.fold(true) #.word_wrap(67)
+    if ann.file and File.file?( ann.file )
+      msg << "\nRELEASE MEMO\n----------------->\n\n"
+      #msg << "\n---\n" #<< ("-" * 68) << "\n"
+      #msg << "(from #{ann.file})\n\n"
+      mg = File.read( ann.file )
+      msg << mg.strip.fold(true) #.word_wrap(67)
     end
 
     # stamp
-    stamp = ''
-    stamp << "\n---\n" #<< ("-" * 68) << "\n"
+    stamp = "\n\n\n"
+    #stamp << "\n\n---\n" #<< ("-" * 68) << "\n"
     stamp << %Q{
-      |Generated by REAP, the Ruby Project Assistant
-      |http://www.ruby-lang.org -- Do you Ruby?
-      }.margin
-    stamp << "\n\n"
-
-    @message = ''
-    @message << announce
-    @message << abstract
-    @message << info
-    @message << slogan
-    @message << memo
-    @message << msg
-    @message << stamp
-  end
-
-  def run
-    puts "\n#{@message}\n\n"
-    print "Send? [Y/n] "
-    until inp = $stdin.gets[0,1] ; sleep 1 ; end
-    if (inp || 'y').downcase == 'y'
-      # ask for password
-      print "Password for #{@account}: "
-      until passwd = $stdin.gets.strip ; sleep 1 ; end
-      mail = %Q{
-        |From: #{@from}
-        |To: #{@address}
-        |Subject: #{@subject}
-        |
-        |#{@message}
-        }.margin
-      begin
-        # --- Send using SMTP object and an adaptor
-        Net::SMTP.enable_tls if Net::SMTP.respond_to?(:enable_tls) and @tls
-        Net::SMTP.start(@server, @port, @domain, @account, passwd, @authtype) do |s|
-          s.send_message mail, @from, @address
-        end
-        puts "Email sent successfully to #{@address}."
-      rescue => e
-        puts "Email delivery failed."
-        puts e
-      end
-    else
-      puts "Reap announce task canceled."
-      exit 0
-    end
+      |               Generated by
+      |
+      |     o)o)o)    o)o)o)o)    o)o)    o)o)o)
+      |    o)    o)  o)        o)    o)  o)    o)
+      |   o)o)o)    o)o)o)    o)o)o)o)  o)o)o)
+      |  o)    o)  o)        o)    o)  o)
+      | o)    o)  o)o)o)o)  o)    o)  o)
+      |
+      |       The Ruby Project Assistant
+      |
+      | Do you Ruby? (http://www.ruby-lang.org)
+      }.margin.indent(12)
+    stamp << "\n"
+
+    message = ''
+    message << announce
+    message << slogan
+    message << abstract
+    message << memo
+    message << msg
+    message << info
+    message << stamp
+
+    message
   end
 
 end