combustion 0.3.1 → 0.3.2

data/HISTORY

@@ -1,3 +1,7 @@
+0.3.2 - March 3rd 2011
+* Tentative Rails 3.0 and migrations support.
+* Allow for different internal app directory.
+
 0.3.1 - September 12th 2011
 * Allow for different versions of Capybara (Leo Liang).
 * Including Capybara::DSL instead of Capybara.

data/README.textile

@@ -39,6 +39,13 @@ bundle exec combust</code></pre>
 
 What Combustion is doing is setting up a Rails application at @spec/internal@ - but you only need to add the files within that directory that you're going to use. Read on for some detail about what that involves.
 
+h3. Configuring a different test app directory
+
+If you want your app to be located somewhere other than @spec/internal@, then make sure you configure it before you call @Combustion.initialize!@:
+
+<pre><code>Combustion.path = 'spec/dummy'
+Combustion.initialize!</code></pre>
+
 h3. Configuring which Rails modules should be loaded.
 
 By default, Combustion assumes you want the full Rails stack. You can customise this though - just pass in what you'd like loaded to the @Combustion.initialize!@ call:

data/combustion.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'rails', '>= 3.1.0'
+  s.add_runtime_dependency 'rails', '>= 3.0.0'
   s.add_runtime_dependency 'thor',  '>= 0.14.6'
 end

data/lib/combustion.rb

@@ -12,18 +12,28 @@ module Combustion
     Combustion::Application.configure_for_combustion
     Combustion::Application.initialize!
 
-    silence_stream(STDOUT) do
-      load "#{Rails.root}/db/schema.rb"
+    if modules.include?('active_record') || modules.include?(:active_record)
+      Combustion::Database.setup
     end
 
     RSpec.configure do |config|
       include_capybara_into config
 
       config.include(Combustion::Application.routes.url_helpers)
-      config.include(Combustion::Application.routes.mounted_helpers)
+      if Combustion::Application.routes.respond_to?(:mounted_helpers)
+        config.include(Combustion::Application.routes.mounted_helpers)
+      end
     end if defined?(RSpec) && RSpec.respond_to?(:configure)
   end
 
+  def self.path
+    @path ||= 'spec/internal'
+  end
+
+  def self.path=(path)
+    @path = path
+  end
+
   def self.include_capybara_into(config)
     return unless defined?(Capybara)
 
@@ -37,4 +47,5 @@ module Combustion
 end
 
 require 'combustion/application'
+require 'combustion/database'
 require 'combustion/version'

data/lib/combustion/application.rb

@@ -1,8 +1,6 @@
 Rails.env = 'test'
 
 class Combustion::Application < Rails::Application
-  config.root   = File.expand_path File.join(Dir.pwd, 'spec', 'internal')
-
   # Core Settings
   config.cache_classes               = true
   config.whiny_nils                  = true
@@ -16,6 +14,8 @@ class Combustion::Application < Rails::Application
   # Instead, wait for this method to be invoked (to get around load-order
   # complications).
   def self.configure_for_combustion
+    config.root = File.expand_path File.join(Dir.pwd, Combustion.path)
+
     if defined?(ActionController) && defined?(ActionController::Engine)
       config.action_dispatch.show_exceptions            = false
       config.action_controller.perform_caching          = false

data/lib/combustion/database.rb

