Merge branch 'master' into fix-tmpdir

Author: stevehodgkiss

Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 platforms :rbx do
-  gem 'rubysl', '~> 2.0'
+  # gem 'rubysl', '~> 2.2'
   gem 'rubinius-developer_tools'
 end
 

README.md

@@ -16,7 +16,7 @@ Spec (files in `spec/lib/generators` are recognized as generator type example gr
 
 ```ruby
 # spec/lib/generators/test/test_generator_spec.rb
-    
+
 require "generator_spec"
 
 describe TestGenerator, type: :generator do
@@ -33,13 +33,13 @@ describe TestGenerator, type: :generator do
   end
 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", type: :generator do
   destination File.expand_path("../../tmp", __FILE__)
-  
+
   before do
     prepare_destination
     run_generator
@@ -52,6 +52,7 @@ describe TestGenerator, "using custom matcher", type: :generator do
         directory "initializers" do
           file "test.rb" do
             contains "# Initializer"
+            does_not_contain "Something else"
           end
         end
       end
@@ -60,6 +61,7 @@ describe TestGenerator, "using custom matcher", type: :generator do
           file "123_create_tests.rb"
           migration "create_tests" do
             contains "class TestMigration"
+            does_not_contain "Something else"
           end
         end
       end

lib/generator_spec/matcher.rb

@@ -2,11 +2,17 @@ module GeneratorSpec
   module Matcher
     # Taken (with permission) from beard by Yahuda Katz
     # https://github.com/carlhuda/beard
-  
+
     class File
+
+      def description
+        'file attributes and content'
+      end
+
       def initialize(name, &block)
         @contents = []
         @name = name
+        @negative_contents = []
 
         if block_given?
           instance_eval(&block)
@@ -17,16 +23,20 @@ def contains(text)
         @contents << text
       end
 
+      def does_not_contain(text)
+        @negative_contents << text
+      end
+
       def matches?(root)
         unless root.join(@name).exist?
           throw :failure, root.join(@name)
         end
 
         check_contents(root.join(@name))
       end
-      
+
       protected
-      
+
       def check_contents(file)
         contents = ::File.read(file)
 
@@ -35,22 +45,32 @@ def check_contents(file)
             throw :failure, [file, string, contents]
           end
         end
+
+        @negative_contents.each do |string|
+          if contents.include?(string)
+            throw :failure, [:not, file, string, contents]
+          end
+        end
       end
     end
-    
+
     class Migration < File
+      def description
+        'valid migration file'
+      end
+
       def matches?(root)
         file_name = migration_file_name(root, @name)
-        
+
         unless file_name && file_name.exist?
           throw :failure, @name
         end
-        
+
         check_contents(file_name)
       end
-      
+
       protected
-      
+
       def migration_file_name(root, name) #:nodoc:
         directory, file_name = ::File.dirname(root.join(name)), ::File.basename(name).sub(/\.rb$/, '')
         migration = Dir.glob("#{directory}/[0-9]*_*.rb").grep(/\d+_#{file_name}.rb$/).first
@@ -61,6 +81,10 @@ def migration_file_name(root, name) #:nodoc:
     class Directory
       attr_reader :tree
 
+      def description
+        'has directory structure'
+      end
+
       def initialize(root = nil, &block)
         @tree = {}
         @negative_tree = []
@@ -83,7 +107,7 @@ def no_file(name)
       def location(name)
         [@root, name].compact.join("/")
       end
-      
+
       def migration(name, &block)
         @tree[name] = Migration.new(location(name), &block)
       end
@@ -110,9 +134,17 @@ def matches?(root)
     end
 
     class Root < Directory
+      def description
+        'have specified directory structure'
+      end
+
       def failure_message
         if @failure.is_a?(Array) && @failure[0] == :not
-          "Structure should not have had #{@failure[1]}, but it did"
+          if @failure.length > 2
+            "Structure should have #{@failure[1]} without #{@failure[2]}. It had:\n#{@failure[3]}"
+          else
+            "Structure should not have had #{@failure[1]}, but it did"
+          end
         elsif @failure.is_a?(Array)
           "Structure should have #{@failure[0]} with #{@failure[1]}. It had:\n#{@failure[2]}"
         else
@@ -136,4 +168,4 @@ def have_structure(&block)
       Root.new(&block)
     end
   end
-end
+end

lib/generator_spec/version.rb

@@ -1,3 +1,3 @@
 module GeneratorSpec
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end

spec/generator_spec/matcher_spec.rb

@@ -72,6 +72,7 @@ module Matcher
         let(:location) { TMP_ROOT.join('test_file') }
 
         context 'with no contains' do
+
           it 'doesnt throw if the file exists' do
             write_file(location, '')
             expect {
@@ -84,6 +85,7 @@ module Matcher
               file.matches?(TMP_ROOT)
             }.to throw_symbol(:failure)
           end
+
         end
 
         context 'with contains' do
@@ -105,6 +107,26 @@ module Matcher
             }.to throw_symbol(:failure)
           end
         end
+
+        context 'with does_not_contain' do
+          before do
+            write_file(location, 'class CreatePosts')
+          end
+
+          it 'doesnt throw if the contents dont include the string' do
+            file.does_not_contain 'PostsMigration'
+            expect {
+              file.matches?(TMP_ROOT)
+            }.to_not throw_symbol
+          end
+
+          it 'throws :failure if the contents include the string' do
+            file.does_not_contain 'CreatePosts'
+            expect {
+              file.matches?(TMP_ROOT)
+            }.to throw_symbol(:failure)
+          end
+        end
       end
     end
 
@@ -151,6 +173,26 @@ module Matcher
             }.to throw_symbol(:failure)
           end
         end
+
+        context 'with does_not_contain' do
+          before do
+            write_file(location, 'class CreatePosts')
+          end
+
+          it 'doesnt throw if the migration doesnt include the given content' do
+            migration.does_not_contain('CreateNotes')
+            expect {
+              migration.matches?(TMP_ROOT)
+            }.to_not throw_symbol
+          end
+
+          it 'throws failure if the migration includes the given content' do
+            migration.does_not_contain('CreatePosts')
+            expect {
+              migration.matches?(TMP_ROOT)
+            }.to throw_symbol(:failure)
+          end
+        end
       end
     end