sprout 1.0.16.pre → 1.0.17.pre

data/bin/sprout

@@ -1,3 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/bash
+
+echo 'Type sprout- and then hit the tab key to see the new sprout binaries.'
 
-puts 'Type sprout- and then hit the tab key to see the new sprout binaries.'

data/lib/sprout/executable.rb

@@ -84,6 +84,7 @@ module Sprout
         options ||= {}
         options[:name] = name
         options[:type] = type
+        # TODO: Integrate the RDOC-parsed parameter description here:
         #options[:description] ||= Sprout::RDocParser.description_for_caller caller.shift
 
         create_param_accessors options
@@ -450,16 +451,24 @@ module Sprout
 
       def assembled_static_collection collection_name
         collection = []
-        clazz = self.class
-        while clazz do
-          if clazz.respond_to?(collection_name)
+        inheritance_chain.reverse.each do |clazz|
+          if(clazz.respond_to?(collection_name))
             collection.concat clazz.send(collection_name)
           end
-          clazz = clazz.superclass
         end
         collection
       end
 
+      def inheritance_chain
+        chain = []
+        clazz = self.class
+        while clazz do
+          chain << clazz
+          clazz = clazz.superclass
+        end
+        chain
+      end
+
       def add_help_param
         option_parser.on '--help', 'Display this help message' do
           puts option_parser.to_s

data/lib/sprout/version.rb

@@ -6,7 +6,7 @@ module Sprout
     module VERSION #:nodoc:
       MAJOR = 1
       MINOR = 0
-      TINY  = 16
+      TINY  = 17
       RELEASE = 'pre'
 
       STRING = [MAJOR, MINOR, TINY, RELEASE].join('.')

data/rakefile.rb

@@ -1,9 +1,8 @@
 require 'rubygems'
 require 'bundler'
 
-Bundler.setup
+Bundler.require
 
-require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
@@ -31,20 +30,15 @@ namespace :test do
     task(:clean) { rm_f "coverage.data" }
   end
 
-  # Apparently, rcov does not work on Windows.
+  # Apparently, rcov does not work on Windows or Ubuntu?
   # Hide these tasks so that we can at least
   # run the others...
-  if(!(RUBY_PLATFORM =~ /mingw/i) && !(RUBY_PLATFORM =~/mswin/i))
+  if(RUBY_PLATFORM =~ /darwin/i)
     require 'rcov/rcovtask'
 
-    namespace :coverage do
-      desc "Delete aggregate coverage data."
-      task(:clean) { rm_f "coverage.data" }
-    end
-  
-    desc "Aggregate code coverage for unit, functional and integration tests"
-    task :coverage => "test:coverage:clean"
-  
+    CLEAN.add('coverage.data')
+    CLEAN.add('.coverage')
+
     # Hold collection in case we need it:
     #%w[unit functional integration].each do |target|
     %w[unit].each do |target|
@@ -54,7 +48,12 @@ namespace :test do
           t.test_files = FileList["test/#{target}/**/*_test.rb"]
           t.output_dir = ".coverage/#{target}"
           t.verbose = true
-          t.rcov_opts << "--aggregate coverage.data --exclude .bundle"
+          t.rcov_opts = ["--sort coverage",
+                         "--aggregate coverage.data", 
+                         "--exclude .bundle",
+                         "--exclude .gem",
+                         "--exclude errors.rb",
+                         "--exclude progress_bar.rb"]
         end
       end
       task :coverage => "test:coverage:#{target}"

data/sprout.gemspec

@@ -15,11 +15,10 @@ Gem::Specification.new do |s|
   s.homepage                  = "http://projectsprouts.org"
   s.summary                   = "Software development - evolved"
   s.description               = "Project Sprouts gives you access to beautiful generators and easily customized templates, automated build scripts, distributed libraries and simple system configuration"
-  s.post_install_message      = File.read 'POSTINSTALL.rdoc'
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "sprout" 
   s.require_path              = ['lib']
-  s.files                     = FileList['**/**/*'].exclude /.git|.svn|.DS_Store/
+  s.files                     = FileList['**/**/*'].exclude /.git|.svn|.DS_Store|rdoc|.coverage|coverage|tmp|pkg/
   s.executables               = ['sprout', 'sprout-library', 'sprout-tool', 'sprout-generator', 'sprout-class']
   s.add_bundler_dependencies
 end

data/test/fixtures/executable/subclass/executable_subclass.rb

