resolving generator issues (when used as a gem)

yortz · Apr 6, 2009 · 4aad8e3 · 4aad8e3
1 parent 43487e8
commit 4aad8e3
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/History.txt b/History.txt
@@ -1,17 +1,24 @@
 (In Git)
 
- === New features 
+ === New features
+ === Bufixes
+
+ == 0.1.2 2009-4-05
+
+ === New features
  === Bufixes
+  * Actually added the renamed generators to the gem so people could use it! D'oh! (Ben Mabey)
+    * You can either use "./script generate email_spec" or "rubigen rails email_spec"
   * Removed Rake tasks from example application to prevent conflicts when used as a plugin. (Ben Mabey)
 
- == 0.1.1 2008-3-26
- === New features 
+ == 0.1.1 2009-3-26
+ === New features
   * Switched dir structure over to support rubigen. (Dr. Nic)
 
  === Bufixes
 
- == 0.1.0 2008-3-25
- === New features 
+ == 0.1.0 2009-3-25
+ === New features
   * Change Rakefile to run all specs and features, as well as prepare the db (Mischa Fierer)
   * Allow for array to be passed into deliver_to matcher. (Diego Carrion)
   * Added matcher for checking if a collection of emails includes an email with a particular subject (Luke Melia, Noah Davis)
@@ -33,17 +40,17 @@
 === Bufixes
  * Revert parse_email_for_link helper method to allow for text links as well as explicit link finding. (Mischa Fierer)
  * Isolated variances between using email-spec with an ARMailer project. (Luke Melia)
-
 
-== 0.0.9 2008-2-15
+
+== 0.0.9 2009-2-15
  === New features
   * have_body_text, have_header matchers (Luke Melia)
   * EmailViewer - opens all sent emails in a given scenario when the environment variables are set. (Luke Melia)
   * Added compatibility with using ARMailer in test mode. (Luke Melia)
  === Bugfixes
   * set_current_email now works with multiple addresses in To field. (Brian McManus, Ben Mabey)
 
-== 0.0.7 2008-1-20
+== 0.0.7 2009-1-20
  === New features
   * have_subject matcher (Ben Mabey)
 

diff --git a/email_spec.gemspec b/email_spec.gemspec
@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{email_spec}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Mabey", "Aaron Gibralter", "Mischa Fierer"]
-  s.date = %q{2009-03-26}
+  s.date = %q{2009-04-05}
   s.description = %q{Easily test email in rspec and cucumber}
   s.email = %q{ben@benmabey.com}
   s.extra_rdoc_files = ["README.rdoc", "MIT-LICENSE.txt"]
