sprout 1.1.5.pre → 1.1.7.pre

data/VERSION

@@ -1 +1 @@
-1.1.5.pre
+1.1.7.pre

data/bin/sprout

@@ -1,4 +1,9 @@
-#!/usr/bin/bash
+#!/usr/bin/env ruby
 
-echo 'Type sprout- and then hit the tab key to see the new sprout binaries.'
+require 'rubygems'
+require 'sprout'
+
+generator = Sprout::CommandLine.new
+generator.parse! ARGV
+generator.execute
 

data/lib/sprout/command_line.rb

@@ -0,0 +1,33 @@
+module Sprout
+
+  class CommandLine < Sprout::Executable::Base
+
+    ##
+    # Get the version of the Sprout gem
+    add_param :version, Boolean, :default => false, :hidden_value => true
+
+    add_param_alias :v, :version
+
+    ##
+    # @return [IO] default $stdout, Replace value in test context.
+    attr_accessor :logger
+
+    def initialize
+      super
+      @logger = $stdout
+    end
+
+    def parse! options
+      if options.empty?
+        handle_parse_error Sprout::Errors::UsageError.new("At least one parameter is required.")
+      end
+      super
+    end
+
+    def execute
+      if version
+        logger.puts "sprout #{Sprout::VERSION::STRING}"
+      end
+    end
+  end
+end

data/lib/sprout/executable/base.rb

@@ -503,8 +503,7 @@ module Sprout
 
       def add_help_param
         option_parser.on '--help', 'Display this help message' do
-          puts option_parser.to_s
-          exit
+          abort option_parser.to_s
         end
       end
 

data/lib/sprout/generators/generator/generator_generator.rb

@@ -47,8 +47,10 @@ module Sprout
     add_param :extension, String, { :default => '.as' }
 
     def manifest  
+      massage_input
+
       directory bin do
-        template "#{input.snake_case}", "generator_executable"
+        template "#{input.dash_case}", "generator_executable"
       end
 
       directory lib do
@@ -72,10 +74,27 @@ module Sprout
           directory "generators"
         end
       end
-      
-      #This should actually be moved to the library generator
-      #directory vendor
 
+      if !File.exists? 'Gemfile'
+        template 'Gemfile', 'generator_gemfile'
+      else
+        say "[INFO] It seems you already have a Gemfile in this project, please be sure it has the following content:"
+        say ''
+        say '  gem "sprout", ">= #{Sprout::VERSION::STRING}"'
+        say ''
+        say '  group :development do'
+        say '    gem "shoulda"'
+        say '    gem "mocha"'
+        say '  end'
+        say ''
+      end
+    end
+
+    protected
+
+    def massage_input
+      self.input = input.gsub(/_generator$/, '')
+      self.input = input.gsub(/Generator$/, '')
     end
 
   end

data/lib/sprout/generators/generator/templates/generator_class.rb

@@ -1,11 +1,14 @@
 
 module Sprout
+  ##
+  # This is where you describe your new Generator.
   class <%= input.camel_case %>Generator < Generator::Base
     
     ##
     # This is how you add a parameter to your generator
     #
-    #   add_param :fwee, String, :default => "fwee"
+    #   # @return [String] Say fwee!
+    #   add_param :fwee, String, { :default => "fwee" }
     #
     def manifest
       directory input.snake_case do

data/lib/sprout/generators/generator/templates/generator_executable

@@ -1,9 +1,7 @@
-#!/usr/bin/env ruby
-
 require 'rubygems'
 require 'sprout'
 require 'generators/<%= input.snake_case %>_generator'
 
 generator = <%= input.camel_case %>Generator.new
 generator.parse! ARGV
-generator.execute
+generator.execute

data/lib/sprout/generators/generator/templates/generator_gemfile

@@ -0,0 +1,9 @@
+source "http://rubygems.org"
+
+gem "sprout", ">= <%= Sprout::VERSION::STRING %>"
+
+group :development do
+  gem "shoulda"
+  gem "mocha"
+end
+

data/lib/sprout/generators/generator/templates/generator_test.rb

@@ -1,33 +1,56 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require 'test_helper'
 
 require 'generators/<%= input.snake_case %>_generator'
 
 class <%= input.camel_case %>GeneratorTest < Test::Unit::TestCase
-  include SproutTestCase
+  include Sprout::TestHelper
 
   context "A new <%= input.camel_case %> generator" do
 
     setup do
+      # Create a temporary directory the generator can 
+      # add files to:
       @temp             = File.join(fixtures, 'generators', 'tmp')
       FileUtils.mkdir_p @temp