@@ -0,0 +1,7 @@
+
+class ExecutableSubclass < ExecutableSuperclass
+  include Sprout::Executable
+
+  add_param :subclass_param, String
+end
+

data/test/fixtures/executable/subclass/executable_superclass.rb

@@ -0,0 +1,7 @@
+
+class ExecutableSuperclass
+  include Sprout::Executable
+
+  add_param :superclass_param, String
+end
+

data/test/unit/executable_test.rb

@@ -1,6 +1,8 @@
 require File.dirname(__FILE__) + '/test_helper'
 require 'test/fixtures/executable/mxmlc'
 require 'test/unit/fake_other_executable'
+require 'test/fixtures/executable/subclass/executable_superclass'
+require 'test/fixtures/executable/subclass/executable_subclass'
 
 class ExecutableTest < Test::Unit::TestCase
   include SproutTestCase
@@ -8,7 +10,14 @@ class ExecutableTest < Test::Unit::TestCase
   context "a new executable delegate" do
 
     setup do
-      @tool = FakeOtherExecutableTask.new
+      @tool       = FakeOtherExecutableTask.new
+      @subclassed = ExecutableSubclass.new
+    end
+
+    should "add subclass params after those added by superclass" do
+      @subclassed.superclass_param = 'A.txt'
+      @subclassed.subclass_param = 'B.txt'
+      assert_equal '--superclass-param=A.txt --subclass-param=B.txt', @subclassed.to_shell
     end
 
     should "accept boolean param" do

data/test/unit/generator_test.rb

@@ -32,7 +32,6 @@ class GeneratorTest < Test::Unit::TestCase
       @generator        = configure_generator FakeGenerator.new
 
       Sprout::Generator.register OtherFakeGenerator
-
       FileUtils.mkdir_p @fixture
     end
 
@@ -276,7 +275,7 @@ class GeneratorTest < Test::Unit::TestCase
     end
     
     should "be loadable if it's in the load path" do
-      generator = Sprout::Generator.load :demo, 'temp_generator', '>= 1.0.pre'
+      generator = Sprout::Generator.load :application, 'temp_generator', '>= 1.0.pre'
       assert_not_nil generator
 
       generator.logger = StringIO.new

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 16
+  - 17
   - pre
-  version: 1.0.16.pre
+  version: 1.0.17.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -243,7 +243,6 @@ files:
 - lib/sprout/platform.rb
 - lib/sprout/process_runner.rb
 - lib/sprout/progress_bar.rb
-- lib/sprout/rdoc_parser.rb
 - lib/sprout/remote_file_loader.rb
 - lib/sprout/remote_file_target.rb
 - lib/sprout/ruby_feature.rb
@@ -261,7 +260,6 @@ files:
 - lib/sprout/version.rb
 - lib/sprout.rb
 - MIT-LICENSE
-- POSTINSTALL.rdoc
 - rakefile.rb
 - README.textile
 - script/console
@@ -298,6 +296,8 @@ files:
 - test/fixtures/executable/paths/folder2/file5
 - test/fixtures/executable/paths/folder3/file6
 - test/fixtures/executable/src/Main.as
+- test/fixtures/executable/subclass/executable_subclass.rb
+- test/fixtures/executable/subclass/executable_superclass.rb
 - test/fixtures/executable/windows_line_endings
 - test/fixtures/generators/song_generator.rb
 - test/fixtures/generators/song_subclass/least_favorite.rb
@@ -351,7 +351,6 @@ files:
 - test/unit/paths_param_test.rb
 - test/unit/platform_test.rb
 - test/unit/process_runner_test.rb
-- test/unit/rdoc_parser_test.rb
 - test/unit/remote_file_loader_test.rb
 - test/unit/remote_file_target_test.rb
 - test/unit/ruby_feature_test.rb
@@ -373,36 +372,7 @@ has_rdoc: true
 homepage: http://projectsprouts.org
 licenses: []
 
-post_install_message: |
-  +++++++++++++++++++++++++++++++++++
-  Welcome to Project Sprouts!
-  
-  If you want to experiment with Sprouts, try the following steps:
-  
-  1) Create a new ActionScript 3 Project:
-  sprout -n as3 SomeProject
-  
-  2) cd to the new directory:
-  cd SomeProject
-  
-  3) Install all prerequisites:
-  bundle install
-  
-  4) Compile and run the new project:
-  rake
-  
-  5) Generate a class, test and suite:
-  script/generate utils.MathUtil
-  
-  6) Compile and run the test harness:
-  rake test
-  
-  If you have any questions or issues, please email us at: 
-  
-  projectsprouts@googlegroups.com
-  
-  +++++++++++++++++++++++++++++++++++
-
+post_install_message: 
 rdoc_options: []
 
 require_paths: 

