rtml 2.0.1 → 2.0.2

data/lib/rtml/init.rb

@@ -1,4 +1,6 @@
+$root_dir = Dir.pwd
 unless defined?(Rtml) && defined?(Rails)
+  $rtml_external = true
   # Now, for some reason, Rails (ActiveSupport?) is removing a lot of existing directories from
   # the load path. Probably for optimization, but kind of counterproductive for this edge case.
   # So I'm going to back them up, and then re-add them.
@@ -77,6 +79,4 @@ unless defined?(Rtml) && defined?(Rails)
     load File.join(File.dirname(__FILE__), '../../tasks/db.rake')
     load 'tasks/routes.rake'
   end
-
-  Dir.chdir RAILS_ROOT
 end

data/lib/rtml/version.rb

@@ -2,7 +2,7 @@ module Rtml
   module VERSION
     MAJOR = 2
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     
     STRING = (defined?(PRE) ? [MAJOR, MINOR, TINY, PRE] : [MAJOR, MINOR, TINY]).join('.')
   end

data/rails_generators/rtml/templates/lib/tasks/rtml.rake

@@ -16,10 +16,9 @@ namespace :rtml do
   desc "Generates RTML rdoc documentation in ./doc/rtml"
   Rake::RDocTask.new(:docs) do |rdoc|
     target_dir = File.expand_path(".")
-    chdir Rtml.root
     accessors = Rtml::Widget::RDOC_ACCESSORS.collect { |k,v| "#{k}=#{v}" }.join(",")
-    files = ['README.rdoc', 'History.txt', 'lib/**/*.rb', 'doc/**/*.rdoc', 'builtin/**/*.rb',
-             'rails_generators/*/*.rb']
+    files = FileList.new(['README.rdoc', 'History.txt', 'lib/**/*.rb', 'doc/**/*.rdoc', 'builtin/**/*.rb',
+             'rails_generators/*/*.rb'].collect { |fi| File.join(Rtml.root, fi) })
     rdoc.rdoc_files.add(files)
     rdoc.main = 'README.rdoc'
     rdoc.title = 'RubyTML 2.0 Documentation'
@@ -49,6 +48,12 @@ namespace :rtml do
       if File.exist?(opts)
         t.spec_opts = ['--options', opts]
       end
+      if $root_dir
+        t.ruby_opts << ['-r', File.join(Rtml.root, 'lib/rtml/init')]
+      end
+      if File.file?(File.join(RAILS_ROOT, "spec/spec_helper"))
+        t.ruby_opts << ['-r', File.join(RAILS_ROOT, "spec/spec_helper")]
+      end
       t.spec_files = FileList[File.join(Rtml.root, "spec/**/*_spec.rb")]
     end
   else
@@ -56,8 +61,13 @@ namespace :rtml do
       puts "You need to have rspec, rspec-rails and webrat installed before you can run"
       puts "in-place testing."
       puts
-      puts "Make sure you've also run script/generate rspec, or you'll just see this"
-      puts "message again."
+      if defined?(RAILS_ROOT) && !$rtml_external
+        puts "Make sure you've also run script/generate rspec, or you'll just see this"
+        puts "message again."
+      else
+        puts "Make sure you've also got a spec folder, or you'll just see this message"
+        puts "again."
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -2,9 +2,6 @@ unless $rtml_spec_helper_already_loaded
   $rtml_spec_helper_already_loaded = 1
   $LOAD_PATH << File.join(File.dirname(__FILE__), 'support/app/controllers')
 
-  # this loads the Rails spec helper, if any, and reloads the current spec helper if run outside of a Rails project
-  # (ie, in the RTML working project dir). Reloading this file is safe thanks to $rtml_spec_helper_already_loaded == 1.
-  require 'spec_helper'
   unless defined?(RAILS_ROOT)
     require File.join(File.dirname(__FILE__), 'support/rails')
     gem 'rspec-rails'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Colin MacKenzie IV