generator-spec 0.5.0 → 0.6.3

data/README.markdown

@@ -1,7 +1,6 @@
 # RSpec 2 add-on for specifying and testing generators
 
-This project contains RSpec 2 matchers, helpers and various utilities to assist in writing Generator specs. 
-There is additional support geared towards spec'ing Generators for Rails 3.
+This project contains RSpec 2 matchers, helpers and various utilities to assist in writing Generator specs. There is additional support geared towards writing specs for Generators in Rails 3.
 
 ## Why?
 
@@ -22,12 +21,6 @@ To install the gem from the code, simply use the jeweler rake task:
 
 <code>rake install</code>
 
-## TODO
-
-Check out ways to improve the DSL, fx using Macros:
-
-http://gist.github.com/511087
-
 ## Usage
 
 The following demonstrates usage of this library. There are many more options and DSL convenience methods (see wiki, code or specs).
@@ -39,7 +32,7 @@ First setup the *spec_helper.rb*. Here is an example configuration.
 <pre># spec/spec_helper.rb
   
 require 'rspec'
-require 'generators_spec'
+require 'generator-spec'
 
 # configure it like this to use default settings
 RSpec::Generator.configure do |config|
@@ -88,10 +81,10 @@ require_generators :canable => :all
 
 <pre># spec/generators/model_generator_spec.rb  
 
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 # list of generators to spec are loaded
-require 'generators/canable'
+require_generator :canable
 
 describe 'model_generator' do
   # include Rails model helpers for ActiveRecord
@@ -102,8 +95,9 @@ describe 'model_generator' do
   use_orm :active_record
   
   # load helper modules and make available inside spec blocks
-  # here the module in rails_helpers/rails_migration is included
-  helpers :migration
+  # here the module in rails_helpers/rails_migration is included 
+  # to load multiple helpers use the method -  use_helpers
+  use_helper :migration
   
   before :each do              
     # define generator to test
@@ -118,6 +112,18 @@ describe 'model_generator' do
     # ensure clean state after each run  
     remove_model :account
   end
+
+  describe "the weird stuff!!!" do
+    before :each do
+      @generator = with_generator do |g|   
+        g.run_generator :account.args
+      end
+    end
+    
+    it "should not work without an existing Account model file" do            
+      @generator.should_not generate_file :account, :model
+    end
+  end
     
   it "should not work without an existing Account model file" do            
     with_generator do |g|   

data/Rakefile

@@ -2,47 +2,26 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "generator-spec"
-    gem.summary = %Q{RSpec 2 library for writing generator specs}
-    gem.description = %Q{RSpec 2 library to assist in writing generator specs}
+    gem.summary = %Q{RSpec 2 library add-on for testing generators}
+    gem.description = %Q{RSpec 2 library to facilitate creating generator specs}
     gem.email = "kmandrup@gmail.com"
     gem.homepage = "http://github.com/kristianmandrup/rspec_for_generators"
     gem.authors = ["Kristian Mandrup"]
