Skip to content
Browse files

fixed gem bundler stuff etc.

  • Loading branch information...
1 parent f45a902 commit d5fc613563ebfa6835d3683bc338ff753737ff61 @marcoow marcoow committed May 13, 2010
Showing with 14 additions and 3 deletions.
  1. +7 −0 Gemfile
  2. +1 −1 generators/reportable_migration/templates/migration.rb
  3. +1 −0 rails/init.rb
  4. +4 −1 spec/boot.rb
  5. +1 −1 spec/spec_helper.rb
View
7 Gemfile
@@ -1,8 +1,15 @@
+source :gemcutter
+
gem 'rails', '>= 2.2.0'
gem 'activerecord', '>= 2.2.0', :require => 'active_record'
gem 'activesupport', '>= 2.2.0', :require => 'active_support'
gem 'actionpack', '>= 2.2.0', :require => 'action_pack'
+gem 'sqlite3-ruby', '>= 1.2.0'
+gem 'mysql', '>= 2.8.0'
+gem 'pg', '>= 0.9.0'
+gem 'tzinfo', '>= 0.3.0'
+
gem 'rake', '>= 0.8.7'
gem 'rspec', '>= 1.2.0'
gem 'rcov', '>= 0.8.1'
View
2 generators/reportable_migration/templates/migration.rb
@@ -7,7 +7,7 @@ def self.up
t.string :grouping, :null => false, :limit => 10
t.string :aggregation, :null => false, :limit => 10
t.string :conditions, :null => false, :limit => 100
- t.float :value, :null => false, :default => 0
+ t.float :value, :null => false, :default => 0
t.datetime :reporting_period, :null => false
t.timestamps
View
1 rails/init.rb
@@ -1,3 +1,4 @@
+require 'action_view'
require 'saulabs/reportable'
require 'saulabs/reportable/report_tag_helper'
View
5 spec/boot.rb
@@ -2,7 +2,10 @@
$:.unshift "#{plugin_root}/lib"
-RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
+Bundler.require
+require 'initializer'
+
+RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + '/../') unless defined?(RAILS_ROOT)
Rails::Initializer.run(:set_load_path)
Rails::Initializer.run(:set_autoload_paths)
Rails::Initializer.run(:initialize_time_zone) do |config|
View
2 spec/spec_helper.rb
@@ -4,7 +4,7 @@
require 'bundler'
Bundler.setup
-require File.join(File.dirname(__FILE__), 'boot') unless defined?(ActiveRecord)
+require File.join(File.dirname(__FILE__), 'boot')
class User < ActiveRecord::Base; end

0 comments on commit d5fc613

Please sign in to comment.
Something went wrong with that request. Please try again.