reap 9.3.5 → 9.4.0

data/lib/reap/project/rdoc.rb

@@ -7,6 +7,7 @@ module Reap
 
     def document(options)
       rdoc(options)
+      ridoc(options)
     end
 
     # Generate rdocs.
@@ -43,13 +44,13 @@ module Reap
         cmdopts = {}
         #cmdopts['op']            = target_output
         cmdopts['main']          = target_main if target_main
-        cmdopts['template']      = target['template']
+        cmdopts['template']      = target['template'] || ENV['RDOC_TEMPLATE'] || 'html'
         #cmdopts['merge']         = target['merge']
         cmdopts['inline-source'] = target['inline']
         cmdopts['exclude']       = list_option(target['exclude'])
 
         files = list_option(target['include'])
-        files = files.collect{ |g| Dir[g] }.flatten  # Need this little rig to remove unwanted toplevel files.
+        files = files.collect{ |g| Dir[g] }.flatten  # Need this to remove unwanted toplevel files.
         files = files - ['Rakefile', 'Rakefile.rb']  # b/c rdoc's exlcude options doesn't work well.
         files = files - [manifest_file].compact
 
@@ -129,25 +130,25 @@ module Reap
 
     def ridoc(options=nil)
       options = configure_options(options, 'doc-ri', 'ri')
-      options = DEFAULT['ri'].merge(options)
+      #options = DEFAULT['ri'].merge(options)
 
       cmdopts = {}
       cmdopts['op']            = options['output']
       cmdopts['exclude']       = options['exclude']
 
       output = options['output']
-      files  = options['include'] # || ['lib', '[A-Z]*']
+      files  = options['include'] || metadata.loadpath #['lib', '[A-Z]*']
 
-      input = files.collect do |i|
-        dir?(i) ? File.join(i,'**','*') : i
-      end
+      input = files #.collect do |i|
+      #  dir?(i) ? File.join(i,'**','*') : i
+      #end
 
       if out_of_date?(output, *input) or force?
         rm_r(output) if exist?(output) and safe?(output)  # remove old ridocs
 
         #input = input.collect{ |i| glob(i) }.flatten
         vector = [input, cmdopts]
-        sh "rdoc --ri #{vector.to_console}"
+        sh "rdoc --ri -M -a #{vector.to_console}"
       else
         puts "RI Docs are current."
       end

data/lib/reap/project/release.rb

@@ -1,4 +1,4 @@
-require 'reap/project/rubyforge'
+require 'reap/hosts/rubyforge'
 
 module Reap
 
@@ -10,7 +10,53 @@ module Reap
 
     def release(options={})
       package(options)
-      rubyforge_release(options)
+
+
+      release_options = configure_options(options, 'release')
+
+      store   = 'pkg'
+      version = metadata.version
+
+      release_options['version'] = version
+      release_options['store']   = store
+
+      changelog = release_options['changelog'] #|| DEFAULT['release']['changelog'] || DEFAULT['rubyforge']['changelog']
+      notelog   = release_options['notelog']   #|| DEFAULT['release']['notelog']   || DEFAULT['rubyforge']['notelog']
+
+      changelog = Dir.glob(changelog.to_s, File::FNM_CASEFOLD).first
+      notelog   = Dir.glob(notelog.to_s, File::FNM_CASEFOLD).first
+
+      release_options['changelog'] = changelog if changelog && File.exist?(changelog)
+      release_options['notelog']   = notelog   if notelog && File.exist?(notelog)
+
+      files   = release_options['files'] || []
+
+      if files.empty?
+        files = Dir[File.join(store, '*')].select do |file|
+          /#{version}[.]/ =~ file
+        end
+        release_options['files'] = files
+        #files = Dir.glob(File.join(store,"#{name}-#{version}*"))
+      end
+
+
+      actions = []
+      select  = options['hosts']
+
+      hosts(select).each do |host|
+        if host.respond_to?(:release)
+          # Not going to do dryrun in Rubyforge class b/c it still requires logging in.
+          if dryrun?
+            puts "release: #{} #{host.basename.downcase}"
+          else
+            if host.release_confirm?(release_options)
+              actions << lambda{ host.release(release_options) }
+            end
+          end
+        end
+      end
+
+      actions.each{ |a| a.call }
     end
 
     # A complete rollout. This will prepare (clean, stamp and package),
