wagons 0.1.0 → 0.1.1

data/lib/generators/wagon/templates/Gemfile.tt

@@ -1,6 +1,6 @@
-<%= app_root_initializer %>
+require File.expand_path('../app_root', __FILE__)
 
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
 # Declare your gem's dependencies in <%= singular_name %>.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and

data/lib/generators/wagon/templates/Rakefile.tt

@@ -7,6 +7,6 @@ rescue LoadError
 end
 
 ENGINE_PATH = File.expand_path('..', __FILE__)
-<%= app_root_initializer %>
+require File.expand_path('../app_root', __FILE__)
 
 load 'wagons/wagon_tasks.rake'

data/lib/generators/wagon/templates/app_root.rb

@@ -0,0 +1,2 @@
+# define the root directory of the main application
+ENV['APP_ROOT'] ||= File.expand_path(__FILE__).split("vendor#{File::SEPARATOR}wagons").first

data/lib/generators/wagon/templates/script/rails.tt

@@ -6,6 +6,6 @@ ENGINE_ROOT = File.expand_path('../..', __FILE__)
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('Gemfile', ENGINE_ROOT)
 ENGINE_PATH = File.expand_path('lib/<%= singular_name %>/engine', ENGINE_ROOT)
 
-<%= app_root_initializer %>
+require File.expand_path('../../app_root', __FILE__)
 
 load File.expand_path('script/rails', ENV["APP_ROOT"])

data/lib/generators/wagon/templates/test/test_helper.rb.tt

@@ -1,8 +1,8 @@
 # Configure Rails Environment
-<%= app_root_initializer %>
+require File.expand_path('../../app_root', __FILE__)
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require File.join(ENV["APP_ROOT"], 'test', 'test_helper.rb')
+require File.expand_path('test/test_helper.rb', ENV['APP_ROOT'])
 
 
 class ActiveSupport::TestCase  

data/lib/generators/wagon/wagon_generator.rb

@@ -1,20 +1,18 @@
 class WagonGenerator < Rails::Generators::NamedBase #:nodoc:
-  
-  attr_reader :wagon_name, :app_root_initializer
-  
+
+  attr_reader :wagon_name
+
   source_root File.expand_path('../templates', __FILE__)
-  
+
   def initialize(*args)
     super
     @wagon_name = name
-    @app_root_initializer = "ENV['APP_ROOT'] ||= File.expand_path(__FILE__).split(\"vendor\#{File::SEPARATOR}wagons\").first"
-    
     assign_names!("#{application_name}_#{name}")
   end
-  
+
   def copy_templates
     self.destination_root = "vendor/wagons/#{wagon_name}"
-    
+
     # do this whole manual traversal to be able to replace every single file
     # individually in the application.
     all_templates.each do |file|
@@ -26,9 +24,9 @@ class WagonGenerator < Rails::Generators::NamedBase #:nodoc:
       end
     end
   end
-  
+
   private
-  
+
   def all_templates
     source_paths.collect do |path|
       Dir[File.join(path, "**", "{*,.[a-z]*}")].
@@ -36,5 +34,5 @@ class WagonGenerator < Rails::Generators::NamedBase #:nodoc:
           collect {|f| f.sub(path + File::SEPARATOR, '') }
     end.flatten.uniq.sort
   end
-  
+
 end

data/lib/wagons/version.rb

@@ -1,3 +1,3 @@
 module Wagons
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/wagons/wagon_tasks.rake

@@ -16,6 +16,26 @@ rescue LoadError
   RDoc::Task = Rake::RDocTask
 end
 
+APP_RAKEFILE = File.join(ENV['APP_ROOT'], "Rakefile")
+
+def app_task(name)
+  task name => [:load_app, "app:db:#{name}"]
+end
+
+def find_engine_path(path)
+  return if path == "/"
+
+  if Rails::Engine.find(path)
+    path
+  else
+    find_engine_path(File.expand_path('..', path))
+  end
+end
+
+def wagon
+  @wagon ||= Rails::Engine.find(ENGINE_PATH)
+end
+
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
@@ -37,26 +57,6 @@ end
 Bundler::GemHelper.install_tasks
 
 
-APP_RAKEFILE = File.join(ENV['APP_ROOT'], "Rakefile")
-
-def app_task(name)
-  task name => [:load_app, "app:db:#{name}"]
-end
-
-def find_engine_path(path)
-  return if path == "/"
-
-  if Rails::Engine.find(path)
-    path
-  else
-    find_engine_path(File.expand_path('..', path))
-  end
-end
-
-def wagon
-  @wagon ||= Rails::Engine.find(ENGINE_PATH)
-end
-
 task "load_app" do
   namespace :app do
     load APP_RAKEFILE
@@ -74,7 +74,7 @@ namespace :db do
   task :migrate => [:load_app, 'app:environment', 'app:db:load_config'] do
     wagon.migrate
   end
-  
+
   desc "Revert the database (options: VERSION=x, VERBOSE=false)."
   task :revert => [:load_app, 'app:environment', 'app:db:load_config'] do
     wagon.revert
@@ -89,16 +89,16 @@ namespace :db do
   task "unseed" => [:load_app, 'app:db:abort_if_pending_migrations'] do
     wagon.unload_seed
   end
-  
+
   desc "Run migrations and seed data (use db:reset to also revert the db first)"
   task :setup => [:migrate, :seed]
-  
+
   desc "Revert the database and set it up again"
   task :reset => [:unseed, :revert, :setup]
-  
+
   desc "Display status of migrations"
   app_task "migrate:status"
-  
+
   app_task "test:prepare"
 end
 
@@ -112,10 +112,10 @@ namespace :app do
       # set migrations paths to core only to have db:test:prepare work as desired
       ActiveRecord::Migrator.migrations_paths = Rails.application.paths['db/migrate'].to_a
     end
-    
+
     namespace :test do
       # for sqlite, make sure to delete the test.sqlite3 from the main application
-      task :purge do 
+      task :purge do
         abcs = ActiveRecord::Base.configurations
         case abcs['test']['adapter']
         when /sqlite/
@@ -123,16 +123,16 @@ namespace :app do
           File.delete(dbfile) if File.exist?(dbfile)
         end
       end
-      
+
       # run wagon migrations and load seed data.
       # append this to the regular app:db:test:prepare task.
       task :prepare do
         Rails.env = 'test'
         dependencies = (wagon.all_dependencies + [wagon])
-        
-        # migrate 
+
+        # migrate
         dependencies.each { |d| d.migrate }
-        
+
         # seed
         SeedFu.quiet = true unless ENV['VERBOSE']
         SeedFu.seed([ Rails.root.join('db/fixtures').to_s,

data/test/dummy/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /home/pzumkehr/src/ruby/wagons
   specs:
-    wagons (0.1.0)
+    wagons (0.1.1)
       bundler (>= 1.1)
       rails (>= 3.2)
       seed-fu-ndo (>= 0.0.2)
@@ -19,74 +19,73 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
-      mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
     erubis (2.7.0)
-    hike (1.2.1)
+    hike (1.2.2)
     i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.5)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    json (1.8.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.19)
-    mocha (0.12.3)
+    mime-types (1.23)
+    mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.3.7)
+    multi_json (1.7.4)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.2)
-    rdoc (3.12)
+    rake (10.0.4)
+    rdoc (3.12.2)
       json (~> 1.4)
     seed-fu (2.2.0)
       activerecord (~> 3.1)
@@ -98,13 +97,13 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thor (0.16.0)
-    tilt (1.3.3)
+    sqlite3 (1.3.7)
+    thor (0.18.1)
+    tilt (1.4.1)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby