generator_spec 0.9.0 → 0.9.1

data/.travis.yml

@@ -1,8 +1,6 @@
 language: ruby
 rvm:
+  - 2.0.0
   - 1.9.3
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
+  - jruby-19mode
   - rbx-19mode
-  - 1.8.7

data/README.md

@@ -12,15 +12,14 @@ group :test do
 end
 ```
 
-Spec:
+Spec (files in `spec/lib/generators` are recognized as generator type example group):
 
 ```ruby
 # spec/lib/generators/test/test_generator_spec.rb
     
-require "generator_spec/test_case"
+require "generator_spec"
 
 describe TestGenerator do
-  include GeneratorSpec::TestCase
   destination File.expand_path("../../tmp", __FILE__)
   arguments %w(something)
 
@@ -38,8 +37,7 @@ end
 An RSpec file matching DSL is also provided, taken with permission from [beard](https://github.com/carlhuda/beard/blob/master/spec/support/matcher.rb) by [carlhuda](https://github.com/carlhuda).
 
 ```ruby
-describe TestGenerator, "using custom matcher" do
-  include GeneratorSpec::TestCase
+describe TestGenerator, "using custom matcher", type: :generator do
   destination File.expand_path("../../tmp", __FILE__)
   
   before do

data/generator_spec.gemspec

@@ -18,8 +18,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_dependency 'activerecord', ['>= 3.0', '<= 4.0']
-  s.add_dependency 'railties', ['>= 3.0', '<= 4.0']
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'fakefs', '~> 0.4.1'
+  s.add_dependency 'activesupport', ['>= 3.0.0']
+  s.add_dependency 'railties', ['>= 3.0.0']
+  s.add_development_dependency 'rspec', '>= 2.14.0'
 end

data/lib/generator_spec.rb

@@ -0,0 +1,12 @@
+require 'rspec/core'
+require 'generator_spec/generator_example_group'
+
+RSpec::configure do |c|
+  def c.escaped_path(*parts)
+    Regexp.compile(parts.join('[\\\/]') + '[\\\/]')
+  end
+
+  c.include GeneratorSpec::GeneratorExampleGroup, :type => :generator, :example_group => {
+    :file_path => c.escaped_path(%w[spec lib generators])
+  }
+end

data/lib/generator_spec/generator_example_group.rb

@@ -0,0 +1,6 @@
+require 'generator_spec/test_case'
+
+module GeneratorSpec::GeneratorExampleGroup
+  extend ActiveSupport::Concern
+  include GeneratorSpec::TestCase
+end

data/lib/generator_spec/test_case.rb

@@ -1,4 +1,4 @@
-require 'active_record'
+require 'active_support/all'
 require 'rails/generators/test_case'
 require 'generator_spec/matcher'
 

data/lib/generator_spec/version.rb

@@ -1,3 +1,3 @@
 module GeneratorSpec
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/spec/generator_spec/generator_example_group_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+module GeneratorSpec
+  describe GeneratorExampleGroup do
+    it { should be_included_in_files_in('./spec/lib/generators/') }
+  end
+end

data/spec/generator_spec/matcher_spec.rb

@@ -1,15 +1,19 @@
 require 'spec_helper'
+require 'tmpdir'
+
+TMP_ROOT = Pathname.new(Dir.tmpdir)
 
 describe TestGenerator, 'using custom matcher' do
   include GeneratorSpec::TestCase
-  destination File.expand_path('../../tmp', __FILE__)
+  destination TMP_ROOT
   arguments %w(test --test)
-  
+
   before do
+    delete_directory(TMP_ROOT)
     prepare_destination
     run_generator
   end
-  
+
   specify do
     destination_root.should have_structure {
       no_file 'test.rb'
@@ -30,7 +34,7 @@ describe TestGenerator, 'using custom matcher' do
       end
     }
   end
-  
+
   it 'fails when it doesnt match' do
     expect {
       destination_root.should have_structure {
@@ -44,241 +48,252 @@ describe TestGenerator, 'using custom matcher' do
   end
 end
 
-TMP_ROOT = Pathname.new(File.expand_path('../../tmp'))
-
-module GeneratorSpec::Matcher
-  describe File do
-    describe '#matches?' do
-      include FakeFS::SpecHelpers
-      
-      before do
-        @file = File.new('test_file')
-        @location = TMP_ROOT.join('test_file')
-      end
-      
-      context 'with no contains' do
-        it 'doesnt throw if the file exists' do
-          write_file(@location, '')
-          expect {
-            @file.matches?(TMP_ROOT)
-          }.to_not throw_symbol
-        end
-      
-        it 'throws :failure if it doesnt exist' do
-          expect {
-            @file.matches?(TMP_ROOT)
-          }.to throw_symbol(:failure)
-        end
-      end
-      
-      context 'with contains' do
+module GeneratorSpec
+  module Matcher
+    describe File do
+      describe '#matches?' do
         before do
-          write_file(@location, 'class CreatePosts')
+          delete_directory(TMP_ROOT)
         end
 
-        it 'doesnt throw if the content includes the string' do
-          @file.contains 'CreatePosts'
-          expect {
-            @file.matches?(TMP_ROOT)
-          }.to_not throw_symbol
+        let(:file) { File.new('test_file') }
+        let(:location) { TMP_ROOT.join('test_file') }
+
+        context 'with no contains' do
+          it 'doesnt throw if the file exists' do
+            write_file(location, '')
+            expect {
+              file.matches?(TMP_ROOT)
+            }.to_not throw_symbol
+          end
+
+          it 'throws :failure if it doesnt exist' do
+            expect {
+              file.matches?(TMP_ROOT)
+            }.to throw_symbol(:failure)
+          end
         end
 
-        it 'throws :failure if the contents dont include the string' do
-          @file.contains 'PostsMigration'
-          expect {
-            @file.matches?(TMP_ROOT)
-          }.to throw_symbol(:failure)
+        context 'with contains' do
+          before do
+            write_file(location, 'class CreatePosts')
+          end
+
+          it 'doesnt throw if the content includes the string' do
+            file.contains 'CreatePosts'
+            expect {
+              file.matches?(TMP_ROOT)
+            }.to_not throw_symbol
+          end
+
+          it 'throws :failure if the contents dont include the string' do
+            file.contains 'PostsMigration'
+            expect {
+              file.matches?(TMP_ROOT)
+            }.to throw_symbol(:failure)
+          end
         end
       end
     end
-  end
-  
-  describe Migration do
-    include FakeFS::SpecHelpers
-    
-    describe '#matches?' do
-      before do
-        @migration = Migration.new('create_posts')
-        @location = TMP_ROOT.join('123456_create_posts.rb')
-      end
 
-      context 'with no contains' do
-        it 'doesnt throw if the migration exists' do
-          write_file(@location, 'class CreatePosts')
-          expect {
-            @migration.matches?(TMP_ROOT)
-          }.to_not throw_symbol
-        end
-        
-        it 'throws :failure if it doesnt exist' do
-          expect {
-            @migration.matches?(TMP_ROOT)
-          }.to throw_symbol(:failure)
-        end
-      end
-      
-      context 'with contains' do
+    describe Migration do
+      describe '#matches?' do
         before do
-          write_file(@location, 'class CreatePosts')
+          delete_directory(TMP_ROOT)
         end
-        
-        it 'doesnt throw if the migration includes the given content' do
-          @migration.contains('CreatePosts')
-          expect {
-            @migration.matches?(TMP_ROOT)
-          }.to_not throw_symbol
+
+        let(:migration) { Migration.new('create_posts') }
+        let(:location) { TMP_ROOT.join('123456_create_posts.rb') }
+
+        context 'with no contains' do
+          it 'doesnt throw if the migration exists' do
+            write_file(location, 'class CreatePosts')
+            expect {
+              migration.matches?(TMP_ROOT)
+            }.to_not throw_symbol
+          end
+
+          it 'throws :failure if it doesnt exist' do
+            expect {
+              migration.matches?(TMP_ROOT)
+            }.to throw_symbol(:failure)
+          end
         end
-        
-        it 'throws failure if the migration doesnt include the given content' do
-          @migration.contains('CreateNotes')
-          expect {
-            @migration.matches?(TMP_ROOT)
-          }.to throw_symbol(:failure)
+
+        context 'with contains' do
+          before do
+            write_file(location, 'class CreatePosts')
+          end
+
+          it 'doesnt throw if the migration includes the given content' do
+            migration.contains('CreatePosts')
+            expect {
+              migration.matches?(TMP_ROOT)
+            }.to_not throw_symbol
+          end
+
+          it 'throws failure if the migration doesnt include the given content' do
+            migration.contains('CreateNotes')
+            expect {
+              migration.matches?(TMP_ROOT)
+            }.to throw_symbol(:failure)
+          end
         end
       end
     end
-  end
-  
-  describe Directory do
-    include FakeFS::SpecHelpers
-    
-    describe '#location' do
-      it 'equals the full path' do
-        Directory.new('test').location('test_2').should eq('test/test_2')
-      end
-    end
-    
-    describe '#directory' do
-      context 'without a block' do
-        it 'adds a directory name to the tree' do
-          dir = Directory.new 'test' do
-            directory 'dir'
-          end
-          dir.tree['dir'].should eq(false)
+
+    describe Directory do
+      describe '#location' do
+        it 'equals the full path' do
+          Directory.new('test').location('test_2').should eq('test/test_2')
         end
       end
-      
-      context 'with a block' do
-        it 'add a directory object to the tree' do
-          dir = Directory.new 'test' do
-            directory 'dir' do
-              directory 'test_2'
+
+      describe '#directory' do
+        context 'without a block' do
+          it 'adds a directory name to the tree' do
+            dir = Directory.new 'test' do
+              directory 'dir'
             end
+            dir.tree['dir'].should eq(false)
           end
-          dir.tree['dir'].should be_an_instance_of(Directory)
-          dir.tree['dir'].tree['test_2'].should eq(false)
         end
-      end
-    end
-    
-    describe '#file' do
-      it 'adds it to the tree' do
-        dir = Directory.new 'test' do
-          file 'test_file'
+
+        context 'with a block' do
+          it 'add a directory object to the tree' do
+            dir = Directory.new 'test' do
+              directory 'dir' do
+                directory 'test_2'
+              end
+            end
+            dir.tree['dir'].should be_an_instance_of(Directory)
+            dir.tree['dir'].tree['test_2'].should eq(false)
+          end
         end
-        dir.tree['test_file'].should be_an_instance_of(File)
       end
-    end
-    
-    describe '#file' do
-      it 'adds it to the tree' do
-        dir = Directory.new 'test' do
-          migration 'test_file'
+
+      describe '#file' do
+        it 'adds it to the tree' do
+          dir = Directory.new 'test' do
+            file 'test_file'
+          end
+          dir.tree['test_file'].should be_an_instance_of(File)
         end
-        dir.tree['test_file'].should be_an_instance_of(Migration)
-        dir.tree['test_file'].instance_variable_get('@name').should eq('test/test_file')
       end
-    end
-    
-    describe '#matches?' do
-      context 'with a directory name' do
-        before do
-          @dir = Directory.new 'test' do
-            directory 'test_2'
+
+      describe '#file' do
+        it 'adds it to the tree' do
+          dir = Directory.new 'test' do
+            migration 'test_file'
           end
-        end
-        
-        it 'doesnt throw if the directory exists' do
-          write_directory(TMP_ROOT.join('test/test_2'))
-          expect {
-            @dir.matches?(TMP_ROOT)
-          }.to_not throw_symbol
-        end
-        
-        it 'throws :failure if it doesnt exist' do
-          expect {
-            @dir.matches?(TMP_ROOT)
-          }.to throw_symbol(:failure)
+          dir.tree['test_file'].should be_an_instance_of(Migration)
+          dir.tree['test_file'].instance_variable_get('@name').should eq('test/test_file')
         end
       end
-      
-      context 'with a directory object' do
+
+      describe '#matches?' do
         before do
-          @dir = Directory.new 'test' do
-            directory 'test_2' do
-              file 'test_file'
+          delete_directory(TMP_ROOT)
+        end
+
+        context 'with a directory name' do
+          let(:dir) {
+            Directory.new 'test' do
+              directory 'test_2'
             end
+          }
+
+          it 'doesnt throw if the directory exists' do
+            write_directory(TMP_ROOT.join('test/test_2'))
+            expect {
+              dir.matches?(TMP_ROOT)
+            }.to_not throw_symbol
+          end
+
+          it 'throws :failure if it doesnt exist' do
+            expect {
+              dir.matches?(TMP_ROOT)
+            }.to throw_symbol(:failure)
           end
-          write_directory(TMP_ROOT.join('test/test_2'))
         end
-        
-        it 'doesnt throw if the file exists' do
-          write_file(TMP_ROOT.join('test/test_2/test_file'), '')
-          expect {
-            @dir.matches?(TMP_ROOT)
-          }.to_not throw_symbol
+
+        context 'with a directory object' do
+          let(:dir) {
+            Directory.new 'test' do
+              directory 'test_2' do
+                file 'test_file'
+              end
+            end
+          }
+
+          before do
+            delete_directory(TMP_ROOT)
+            write_directory(TMP_ROOT.join('test/test_2'))
+          end
+
+          it 'doesnt throw if the file exists' do
+            write_file(TMP_ROOT.join('test/test_2/test_file'), '')
+            expect {
+              dir.matches?(TMP_ROOT)
+            }.to_not throw_symbol
+          end
+
+          it 'throws :failure if it doesnt exist' do
+            expect {
+              dir.matches?(TMP_ROOT)
+            }.to throw_symbol(:failure)
+          end
         end
-        
-        it 'throws :failure if it doesnt exist' do
-          expect {
-            @dir.matches?(TMP_ROOT)
-          }.to throw_symbol(:failure)
+
+        context '#no_file' do
+          let(:dir) {
+            Directory.new 'test' do
+              no_file 'test_file'
+            end
+          }
+          before do
+            delete_directory(TMP_ROOT)
+            write_directory(TMP_ROOT.join('test'))
+          end
+
+          it 'doesnt throw if the file exist' do
+            expect {
+              dir.matches?(TMP_ROOT)
+            }.to_not throw_symbol
+          end
+
+          it 'throws if the file exists' do
+            write_file(TMP_ROOT.join('test/test_file'), '')
+            expect {
+              dir.matches?(TMP_ROOT)
+            }.to throw_symbol(:failure)
+          end
         end
       end
-      
-      context '#no_file' do
+
+    end
+
+    describe Root do
+      describe '#matches?' do
         before do
-          @dir = Directory.new 'test' do
-            no_file 'test_file'
-          end
-          write_directory(TMP_ROOT.join('test'))
+          delete_directory(TMP_ROOT)
         end
-        
-        it 'doesnt throw if the file exist' do
-          expect {
-            @dir.matches?(TMP_ROOT)
-          }.to_not throw_symbol
-        end
-        
-        it 'throws if the file exists' do
-          write_file(TMP_ROOT.join('test/test_file'), '')
-          expect {
-            @dir.matches?(TMP_ROOT)
-          }.to throw_symbol(:failure)
+
+        let(:root) {
+          Root.new 'test' do
+            directory 'test_dir'
+          end
+        }
+
+        it 'returns true on no failures' do
+          write_directory(TMP_ROOT.join('test/test_dir'))
+          root.matches?(TMP_ROOT).should be_true
         end
-      end
-    end
-    
-  end
-  
-  describe Root do
-    include FakeFS::SpecHelpers
-    
-    describe '#matches?' do
-      before do
-        @root = Root.new 'test' do
-          directory 'test_dir'
+
+        it 'returns false on failures' do
+          root.matches?(TMP_ROOT).should be_false
         end
       end
-      
-      it 'returns true on no failures' do
-        write_directory(TMP_ROOT.join('test/test_dir'))
-        @root.matches?(TMP_ROOT).should be_true
-      end
-      
-      it 'returns false on failures' do
-        @root.matches?(TMP_ROOT).should be_false
-      end
     end
   end
-end
+end

data/spec/generator_spec/test_case_spec.rb

@@ -10,7 +10,7 @@ describe GeneratorSpec::TestCase do
       self.should_receive(:described_class).and_return(TestClass)
       include GeneratorSpec::TestCase
     end
-    @klass.test_case_instance = mock
+    @klass.test_case_instance = double
   end
   
   it 'passes unknown messages on to test_case_instance' do
@@ -24,8 +24,7 @@ describe GeneratorSpec::TestCase do
   end
 end
 
-describe TestGenerator, 'using normal assert methods' do
-  include GeneratorSpec::TestCase
+describe TestGenerator, 'using normal assert methods', :type => 'generator' do
   destination File.expand_path('../../tmp', __FILE__)
   arguments %w(test --test)
   
@@ -47,8 +46,7 @@ describe TestGenerator, 'using normal assert methods' do
   end
 end
 
-describe TestGenerator, 'with contexts' do
-  include GeneratorSpec::TestCase
+describe TestGenerator, 'with contexts', :type => 'generator' do
   destination File.expand_path('../../tmp', __FILE__)
   before { prepare_destination }
   
@@ -67,4 +65,4 @@ describe TestGenerator, 'with contexts' do
       assert_no_file 'config/initializers/test.rb'
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,11 +1,9 @@
 require 'bundler/setup'
-require 'active_record'
 require 'rspec'
-require 'generator_spec/test_case'
-require 'fakefs/spec_helpers'
+require 'generator_spec'
 
 Dir[Pathname.new(File.expand_path('../', __FILE__)).join('support/**/*.rb')].each {|f| require f}
 
 RSpec.configure do |config|
   config.include Helpers::FileSystem
-end
+end

data/spec/support/file_system.rb

@@ -8,5 +8,9 @@ module Helpers
     def write_directory(name)
       FileUtils.mkdir_p(name)
     end
+
+    def delete_directory(name)
+      FileUtils.rm_rf(name)
+    end
   end
-end
+end

data/spec/support/helpers.rb

@@ -0,0 +1,21 @@
+# taken from https://github.com/rspec/rspec-rails/blob/master/spec/support/helpers.rb
+module Helpers
+  def stub_metadata(additional_metadata)
+    stub_metadata = metadata_with(additional_metadata)
+    RSpec::Core::ExampleGroup.stub(:metadata) { stub_metadata }
+  end
+
+  def metadata_with(additional_metadata)
+    m = RSpec::Core::Metadata.new
+    m.process("example group")
+
+    group_metadata = additional_metadata.delete(:example_group)
+    if group_metadata
+      m[:example_group].merge!(group_metadata)
+    end
+    m.merge!(additional_metadata)
+    m
+  end
+
+  RSpec.configure {|c| c.include self}
+end

data/spec/support/matchers.rb

@@ -0,0 +1,11 @@
+# taken from  https://raw.github.com/rspec/rspec-rails/master/spec/support/matchers.rb
+
+RSpec::Matchers::define :be_included_in_files_in do |path|
+  match do |mod|
+    stub_metadata(
+      :example_group => {:file_path => "#{path}whatever_spec.rb:15"}
+    )
+    group = RSpec::Core::ExampleGroup.describe
+    group.included_modules.include?(mod)
+  end
+end

data/spec/support/test_generator/templates/migration.rb

@@ -1,3 +1,5 @@
-class TestMigration < ActiveRecord::Migration
+if defined?(ActiveRecord)
+  class TestMigration < ActiveRecord::Migration
   
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generator_spec
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <=
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,10 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <=
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -40,10 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <=
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,10 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <=
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,23 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 2.14.0
 description: Test Rails generators with RSpec
 email:
 - steve@hodgkiss.me.uk
@@ -103,13 +75,17 @@ files:
 - Rakefile
 - generator_spec.gemspec
 - lib/generator_spec.rb
+- lib/generator_spec/generator_example_group.rb
 - lib/generator_spec/matcher.rb
 - lib/generator_spec/test_case.rb
 - lib/generator_spec/version.rb
+- spec/generator_spec/generator_example_group_spec.rb
 - spec/generator_spec/matcher_spec.rb
 - spec/generator_spec/test_case_spec.rb
 - spec/spec_helper.rb
 - spec/support/file_system.rb
+- spec/support/helpers.rb
+- spec/support/matchers.rb
 - spec/support/test_generator/templates/initializer.rb
 - spec/support/test_generator/templates/migration.rb
 - spec/support/test_generator/test_generator.rb
@@ -138,10 +114,13 @@ signing_key:
 specification_version: 3
 summary: Test Rails generators with RSpec
 test_files:
+- spec/generator_spec/generator_example_group_spec.rb
 - spec/generator_spec/matcher_spec.rb
 - spec/generator_spec/test_case_spec.rb
 - spec/spec_helper.rb
 - spec/support/file_system.rb
+- spec/support/helpers.rb
+- spec/support/matchers.rb
 - spec/support/test_generator/templates/initializer.rb
 - spec/support/test_generator/templates/migration.rb
 - spec/support/test_generator/test_generator.rb