genspec 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -10,65 +10,75 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
-    arel (2.0.10)
-    builder (2.1.2)
+    actionmailer (3.1.1)
+      actionpack (= 3.1.1)
+      mail (~> 2.3.0)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    builder (3.0.0)
     diff-lcs (1.1.3)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    erubis (2.7.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.6.1)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.2)
-    rack-mount (0.6.14)
+    mime-types (1.17.2)
+    multi_json (1.0.3)
+    polyglot (0.3.2)
+    rack (1.3.5)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
+    rails (3.1.1)
+      actionmailer (= 3.1.1)
+      actionpack (= 3.1.1)
+      activerecord (= 3.1.1)
+      activeresource (= 3.1.1)
+      activesupport (= 3.1.1)
       bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
+      railties (= 3.1.1)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.9.2)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -79,10 +89,16 @@ GEM
     rspec-mocks (2.6.0)
     sc-core-ext (1.2.1)
       activesupport (>= 2.3.5)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
-    treetop (1.4.9)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
+    tzinfo (0.3.30)
 
 PLATFORMS
   ruby

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Colin MacKenzie IV
+Copyright (c) 2009-2011 Colin MacKenzie IV
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -7,11 +7,16 @@ end
 
 task :default do
   run "rspec", "spec"
-  ENV['RAILS'] = '1'
+  ENV['USE_RAILS'] = '1'
   run "rspec", "spec"
 end
 
-require 'rake/rdoctask'
+begin
+  require "rdoc/task"
+rescue LoadError
+  require 'rake/rdoctask'
+end
+
 Rake::RDocTask.new do |rdoc|
   version = GenSpec::VERSION
 

data/lib/genspec/matchers/base.rb

@@ -103,17 +103,10 @@ module GenSpec
             end
           
             @destination_root = tempdir
-            stdout, stderr, stdin = $stdout, $stderr, $stdin
-            $stdout, $stderr, $stdin = shell.output, shell.output, shell.input
-
-            begin
-              @generator.start(@args || [], {
-                :shell => @shell,
-                :destination_root => destination_root
-              })
-            ensure
-              $stdout, $stderr, $stdin = stdout, stderr, stdin
-            end
+            @generator.start(@args || [], {
+              :shell => @shell,
+              :destination_root => destination_root
+            })
           
             check_for_errors
             generated

data/lib/genspec/shell.rb

@@ -5,11 +5,19 @@ module GenSpec
   # the specified streams. By default, these are initialized to instances of StringIO.
   class Shell < Thor::Shell::Basic
     attr_accessor :stdin, :stdout, :stderr
-    alias_method :input, :stdin
-    alias_method :input=, :stdin=
-    alias_method :output, :stdout
+    alias_method :input,   :stdin
+    alias_method :input=,  :stdin=
+    alias_method :output,  :stdout
     alias_method :output=, :stdout=
     
+    Thor::Shell::SHELL_DELEGATED_METHODS.each do |method|
+      eval <<-end_code                            
+        def #{method}(*args, &block)            # def yes?(*args, &block)
+          push_std { super(*args, &block) }     #   push_std { super(*args, &block) }
+        end                                     # end
+      end_code
+    end
+    
     def ask(statement, color = nil)
       say "#{statement} ", color
       response = stdin.gets
@@ -34,6 +42,14 @@ module GenSpec
     end
 
     private
+    def push_std
+      _stderr, _stdout, _stdin = $stderr, $stdout, $stdin
+      $stderr, $stdout, $stdin =  stderr,  stdout,  stdin
+      yield
+    ensure
+      $stderr, $stdout, $stdin = _stderr, _stdout, _stdin
+    end
+    
     def init_stream(which, value)
       if value.kind_of?(String)
         value = StringIO.new(value)

data/lib/genspec/version.rb

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

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ $LOAD_PATH.push File.join(File.dirname(__FILE__), "support")
 require 'bundler'
 Bundler.setup
 
-if ENV['RAILS']
+if ENV['USE_RAILS']
   require 'rails'
   require 'rails/generators'
 end  

data/spec/support/generators/question/question_generator.rb

@@ -11,8 +11,8 @@ class Question < base
   def ask_question
     yn = ask "Are you a GOD?"
     case yn.downcase[0]
-      when ?y then puts "Oh, uh... Good."
-      else puts "You're new around here, aren't you?"
+      when ?y then say "Oh, uh... Good."
+      else say "You're new around here, aren't you?"
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: genspec
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Colin MacKenzie IV
@@ -14,6 +14,7 @@ date: 2010-07-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -21,10 +22,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.14.6
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,10 +33,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.6.0
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: sc-core-ext
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,10 +44,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.1
   type: :runtime
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: i18n
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -54,7 +55,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.5.0
   type: :runtime
-  prerelease: false
   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.
 email: sinisterchipmunk@gmail.com
@@ -110,23 +110,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2099379127679361504
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2099379127679361504
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+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.