genspec 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3740bec750e728d9bb6506135c75d721b407214a
-  data.tar.gz: 0e822cbddfcf0ca68e68a44bfb6dd868fa661c0b
+  metadata.gz: 75981b2df31e29244d8c38691d098fb64fab64d0
+  data.tar.gz: b7bf7d18e376bfd62dde9c7a4c6c004fc3ff6724
 SHA512:
-  metadata.gz: b2f5e61ad14a6af712f092a67721ca0a7312e01c472c1c78a8abb2730d3babeab14dd4ea381d1272299b46445e0dd475e607f546d9867086dc54a02ecec08715
-  data.tar.gz: 51076fb0b0f07ad9ce83544a88e7e21d8be623a1d2ac14c4a39950e3b203193104b82e94dcb30cd3ed77ca5f868f03d58a6716a4e0e238476a65e942bf8c5b9a
+  metadata.gz: 95cd7496ca88976ff649f652cfd4cea630a76b62399c052add342e4e52882a0e5c1b4b04edb2a33190fd37c6eb8e95b1fa3fd85d3ef0345c0c53412d5587ce3c
+  data.tar.gz: faffdeff2700c52728ebe15c368573523c771e0dd5b0aafefd38d37990d1fd544bf629cb496c9fb0ae264cc0057d86af1f494f4b42e4885cd7dfa8def6d076db

data/.travis.yml

@@ -18,6 +18,9 @@ env:
   # which isn't considered here), I'm assuming no.
   - RAILS_VERSION="none"     RSPEC_VERSION="~> 2.0"
   - RAILS_VERSION="none"     RSPEC_VERSION="~> 3.0"
+  # don't use rails, but define a module called Rails. This happens if you
+  # pull in ActiveRecord and then require AR's generators.
+  - RAILS_VERSION="none"     DEFINE_RAILS_MODULE=1
 
 matrix:
   allow_failures:

data/lib/genspec.rb

@@ -1,5 +1,5 @@
 require 'thor'
-if defined?(Rails)
+if defined?(Rails) && defined?(Rails::VERSION)
   if Rails::VERSION::MAJOR == 2
     raise "Use genspec 0.1.x for Rails 2; this version is for Rails 3."
   elsif [3, 4, 5].include? Rails::VERSION::MAJOR
@@ -22,6 +22,10 @@ module GenSpec
   def self.root;        @root;        end
   def self.root=(root); @root = root; end
 
+  def self.rails?
+    defined?(Rails) && defined?(Rails::VERSION)
+  end
+
   require 'genspec/version' unless defined?(GenSpec::VERSION)
   require 'genspec/shell'
   require 'genspec/matchers'

data/lib/genspec/matchers/base.rb

@@ -30,7 +30,7 @@ module GenSpec
         if @described.kind_of?(Class)
           @generator = @described
         else
-          if defined?(Rails)
+          if GenSpec.rails?
             @generator = Rails::Generators.find_by_namespace(@described, base)
           else
             @generator = Thor::Util.find_by_namespace(@described)

data/lib/genspec/matchers/generation_method_matcher.rb

@@ -117,9 +117,9 @@ class GenSpec::Matchers::GenerationMethodMatcher < GenSpec::Matchers::Base
     def generation_methods
       GENERATION_CLASSES.inject([]) do |arr, mod|
         if mod.kind_of?(String)
-          next arr if !defined?(Rails) && mod =~ /^Rails/
+          next arr if !GenSpec.rails? && mod =~ /^Rails/
           mod = mod.split('::').inject(Kernel) do |container, name|
-            container.const_get(name)
+            container && container.const_get(name)
           end
         end
         arr.concat mod.public_instance_methods.collect { |i| i.to_s }.reject { |i| i =~ /=/ }

data/lib/genspec/version.rb

@@ -2,7 +2,7 @@ module GenSpec
   class Version
     MAJOR = 0
     MINOR = 3
-    PATCH = 0
+    PATCH = 1
     RELEASE = nil
     
     STRING = (RELEASE ? [MAJOR, MINOR, PATCH, RELEASE] : [MAJOR, MINOR, PATCH]).join('.')

data/spec/generators/migration_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-if defined?(Rails)
+if GenSpec.rails?
   describe :my_migration do
     it "should run migration template" do
       # bug, raising NameError: undefined local variable or method `interceptor'

data/spec/generators/test_rails3_spec.rb

@@ -56,7 +56,7 @@ describe :test_rails3 do
     # Rails-specific actions are also working. If they are, it's safe to say custom extensions
     # will work fine too.
     it 'should add_source "http://gems.github.com/"' do
-      if defined?(Rails)
+      if GenSpec.rails?
         expect(subject).to add_source("http://gems.github.com/")
       end
     end

data/spec/spec_helper.rb

@@ -12,7 +12,13 @@ Bundler.setup
 if ENV['RAILS_VERSION'] != 'none'
   require 'rails'
   require 'rails/generators'
-end  
+elsif ENV['DEFINE_RAILS_MODULE']
+  # Rails module can be defined while missing common constants like VERSION
+  # if you pull in a rails component like ActiveRecord, then require the
+  # activerecord generators. Maybe this can happen in other scenarios too.
+  # Anyway the existence of a Rails module alone should not break genspec.
+  module Rails; end
+end
 
 module CustomActions
   def act_upon(file)
@@ -20,7 +26,8 @@ module CustomActions
   end
 end
 
-if !defined?(Rails)
+require 'genspec'
+unless GenSpec.rails?
   require 'thor/group'
   require File.expand_path('support/generators/test_rails3/test_rails3_generator', File.dirname(__FILE__))
   require File.expand_path('support/generators/question/question_generator', File.dirname(__FILE__))

data/spec/support/generators/question/question_generator.rb

@@ -1,4 +1,4 @@
-base = defined?(Rails) ? Rails::Generators::Base : Thor::Group
+base = GenSpec.rails? ? Rails::Generators::Base : Thor::Group
 
 class Question < base
   include Thor::Actions

data/spec/support/generators/test_rails3/test_rails3_generator.rb

@@ -1,4 +1,4 @@
-base = defined?(Rails) ? Rails::Generators::Base : Thor::Group
+base = GenSpec.rails? ? Rails::Generators::Base : Thor::Group
 
 class TestRails3 < base
   include Thor::Actions
@@ -24,7 +24,7 @@ class TestRails3 < base
   
   def gen_gem_source
     if File.file?("Gemfile")
-      if defined?(Rails)
+      if GenSpec.rails?
         add_source "http://gems.github.com/"
       else
         append_file "Gemfile", 'source "http://gems.github.com/"'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genspec
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Colin MacKenzie IV