reap 9.3.5 → 9.4.0

data/lib/reap/project/check.rb

@@ -58,7 +58,7 @@ module Reap
     # This takes one option +:scripts+ which is a glob or list of globs
     # of the scripts to check. By default this is all scripts in the libpath(s).
     #
-    # FIXME: This isn't routing output to dev/null as expected.
+    # FIXME: This isn't routing output to dev/null as expected ?
 
     def check_load(options=nil)
       options = configure_options(options, 'check-load', 'check')

data/lib/reap/project/gem.rb

@@ -1,3 +1,5 @@
+#require 'facets/project/package'
+
 module Reap
 
   class Project
@@ -19,59 +21,7 @@ module Reap
     # TODO: Should this use staging too, like zip/tgz?
 
     def gem_package(options=nil)
-      begin
-        require 'rubygems/specification'
-        Gem::manage_gems
-      rescue LoadError
-        #raise LoadError, "RubyGems is not installed?"
-      end
-
-      options = configure_options(options, 'package-gem', 'package')
-
-      prepare(options)
-
-      package = metadata.clone
-      package.update(options)
-
-      abort "No name" unless package.name
-      abort "No version" unless package.version
-
-      store = 'pkg' #package.package_directory
-      fname = package.stage_name
-      files = package.filelist
-
-      stage = File.join(store, fname)
-      pfile = stage + ".gem"
-
-      unless out_of_date?(pfile, *files) or force?
-        report_package_already_built(pfile)
-        return
-      end 
-
-      rm_r(stage) if File.exist?(stage)  # remove old stage
-      stage(stage, files)                # make new stage
-      package_manifest(stage)            # generate manifest
-
-      if dryrun?
-        status "gem build #{stage}"
-      else
-        file = nil
-        cd(stage) do
-          #status "vi #{metadata.name}.gemspec"
-          builder = ::Gem::Builder.new(gemspec(package))
-          status "gem build #{stage}"
-          unless dryrun?
-            file = builder.build
-            file = File.expand_path(file)
-          end
-        end
-        # transfer gem package to package store
-        mkdir_p(store)
-        destination = File.join(store, File.basename(file))
-        mv(file, store) unless File.expand_path(file) == File.expand_path(destination)
-      end
-
-      return destination
+      return package_gem(options=nil)
     end
 
     # Install gem package, creating the package if not already created.
@@ -120,8 +70,7 @@ module Reap
         spec.rubyforge_project = rubyforge_project
         spec.homepage          = package.homepage
 
-        # Platform: ruby, mswin32, i586-linux, powerpc-darwin, current
-        spec.platform = 'ruby'  # TODO current support!
+        spec.platform          = package.platform  #'ruby'
 
         spec.require_paths = [package.loadpath].flatten
 
@@ -133,34 +82,49 @@ module Reap
         spec.executables  = package.executables
         spec.requirements = package.requirements
 
-        # TODO: Looks like there is no choice but to auto-rdoc gem install. 
-        spec.has_rdoc = !(FalseClass===package.document)
-
         if package.dependencies
           package.dependencies.each do |d,v|
             spec.add_dependency(*[d,v].compact)
           end
         end
 
-        spec.extensions = package.compile
+        spec.extensions = [package.extensions].flatten.compact
+
+        # rdocs (argh!)
+
+        readme = Dir.glob('README{,.txt}', File::FNM_CASEFOLD).first
+
+        spec.has_rdoc = package.autodoc  # Make true always?
+
+        rdocfiles = []
+        rdocfiles << readme if readme
+        rdocfiles.concat(Dir['[A-Z]*'] || [])  # package.document
+        rdocfiles.uniq!
+        spec.extra_rdoc_files = rdocfiles
+
+        rdoc_options = ['--inline-source']
+        rdoc_options.concat ["--title", package.title] if package.title
+        rdoc_options.concat ["--main", readme] if readme
+        spec.rdoc_options = rdoc_options
 
         spec.files = distribute
 