-    gem.add_development_dependency "rspec", ">= 2.0.0.beta19"
-    gem.add_dependency "rspec",     ">= 2.0.0.beta.19"
-    gem.add_dependency "rake",      ">= 0.8.7"
-    gem.add_dependency "rails",     ">= 3.0.0.rc" 
-    gem.add_dependency "test-unit", ">= 2.0.9" 
-    gem.add_dependency "require_all", ">= 1.1.0"
+    gem.add_development_dependency "rspec",           "~> 2.0.0.beta.22"
+    gem.add_development_dependency "mocha",           "~> 0.9.8"
+    gem.add_development_dependency 'rails-app-spec',  "~> 0.2.5"
+
+    gem.add_dependency "rspec",             "~> 2.0.0.beta.22"
+    gem.add_dependency "rake",              "~> 0.8.7"
+    gem.add_dependency "rails",             "~> 3.0.0" 
+    gem.add_dependency "test-unit",         "~> 2.0.9" 
+    gem.add_dependency "require_all",       "~> 1.1.0"
+    gem.add_dependency "sugar-high",        "~> 0.2.5"
+    gem.add_dependency "rails3_artifactor", "~> 0.2.0"
+    
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
-
-# require 'spec/rake/spectask'
-# Spec::Rake::SpecTask.new(:spec) do |spec|
-#   spec.libs << 'lib' << 'spec'
-#   spec.spec_files = FileList['spec/**/*_spec.rb']
-# end
-# 
-# Spec::Rake::SpecTask.new(:rcov) do |spec|
-#   spec.libs << 'lib' << 'spec'
-#   spec.pattern = 'spec/**/*_spec.rb'
-#   spec.rcov = true
-# end
-# 
-# task :spec => :check_dependencies
-# 
-# task :default => :spec
-# 
-# require 'rake/rdoctask'
-# Rake::RDocTask.new do |rdoc|
-#   version = File.exist?('VERSION') ? File.read('VERSION') : ""
-# 
-#   rdoc.rdoc_dir = 'rdoc'
-#   rdoc.title = "rspec_for_generators #{version}"
-#   rdoc.rdoc_files.include('README*')
-#   rdoc.rdoc_files.include('lib/**/*.rb')
-# end
-

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.3

data/generator-spec.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{generator-spec}
-  s.version = "0.5.0"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-08-14}
-  s.description = %q{RSpec 2 library to assist in writing generator specs}
+  s.date = %q{2010-09-16}
+  s.description = %q{RSpec 2 library to facilitate creating generator specs}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -25,51 +25,19 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "generator-spec.gemspec",
-     "lib/generator_spec.rb",
-     "lib/generator_spec/extensions/core_ext.rb",
-     "lib/generator_spec/helpers/configure_rails.rb",
-     "lib/generator_spec/helpers/generator_helper.rb",
-     "lib/generator_spec/helpers/migration_helper.rb",
-     "lib/generator_spec/main.rb",
-     "lib/generator_spec/matchers/content/content_matcher.rb",
-     "lib/generator_spec/matchers/content/have_block.rb",
-     "lib/generator_spec/matchers/content/have_call.rb",
-     "lib/generator_spec/matchers/content/have_calls.rb",
-     "lib/generator_spec/matchers/content/have_class_self.rb",
-     "lib/generator_spec/matchers/content/have_comment.rb",
-     "lib/generator_spec/matchers/content/have_method.rb",
-     "lib/generator_spec/matchers/content/have_module.rb",
-     "lib/generator_spec/matchers/content/have_region.rb",
-     "lib/generator_spec/matchers/content/have_subclass.rb",
-     "lib/generator_spec/matchers/content/include_module.rb",
-     "lib/generator_spec/matchers/content/inherit_from.rb",
-     "lib/generator_spec/matchers/file/generate_directory.rb",
-     "lib/generator_spec/matchers/file/generate_file.rb",
-     "lib/generator_spec/matchers/file/generate_migration.rb",
-     "lib/generator_spec/matchers/file/have_file.rb",
-     "lib/generator_spec/matchers/helpers/content.rb",
-     "lib/generator_spec/matchers/helpers/file.rb",
-     "lib/generator_spec/matchers/helpers/migration.rb",
-     "lib/generator_spec/matchers/migration/have_column.rb",
-     "lib/generator_spec/matchers/migration/have_index.rb",
-     "lib/generator_spec/matchers/migration/have_table.rb",
-     "lib/generator_spec/matchers/migration/have_tbl_column.rb",
-     "lib/generator_spec/matchers/migration/have_up_down.rb",
-     "lib/generator_spec/rails_helpers/base_helper.rb",
-     "lib/generator_spec/rails_helpers/rails_app.rb",
-     "lib/generator_spec/rails_helpers/rails_controller.rb",
-     "lib/generator_spec/rails_helpers/rails_helper.rb",
-     "lib/generator_spec/rails_helpers/rails_mailer.rb",
-     "lib/generator_spec/rails_helpers/rails_migration.rb",
-     "lib/generator_spec/rails_helpers/rails_model.rb",
-     "lib/generator_spec/rails_helpers/rails_observer.rb",
-     "lib/generator_spec/rails_helpers/rails_orm.rb",
-     "lib/generator_spec/rails_helpers/rails_view.rb",
-     "lib/generator_spec/require_generator.rb",
-     "lib/generator_spec/rspec_generator/configure.rb",
-     "lib/generator_spec/rspec_generator/generator_util.rb",
-     "lib/generator_spec/rspec_generator/routes.rb",
-     "lib/generator_spec/rspec_generator/test_case.rb",
+     "lib/generator-spec.rb",
+     "lib/generator-spec/namespaces.rb",
+     "lib/generator-spec/rails/configure.rb",
+     "lib/generator-spec/rspec.rb",
+     "lib/generator-spec/rspec/configure.rb",
+     "lib/generator-spec/rspec/generator.rb",
+     "lib/generator-spec/rspec/generator/configure.rb",
+     "lib/generator-spec/rspec/generator/require.rb",
+     "lib/generator-spec/rspec/generator/routes.rb",
+     "lib/generator-spec/rspec/generator/test_case.rb",
+     "lib/generator-spec/rspec/macro.rb",
+     "lib/generator-spec/rspec/matchers/generate_artifact.rb",
+     "lib/generator-spec/rspec/matchers/generate_artifacts.rb",
      "lib/generators/controller/controller_generator.rb",
      "lib/generators/helper/helper_generator.rb",
      "lib/generators/migration/migration_generator.rb",
