genspec 0.2.8 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3740bec750e728d9bb6506135c75d721b407214a
+  data.tar.gz: 0e822cbddfcf0ca68e68a44bfb6dd868fa661c0b
+SHA512:
+  metadata.gz: b2f5e61ad14a6af712f092a67721ca0a7312e01c472c1c78a8abb2730d3babeab14dd4ea381d1272299b46445e0dd475e607f546d9867086dc54a02ecec08715
+  data.tar.gz: 51076fb0b0f07ad9ce83544a88e7e21d8be623a1d2ac14c4a39950e3b203193104b82e94dcb30cd3ed77ca5f868f03d58a6716a4e0e238476a65e942bf8c5b9a

data/.gitignore

@@ -1,4 +1,5 @@
 .idea
+.rvmrc
 
 ## MAC OS
 .DS_Store
@@ -21,3 +22,5 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+Gemfile.lock
+coverage

data/.travis.yml

@@ -1,16 +1,34 @@
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
+  - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
   - ruby-head
-  - ree
-  - jruby-18mode
-  - jruby-19mode
-  - jruby-head
-  - rbx-18mode
   - rbx-19mode
 
 env:
-  - RAILS_VERSION="~> 3.1"
-  - RAILS_VERSION="~> 3.2"
-  - RAILS_VERSIOn="4.0.0.beta1"
+  - RAILS_VERSION="~> 3.1.0"
+  - RAILS_VERSION="~> 3.2.0"
+  - RAILS_VERSION="~> 4.0.0"
+  - RAILS_VERSION="~> 4.1.0"
+  - RAILS_VERSION="~> 4.2.0"
+  - RAILS_VERSION="~> 5.0.0"
+  # Do we need to test each rspec version with each rails?
+  # Since rspec has no direct relation to rails (except through rspec-rails,
+  # which isn't considered here), I'm assuming no.
+  - RAILS_VERSION="none"     RSPEC_VERSION="~> 2.0"
+  - RAILS_VERSION="none"     RSPEC_VERSION="~> 3.0"
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: rbx-19mode
+  exclude:
+    - rvm: 2.3.0
+      env: RAILS_VERSION="~> 3.1.0"
+    - rvm: 2.3.0
+      env: RAILS_VERSION="~> 3.2.0"
+    - rvm: 2.0.0
+      env: RAILS_VERSION="~> 5.0.0"
+    - rvm: 2.1.8
+      env: RAILS_VERSION="~> 5.0.0"

data/Gemfile

@@ -2,4 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails', ENV['RAILS_VERSION'] || '>= 3'
+if ENV['RAILS_VERSION'] != 'none'
+  gem 'rails', ENV['RAILS_VERSION'] || '>= 3'
+end

data/README.rdoc