-        spec.test_files = distribute.select{ |f| f =~ /^test\// }  # TODO make test_files configurable
+        # TODO make test_files configurable (?)
+        spec.test_files = distribute.select{ |f| f =~ /^test\// }
       end
     end
 
     # Report that a package has been built.
     # FIXME
 
-    def report_package_built(type, file)
-      r = ''
-      r << "\n  Successfully built #{type}"
-      r << "\n  Name: #{package.name}"
-      r << "\n  Version: #{package.version}"
-      r << "\n  File: #{File.basename(file)}"
-      say r
-    end
+    #def report_package_built(type, file)
+    #  r = ''
+    #  r << "\n  Successfully built #{type}"
+    #  r << "\n  Name: #{package.name}"
+    #  r << "\n  Version: #{package.version}"
+    #  r << "\n  File: #{File.basename(file)}"
+    #  say r
+    #end
 
   end
 end

data/lib/reap/project/log.rb

@@ -53,9 +53,11 @@ module Reap
       if records.empty?
         puts "No #{labels.join(', ')} notes."
       else
-        log_notes_save(output, notes, labels)
+        files_saved = log_notes_save(output, notes, labels)
+        files_saved.each do |file|
+          puts "Updated #{file}"
+        end
         puts counts.collect{|l,n| "#{n} #{l}s"}.join(', ')
-        puts "Notes saved in #{output} folder."
       end
     end
 
@@ -115,7 +117,7 @@ module Reap
           if last_file != record['file']
             out << "\n"
             last_file = record['file']
-            out << "file://#{record['file']}\n"
+            out << "== file://#{record['file']}\n"
           end
           out << "* #{record['note'].rstrip} (#{record['line']})\n"
         end
@@ -127,6 +129,7 @@ module Reap
     # Save notes.
 
     def log_notes_save(dir, notes, labels)
+      files_saved = []
       mkdir_p(dir)
       # Remove empty note files.
       (labels - notes.keys).each do |label|
@@ -135,22 +138,24 @@ module Reap
       end
       # Create note files.
       notes.each do |label, note|
-        file = apply_naming_policy(label, 'txt')
+        file = apply_naming_policy(label, 'rdoc')
         file = File.join(dir,file)
         if dryrun?
           puts "write #{file}"
         else
-          File.open(file,'w') do |f| f << note end
+          files_saved << file
+          File.open(file,'w') do |f| f << note end      
         end
       end
+      return files_saved
     end
 
     #
 
     def naming_policy
       @naming_policy ||= (
-        logconfig = configuration['log'] || {}
-        policy = logconfig['policy'] || ['cap', 'ext']
+        logconfig = settings['log'] || {}
+        policy = logconfig['policy'] || ['down', 'ext']
         list_option(policy)
       )
     end

data/lib/reap/project/make.rb

@@ -27,7 +27,6 @@ module Reap
       @extensions ||= Dir['ext/**/*.c'].collect{ |file| File.dirname(file) }.uniq
     end
 
-
     # Compile extensions.
 
     def make

data/lib/reap/project/package.rb

@@ -1,9 +1,25 @@
 require 'reap/project/gem'
+require 'facets/platform'
+#require 'facets/kernel/silence'
 
 module Reap
 
   class Project
 
+    PACKAGE_STORE = 'pkg'
+
+    # Returns the package storage directory (now constant 'pkg').
+
+    def package_store
+      PACKAGE_STORE
+    end
+
+    # Current platform.
+
+    def current_platform
+      Platform.local.to_s
+    end
+
     # Remove packages.
 
     def clobber_packages(options=nil)
@@ -19,7 +35,7 @@ module Reap
       end
     end
 
-    # Prepare for packaging (clean, distclean, stamp).
+    # Prepare for packaging (clean, distclean, version stamp).
     #
     # TODO: When we add support for binary packages distclean
     #       should not be done for them.
@@ -38,62 +54,99 @@ module Reap
     def package(options=nil)
       packopts = configure_options(options, 'package')
 
-      formats = packopts['formats'] || ['zip']
+      formats = packopts['formats'] || ['gem', 'tgz']
       formats = [formats].flatten
 
       prepare(options)
 
       puts unless dryrun?
+
       formats.each do |format|
         send("package_#{format}", options)
-        puts unless dryrun?
+        #puts unless dryrun?
       end
     end
 
-    # Routes to $gem_package.
+    # Routes to #gem_package.
 
     def package_gem(options=nil)
-      gem_package(options)
-    end
-
-    # Create a Tar'd Gzip package.
-
-    def package_tgz(options=nil)
-      options = configure_options(options, 'package-tgz', 'package')
-
-      prepare(options)
+      begin
+        require 'rubygems/specification'
+        Gem::manage_gems
+      rescue LoadError
+        #raise LoadError, "RubyGems is not installed?"
+      end
 
-      package = metadata.clone
-      package.update(options)
+      options = configure_options(options, 'package-gem', 'package')
+      extension = '.gem'
+
+      platform  = options.delete('platform') || 'none'
+
+      platforms = []
+      platforms << nil if platform != 'only'
+      platforms << 'current' if platform != 'none'
+
+      platforms.each do |pl|
+        options['platform'] = pl
+        fname, metadata = package_prepare_stage(extension, options)
+        next unless fname # if already built
+        stage = File.join(package_store, fname)
+        if dryrun?
+          status "gem build #{stage}"
+        else
+          file = nil
+          cd(stage) do
+            #status "vi #{metadata.name}.gemspec"
+            builder = ::Gem::Builder.new(gemspec(metadata))
+            status "gem build #{stage}"
+            unless dryrun?
+              file = builder.build
+              file = File.expand_path(file)
+            end
+          end
+          # transfer gem package to package store
+          mkdir_p(package_store)
+          destination = File.join(package_store, File.basename(file))
+          mv(file, package_store) unless File.expand_path(file) == File.expand_path(destination)
+          puts
+        end
+      end
+    end
 
-      abort "No name" unless package.name
-      abort "No version" unless package.version
+    # Create a Gem package.
+    #
+    # TODO: Should this use staging too, like zip/tgz?
 
-      store = 'pkg' #package.package_directory
-      fname = package.stage_name
-      files = package.filelist
+    #def gem_package(options=nil)
+    #end
 
-      stage = File.join(store, fname)
-      pfile = stage + ".tgz"
 
-      unless out_of_date?(pfile, *files) or force?
-        report_package_already_built(pfile)
-        return
-      end
+    # Create a Tar'd Gzip package.
 
-      rm_r(stage) if File.exist?(stage)  # remove old stage
-      stage(stage, files)                # make new stage
-      package_manifest(stage)            # generate stage manifest
+    def package_tgz(options=nil)
+      options = configure_options(options, 'package-tgz', 'package')
 
-      if dryrun?
-        status "tar -cxf #{fname}.tgz"
-      else
-        file = nil
-        cd(store) do
-          file = tgz(fname)  # FIXME: Prefer .tgz as extensions.
+      platform  = options.delete('platform') || 'none'
+      extension = '.tgz'
+
+      platforms = []
+      platforms << nil if platform != 'only'
+      platforms << current_platform if platform != 'none'
+
+      platforms.each do |pl|
+        options['platform'] = pl
+        fname, metadata = package_prepare_stage(extension, options)
+        next unless fname  # if already built
+        if dryrun?
+          status "tar -cxf #{fname}.tgz"
+        else
+          file = nil
+          cd(package_store) do
+            file = compress(:tgz, fname)
+          end
+          transfer(file, package_store)
+          report_package_built(file)
         end
-        transfer(file, store)
-        report_package_built(file)
       end
     end
 
@@ -102,59 +155,91 @@ module Reap
     def package_zip(options=nil)
       options = configure_options(options, 'package-zip', 'package')
 
-      prepare(options)
+      platform  = options.delete('platform') || 'none'
+      extension = '.zip'
+
+      platforms = []
+      platforms << nil if platform != 'only'
+      platforms << current_platform if platform != 'none'
+
+      platforms.each do |pl|
+        options['platform'] = pl
+        fname, metadata = package_prepare_stage(extension, options)
+        next unless fname  # if already built
+        if dryrun?
+          status "zip -r #{fname}.zip ."
+        else
+          file = nil
+          cd(package_store) do
+            file = compress(:zip, fname)
+          end
+          transfer(file, package_store)
+          report_package_built(file)
+        end
+      end
+    end
 
-      package = metadata.clone
-      package.update(options)
+    # Create off-line documentation package.
+    #
+    # FIXME: package_docs is not yet ready for use.
+    #
+    #def package_docs(options=nil)
+    #  options = configure_options(options, 'package-doc')
+    #
+    #  dir  = options['dir']     || 'doc'
+    #  name = options['name']    || metadata.name
+    #  ver  = options['version'] || metadata.version
+    #
+    #  cd(dir) do
+    #    zip "-czhvf #{name}-docs-#{ver}.zip *"
+    #  end
+    #end
 
-      abort "No name" unless package.name
-      abort "No version" unless package.version
+    private
 
-      store = 'pkg' #package.package_directory
-      fname = package.stage_name
-      files = package.filelist
+    #
 
-      stage = File.join(store, fname)
-      pfile = stage + ".zip"
+    def package_prepare_stage(extension, options)
+      prepare(options)
 
-      unless out_of_date?(pfile, *files) or force?
-        report_package_already_built(pfile)
-        return
-      end 
+      metadata = metadata().clone
+      metadata.update(options)
 
-      rm_r(stage) if File.exist?(stage)  # remove old stage
-      stage(stage, files)                # make new stage
-      package_manifest(stage)            # generate manifest
+      abort "No name"     unless metadata.name
+      abort "No version"  unless metadata.version
 
-      if dryrun?
-        status "zip -r #{fname}.zip ."
-      else
-        file = nil
-        cd(store) do
-          file = zip(fname)
+      fname = metadata.stage_name
+
+      if compiles?
+        streams = verbose? ? [] : [STDOUT, STDERR]
+        silence_stream(*streams) do
+          make_distclean
+          # If platform package then pre-compile
+          if options['platform']
+            make
+          end
         end
-        transfer(file, store)
-        report_package_built(file)
       end
-    end
 
-    # Create off-line documentation package.
-    #
-    # FIXME: package_docs is not yet ready for use.
+      stage = File.join(package_store, fname)
 
-    def package_docs(options=nil)
-      options = configure_options(options, 'package-doc')
+      pfile = stage + extension #".tgz"
 
-      dir  = options['dir']     || 'doc'
-      name = options['name']    || metadata.name
-      ver  = options['version'] || metadata.version
+      files = metadata.filelist
 
-      cd(dir) do
-        zip "-czhvf #{name}-docs-#{ver}.zip *"
+      unless out_of_date?(pfile, *files) or force?
+        report_package_already_built(pfile)
+        return nil, metadata
       end
-    end
 
-    private
+      rm_r(stage) if File.exist?(stage)  # remove old stage
+
+      stage(stage, files)                # make new stage
+
+      package_manifest(stage)            # generate stage manifest
+
+      return fname, metadata
+    end
 
     # Transfer package file to storage location.
 
@@ -191,6 +276,7 @@ module Reap
       puts "  Name: #{name}"
       puts "  Version: #{vers}"
       puts "  File: #{file}"
+      puts
     end
 
     # Report that a package has been built.
@@ -203,6 +289,7 @@ module Reap
       vers = file[file.rindex('-')+1..-1].chomp(type)
 
       puts "  Package #{file} is already current."
+      puts
       #puts "  Name: #{name}"
       #puts "  Version: #{vers}"
       #puts "  File: #{file}"
@@ -246,3 +333,69 @@ end
   #     def report_packaging_complete(size)
   #       say "\nSuccessfully built #{size} packages at #{store}/."
   #     end
+
+
+=begin
+      prepare(options)
+
+      package = metadata.clone
+      package.update(options)
+
+      abort "No name" unless package.name
+      abort "No version" unless package.version
+
+      fname = package.stage_name
+      files = package.filelist
+
+      stage = File.join(package_store, fname)
+      pfile = stage + ".zip"
+
+      unless out_of_date?(pfile, *files) or force?
+        report_package_already_built(pfile)
+        return
+      end 
+
+      rm_r(stage) if File.exist?(stage)  # remove old stage
+      stage(stage, files)                # make new stage
+      package_manifest(stage)            # generate manifest
+
+      if dryrun?
+        status "zip -r #{fname}.zip ."
+      else
+        file = nil
+        cd(package_store) do
+          file = zip(fname)
+        end
+        transfer(file, package_store)
+        report_package_built(file)
+      end
+=end
+
+=begin
+      prepare(options)
+
+      package = metadata.clone
+      package.update(options)
+
+      abort "No name" unless package.name
+      abort "No version" unless package.version
+
+      store = 'pkg' #package.package_directory
+      fname = package.stage_name
+      files = package.filelist
+
+      stage = File.join(store, fname)
+
+      pfile = stage + ".tgz"
+
+      unless out_of_date?(pfile, *files) or force?
+        report_package_already_built(pfile)
+        return
+      end
+
+      rm_r(stage) if File.exist?(stage)  # remove old stage
+      stage(stage, files)                # make new stage
+
+      package_manifest(stage)            # generate stage manifest
+=end
+