@@ -77,47 +45,14 @@ Gem::Specification.new do |s|
      "lib/generators/model/model_generator.rb",
      "lib/generators/observer/observer_generator.rb",
      "lib/generators/view/view_generator.rb",
-     "rspec_for_generators.gemspec",
-     "spec/generator_spec/generators/controller_generator_spec.rb",
-     "spec/generator_spec/generators/helper_generator_spec.rb",
-     "spec/generator_spec/generators/migration_generator_spec.rb",
-     "spec/generator_spec/generators/model_generator_spec.rb",
-     "spec/generator_spec/generators/observer_generator_spec.rb",
-     "spec/generator_spec/generators/view_generator_spec.rb",
-     "spec/generator_spec/matchers/content/class_self_spec.rb",
-     "spec/generator_spec/matchers/content/have_block_spec.rb",
-     "spec/generator_spec/matchers/content/have_call_spec.rb",
-     "spec/generator_spec/matchers/content/have_calls_spec.rb",
-     "spec/generator_spec/matchers/content/have_class_spec.rb",
-     "spec/generator_spec/matchers/content/have_method_spec.rb",
-     "spec/generator_spec/matchers/content/have_module_spec.rb",
-     "spec/generator_spec/matchers/content/have_region_spec.rb",
-     "spec/generator_spec/matchers/content/have_subclass_spec.rb",
-     "spec/generator_spec/matchers/content/include_module_spec.rb",
-     "spec/generator_spec/matchers/content/inherit_from_spec.rb",
-     "spec/generator_spec/matchers/file/directory_spec.rb",
-     "spec/generator_spec/matchers/file/file_spec.rb",
-     "spec/generator_spec/matchers/file/migration_spec.rb",
-     "spec/generator_spec/matchers/migration/have_column_spec.rb",
-     "spec/generator_spec/matchers/migration/have_index_spec.rb",
-     "spec/generator_spec/matchers/migration/have_table_spec.rb",
-     "spec/generator_spec/matchers/migration/have_tbl_column_spec.rb",
-     "spec/generator_spec/matchers/migration/have_up_down_spec.rb",
-     "spec/generator_spec/matchers/rails/controller_matcher_spec.rb",
-     "spec/generator_spec/matchers/rails/helper_matcher_spec.rb",
-     "spec/generator_spec/matchers/rails/mailer_matcher_spec.rb",
-     "spec/generator_spec/matchers/rails/model_matcher_spec.rb",
-     "spec/generator_spec/matchers/rails/observer_matcher_spec.rb",
-     "spec/generator_spec/matchers/rails/view_matcher_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_app_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_controller_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_helper_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_mailer_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_migration_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_model_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_observer_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_orm_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_view_spec.rb",
+     "spec/generator_spec/generators/controller_gen_spec.rb",
+     "spec/generator_spec/generators/helper_gen_spec.rb",
+     "spec/generator_spec/generators/migration_gen_spec.rb",
+     "spec/generator_spec/generators/model_gen_spec.rb",
+     "spec/generator_spec/generators/observer_gen_spec.rb",
+     "spec/generator_spec/generators/view_gen_spec.rb",
+     "spec/generator_spec/matchers/generate_artifact_spec.rb",
+     "spec/generator_spec/matchers/generate_artifacts_spec.rb",
      "spec/spec_helper.rb",
      "wiki/Custom Rails 3 Generators.textile",
      "wiki/content_matchers.textile",
