genspec 0.2.5 → 0.2.6

data/.travis.yml

@@ -2,8 +2,11 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ree
-  - jruby
   - ruby-head
-  - rbx-2.0
+  - ree
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
+  - rbx-18mode
+  - rbx-19mode
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    genspec (0.2.4)
+    genspec (0.2.5)
       i18n (>= 0.5.0)
       rspec (~> 2)
       sc-core-ext (~> 1.2.1)
@@ -79,14 +79,14 @@ GEM
     rake (0.9.2.2)
     rdoc (3.11)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
     sc-core-ext (1.2.1)
       activesupport (>= 2.3.5)
     sprockets (2.0.3)

data/lib/genspec.rb

@@ -17,13 +17,17 @@ end
 
 require 'fileutils'
 
-require 'sc-core-ext'
-require 'genspec/version' unless defined?(GenSpec::VERSION)
-require 'genspec/shell'
-require 'genspec/matchers'
-require 'genspec/generator_example_group'
+module GenSpec
+  def self.root;        @root;        end
+  def self.root=(root); @root = root; end
+  
+  require 'sc-core-ext'
+  require 'genspec/version' unless defined?(GenSpec::VERSION)
+  require 'genspec/shell'
+  require 'genspec/matchers'
+  require 'genspec/generator_example_group'
+end
 
-# RSpec 2.0 compat
 RSpec.configure do |config|
   config.include GenSpec::GeneratorExampleGroup, :example_group => { :file_path => /spec[\/]generators/ }
   

data/lib/genspec/generator_example_group.rb

@@ -29,14 +29,15 @@ module GenSpec
     #
     def generator_descriptor
       {
-        :described => self.class.target_generator,
+        :described => self.class.generator,
         :args => self.class.generator_args,
         :input => self.class.generator_input,
+        :output => self.class.generator_output,
         :init_blocks => generator_init_blocks,
         :generator_options => self.class.generator_options
       }
     end
-
+    
     module ClassMethods
       # Sets the list of arguments for this generator.
       #
@@ -174,6 +175,17 @@ module GenSpec
         end
       end
       
+      # Returns the generator output string or IO, or nil.
+      def generator_output
+        return metadata[:generator_output] if metadata[:generator_output]
+        
+        metadata[:generator_output] = if genspec_subclass?
+          superclass.generator_output
+        else
+          nil
+        end
+      end
+      
       # Returns the input stream to be used for this context. If this context doesn't
       # have an input stream, its superclass is checked, and so on until either the
       # parent isn't a GenSpec or an input stream is found. Only the closest input
@@ -195,9 +207,15 @@ module GenSpec
       
       # Traverses up the context tree to find the topmost description, which represents
       # the controller to be tested or the string/symbol representing it.
-      def target_generator
+      #
+      # If name is specified, it will be used instead and subsequent calls to this method
+      # will return the specified name.
+      def generator(name = nil)
+        metadata[:generator_name] = name.to_s if name
+        return metadata[:generator_name] if metadata[:generator_name]
+        
         if genspec_subclass?
-          superclass.target_generator
+          superclass.generator
         else
           describes || description
         end

data/lib/genspec/matchers/base.rb

@@ -22,7 +22,7 @@ module GenSpec
         @described = generator[:described]
         @args = generator[:args]
         @generator_options = generator[:generator_options]
-        @shell = GenSpec::Shell.new("", generator[:input] || "")
+        @shell = GenSpec::Shell.new(generator[:output] || "", generator[:input] || "")
         @init_blocks = generator[:init_blocks]
         
         if @described.kind_of?(Class)
@@ -96,18 +96,27 @@ module GenSpec
         raise error if error && !@errors_silenced
       end
       
+      def mktmpdir(&block)
+        tmpdir_args = [ @described.to_s ]
+        if GenSpec.root
+          FileUtils.mkdir_p GenSpec.root
+          tmpdir_args << GenSpec.root
+        end
+        Dir.mktmpdir *tmpdir_args, &block
+      end
+      
       def invoke
-        Dir.mktmpdir do |tempdir|
+        mktmpdir do |tempdir|
           FileUtils.chdir tempdir do
             init_blocks.each do |block|
               block.call(tempdir)
             end
           
             @destination_root = tempdir