@@ -22,10 +68,10 @@ module Reap
       if force?
         doc, pub, ann, tag = true, true, true, true
       else
-        doc = ask("Generate doumentation?", "Yn").downcase =~ /^(|y|yes)$/i
-        pub = ask("Publish website?      ", "Yn") =~ /^(|y|yes)$/i
-        tag = ask("Tag current version?  ", "Yn") =~ /^(|y|yes)$/i
-        ann = ask("Announce release?     ", "Yn") =~ /^(|y|yes)$/i
+        doc = ask("Generate doumentation?", "yN").downcase =~ /^(y|yes)$/i
+        pub = ask("Publish website?      ", "yN") =~ /^(y|yes)$/i
+        tag = scm? ? (ask("Tag current version?  ", "yN") =~ /^(y|yes)$/i) : false      
+        ann = ask("Announce release?     ", "yN") =~ /^(y|yes)$/i
         puts
       end
 

data/lib/reap/project/scm.rb

@@ -1,63 +1,78 @@
-require 'reap/project/svn'
+require 'reap/systems'
 
 module Reap
 
   class Project
 
+    # Determine if project is under version control.
+    #
+    # TODO: scm? may need to be made more robsut.
+
+    def scm?
+      Systems::System.detect
+    end
+
     # Generate ChangeLog. This method routes to the 
     # appropriate method for the project's source
     # control manager.
     #
+    #   change     File path to store rdoc formated changelog. Default is 'log/changelog.txt'.
+    #   xmlchange  File path to store XML formated changelog. Default is 'doc/log/changelog.xml'.
     #
+    # Set either to false to supress creation.
 
     def scm_log(options={})
-      create_txtlog = (options['txtlog'] != false)
-      create_xmllog = (options['xmllog'] != false)
+      #create_txtlog = (options['txtlog'] != false)
+      #create_xmllog = (options['xmllog'] != false)
 
       xmlout = options['xmloutput'] || 'site/log'  # TODO: How to set site/?
 
-      if create_txtlog
-        txtlog = apply_naming_policy('changelog', 'txt')
+      #if create_txtlog
+        txtlog = apply_naming_policy('changelog', 'rdoc')
         txtlog = File.join('log', txtlog)
-      end
+      #end
 
-      if create_xmllog
+      #if create_xmllog
         xmllog = apply_naming_policy('changelog', 'xml')
         xmllog = File.join(xmlout, xmllog)
-      end
+      #end
 
       #txtlog = File.join('lib', txtlog) unless txtlog.include?('/')
       #xmllog = File.join(xmldir, xmllog) unless xmllog.include?('/')
 
-      if File.directory?('.svn')
-        svn_log('txtlog' => txtlog, 'xmllog' => xmllog)
-      else
-        abort "Only Subversion is currently supported."
-      end
+      txtlog ||= options['txtlog']
+      xmllog ||= options['xmllog']
+
+      scm.log(txtlog)
+      scm.log_xml(xmllog) if xmllog
     end
 
     # Tag current versoin of project. This method routes
     # to the appropriate method for the project's source
     # control manager.
+    #
+    #   message       Optional commit message. This is intended for commandline
+    #                 usage. (Use -m for shorthand).
+    #
+    # TODO: How should metadata.repository come into play here?
 
-    def scm_tag(*args)
-      if File.directory?('.svn')
-        svn_tag(*args)
-      else
-        abort "Only Subversion is currently supported."
-      end
+    def scm_tag(options=nil)
+      options = configure_options(options, 'scm-tag', 'scm')
+      scm.tag(options)
     end
 
     # Branch current version of project. This method routes
     # to the appropriate method for the project's source
     # control manager.