-  s.files = ["History.txt", "install.rb", "MIT-LICENSE.txt", "README.rdoc", "Rakefile", "lib/email_spec", "lib/email_spec/address_converter.rb", "lib/email_spec/cucumber.rb", "lib/email_spec/deliveries.rb", "lib/email_spec/email_viewer.rb", "lib/email_spec/helpers.rb", "lib/email_spec/matchers.rb", "lib/email_spec.rb", "spec/email_spec", "spec/email_spec/matchers_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "examples/rails_root", "examples/rails_root/app", "examples/rails_root/app/controllers", "examples/rails_root/app/controllers/application.rb", "examples/rails_root/app/controllers/welcome_controller.rb", "examples/rails_root/app/helpers", "examples/rails_root/app/helpers/application_helper.rb", "examples/rails_root/app/helpers/welcome_helper.rb", "examples/rails_root/app/models", "examples/rails_root/app/models/user.rb", "examples/rails_root/app/models/user_mailer.rb", "examples/rails_root/app/views", "examples/rails_root/app/views/user_mailer", "examples/rails_root/app/views/user_mailer/signup.erb", "examples/rails_root/app/views/welcome", "examples/rails_root/app/views/welcome/confirm.html.erb", "examples/rails_root/app/views/welcome/index.html.erb", "examples/rails_root/app/views/welcome/signup.html.erb", "examples/rails_root/config", "examples/rails_root/config/boot.rb", "examples/rails_root/config/database.yml", "examples/rails_root/config/environment.rb", "examples/rails_root/config/environments", "examples/rails_root/config/environments/development.rb", "examples/rails_root/config/environments/production.rb", "examples/rails_root/config/environments/test.rb", "examples/rails_root/config/initializers", "examples/rails_root/config/initializers/inflections.rb", "examples/rails_root/config/initializers/mime_types.rb", "examples/rails_root/config/initializers/new_rails_defaults.rb", "examples/rails_root/config/routes.rb", "examples/rails_root/cucumber.yml", "examples/rails_root/db", "examples/rails_root/db/migrate", "examples/rails_root/db/migrate/20090125013728_create_users.rb", "examples/rails_root/db/schema.rb", "examples/rails_root/db/test.sqlite3", "examples/rails_root/doc", "examples/rails_root/doc/README_FOR_APP", "examples/rails_root/features", "examples/rails_root/features/errors.feature", "examples/rails_root/features/example.feature", "examples/rails_root/features/step_definitions", "examples/rails_root/features/step_definitions/email_steps.rb", "examples/rails_root/features/step_definitions/user_steps.rb", "examples/rails_root/features/step_definitions/webrat_steps.rb", "examples/rails_root/features/support", "examples/rails_root/features/support/env.rb", "examples/rails_root/lib", "examples/rails_root/lib/tasks", "examples/rails_root/lib/tasks/rspec.rake", "examples/rails_root/log", "examples/rails_root/log/development.log", "examples/rails_root/log/test.log", "examples/rails_root/public", "examples/rails_root/public/404.html", "examples/rails_root/public/422.html", "examples/rails_root/public/500.html", "examples/rails_root/public/dispatch.rb", "examples/rails_root/public/favicon.ico", "examples/rails_root/public/images", "examples/rails_root/public/images/rails.png", "examples/rails_root/public/javascripts", "examples/rails_root/public/javascripts/application.js", "examples/rails_root/public/javascripts/controls.js", "examples/rails_root/public/javascripts/dragdrop.js", "examples/rails_root/public/javascripts/effects.js", "examples/rails_root/public/javascripts/prototype.js", "examples/rails_root/public/robots.txt", "examples/rails_root/Rakefile", "examples/rails_root/script", "examples/rails_root/script/about", "examples/rails_root/script/autospec", "examples/rails_root/script/console", "examples/rails_root/script/cucumber", "examples/rails_root/script/dbconsole", "examples/rails_root/script/destroy", "examples/rails_root/script/generate", "examples/rails_root/script/performance", "examples/rails_root/script/performance/benchmarker", "examples/rails_root/script/performance/profiler", "examples/rails_root/script/performance/request", "examples/rails_root/script/plugin", "examples/rails_root/script/process", "examples/rails_root/script/process/inspector", "examples/rails_root/script/process/reaper", "examples/rails_root/script/process/spawner", "examples/rails_root/script/runner", "examples/rails_root/script/server", "examples/rails_root/script/spec", "examples/rails_root/script/spec_server", "examples/rails_root/spec", "examples/rails_root/spec/controllers", "examples/rails_root/spec/controllers/welcome_controller_spec.rb", "examples/rails_root/spec/model_factory.rb", "examples/rails_root/spec/models", "examples/rails_root/spec/models/user_mailer_spec.rb", "examples/rails_root/spec/models/user_spec.rb", "examples/rails_root/spec/rcov.opts", "examples/rails_root/spec/spec.opts", "examples/rails_root/spec/spec_helper.rb", "examples/rails_root/stories", "examples/rails_root/stories/all.rb", "examples/rails_root/stories/helper.rb", "examples/rails_root/vendor", "examples/rails_root/vendor/plugins", "examples/rails_root/vendor/plugins/email_spec", "examples/rails_root/vendor/plugins/email_spec/rails_generators", "examples/rails_root/vendor/plugins/email_spec/rails_generators/email_spec", "examples/rails_root/vendor/plugins/email_spec/rails_generators/email_spec/email_spec_generator.rb", "examples/rails_root/vendor/plugins/email_spec/rails_generators/email_spec/templates", "examples/rails_root/vendor/plugins/email_spec/rails_generators/email_spec/templates/email_steps.rb"]
+  s.files = ["History.txt", "install.rb", "MIT-LICENSE.txt", "README.rdoc", "Rakefile", "lib/email_spec", "lib/email_spec/address_converter.rb", "lib/email_spec/cucumber.rb", "lib/email_spec/deliveries.rb", "lib/email_spec/email_viewer.rb", "lib/email_spec/helpers.rb", "lib/email_spec/matchers.rb", "lib/email_spec.rb", "rails_generators/email_spec", "rails_generators/email_spec/email_spec_generator.rb", "rails_generators/email_spec/templates", "rails_generators/email_spec/templates/email_steps.rb", "spec/email_spec", "spec/email_spec/matchers_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "examples/rails_root", "examples/rails_root/app", "examples/rails_root/app/controllers", "examples/rails_root/app/controllers/application.rb", "examples/rails_root/app/controllers/welcome_controller.rb", "examples/rails_root/app/helpers", "examples/rails_root/app/helpers/application_helper.rb", "examples/rails_root/app/helpers/welcome_helper.rb", "examples/rails_root/app/models", "examples/rails_root/app/models/user.rb", "examples/rails_root/app/models/user_mailer.rb", "examples/rails_root/app/views", "examples/rails_root/app/views/user_mailer", "examples/rails_root/app/views/user_mailer/signup.erb", "examples/rails_root/app/views/welcome", "examples/rails_root/app/views/welcome/confirm.html.erb", "examples/rails_root/app/views/welcome/index.html.erb", "examples/rails_root/app/views/welcome/signup.html.erb", "examples/rails_root/config", "examples/rails_root/config/boot.rb", "examples/rails_root/config/database.yml", "examples/rails_root/config/environment.rb", "examples/rails_root/config/environments", "examples/rails_root/config/environments/development.rb", "examples/rails_root/config/environments/production.rb", "examples/rails_root/config/environments/test.rb", "examples/rails_root/config/initializers", "examples/rails_root/config/initializers/inflections.rb", "examples/rails_root/config/initializers/mime_types.rb", "examples/rails_root/config/initializers/new_rails_defaults.rb", "examples/rails_root/config/routes.rb", "examples/rails_root/cucumber.yml", "examples/rails_root/db", "examples/rails_root/db/development.sqlite3", "examples/rails_root/db/migrate", "examples/rails_root/db/migrate/20090125013728_create_users.rb", "examples/rails_root/db/schema.rb", "examples/rails_root/db/test.sqlite3", "examples/rails_root/doc", "examples/rails_root/doc/README_FOR_APP", "examples/rails_root/features", "examples/rails_root/features/errors.feature", "examples/rails_root/features/example.feature", "examples/rails_root/features/step_definitions", "examples/rails_root/features/step_definitions/email_steps.rb", "examples/rails_root/features/step_definitions/user_steps.rb", "examples/rails_root/features/step_definitions/webrat_steps.rb", "examples/rails_root/features/support", "examples/rails_root/features/support/env.rb", "examples/rails_root/lib", "examples/rails_root/log", "examples/rails_root/log/development.log", "examples/rails_root/log/test.log", "examples/rails_root/public", "examples/rails_root/public/404.html", "examples/rails_root/public/422.html", "examples/rails_root/public/500.html", "examples/rails_root/public/dispatch.rb", "examples/rails_root/public/favicon.ico", "examples/rails_root/public/images", "examples/rails_root/public/images/rails.png", "examples/rails_root/public/javascripts", "examples/rails_root/public/javascripts/application.js", "examples/rails_root/public/javascripts/controls.js", "examples/rails_root/public/javascripts/dragdrop.js", "examples/rails_root/public/javascripts/effects.js", "examples/rails_root/public/javascripts/prototype.js", "examples/rails_root/public/robots.txt", "examples/rails_root/script", "examples/rails_root/script/about", "examples/rails_root/script/autospec", "examples/rails_root/script/console", "examples/rails_root/script/cucumber", "examples/rails_root/script/dbconsole", "examples/rails_root/script/destroy", "examples/rails_root/script/generate", "examples/rails_root/script/performance", "examples/rails_root/script/performance/benchmarker", "examples/rails_root/script/performance/profiler", "examples/rails_root/script/performance/request", "examples/rails_root/script/plugin", "examples/rails_root/script/process", "examples/rails_root/script/process/inspector", "examples/rails_root/script/process/reaper", "examples/rails_root/script/process/spawner", "examples/rails_root/script/runner", "examples/rails_root/script/server", "examples/rails_root/script/spec", "examples/rails_root/script/spec_server", "examples/rails_root/spec", "examples/rails_root/spec/controllers", "examples/rails_root/spec/controllers/welcome_controller_spec.rb", "examples/rails_root/spec/model_factory.rb", "examples/rails_root/spec/models", "examples/rails_root/spec/models/user_mailer_spec.rb", "examples/rails_root/spec/models/user_spec.rb", "examples/rails_root/spec/rcov.opts", "examples/rails_root/spec/spec.opts", "examples/rails_root/spec/spec_helper.rb", "examples/rails_root/stories", "examples/rails_root/stories/all.rb", "examples/rails_root/stories/helper.rb", "examples/rails_root/vendor", "examples/rails_root/vendor/plugins", "examples/rails_root/vendor/plugins/email_spec", "examples/rails_root/vendor/plugins/email_spec/rails_generators", "examples/rails_root/vendor/plugins/email_spec/rails_generators/email_spec", "examples/rails_root/vendor/plugins/email_spec/rails_generators/email_spec/email_spec_generator.rb", "examples/rails_root/vendor/plugins/email_spec/rails_generators/email_spec/templates", "examples/rails_root/vendor/plugins/email_spec/rails_generators/email_spec/templates/email_steps.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/bmabey/email-spec/}
   s.rdoc_options = ["--inline-source", "--charset=UTF-8"]

diff --git a/.../rails_root/vendor/plugins/email_spec/rails_generators/email_spec/email_spec_generator.rb b/.../rails_root/vendor/plugins/email_spec/rails_generators/email_spec/email_spec_generator.rb
@@ -1,5 +1,6 @@
 # This generator adds email steps to the step definitions directory 
-class EmailSpecGenerator < RubiGen::Base#Rails::Generator::Base
+generator_base = defined?(Rails) ? Rails::Generator::Base : RubiGen::Base
+class EmailSpecGenerator < generator_base
   def manifest
     record do |m|
       m.directory 'features/step_definitions'

diff --git a/rails_generators/email_spec/email_spec_generator.rb b/rails_generators/email_spec/email_spec_generator.rb
@@ -1,5 +1,6 @@
 # This generator adds email steps to the step definitions directory 
-class EmailSpecGenerator < RubiGen::Base#Rails::Generator::Base
+generator_base = defined?(Rails) ? Rails::Generator::Base : RubiGen::Base
+class EmailSpecGenerator < generator_base
   def manifest
     record do |m|
       m.directory 'features/step_definitions'