@@ -129,48 +64,16 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{RSpec 2 library for writing generator specs}
+  s.summary = %q{RSpec 2 library add-on for testing generators}
   s.test_files = [
-    "spec/generator_spec/generators/controller_generator_spec.rb",
-     "spec/generator_spec/generators/helper_generator_spec.rb",
-     "spec/generator_spec/generators/migration_generator_spec.rb",
-     "spec/generator_spec/generators/model_generator_spec.rb",
-     "spec/generator_spec/generators/observer_generator_spec.rb",
-     "spec/generator_spec/generators/view_generator_spec.rb",
-     "spec/generator_spec/matchers/content/class_self_spec.rb",
-     "spec/generator_spec/matchers/content/have_block_spec.rb",
-     "spec/generator_spec/matchers/content/have_call_spec.rb",
-     "spec/generator_spec/matchers/content/have_calls_spec.rb",
-     "spec/generator_spec/matchers/content/have_class_spec.rb",
-     "spec/generator_spec/matchers/content/have_method_spec.rb",
-     "spec/generator_spec/matchers/content/have_module_spec.rb",
-     "spec/generator_spec/matchers/content/have_region_spec.rb",
-     "spec/generator_spec/matchers/content/have_subclass_spec.rb",
-     "spec/generator_spec/matchers/content/include_module_spec.rb",
-     "spec/generator_spec/matchers/content/inherit_from_spec.rb",
-     "spec/generator_spec/matchers/file/directory_spec.rb",
-     "spec/generator_spec/matchers/file/file_spec.rb",
-     "spec/generator_spec/matchers/file/migration_spec.rb",
-     "spec/generator_spec/matchers/migration/have_column_spec.rb",
-     "spec/generator_spec/matchers/migration/have_index_spec.rb",
-     "spec/generator_spec/matchers/migration/have_table_spec.rb",
-     "spec/generator_spec/matchers/migration/have_tbl_column_spec.rb",
-     "spec/generator_spec/matchers/migration/have_up_down_spec.rb",
-     "spec/generator_spec/matchers/rails/controller_matcher_spec.rb",
-     "spec/generator_spec/matchers/rails/helper_matcher_spec.rb",
-     "spec/generator_spec/matchers/rails/mailer_matcher_spec.rb",
-     "spec/generator_spec/matchers/rails/model_matcher_spec.rb",
-     "spec/generator_spec/matchers/rails/observer_matcher_spec.rb",
-     "spec/generator_spec/matchers/rails/view_matcher_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_app_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_controller_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_helper_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_mailer_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_migration_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_model_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_observer_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_orm_spec.rb",
-     "spec/generator_spec/rails_helpers/rails_view_spec.rb",
+    "spec/generator_spec/generators/controller_gen_spec.rb",
+     "spec/generator_spec/generators/helper_gen_spec.rb",
+     "spec/generator_spec/generators/migration_gen_spec.rb",
+     "spec/generator_spec/generators/model_gen_spec.rb",
+     "spec/generator_spec/generators/observer_gen_spec.rb",
+     "spec/generator_spec/generators/view_gen_spec.rb",
+     "spec/generator_spec/matchers/generate_artifact_spec.rb",
+     "spec/generator_spec/matchers/generate_artifacts_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -179,27 +82,39 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta19"])
-      s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
-      s.add_runtime_dependency(%q<rake>, [">= 0.8.7"])
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.0.rc"])
-      s.add_runtime_dependency(%q<test-unit>, [">= 2.0.9"])
-      s.add_runtime_dependency(%q<require_all>, [">= 1.1.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_development_dependency(%q<mocha>, ["~> 0.9.8"])
+      s.add_development_dependency(%q<rails-app-spec>, ["~> 0.2.5"])
+      s.add_runtime_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_runtime_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<test-unit>, ["~> 2.0.9"])
+      s.add_runtime_dependency(%q<require_all>, ["~> 1.1.0"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.5"])
+      s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.2.0"])
     else
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta19"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
-      s.add_dependency(%q<rake>, [">= 0.8.7"])
-      s.add_dependency(%q<rails>, [">= 3.0.0.rc"])
-      s.add_dependency(%q<test-unit>, [">= 2.0.9"])
-      s.add_dependency(%q<require_all>, [">= 1.1.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_dependency(%q<mocha>, ["~> 0.9.8"])
+      s.add_dependency(%q<rails-app-spec>, ["~> 0.2.5"])
+      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_dependency(%q<rails>, ["~> 3.0.0"])
+      s.add_dependency(%q<test-unit>, ["~> 2.0.9"])
+      s.add_dependency(%q<require_all>, ["~> 1.1.0"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.2.5"])
+      s.add_dependency(%q<rails3_artifactor>, ["~> 0.2.0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta19"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
-    s.add_dependency(%q<rake>, [">= 0.8.7"])
-    s.add_dependency(%q<rails>, [">= 3.0.0.rc"])
-    s.add_dependency(%q<test-unit>, [">= 2.0.9"])
-    s.add_dependency(%q<require_all>, [">= 1.1.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+    s.add_dependency(%q<mocha>, ["~> 0.9.8"])
+    s.add_dependency(%q<rails-app-spec>, ["~> 0.2.5"])
+    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+    s.add_dependency(%q<rake>, ["~> 0.8.7"])
+    s.add_dependency(%q<rails>, ["~> 3.0.0"])
+    s.add_dependency(%q<test-unit>, ["~> 2.0.9"])
+    s.add_dependency(%q<require_all>, ["~> 1.1.0"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.2.5"])
+    s.add_dependency(%q<rails3_artifactor>, ["~> 0.2.0"])
   end
 end
 

data/lib/generator-spec.rb

@@ -0,0 +1,12 @@
+require 'rspec'
+require 'rake'            
+require 'rails'
+require 'require_all'
+require 'sugar-high/arguments'
+require 'sugar-high/module'
+require 'rails-app-spec'
+
+require 'generator-spec/namespaces'
+require 'generator-spec/rails/configure'
+require 'generator-spec/rspec'
+

data/lib/generator-spec/namespaces.rb

@@ -0,0 +1,7 @@
+module RSpec
+  modules :generator, :rails
+end
+
+module Rails
+  modules :generators
+end

data/lib/{generator_spec/helpers/configure_rails.rb → generator-spec/rails/configure.rb}

@@ -20,7 +20,7 @@ end
   
 module Rails
   def self.root
-    @root ||= File.join(Rails.application.config.root_dir, 'rails')
+    @root ||= File.join(Rails.application.config.root_dir, 'rails_app')
   end
 end
 
@@ -29,7 +29,6 @@ end
 
 Rails.application = TestApp 
                 
-# !!!!!!!!!!!!!!!!!!!!!!
 module Rails
   def self.logger
     logger_type = RSpec::Generator.logger
@@ -44,7 +43,8 @@ module Rails
       return Logger.new(STDOUT)
     end                 
     if file != @logger_file
-      @logger_file = file 
+      @logger_file = file
+      RSpec::Generator.logfile = file 
       @logger = Logger.new(file) if file
     else
       @logger ||= Logger.new(file) if file