@@ -0,0 +1,156 @@
+class Combustion::Database
+  def self.setup
+    silence_stream(STDOUT) do
+      reset_database
+      load_schema
+      migrate
+    end
+  end
+
+  def self.reset_database
+    abcs = ActiveRecord::Base.configurations
+    case abcs['test']['adapter']
+    when /mysql/
+      ActiveRecord::Base.establish_connection(:test)
+      ActiveRecord::Base.connection.recreate_database(abcs['test']['database'],
+        mysql_creation_options(abcs['test']))
+      ActiveRecord::Base.establish_connection(:test)
+    when /postgresql/
+      ActiveRecord::Base.clear_active_connections!
+      drop_database(abcs['test'])
+      create_database(abcs['test'])
+    when /sqlite/
+      dbfile = abcs['test']['database'] || abcs['test']['dbfile']
+      File.delete(dbfile) if File.exist?(dbfile)
+    when 'sqlserver'
+      test = abcs.deep_dup['test']
+      test_database = test['database']
+      test['database'] = 'master'
+      ActiveRecord::Base.establish_connection(test)
+      ActiveRecord::Base.connection.recreate_database!(test_database)
+    when "oci", "oracle"
+      ActiveRecord::Base.establish_connection(:test)
+      ActiveRecord::Base.connection.structure_drop.split(";\n\n").each do |ddl|
+        ActiveRecord::Base.connection.execute(ddl)
+      end
+    when 'firebird'
+      ActiveRecord::Base.establish_connection(:test)
+      ActiveRecord::Base.connection.recreate_database!
+    else
+      raise "Cannot reset databases for '#{abcs['test']['adapter']}'"
+    end
+  end
+
+  def self.load_schema
+    load "#{Rails.root}/db/schema.rb"
+  end
+
+  def self.migrate
+    migrator = ActiveRecord::Migrator
+    paths    = 'db/migrate/'
+
+    if migrator.respond_to?(:migrations_paths)
+      paths    = migrator.migrations_paths
+    end
+
+    migrator.migrate paths, nil
+  end
+
+  private
+
+  def self.create_database(config)
+    begin
+      if config['adapter'] =~ /sqlite/
+        if File.exist?(config['database'])
+          $stderr.puts "#{config['database']} already exists"
+        else
+          begin
+            # Create the SQLite database
+            ActiveRecord::Base.establish_connection(config)
+            ActiveRecord::Base.connection
+          rescue Exception => e
+            $stderr.puts e, *(e.backtrace)
+            $stderr.puts "Couldn't create database for #{config.inspect}"
+          end
+        end
+        return # Skip the else clause of begin/rescue
+      else
+        ActiveRecord::Base.establish_connection(config)
+        ActiveRecord::Base.connection
+      end
+    rescue
+      case config['adapter']
+      when /^(jdbc)?mysql/
+        if config['adapter'] =~ /jdbc/
+          #FIXME After Jdbcmysql gives this class
+          require 'active_record/railties/jdbcmysql_error'
+          error_class = ArJdbcMySQL::Error
+        else
+          error_class = config['adapter'] =~ /mysql2/ ? Mysql2::Error : Mysql::Error
+        end
+        access_denied_error = 1045
+        begin
+          ActiveRecord::Base.establish_connection(config.merge('database' => nil))
+          ActiveRecord::Base.connection.create_database(config['database'], mysql_creation_options(config))
+          ActiveRecord::Base.establish_connection(config)
+        rescue error_class => sqlerr
+          if sqlerr.errno == access_denied_error
+            print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>"
+            root_password = $stdin.gets.strip
+            grant_statement = "GRANT ALL PRIVILEGES ON #{config['database']}.* " \
+              "TO '#{config['username']}'@'localhost' " \
+              "IDENTIFIED BY '#{config['password']}' WITH GRANT OPTION;"
+            ActiveRecord::Base.establish_connection(config.merge(
+                'database' => nil, 'username' => 'root', 'password' => root_password))
+            ActiveRecord::Base.connection.create_database(config['database'], mysql_creation_options(config))
+            ActiveRecord::Base.connection.execute grant_statement
+            ActiveRecord::Base.establish_connection(config)
+          else
+            $stderr.puts sqlerr.error
+            $stderr.puts "Couldn't create database for #{config.inspect}, charset: #{config['charset'] || @charset}, collation: #{config['collation'] || @collation}"
+            $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset']
+          end
+        end
+      when /^(jdbc)?postgresql$/
+        @encoding = config['encoding'] || ENV['CHARSET'] || 'utf8'
+        begin
+          ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+          ActiveRecord::Base.connection.create_database(config['database'], config.merge('encoding' => @encoding))
+          ActiveRecord::Base.establish_connection(config)
+        rescue Exception => e
+          $stderr.puts e, *(e.backtrace)
+          $stderr.puts "Couldn't create database for #{config.inspect}"
+        end
+      end
+    else
+      $stderr.puts "#{config['database']} already exists"
+    end
+  end
+
+  def self.drop_database(config)
+    case config['adapter']
+    when /^(jdbc)?mysql/
+      ActiveRecord::Base.establish_connection(config)
+      ActiveRecord::Base.connection.drop_database config['database']
+    when /^(jdbc)?sqlite/
+      require 'pathname'
+      path = Pathname.new(config['database'])
+      file = path.absolute? ? path.to_s : File.join(Rails.root, path)
+
+      FileUtils.rm(file)
+    when /^(jdbc)?postgresql$/
+      ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+      ActiveRecord::Base.connection.drop_database config['database']
+    end
+  end
+
+  def self.mysql_creation_options(config)
+    @charset   = ENV['CHARSET']   || 'utf8'
+    @collation = ENV['COLLATION'] || 'utf8_unicode_ci'
+
+    {
+      :charset   => (config['charset']   || @charset),
+      :collation => (config['collation'] || @collation)
+    }
+  end
+end

data/lib/combustion/version.rb

@@ -1,3 +1,3 @@
 module Combustion
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,46 +1,64 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: combustion
-version: !ruby/object:Gem::Version
-  version: 0.3.1
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
-authors:
+authors: 
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &2152618140 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
+
+date: 2012-03-03 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  version_requirements: *id001
   prerelease: false
-  version_requirements: *2152618140
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: &2152617480 !ruby/object:Gem::Requirement
+  name: rails
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 14
+        - 6
         version: 0.14.6
-  type: :runtime
+  version_requirements: *id002
   prerelease: false
-  version_requirements: *2152617480
+  name: thor
 description: Test your Rails Engines without needing a full Rails app
-email:
+email: 
 - pat@freelancing-gods.com
-executables:
+executables: 
 - combust
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - HISTORY
@@ -51,34 +69,45 @@ files:
 - combustion.gemspec
 - lib/combustion.rb
 - lib/combustion/application.rb
+- lib/combustion/database.rb
 - lib/combustion/generator.rb
 - lib/combustion/version.rb
 - templates/config.ru
 - templates/database.yml
 - templates/routes.rb
 - templates/schema.rb
-homepage: ''
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: combustion
-rubygems_version: 1.8.6
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Elegant Rails Engine Testing
 test_files: []
+