+
+      # Instantiate the generator:
       @generator        = Sprout::<%= input.camel_case %>Generator.new
+
+      # Tell the generator to use the new temp path:
       @generator.path   = @temp
+
+      # Hide generator output from terminal:
+      # (uncomment to see output)
       @generator.logger = StringIO.new
     end
 
     teardown do
+      # Remove the temp directory after each test method:
       remove_file @temp
     end
 
+    # Run all test methods with:
+    #
+    #   ruby -I test/unit test/unit/<%= input.snake_case %>_generator_test.rb
+    #
+    # Run just this test method with:
+    #
+    #   ruby -I test/unit test/unit/<%= input.snake_case %>_generator_test.rb -n '/generate a new/'
+    #
     should "generate a new <%= input.camel_case %>" do
+      # provide example input:
       @generator.input = "<%= input.camel_case %>"
       @generator.execute
 
-      input_dir = File.join(@temp, "<%= input.snake_case %>")
+      input_dir = File.join @temp, "<%= input.snake_case %>"
       assert_directory input_dir
 
-      input_file = File.join(input_dir, "<%= input.camel_case %><%= extension %>")
+      input_file = File.join input_dir, "<%= input.camel_case %><%= extension %>"
+      # Custom Sprout::TestHelper assertion, optional block
+      # yields the file content as a String
       assert_file input_file do |content|
+        # Custom Sprout::TestHelper assertion, update the Regex
+        # with your expectation.
         assert_matches /Your content to assert here/, content
       end
     end

data/lib/sprout/generators/generator/templates/generator_test_helper.rb

@@ -1,16 +1,19 @@
 require "rubygems"
 require "bundler"
+Bundler.require :default, :development
 
-Bundler.setup :default, :development
-
-require 'sprout'
 # These require statments *must* be in this order:
 # http://bit.ly/bCC0Ew
 # Somewhat surprised they're not being required by Bundler...
 require 'shoulda'
 require 'mocha'
 
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..'))
+lib = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
+$:.unshift lib unless $:.include? lib
+
+test = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+$:.unshift test unless $:.include? test
+
+require 'sprout'
+require 'sprout/test_helper'
 
-require 'sprout/test/sprout_test_case'

data/lib/sprout/generators/ruby/ruby_generator.rb

@@ -50,8 +50,8 @@ module Sprout
           directory fixtures
           directory unit do
             template "#{input.snake_case}_test.rb", 'ruby_test_case.rb'
+            template 'test_helper.rb', 'ruby_test_helper.rb'
           end
-          template 'test_helper.rb', 'ruby_test_helper.rb'
         end
 
         directory bin do

data/lib/sprout/generators/ruby/templates/ruby_gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'sprout', '>= 1.0.0.pre'
+gem 'sprout', '>= <%= Sprout::VERSION::STRING %>'
 
 group :development do
   gem 'rake'

data/lib/sprout/generators/ruby/templates/ruby_rakefile

@@ -4,9 +4,14 @@ Bundler.require
 
 require 'rake/testtask'
 
+# Hack this dir onto path for Ruby 1.9.2
+# support:
+test_package = File.expand_path(File.join(File.dirname(__FILE__), 'test'))
+$: << test_package unless $:.include? test_package
+
 namespace :test do
   Rake::TestTask.new(:units) do |t|
-    t.libs << "test"
+    t.libs << "test/unit"
     t.test_files = FileList["test/unit/*_test.rb"]
     t.verbose = true
   end

data/lib/sprout/generators/ruby/templates/ruby_test_case.rb

@@ -1,7 +1,7 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test_helper'
 
 class <%= input.camel_case %>Test < Test::Unit::TestCase
-  include SproutTestCase
+  include Sprout::TestHelper
 
   context "A <%= input.camel_case %>" do
 

data/lib/sprout/generators/ruby/templates/ruby_test_helper.rb

@@ -2,9 +2,20 @@ require "rubygems"
 require "bundler"
 Bundler.require :default, :development
 
-lib = File.join(File.dirname(__FILE__), '..', 'lib')
+# These require statments *must* be in this order:
+# http://bit.ly/bCC0Ew
+# Somewhat surprised they're not being required by Bundler...
+require 'shoulda'
+require 'mocha'
+
+lib = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
 $:.unshift lib unless $:.include? lib
 
+test = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+$:.unshift test unless $:.include? test
+
+require 'sprout'
+require 'sprout/test_helper'
+
 require '<%= input.snake_case %>'
-require 'sprout/test/sprout_test_case'
 