+    #
+    #   message    Optional commit message. This is intended
+    #              for commandline usage. (Use -m for shorthand).
+    #
+    # TODO: How should metadata.repository come into play here?
 
-    def scm_branch(*args)
-      if File.directory?('.svn')
-        svn_branch(*args)
-      else
-        abort "Only Subversion is currently supported."
-      end
+    def scm_branch(options=nil)
+      options = configure_options(options, 'scm-branch', 'scm')
+      scm.branch(options)
     end
 
   end

data/lib/reap/project/spec.rb

@@ -43,9 +43,9 @@ module Reap
       specopt  = options['specopt']
       live     = options['live']
 
-      specs    = list_options(specs) 
-      loadpath = list_options(loadpath)
-      requires = list_options(requires)
+      specs    = list_option(specs)
+      loadpath = list_option(loadpath)
+      requires = list_option(requires)
 
       files = multiglob(*specs)
 

data/lib/reap/project/test.rb

@@ -3,8 +3,7 @@
 #   Test
 #
 
-require 'facets/hash/rekey'
-require 'facets/string/tabs'
+require 'facets' #/hash/reke, string/tabs
 require 'facets/progressbar'
 
 module Reap

data/lib/reap/project/version.rb

@@ -39,6 +39,7 @@ module Reap
       status  = options['status']
 
       bumps = [ options['major'], options['minor'], options['tiny'], options['teeny'] ]
+
       bump  = bumps.any?{|x|x}
 
       abort "Specify bumps or version, not both." if bump and version
@@ -49,11 +50,24 @@ module Reap
       status  = status  || metadata.status  || '0.0.0'
 
       if bump
-        points = []
-        version.to_s.split(/[.]/).each_with_index do |x, i|
-          points[i] = (bumps[i] ? x.to_i + 1 : x).to_s
+        points = version.to_s.split(/[.]/).collect do |x|
+          x.to_i
+        end
+
+        if options['major']
+          points[0] += 1
+          points[1..-1] = *([0] * points[1..-1].size)
+        elsif options['minor']
+          points[1] += 1
+          points[2..-1] = *([0] * points[2..-1].size)
+        elsif options['tiny']
+          points[2] += 1
+          points[3..-1] = *([0] * points[3..-1].size)
+        elsif options['teeny']
+          points[3] += 1
         end
-        version = points.join('.').sub(/[.0]$/,'')
+
+        version = points.join('.') #.chomp('.0')
       else
         abort "Invalid version -- #{version}" unless String===version && /^[0-9]/ =~ version
       end

data/lib/reap/runmodes.rb

@@ -0,0 +1,24 @@
+module Reap
+
+  class RunModes
+
+    attr_accessor :dryrun
+    attr_accessor :verbose
+    attr_accessor :trace
+    attr_accessor :force
+    attr_accessor :debug
+
+    def initialize(options, &block)
+      populate(options, &block)
+    end
+
+    def dryrun?  ; @dryrun  ; end
+    def verbose? ; @verbose ; end
+    def trace?   ; @trace   ; end
+    def force?   ; @force   ; end
+    def debug?   ; @debug   ; end
+
+  end
+
+end
+

data/lib/reap/settings.rb

@@ -2,13 +2,12 @@ module Reap
 
   class Project
 
-    # Configuration is an open hash.
+    # = Project Settings
     #
-    # TODO: Settings needs improvement -- it's rather sloppy at this point.
+    # Configuration settings (from .reap file).
 
     class Settings < Hash
 
-      DEFAULT_FILE = File.join(File.dirname(__FILE__), 'default.yaml')
       REAP_FILE = '{.reap,_reap,reapfile}{.yaml,.yml,}'
 
       def self.read(location, metadata)
@@ -23,23 +22,13 @@ module Reap
         else
           data = {}
         end
-
         new(data, metadata)
       end
 
