Merge pull request #50 from anitagraham/descriptions

Compatible with Ruby 3.2

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
 

lib/generator_spec/matcher.rb

@@ -2,8 +2,13 @@ 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
@@ -24,9 +29,9 @@ def matches?(root)
 
         check_contents(root.join(@name))
       end
-      
+
       protected
-      
+
       def check_contents(file)
         contents = ::File.read(file)
 
@@ -37,20 +42,24 @@ def check_contents(file)
         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 +70,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 +96,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,6 +123,10 @@ 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"
@@ -136,4 +153,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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'tmpdir'
 
-TMP_ROOT = Pathname.new(Dir.tmpdir)
+TMP_ROOT = Pathname.new(Dir.tmpdir).join('generator')
 
 describe TestGenerator, 'using custom matcher' do
   include GeneratorSpec::TestCase
@@ -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