@@ -1,4 +1,4 @@
-= GenSpec
+= GenSpec {<img src="https://travis-ci.org/sinisterchipmunk/genspec.png?branch=master" alt="Build Status" />}[https://travis-ci.org/sinisterchipmunk/genspec] {<img src="https://codeclimate.com/github/sinisterchipmunk/genspec.png" />}[https://codeclimate.com/github/sinisterchipmunk/genspec] {<img src="https://coveralls.io/repos/sinisterchipmunk/genspec/badge.png" alt="Coverage Status" />}[https://coveralls.io/r/sinisterchipmunk/genspec]
 
 Simple, expressive generator testing for RSpec. This version of GenSpec supports testing either Thor generators (in standalone applications/gems) or Rails 3 generators for Rails apps.
 
@@ -28,47 +28,55 @@ A basic generator spec might look something like this:
   describe :custom_controller do
     context "with no arguments or options" do
       it "should generate a help message" do
-        subject.should output("A Help Message")
+        expect(subject).to output("A Help Message")
       end
     end
     
     with_args :users do
       it "should generate a UsersController" do
-        subject.should generate("app/controllers/users_controller.rb") { |content|
-          content.should =~ /class UserController/
+        expect(subject).to generate("app/controllers/users_controller.rb") { |content|
+          expect(content).to =~ /class UserController/
         }
       end
     end
   end
+
+=== Checking an engine
+
+You may need to specify a base class, particularly if you are testing a Rails engine:
+
+  describe "base_class:custom_controller" do
+    ...
+  end
   
 === Checking Generated Files
 
 This is the preferred way to test files that were generated, because this matcher checks your generator's *behavior*. The test won't care _how_ a file is generated, as long as it _is_ generated. It's as simple as passing the name of the file you expected to be generated:
 
   it "should generate a readme file" do
-    subject.should generate("README")
+    expect(subject).to generate("README")
   end
 
 You can also check the generated file's content by simply passing a block. The _content_ argument in the block is
 a simple String containing the content of the file:
 
   it "should generate a model called 'user'" do
-    subject.should generate("app/models/user.rb") { |content|
-      content.should =~ /class User < ActiveRecord\:\:Base/
+    expect(subject).to generate("app/models/user.rb") { |content|
+      expect(content).to =~ /class User < ActiveRecord\:\:Base/
     }
   end
 
 You can also very simply ensure that the generator runs without error, without any further validation, by omitting all arguments:
 
   it "should generate successfully" do
-    subject.should generate
+    expect(subject).to generate
   end
 
 Finally, you could pass a block but no other arguments to +generate+ in order to check the generator's results the old-fashioned way:
 
   it "should generate a model called 'user'" do
-    subject.should generate {
-      File.read("app/models/user.rb").should =~ /class User < ActiveRecord\:\:Base/
+    expect(subject).to generate {
+      expect(File.read("app/models/user.rb")).to =~ /class User < ActiveRecord\:\:Base/
     }
   end
   
@@ -81,17 +89,17 @@ However, sometimes you need to verify that some action occurs which can't be val
 All 3 of the following examples perform exactly the same test. Use whichever seems the most expressive to you. (I prefer the first one.)
 
   it "should add a gem source" do
-    subject.should add_source("http://gems.github.com")
+    expect(subject).to add_source("http://gems.github.com")
   end
 
   # -or-
   it "should add a gem source" do
-    subject.should call_action(:add_source, "http://gems.github.com")
+    expect(subject).to call_action(:add_source, "http://gems.github.com")
   end
 
   # -or-
   it "should add a gem source" do
-    subject.should generate(:add_source, "http://gems.github.com")
+    expect(subject).to generate(:add_source, "http://gems.github.com")
   end
 
 You can stop passing arguments at any time. This has the effect of widening the range of acceptable parameters. For
@@ -99,13 +107,13 @@ instance, the following example does the same thing but will accept _any_ source
 action is called:
 
   it "should add a gem source" do
-    subject.should generate(:add_source)
+    expect(subject).to generate(:add_source)
   end
   
 Similarly, you can get away with specifying only the some of a sequence of arguments; the omitted arguments will accept any value, while the specified ones will be tested. Another example:
 
   it "should inject into file" do
-    subject.should inject_into_file("config/environment.rb", "config.gem :thor")
+    expect(subject).to inject_into_file("config/environment.rb", "config.gem :thor")
   end
   
   # if the generator includes the following action, the test will
@@ -125,12 +133,12 @@ If you need to test the generator's feedback rather than the generator's results
 
   # Example 1: String
   it "should generate a help message" do
-    subject.should output("A Help Message")
+    expect(subject).to output("A Help Message")
   end
 
   # Example 2: Regular Expression
   it "should generate a help message" do
-    subject.should output(/A [hH]elp Message/)
+    expect(subject).to output(/A [hH]elp Message/)
   end
 
 
@@ -209,10 +217,10 @@ Here's an example that verifies that a file is created by the generator, but tha
 
   describe :controller do
     with_args "welcome" do
-      it { should generate("app/controllers/welcome_controller.rb") }
+      it { is_expected.to generate("app/controllers/welcome_controller.rb") }
     
       with_options :behavior => :revoke do
-        it { should delete("app/controllers/welcome_controller.rb") }
+        it { is_expected.to delete("app/controllers/welcome_controller.rb") }
       end
     end
   end
@@ -239,8 +247,8 @@ You can even nest such structures within various contexts:
       within_source_root { touch "config/routes.rb" }
       
       it "should insert the new route" do
-        subject.should generate {
-          File.read("config/routes.rb").should_not be_blank
+        expect(subject).to generate {
+          expect(File.read("config/routes.rb")).not_to be_blank
         }
       end
     end

data/Rakefile

@@ -5,10 +5,12 @@ def run(*args)
   raise "tests failed" unless system *args
 end
 
+require 'coveralls/rake/task'
+Coveralls::RakeTask.new
+
 task :default do
   run "rspec", "spec"
-  ENV['USE_RAILS'] = '1'
-  run "rspec", "spec"
+  Rake::Task['coveralls:push'].invoke
 end
 
 begin

data/genspec.gemspec

@@ -8,22 +8,28 @@ Gem::Specification.new do |s|
 
   s.authors = ["Colin MacKenzie IV"]
   s.date = '2010-07-08'
-  s.description = %q{Simple, expressive Thor and/or Rails 3 generator testing for RSpec. For the Rails 2.3 version, use genspec 0.1.x.}
+  s.description = %q{Simple, expressive Thor and/or Rails 3+ generator testing for RSpec. For the Rails 2.3 version, use genspec 0.1.x.}
   s.email = 'sinisterchipmunk@gmail.com'
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
   ]
   s.files = `git ls-files`.split(/\n/)
-  s.homepage = %q{http://www.thoughtsincomputation.com}
+  s.homepage = %q{http://github.com/sinisterchipmunk/genspec}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Simple, expressive Thor and/or Rails 3 generator testing for RSpec. For the Rails 2.3 version, use genspec 0.1.x.}
+  s.summary = %q{Simple, expressive Thor and/or Rails 3+ generator testing for RSpec. For the Rails 2.3 version, use genspec 0.1.x.}
   s.test_files = Dir["spec/**/*"]
 
   s.add_dependency 'thor'
-  s.add_dependency 'rspec', '~> 2'
-  s.add_dependency 'sc-core-ext', "~> 1.2.1"
+  if ENV['RSPEC_VERSION']
+    s.add_dependency 'rspec', ENV['RSPEC_VERSION']
+  else
+    s.add_dependency 'rspec', '>= 2', '< 4'
+  end
+
+  s.add_development_dependency 'coveralls'
+  s.add_development_dependency 'rake'
 end
 

data/lib/genspec.rb

@@ -2,7 +2,7 @@ require 'thor'
 if defined?(Rails)
   if Rails::VERSION::MAJOR == 2
     raise "Use genspec 0.1.x for Rails 2; this version is for Rails 3."
-  elsif [3, 4].include? Rails::VERSION::MAJOR
+  elsif [3, 4, 5].include? Rails::VERSION::MAJOR
     require 'rails/generators'
   else
     raise "Unsupported Rails version: #{Rails::VERSION::STRING}"
@@ -11,8 +11,9 @@ end
 
 begin
   require 'rspec/core'
+  require 'rspec/version'
 rescue LoadError
-  raise "GenSpec requires RSpec v2.0."
+  raise "GenSpec requires RSpec v2.0 or newer."
 end
 
 require 'fileutils'
@@ -20,8 +21,7 @@ require 'fileutils'
 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'
@@ -29,7 +29,13 @@ module GenSpec
 end
 
 RSpec.configure do |config|
-  config.include GenSpec::GeneratorExampleGroup, :example_group => { :file_path => /spec[\/]generators/ }
+  if RSpec::Version::STRING[0] == '2'
+    config.include GenSpec::GeneratorExampleGroup, example_group: { file_path: /spec[\/]generators/ }
+  elsif RSpec::Version::STRING[0] == '3'
+    config.include GenSpec::GeneratorExampleGroup, file_path: /spec[\/]generators/
+  else
+    raise "unexpected rspec version: #{RSpec::Version::STRING}"
+  end
   
   # Kick off the action wrappers.
   #

data/lib/genspec/generator_example_group.rb

@@ -58,7 +58,7 @@ module GenSpec
       #   end
       #
       def with_args(*args, &block)
-        options = args.extract_options!
+        options = args.last.kind_of?(Hash) ? args.pop : {}
         args = args.flatten.collect { |c| c.to_s } unless options[:object]
         
         if block_given?
@@ -217,7 +217,7 @@ module GenSpec
         if genspec_subclass?
           superclass.generator
         else
-          describes || description
+          described_class || description
         end
       end
 

data/lib/genspec/matchers.rb

@@ -9,15 +9,15 @@ module GenSpec
     # :migration_template, :route_resources
     #
     # Examples:
-    #   subject.should generate(:file, ...)
-    #   subject.should generate("vendor/plugins/will_paginate/init.rb")
+    #   expect(subject).to generate(:file, ...)
+    #   expect(subject).to generate("vendor/plugins/will_paginate/init.rb")
     #
     def generate(kind = nil, *args, &block)
       if kind.kind_of?(Symbol)
-        # subject.should generate(:file, ...)
+        # expect(subject).to generate(:file, ...)
         call_action(kind, *args, &block)
       else
-        # subject.should generate("vendor/plugins/will_paginate/init.rb")
+        # expect(subject).to generate("vendor/plugins/will_paginate/init.rb")
         GenSpec::Matchers::ResultMatcher.new(kind, &block)
       end
     end
@@ -27,7 +27,7 @@ module GenSpec
     # completes its run.
     #
     # Example:
-    #   subject.should delete("path/to/file")
+    #   expect(subject).to delete("path/to/file")
     #
     def delete(filename)
       within_source_root do
@@ -35,11 +35,11 @@ module GenSpec
         FileUtils.touch   filename
       end
       
-      generate { File.should_not exist(filename) }
+      generate { expect(File).not_to exist(filename) }
     end
     
     # ex:
-    #   subject.should call_action(:create_file, ...)
+    #   expect(subject).to call_action(:create_file, ...)
     #
     def call_action(kind, *args, &block)
       GenSpec::Matchers::GenerationMethodMatcher.for_method(kind, *args, &block)
@@ -56,18 +56,21 @@ module GenSpec
         instance_methods = base.instance_methods.collect { |m| m.to_s }
         
         # ex:
-        #   subject.should create_file(...)
+        #   expect(subject).to create_file(...)
         # equivalent to:
-        #   subject.should call_action(:create_file, ...)
+        #   expect(subject).to call_action(:create_file, ...)
         
         GenSpec::Matchers::GenerationMethodMatcher.generation_methods.each do |method_name|
           # don't overwrite existing methods. since the user expects this to fire FIRST,
           # it's as if this method's been "overridden". See #included and #extended.
           next if instance_methods.include?(method_name.to_s)
           base.class_eval <<-end_code
-            def #{method_name}(*args, &block)                    # def create_file(*args, &block)
-              call_action(#{method_name.inspect}, *args, &block) #   call_action('create_file', *args, &block)
-            end                                                  # end
+            # def create_file(*args, &block)
+            #   call_action('create_file', *args, &block)
+            # end
+            def #{method_name}(*args, &block)
+              call_action(#{method_name.inspect}, *args, &block)
+            end
           end_code
         end 
       end

data/lib/genspec/matchers/base.rb

@@ -19,7 +19,9 @@ module GenSpec
       end
       
       def matches?(generator)
-        @described = generator[:described]
+        @described = generator[:described].to_s
+        base = nil
+        base, @described = @described.split(/:/) if @described =~ /:/
         @args = generator[:args]
         @generator_options = generator[:generator_options]
         @shell = GenSpec::Shell.new(generator[:output] || "", generator[:input] || "")
@@ -29,7 +31,7 @@ module GenSpec
           @generator = @described
         else
           if defined?(Rails)
-            @generator = Rails::Generators.find_by_namespace(@described)
+            @generator = Rails::Generators.find_by_namespace(@described, base)
           else
             @generator = Thor::Util.find_by_namespace(@described)
           end
@@ -113,15 +115,25 @@ module GenSpec
             end
           
             @destination_root = tempdir
-            @generator.start @args || [], @generator_options.reverse_merge(
-              :shell => @shell,
-              :destination_root => destination_root
-            )
+            defaults = { :shell => @shell, :destination_root => destination_root }
+            with_captured_io do
+              @generator.start @args || [], defaults.merge(@generator_options)
+            end
             check_for_errors
             generated
           end
         end
       end
+
+      def with_captured_io
+        stdout, stderr, stdin = $stdout, $stderr, $stdin
+        begin
+          $stdout, $stderr, $stdin = @shell.output, @shell.output, @shell.input
+          yield
+        ensure
+          $stdout, $stderr, $stdin = stdout, stderr, stdin
+        end
+      end
       
       def inject_error_handlers!
         interceptor = self

data/lib/genspec/matchers/generation_method_matcher.rb

@@ -32,8 +32,8 @@ class GenSpec::Matchers::GenerationMethodMatcher < GenSpec::Matchers::Base
   def report_actual_args(args)
     # save a reference to the set of args that most *closely* matched the expectation.
     return(@actual_args = args) if @actual_args.nil?
-    matches = (method_args % args).length
-    if matches > (method_args % @actual_args).length
+    matches = (method_args & args).length
+    if matches > (method_args & @actual_args).length
       @actual_args = args
     end
   end
@@ -42,7 +42,7 @@ class GenSpec::Matchers::GenerationMethodMatcher < GenSpec::Matchers::Base
     "expected to generate a call to #{method_name.inspect}#{with_args} but #{what}"
   end
   
-  def negative_failure_message
+  def failure_message_when_negated
     "expected not to generate a call to #{method_name.inspect}#{with_args} but it happened anyway"
   end
   
@@ -85,8 +85,9 @@ class GenSpec::Matchers::GenerationMethodMatcher < GenSpec::Matchers::Base
           
           send(:"#{method_name}_without_intercept", *argus, &block)
         end
-        
-        alias_method_chain :"#{method_name}", :intercept
+
+        alias_method :"#{method_name}_without_intercept", :"#{method_name}"
+        alias_method :"#{method_name}", :"#{method_name}_with_intercept"
       end
     end
   end
@@ -109,7 +110,7 @@ class GenSpec::Matchers::GenerationMethodMatcher < GenSpec::Matchers::Base
     # GENERATION_CLASSES. This is the list of methods that will be converted
     # into matchers, which can be used like so:
     #
-    #   subject.should create_file(. . .)
+    #   expect(subject).to create_file(. . .)
     #
     # See also GENERATION_CLASSES
     #
@@ -117,7 +118,9 @@ class GenSpec::Matchers::GenerationMethodMatcher < GenSpec::Matchers::Base
       GENERATION_CLASSES.inject([]) do |arr, mod|
         if mod.kind_of?(String)
           next arr if !defined?(Rails) && mod =~ /^Rails/
-          mod = mod.constantize
+          mod = mod.split('::').inject(Kernel) do |container, name|
+            container.const_get(name)
+          end
         end
         arr.concat mod.public_instance_methods.collect { |i| i.to_s }.reject { |i| i =~ /=/ }
         arr
@@ -127,10 +130,10 @@ class GenSpec::Matchers::GenerationMethodMatcher < GenSpec::Matchers::Base
     # called from GenSpec::Matchers#call_action
     # 
     # example:
-    #   subject.should call_action(:create_file, ...)
+    #   expect(subject).to call_action(:create_file, ...)
     #
     # equivalent to:
-    #   subject.should GenSpec::Matchers::GenerationMethodMatcher.for_method(:create_file, ...)
+    #   expect(subject).to GenSpec::Matchers::GenerationMethodMatcher.for_method(:create_file, ...)
     #
     def for_method(which, *args, &block)
       if generation_methods.include?(which.to_s)

data/lib/genspec/matchers/output_matcher.rb

@@ -25,7 +25,7 @@ module GenSpec
           "expected to match #{@regexp.inspect}, but did not"
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         output + "\n" \
           "expected not to match #{@regexp.inspect}, but did"
       end

data/lib/genspec/matchers/result_matcher.rb

@@ -30,7 +30,7 @@ module GenSpec
         "Expected to generate #{filename}"
       end
         
-      def negative_failure_message
+      def failure_message_when_negated
         "Expected to not generate #{filename}"
       end
     end

data/lib/genspec/shell.rb

@@ -10,14 +10,6 @@ module GenSpec
     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
@@ -42,13 +34,6 @@ 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)

data/lib/genspec/version.rb

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

data/spec/generators/migration_spec.rb

@@ -4,7 +4,8 @@ if defined?(Rails)
   describe :my_migration do
     it "should run migration template" do
       # bug, raising NameError: undefined local variable or method `interceptor'
-      proc { subject.should generate(:migration_template, "1", "2") }.should_not raise_error(NameError)
+      expect(proc { expect(subject).to generate(:migration_template, "1", "2")
+      }).not_to raise_error
     end
   end
 end

data/spec/generators/question_spec.rb

@@ -3,29 +3,31 @@ require 'spec_helper'
 describe :question do
   context "without input" do
     it "should raise an error" do
-      proc { subject.should output("Are you a GOD?") }.should raise_error
+      expect(proc { expect(subject).to output("Are you a GOD?")
+      }).to raise_error
     end
   end
   
   with_input "yes" do
     it "should act upon something" do
-      subject.should act_upon("something")
-      subject.should output(/Acted upon something/)
+      expect(subject).to act_upon("something")
+      expect(subject).to output(/Acted upon something/)
     end
     
     it "should not raise an error" do
-      proc { subject.should output("Good.") }.should_not raise_error
+      expect(proc { expect(subject).to output("Good.") }).not_to raise_error
     end
   end
 
   with_input "no" do
     it "should act upon something" do
-      subject.should act_upon("something")
-      subject.should output(/Acted upon something/)
+      expect(subject).to act_upon("something")
+      expect(subject).to output(/Acted upon something/)
     end
     
     it "should not raise an error" do
-      proc { subject.should output("You're new around here, aren't you?") }.should_not raise_error
+      expect(proc { expect(subject).to output("You're new around here, aren't you?")
+      }).not_to raise_error
     end
   end
 end

data/spec/generators/test_rails3_spec.rb

@@ -7,49 +7,49 @@ describe :test_rails3 do
   
   it "should modify Gemfile" do
     out = ""
-    subject.should generate {
-      File.read("Gemfile").strip.should_not be_blank
+    expect(subject).to generate {
+      expect(File.read("Gemfile").strip).not_to be_empty
       out.concat File.read("Gemfile")
     }
-    out.strip.should == 'source "http://gems.github.com/"'
+    expect(out.strip).to match %r(\Asource ['"]http://gems.github.com/['"]\z)
   end
   
   context "with no options or arguments" do
     it "should generate a file called default_file" do
-      subject.should     generate("default_file")
-      subject.should_not generate("some_other_file")
+      expect(subject).to     generate("default_file")
+      expect(subject).not_to generate("some_other_file")
       
-      subject.should     call_action(:create_file)
-      subject.should     call_action(:create_file, "default_file")
-      subject.should_not call_action(:create_file, "some_other_file")
+      expect(subject).to     call_action(:create_file)
+      expect(subject).to     call_action(:create_file, "default_file")
+      expect(subject).not_to call_action(:create_file, "some_other_file")
       
-      subject.should     create_file
-      subject.should     create_file('default_file')
-      subject.should_not create_file("some_other_file")
+      expect(subject).to     create_file
+      expect(subject).to     create_file('default_file')
+      expect(subject).not_to create_file("some_other_file")
     end
     
     it "should generate a file with specific content" do
-      subject.should generate("default_file") { |content| content.should == "content!" }
-      subject.should generate("default_file") { |content| content.should_not == "!content" }
-      subject.should_not generate("some_other_file")
+      expect(subject).to generate("default_file") { |content| expect(content).to eq "content!" }
+      expect(subject).to generate("default_file") { |content| expect(content).not_to eq "!content" }
+      expect(subject).not_to generate("some_other_file")
     end
     
     it "should generate a template called 'default_template'" do
-      subject.should generate(:template)
-      subject.should generate(:template, 'file', 'file_template')
+      expect(subject).to generate(:template)
+      expect(subject).to generate(:template, 'file', 'file_template')
     end
     
     it "should output 'create    file'" do
-      subject.should output(/create\s+default_file/)
+      expect(subject).to output(/create\s+default_file/)
     end
     
     it "shoud generate a directory called 'a_directory'" do
-      subject.should     generate(:empty_directory)
-      subject.should     generate(:empty_directory, "a_directory")
-      subject.should     generate("a_directory")
-      subject.should_not generate(:empty_directory, 'another_directory')
-      subject.should     empty_directory("a_directory")
-      subject.should_not empty_directory("another_directory")
+      expect(subject).to     generate(:empty_directory)
+      expect(subject).to     generate(:empty_directory, "a_directory")
+      expect(subject).to     generate("a_directory")
+      expect(subject).not_to generate(:empty_directory, 'another_directory')
+      expect(subject).to     empty_directory("a_directory")
+      expect(subject).not_to empty_directory("another_directory")
     end
     
     # if the other tests pass then it seems to be working properly, but let's make sure
@@ -57,18 +57,18 @@ describe :test_rails3 do
     # will work fine too.
     it 'should add_source "http://gems.github.com/"' do
       if defined?(Rails)
-        subject.should add_source("http://gems.github.com/")
+        expect(subject).to add_source("http://gems.github.com/")
       end
     end
   end
   
   with_args '--help' do
     it "should output usage banner with string" do
-      subject.should output(" test_rails3 [ARGUMENT1]")
+      expect(subject).to output(" test_rails3 [ARGUMENT1]")
     end
     
     it "should output usage banner with regexp" do
-      subject.should output(/ test_rails3 /)
+      expect(subject).to output(/ test_rails3 /)
     end
   end
   
@@ -76,42 +76,42 @@ describe :test_rails3 do
     with_args :test_arg
     
     it "should generate file 'test_arg'" do
-      subject.should generate('test_arg')
+      expect(subject).to generate('test_arg')
     end
   end
 
   with_args :test_arg do
     it "should generate file 'test_arg'" do
-      subject.should generate('test_arg')
+      expect(subject).to generate('test_arg')
     end
     
     it "should not generate template_name" do
       # because that option hasn't been given in this context.
-      subject.should_not generate('template_name')
+      expect(subject).not_to generate('template_name')
     end
     
     with_generator_options :behavior => :revoke do
       it "should delete file 'test_arg'" do
-        subject.should generate {
-          File.should_not exist("test_arg")
+        expect(subject).to generate {
+          expect(File).not_to exist("test_arg")
         }
       end
       
       # demonstrate use of the `delete` matcher, which is equivalent to
       # above:
       it "should destroy file 'test_arg'" do
-        subject.should delete("test_arg")
+        expect(subject).to delete("test_arg")
       end
     end
     
     # ...and a test of nested args
     with_args "template_name" do
       it "should generate file 'test_arg'" do
-        subject.should generate('test_arg')
+        expect(subject).to generate('test_arg')
       end
 
       it "should generate file 'template_name'" do
-        subject.should generate("template_name")
+        expect(subject).to generate("template_name")
       end
     end
   end

data/spec/lib/genspec_spec.rb

@@ -10,8 +10,8 @@ describe GenSpec do
     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")
+      within_source_root { expect(Dir[File.join(GenSpec.root, '**/*')]).not_to be_empty }
+      expect(subject).to generate("a_directory")
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear_merged!
+
 # Having ./support in the load path means Rails will load the generators at
 # ./support/generators/**/*_generator.rb and
 # ./support/rails/generators/**/*_generator.rb
@@ -6,7 +9,7 @@ $LOAD_PATH.push File.join(File.dirname(__FILE__), "support")
 require 'bundler'
 Bundler.setup
 
-if ENV['USE_RAILS']
+if ENV['RAILS_VERSION'] != 'none'
   require 'rails'
   require 'rails/generators'
 end  
@@ -23,6 +26,10 @@ if !defined?(Rails)
   require File.expand_path('support/generators/question/question_generator', File.dirname(__FILE__))
 end
 
+if RSpec::Expectations.respond_to?(:configuration)
+  RSpec::Expectations.configuration.on_potential_false_positives = :nothing
+end
+
 RSpec.configure do |c|
   c.before { GenSpec.root = File.expand_path('../tmp', File.dirname(__FILE__)) } if RUBY_PLATFORM =~ /java/i
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genspec
 version: !ruby/object:Gem::Version
-  version: 0.2.8
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Colin MacKenzie IV
@@ -14,53 +13,67 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: sc-core-ext
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
-description: Simple, expressive Thor and/or Rails 3 generator testing for RSpec. For
-  the Rails 2.3 version, use genspec 0.1.x.
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+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: []
@@ -68,10 +81,10 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
-- .document
-- .gitignore
-- .rspec
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -99,38 +112,31 @@ files:
 - spec/support/generators/test_rails3/USAGE
 - spec/support/generators/test_rails3/templates/file
 - spec/support/generators/test_rails3/test_rails3_generator.rb
-homepage: http://www.thoughtsincomputation.com
+homepage: http://github.com/sinisterchipmunk/genspec
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4044716062259480151
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4044716062259480151
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.5.1
 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.
+specification_version: 4
+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