data/POSTINSTALL.rdoc

@@ -1,28 +0,0 @@
-+++++++++++++++++++++++++++++++++++
-Welcome to Project Sprouts!
-
-If you want to experiment with Sprouts, try the following steps:
-
-1) Create a new ActionScript 3 Project:
-sprout -n as3 SomeProject
-
-2) cd to the new directory:
-cd SomeProject
-
-3) Install all prerequisites:
-bundle install
-
-4) Compile and run the new project:
-rake
-
-5) Generate a class, test and suite:
-script/generate utils.MathUtil
-
-6) Compile and run the test harness:
-rake test
-
-If you have any questions or issues, please email us at: 
-
-projectsprouts@googlegroups.com
-
-+++++++++++++++++++++++++++++++++++

data/lib/sprout/rdoc_parser.rb

@@ -1,91 +0,0 @@
-require 'rdoc/rdoc'
-
-module Sprout
-
-  class RDocParser
-
-    def parse content
-    end
-
-    def parse_from_caller_string caller_string
-      class_name, file_name, line_number = parse_caller_string caller_string
-      rdoc_description_for class_name, file_name, line_number
-    end
-
-    private
-
-    ##
-    # NOTE: Don't forget that this string *sometimes* contains a colon on Windows...
-    def parse_caller_string caller_string
-      sections = caller_string.split(' ')
-      parts = sections.first.split(':')
-      file_name   = parts.shift
-      line_number = parts.shift
-      class_name  = class_name_from_caller_string caller_string
-      #puts ">> class_name: #{class_name} file_name: #{file_name} line_number: #{line_number}"
-      [class_name, file_name, line_number]
-    end
-
-    def class_name_from_caller_string caller_string
-      parts   = caller_string.split(' ')
-      long    = parts.pop
-      matched = long.match /<class:([\w:]+)>/
-      matched[1] unless matched.nil?
-    end
-
-    def rdoc_description_for class_name, file_name, line_number
-      rendered = rendered_rdoc file_name
-    end
-
-    def rendered_rdoc file
-      @rendered_rdoc ||= render_rdoc file
-    end
-
-    def render_rdoc file
-      rdoc = RDoc::RDoc.new
-      puts "==================================="
-      puts ">> generating rdoc for: #{file}"
-
-      rdoc.document [ file, "--format=xml", "--output=temp" ]
-      {}
-    end
-
-    def render_rdoc_from_files
-      # This works to some extent...
-      #rdoc test/fixtures/examples/echo_inputs.rb --fmt=xml --op=tmp --all -q
-      # But the following does not do the same thing:
-      #response = rdoc.document [ file, '--fmt=xml', '--op=tmp', '--all', '-q' ]
-      
-      options           = RDoc::Options.new
-      options.files     = FileList[ file ]
-      options.formatter = 'markup'
-      options.op_dir    = './tmp'
-      options.verbosity = 0
-
-      rdoc.options      = options
-
-      #rdoc.stats        = RDoc::Stats.new 1, options.verbosity
-      #response = rdoc.document []
-      
-      response = rdoc.parse_files [ file ]
-      render_rdoc_toplevel response
-    end
-
-    def render_rdoc_toplevel toplevel
-      puts ">> toplevel: #{toplevel}"
-      toplevel.each do |file|
-        puts ">> file: #{file.name}"
-        puts ">> pretty: #{file.pretty_print}"
-      end
-
-      toplevel
-    end
-
-    def render_rdoc_bak file
-      rdoc = RDoc::RDoc.new
-      rdoc.options = RDoc::Options.new
-      rdoc.parse_files [file]
-    end
-  end
-end
-

data/test/unit/rdoc_parser_test.rb

@@ -1,15 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-require 'test/fixtures/examples/echo_inputs'
-
-class ExecutableOptionParserTest < Test::Unit::TestCase
-  include SproutTestCase
-
-  context "a new RDoc parser" do
-
-    setup do
-      @parser = Sprout::RDocParser.new
-    end
-
-  end
-end
-