-
-      attr :metadata
-
-      # FIXME: when using the settings, I think nil should be considered a none entry and
-      # so false would be required to actually mean "off". This means assigning each key value par one a time?
-
       def initialize(data, metadata)
         super()
         @metadata = metadata
-        defaults = File.read(DEFAULT_FILE)
-        defaults = instance_eval("<<-XXXXXXXXXXXXX\n#{defaults}\nXXXXXXXXXXXXX")
-        defaults = YAML::load(defaults)
-        settings = defaults.dup
+        settings = {}
         data.each do |key, value|
           settings[key] ||= {}
           settings[key].update(value) if value

data/lib/reap/systems.rb

@@ -0,0 +1,4 @@
+require 'reap/systems/svn'
+require 'reap/systems/git'
+require 'reap/systems/hg'
+

data/lib/reap/systems/{subversion.rb → svn.rb}

@@ -1,13 +1,34 @@
 require 'reap/utilities'
+require 'reap/systems/system'
 
 module Reap
-
-  class Subversion
-    include Utilities
-
-    # Project name (for repository).
-
-    attr_accessor :project
+module Systems
+
+  # = Subversion
+  #
+  # Source control system for Subversion. Provides:
+  # 
+  #   log
+  #   log_xml
+  #   tag
+  #   branch
+  #
+  # Options are:
+  #
+  #   repository    Developers URL to repository. Defaults to Rubyforge address.
+  #   username      Username. Defaults to ENV['RUBYFORGE_USERNAME'].
+  #   protocol      The URL protocol to use. Defaults to "svn+ssh".
+  #   prefix        Prefix to use on tag folder. Default is no prefix.
+  #   tagpath       Directory to store tags. Defaults to tags/.
+  #   branchpath    Directory to store branches. Defaults to branches/.
+
+  class Svn < System
+
+    register('subversion')
+
+    # Project unixname (for repository).
+
+    attr_accessor :unixname
 
     # Current version of project.
 
@@ -42,22 +63,32 @@ module Reap
 
     attr_accessor :branchpath
 
-    # Operate in dryrun mode.
-
-    attr_accessor :dryrun
-
     # New Subversion object.
     #
     # TODO: Perhaps format prefix, like: 
     #       prefix  = prefix + '_' if prefix && prefix !~ /[_-]$/
+    #
+    # TODO: tie in Metadata#scm, but probably via project/scm.rb.
+
+    def initialize(project, options={})
+      options  = options.rekey
+
+      super(project, options)
+
+      #settings = (project.settings['svn'] || {}).rekey
+      #options  = settings.update(options)
+
+      options[:repository] ||= project.metadata.repository
+      options[:unixname]   ||= project.metadata.unixname
+
+      options[:version] = project.metadata.version
 
-    def initialize(options={})
       options.each do |k,v|
         send("#{k}=", v) if respond_to?("#{k}=")
       end
 
       # defaults are for rubyforge
-      @repository ||= "rubyforge.org/var/svn/#{project}"
+      @repository ||= "rubyforge.org/var/svn/#{unixname}"
       @username   ||= ENV['RUBYFORGE_USERNAME']
       @protocol   ||= "svn+ssh"
       @tagpath    ||= "tags"
@@ -162,7 +193,7 @@ module Reap
         File.open(file, 'w'){|f| f << text }
         puts "Updated #{file}"
       else
-         puts text
+        puts text
       end
     end
 
@@ -176,7 +207,7 @@ module Reap
 
       text = changelog_xml
       i = text.index("?>\n")
-      text.insert(i+2, "\n" + %[<?xml-stylesheet href="#{xslfile}" type="text/xsl" ?>])
+      text.insert(i+2, "\n" + %[<?xml-stylesheet href="#{File.basename(xslfile)}" type="text/xsl" ?>])
 
       if dryrun?
         puts "svn log --xml > #{file}"
@@ -304,7 +335,7 @@ END
   end
 
 end
-
+end
 
 
 =begin