generator-spec 0.7.4 → 0.7.5

data/Rakefile

@@ -12,6 +12,7 @@ begin
     # gem.add_development_dependency "rspec",           ">= 2.0.1"
     gem.add_development_dependency "mocha",             ">= 0.9.8"
     # gem.add_development_dependency 'rails-app-spec',  "~> 0.3.0"
+    gem.add_development_dependency 'logging_assist',    "~> 0.2.2"
 
     # gem.add_dependency 'rails-app-spec',    ">= 0.3.2"
     gem.add_dependency "rspec",             ">= 2.4.1"
@@ -21,7 +22,7 @@ begin
 
     gem.add_dependency "require_all",       "~> 1.2.0"
     gem.add_dependency "sugar-high",        "~> 0.4.0"
-    # gem.add_dependency "rails3_artifactor", ">= 0.3.2"
+    gem.add_dependency "rails_artifactor",  ">= 0.3.3"
     
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.7.5

data/generator-spec.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{generator-spec}
-  s.version = "0.7.4"
+  s.version = "0.7.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -93,29 +93,35 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_development_dependency(%q<logging_assist>, ["~> 0.2.2"])
       s.add_runtime_dependency(%q<rspec>, [">= 2.4.1"])
       s.add_runtime_dependency(%q<rake>, [">= 0.8.7"])
       s.add_runtime_dependency(%q<rails>, [">= 3.0.1"])
       s.add_runtime_dependency(%q<test-unit>, [">= 2.0.1"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<sugar-high>, ["~> 0.4.0"])
+      s.add_runtime_dependency(%q<rails_artifactor>, [">= 0.3.3"])
     else
       s.add_dependency(%q<mocha>, [">= 0.9.8"])
+      s.add_dependency(%q<logging_assist>, ["~> 0.2.2"])
       s.add_dependency(%q<rspec>, [">= 2.4.1"])
       s.add_dependency(%q<rake>, [">= 0.8.7"])
       s.add_dependency(%q<rails>, [">= 3.0.1"])
       s.add_dependency(%q<test-unit>, [">= 2.0.1"])
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_dependency(%q<sugar-high>, ["~> 0.4.0"])
+      s.add_dependency(%q<rails_artifactor>, [">= 0.3.3"])
     end
   else
     s.add_dependency(%q<mocha>, [">= 0.9.8"])
+    s.add_dependency(%q<logging_assist>, ["~> 0.2.2"])
     s.add_dependency(%q<rspec>, [">= 2.4.1"])
     s.add_dependency(%q<rake>, [">= 0.8.7"])
     s.add_dependency(%q<rails>, [">= 3.0.1"])
     s.add_dependency(%q<test-unit>, [">= 2.0.1"])
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
     s.add_dependency(%q<sugar-high>, ["~> 0.4.0"])
+    s.add_dependency(%q<rails_artifactor>, [">= 0.3.3"])
   end
 end
 

data/lib/generator-spec/rspec.rb

@@ -1,4 +1,4 @@
-require 'rails3_assist/rspec'
-require 'rails3_artifactor/rspec'
+require 'rails_assist/rspec'
+require 'rails_artifactor/rspec'
 
 require_all File.dirname(__FILE__) + '/rspec'

data/lib/generator-spec/rspec/generator/require.rb

@@ -47,14 +47,17 @@ module RSpec::Generator
         base_path = File.join(lib, 'generators')
         path = name ? File.join(base_path, name) : base_path
         path = File.expand_path path
-        puts "require_all: #{path}"
+        root = root_dir || ''
+        path = File.join(root, path)                
+        puts "require_all: #{path}" if debug?
         require_all path
       end
 
       def require_generator! name, generator=nil  
         require_all_generators(name) and return if generator == :all        
 
-        file = (require_file_name name, generator)          
+        file = (require_file_name name, generator)
+        file.gsub! /^\//, ''
         puts "Loading generator: #{file}" if debug?
         require file
       end

data/lib/generator-spec/rspec/matchers/generate_artifact.rb

@@ -15,7 +15,7 @@ module RSpec::RailsApp::Artifact
       GenerateArtifact.new name, type
     end
 
-    (::Rails3::Assist.artifacts - [:view]).each do |name|
+    (::RailsAssist.artifacts - [:view]).each do |name|
       plural_artifact = name.to_s.pluralize
       class_eval %{
         def generate_#{name} name

data/lib/generator-spec/rspec/matchers/generate_artifact_file.rb

@@ -1,6 +1,6 @@
 module RSpec::RailsApp::ArtifactFile  
   module Matchers    
-    ::Rails3::Assist.artifacts.each do |name|
+    ::RailsAssist.artifacts.each do |name|
       class_eval %{
         alias_method :generate_#{name}_file, :have_#{name}_file
       }

data/lib/generator-spec/rspec/matchers/generate_artifact_files.rb

@@ -2,7 +2,7 @@ module RSpec::RailsApp::ArtifactFile
   module Matchers    
     alias_method :generate_artifact_files, :have_rails_artifact_files
     
-    ::Rails3::Assist.artifacts.each do |name|
+    ::RailsAssist.artifacts.each do |name|
       class_eval %{
         alias_method :generate_#{name}_files, :have_#{name}_files
       }

data/lib/generator-spec/rspec/matchers/generate_artifacts.rb

@@ -15,7 +15,7 @@ module RSpec::RailsApp::Artifact
       GenerateArtifacts.new type, *names
     end
     
-    (::Rails3::Assist.artifacts - [:view]).each do |name|
+    (::RailsAssist.artifacts - [:view]).each do |name|
       plural_artifact = name.to_s.pluralize
       class_eval %{
         def generate_#{plural_artifact} *names

data/spec/generator_spec/fixtures/generators/controller/controller_generator.rb

@@ -1,4 +1,4 @@
-require 'rails3_artifactor'
+require 'rails_artifactor'
 
 class ControllerGenerator < Rails::Generators::NamedBase
   desc "Adds method 'control_me' to a Controller" 
@@ -15,7 +15,7 @@ class ControllerGenerator < Rails::Generators::NamedBase
 
   protected
   
-  extend Rails3::Assist::UseMacro
+  extend RailsAssist::UseMacro
   use_helpers :controller
 
   def include_txt

data/spec/generator_spec/fixtures/generators/helper/helper_generator.rb

@@ -1,7 +1,7 @@
-require 'rails3_artifactor'
+require 'rails_artifactor'
 
 class HelperGenerator < Rails::Generators::NamedBase
-  include Rails3::Assist::Artifact::Helper
+  include RailsAssist::Artifact::Helper
 
   desc "Adds method 'help_me' to a Helper" 
     

data/spec/generator_spec/fixtures/generators/migration/migration_generator.rb

@@ -1,8 +1,7 @@
 require 'migration_assist'
 
-class MigrationGenerator < Rails::Generators::NamedBase 
-  include Rails3::Migration::Assist
-  include Rails3::Assist::Migration
+class MigrationGenerator < Rails::Generators::NamedBase
+  include RailsAssist::Migration
 
   desc "Creates a migration"
 

data/spec/generator_spec/fixtures/generators/model/model_generator.rb

@@ -28,9 +28,9 @@ class ModelGenerator < Rails::Generators::NamedBase
 
   protected
 
-  include Rails3::Assist::BasicLogger
+  include RailsAssist::BasicLogger
   
-  extend Rails3::Assist::UseMacro
+  extend RailsAssist::UseMacro
   use_orm   :mongoid
   # use_helper :model
 

data/spec/generator_spec/fixtures/generators/observer/observer_generator.rb

@@ -4,8 +4,8 @@ require 'logging_assist'
 include Log4r
 
 class ObserverGenerator < Rails::Generators::NamedBase
-  include Rails3::Assist::BasicLogger  
-  extend Rails3::Assist::UseMacro
+  include RailsAssist::BasicLogger  
+  extend RailsAssist::UseMacro
   
   desc "Adds method 'observe_me' to a Observer" 
     

data/spec/generator_spec/fixtures/generators/view/view_generator.rb

@@ -4,8 +4,8 @@ require 'logging_assist'
 include Log4r
 
 class ViewGenerator < Rails::Generators::NamedBase
-  include Rails3::Assist::BasicLogger  
-  extend Rails3::Assist::UseMacro
+  include RailsAssist::BasicLogger  
+  extend RailsAssist::UseMacro
 
   desc "Adds some view code to existing View" 
     

data/spec/generator_spec/generators/controller_gen_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 RSpec::Generator::Require.root_dir = 'generator_spec/fixtures'
 
+puts "root_dir: #{RSpec::Generator::Require.root_dir}"
+
+RSpec::Generator.debug = true
+
 require_generator :controller
 
 describe 'helper_generator' do  

data/spec/generator_spec/generators/migration_gen_spec.rb

@@ -6,7 +6,7 @@ RSpec::Generator.debug = true
 
 require_generator :migration
 
-Rails3::Migration::Assist.orm = :active_record
+RailsAssist::Migration.orm = :active_record
 
 describe 'migration_generator' do
   use_orm :active_record

data/spec/generator_spec/matchers/generate_artifact_file_spec.rb

@@ -1,9 +1,10 @@
 require 'rspec/core'
 require 'generator-spec'
 # require 'spec_helper'
-# RSpec::Generator::Require.root_dir = 'generator_spec/fixtures'
 
-# require_generator :model
+RSpec::Generator::Require.root_dir = 'generator_spec/fixtures'
+
+require_generator :model
 
 describe 'model_generator' do
   use_orm :mongoid

data/spec/generator_spec/matchers/generate_artifact_files_spec.rb

@@ -1,4 +1,6 @@
 require 'spec_helper'
+RSpec::Generator::Require.root_dir = 'generator_spec/fixtures'
+
 require_generator :model
 
 describe 'model_generator' do

data/spec/generator_spec/matchers/generate_artifact_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+RSpec::Generator::Require.root_dir = 'generator_spec/fixtures'
 require_generator :model
 
 describe 'model_generator' do

data/spec/generator_spec/matchers/generate_artifacts_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+RSpec::Generator::Require.root_dir = 'generator_spec/fixtures'
 require_generator :model
 
 describe 'model_generator' do

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'rspec/core'
+require 'rspec'
 require 'generator-spec'
 
 RSpec::Generator.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generator-spec
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2157249500 !ruby/object:Gem::Requirement
+  requirement: &2157680920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,21 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *2157249500
+  version_requirements: *2157680920
+- !ruby/object:Gem::Dependency
+  name: logging_assist
+  requirement: &2157680420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :development
+  prerelease: false
+  version_requirements: *2157680420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157248820 !ruby/object:Gem::Requirement
+  requirement: &2157679940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +44,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157248820
+  version_requirements: *2157679940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157247680 !ruby/object:Gem::Requirement
+  requirement: &2157679460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +55,10 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *2157247680
+  version_requirements: *2157679460
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2157246600 !ruby/object:Gem::Requirement
+  requirement: &2157678980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +66,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157246600
+  version_requirements: *2157678980
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &2157242680 !ruby/object:Gem::Requirement
+  requirement: &2157678500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +77,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157242680
+  version_requirements: *2157678500
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &2157241820 !ruby/object:Gem::Requirement
+  requirement: &2157678000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +88,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157241820
+  version_requirements: *2157678000
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2157241180 !ruby/object:Gem::Requirement
+  requirement: &2157677460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,7 +99,18 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157241180
+  version_requirements: *2157677460
+- !ruby/object:Gem::Dependency
+  name: rails_artifactor
+  requirement: &2157676960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157676960
 description: RSpec 2 library to facilitate creating generator specs
 email: kmandrup@gmail.com
 executables: []