data/lib/sprout.rb

@@ -43,6 +43,7 @@ require 'sprout/rdoc_parser'
 require 'sprout/specification'
 require 'sprout/executable'
 require 'sprout/daemon'
+require 'sprout/command_line'
 
 # Generators
 require 'sprout/generator'

data/test/unit/command_line_test.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+class CommandLineTest < Test::Unit::TestCase
+  include Sprout::TestHelper
+
+  context "a new command line ui" do
+    
+    setup do
+      @logger          = Sprout::OutputBuffer.new
+      @instance        = Sprout::CommandLine.new
+      @instance.logger = @logger
+    end
+
+    should "display the version number" do
+      @instance.parse! ['--version']
+      @instance.execute
+      assert_matches /sprout #{Sprout::VERSION::STRING}/, @logger.read
+    end
+
+    should "display helper if no options provided" do
+      @instance.expects :abort
+      @instance.parse! []
+    end
+  end
+end
+
+

data/test/unit/executable_option_parser_test.rb

@@ -42,8 +42,8 @@ class ExecutableOptionParserTest < Test::Unit::TestCase
     end
     
     should "always accept help option" do
-      @exe.expects :puts
-      assert_raises SystemExit do
+      @exe.expects :abort
+      assert_raises Sprout::Errors::MissingArgumentError do
         @exe.parse! [ '--help' ]
       end
     end

data/test/unit/generator_generator_test.rb

@@ -19,6 +19,19 @@ class GeneratorGeneratorTest < Test::Unit::TestCase
       remove_file @temp
     end
 
+    ['TestClassGenerator', 'test_class_generator', 'test_class', 'TestClass'].each do |input|
+
+      should "massage '#{input}' into appropriate value" do
+        @generator.input = "TestClassGenerator"
+        @generator.execute
+
+        test_file = File.join(@temp, 'test', 'unit', 'test_class_generator_test.rb')
+        assert_file test_file do |content|
+          assert_matches /TestClassGeneratorTest/, content
+        end
+      end
+    end
+
     should "generate a new generator" do
       @generator.input = 'fwee'
       @generator.execute

data/test/unit/ruby_generator_test.rb

@@ -55,14 +55,14 @@ class RubyGeneratorTest < Test::Unit::TestCase
       test_dir = File.join project_dir, 'test'
       assert_file test_dir
 
-      test_helper = File.join test_dir, 'test_helper.rb'
+      unit_dir = File.join test_dir, 'unit'
+      assert_file unit_dir
+
+      test_helper = File.join unit_dir, 'test_helper.rb'
       assert_file test_helper do |content|
         assert_matches /require 'some_project'/, content
       end
 
-      unit_dir = File.join test_dir, 'unit'
-      assert_file unit_dir
-
       test_case = File.join unit_dir, 'some_project_test.rb'
       assert_file test_case do |content|
         assert_matches /class SomeProjectTest/, content

data/test/unit/test_helper.rb

@@ -14,7 +14,8 @@ $:.unshift lib unless $:.include? lib
 
 require 'sprout'
 
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..'))
+test = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+$:.unshift test unless $:.include? test
 
 require 'unit/fake_process_runner'
 require 'unit/fake_executable_task'

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 5
+  - 7
   - pre
-  version: 1.1.5.pre
+  version: 1.1.7.pre
 platform: ruby
 authors: 
 - Luke Bayes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-31 00:00:00 -08:00
+date: 2011-01-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -209,6 +209,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - lib/sprout/archive_unpacker.rb
+- lib/sprout/command_line.rb
 - lib/sprout/concern.rb
 - lib/sprout/daemon.rb
 - lib/sprout/dir.rb
@@ -239,6 +240,7 @@ files:
 - lib/sprout/generators/generator/generator_generator.rb
 - lib/sprout/generators/generator/templates/generator_class.rb
 - lib/sprout/generators/generator/templates/generator_executable
+- lib/sprout/generators/generator/templates/generator_gemfile
 - lib/sprout/generators/generator/templates/generator_template
 - lib/sprout/generators/generator/templates/generator_test.rb
 - lib/sprout/generators/generator/templates/generator_test_helper.rb
@@ -358,6 +360,7 @@ files:
 - test/fixtures/user/mxmlc_crlf
 - test/unit/archive_unpacker_test.rb
 - test/unit/boolean_param_test.rb
+- test/unit/command_line_test.rb
 - test/unit/daemon_test.rb
 - test/unit/executable_option_parser_test.rb
 - test/unit/executable_param_test.rb