-            @generator.start(@args || [], @generator_options.reverse_merge(
+            @generator.start @args || [], @generator_options.reverse_merge(
               :shell => @shell,
               :destination_root => destination_root
-            ))
+            )
             check_for_errors
             generated
           end

data/lib/genspec/version.rb

@@ -2,7 +2,7 @@ module GenSpec
   class Version
     MAJOR = 0
     MINOR = 2
-    PATCH = 5
+    PATCH = 6
     RELEASE = nil
     
     STRING = (RELEASE ? [MAJOR, MINOR, PATCH, RELEASE] : [MAJOR, MINOR, PATCH]).join('.')

data/spec/lib/genspec_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe GenSpec do
+  include GenSpec::GeneratorExampleGroup
+  generator :test_rails3
+  with_args "one", "two"
+  
+  describe "with a custom root" do
+    before { GenSpec.root = File.expand_path("../../tmp", File.dirname(__FILE__)) }
+    after  { GenSpec.root = nil }
+  
+    it "should generate files in generation root" do
+      within_source_root { Dir[File.join(GenSpec.root, '**/*')].should_not be_empty }
+      subject.should generate("a_directory")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -23,5 +23,9 @@ if !defined?(Rails)
   require File.expand_path('support/generators/question/question_generator', File.dirname(__FILE__))
 end
 
+RSpec.configure do |c|
+  c.before { GenSpec.root = File.expand_path('../tmp', File.dirname(__FILE__)) } if RUBY_PLATFORM =~ /java/i
+end
+
 require File.join(File.dirname(__FILE__),"../lib/gen_spec")
 GenSpec::Matchers::GenerationMethodMatcher::GENERATION_CLASSES << "CustomActions"

data/spec/support/generators/test_rails3/test_rails3_generator.rb

@@ -23,10 +23,12 @@ class TestRails3 < base
   end
   
   def gen_gem_source
-    if defined?(Rails)
-      add_source "http://gems.github.com/"
-    else
-      append_file "Gemfile", 'source "http://gems.github.com/"'
+    if File.file?("Gemfile")
+      if defined?(Rails)
+        add_source "http://gems.github.com/"
+      else
+        append_file "Gemfile", 'source "http://gems.github.com/"'
+      end
     end
   end
 end

metadata

@@ -1,71 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: genspec
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.6
   prerelease: 
-  version: 0.2.5
 platform: ruby
-authors: 
+authors:
 - Colin MacKenzie IV
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-07-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2010-07-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152490020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152490020
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2152489100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sc-core-ext
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2152489100
+- !ruby/object:Gem::Dependency
+  name: sc-core-ext
+  requirement: &2152488220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2152488220
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2152487180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
-  version_requirements: *id004
-description: Simple, expressive Thor and/or Rails 3 generator testing for RSpec. For the Rails 2.3 version, use genspec 0.1.x.
+  prerelease: false
+  version_requirements: *2152487180
+description: Simple, expressive Thor and/or Rails 3 generator testing for RSpec. For
+  the Rails 2.3 version, use genspec 0.1.x.
 email: sinisterchipmunk@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
 - .gitignore
 - .rspec
@@ -89,6 +87,7 @@ files:
 - spec/generators/migration_spec.rb
 - spec/generators/question_spec.rb
 - spec/generators/test_rails3_spec.rb
+- spec/lib/genspec_spec.rb
 - spec/rcov.opts
 - spec/rspec.opts
 - spec/spec_helper.rb
@@ -99,35 +98,35 @@ files:
 - spec/support/generators/test_rails3/test_rails3_generator.rb
 homepage: http://www.thoughtsincomputation.com
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Simple, expressive Thor and/or Rails 3 generator testing for RSpec. For the Rails 2.3 version, use genspec 0.1.x.
-test_files: 
+summary: Simple, expressive Thor and/or Rails 3 generator testing for RSpec. For the
+  Rails 2.3 version, use genspec 0.1.x.
+test_files:
 - spec/generators/migration_spec.rb
 - spec/generators/question_spec.rb
 - spec/generators/test_rails3_spec.rb
+- spec/lib/genspec_spec.rb
 - spec/rcov.opts
 - spec/rspec.opts
 - spec/spec_helper.rb