wagons 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTA2ZTc4NjkwNWJjZTU1YTZkNTE0MTY2MTg4MTMzYWMwMjU4N2ZhYQ==
+    YTg0ZDk4Y2Q1NDMzZDkwYzRmZmI1MThlZjdjNDIwZjU4ZGQxZWZiMA==
   data.tar.gz: !binary |-
-    NTBhOTYzY2UxNDAxNzk0YjlkZjA1OTFkMDNlMjkwMGQ3NmY1YmI5ZA==
+    OTM2ODY5MDJmMzg1NzdkM2MxNDE4MDE2MWI2YTY3NmY5Y2JiMDc5Mw==
 SHA512:
   metadata.gz: !binary |-
-    NzQzZWZhMGJjNmVkNzQ3OGRhMTRkOWZkMTNjZmVkZWZjNzU1ZjNkYzU0MjFl
-    NzliMGU5ZWRjNGQ3MDc2NTFhYzVmMjgwMDA1Y2QwNDM4MDdjZTg1OTMwODFh
-    NDhhOGMyNzU0ZGFmZWM5NGZiYjM0OGI2NTI5ODZlOWY5NWMyMzA=
+    YTBlZDhkOTAzNDQxOWNjMGMwOWYzMTU4ODZkZDQ5NjczMTE1NGNmMzk0MTA0
+    Y2ZiNDY1ODcxMzgyNTI5Y2M1NjNkMmI4Zjg2Nzc2YTU2OWM5NWY0MDNkOGE2
+    ZTZhYWYzMjAyMjVmMjM1Y2I4MzAwZjIxMGIxMDZhNzA4MDBkN2M=
   data.tar.gz: !binary |-
-    M2I0MWExOWI1YzE5Njk0MTg1M2JmZDk3ZjU4MjBlMWUyNjg3NTE4YWI3MzI4
-    ZWUwN2Q2ZmQ0ZTFmZGZlYjM4MTdjNzY5ZGU3YmNlNjhhN2U5YTk0YjNmMWE0
-    MDQ3ZDQ3MDBkNmJiYmNiMzI0MmJjNjkwNDNkNDBjMDZjNjMwMmI=
+    OTNiODA1NzRkZTEwMWZkZjRiMDZlMjkwNDgwZDQ0OTU5OTUwZTY1MmE2YWM5
+    ZGFhYjYzOWY5OWU0NjEwNmYyMTMzNzE5MDg5MWQ5MTc5MTY4MDMzNTQyMzc0
+    MTk2MzA0ZGQ0MmU3MWUxMTcwMzg0MGE3YjY2MDk2ZDczMmQ3MjY=

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

@@ -5,8 +5,8 @@
 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)
+ENGINE_PATH = File.expand_path('lib/<%= singular_name %>/wagon', ENGINE_ROOT)
 
 load File.expand_path('../../app_root.rb', __FILE__)
 
-load File.expand_path('script/rails', ENV['APP_ROOT'])
+load File.expand_path('bin/rails', ENV['APP_ROOT'])

data/lib/tasks/wagons.rake

@@ -8,7 +8,7 @@ namespace :wagon do
       wagon.migrate(ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
     end
   end
-  
+
   desc "Revert wagon migrations (options: WAGON=abc, VERBOSE=false)"
   task :revert => [:environment, :'db:load_config'] do
     ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
@@ -16,20 +16,20 @@ namespace :wagon do
       wagon.revert
     end
   end
-  
+
   desc "Seed wagon data (options: WAGON=abc)"
-  task :seed => :abort_if_pending_migrations do 
+  task :seed => :abort_if_pending_migrations do
     wagons.each { |wagon| wagon.load_seed }
   end
-  
+
   desc "Unseed wagon data (options: WAGON=abc)"
   task :unseed do
     wagons.reverse.each { |wagon| wagon.unload_seed }
   end
-  
+
   desc "Migrate and seed wagons"
   task :setup => [:migrate, :seed]
-  
+
   desc "Remove the specified wagon"
   task :remove => :environment do
     if wagons.size == 0 || (wagons.size > 1 && ENV['WAGON'].blank?)
@@ -44,7 +44,7 @@ namespace :wagon do
       end
     end
   end
-  
+
   desc "Generate an initializer to set the application version"
   task :app_version do
     file = Rails.root.join('config', 'initializers', 'wagon_app_version.rb')
@@ -62,7 +62,7 @@ FIN
       end
     end
   end
-  
+
   desc "Creates a Wagonfile for development"
   task :file do
     file = Rails.root.join('Wagonfile')
@@ -84,7 +84,7 @@ FIN
       File.open(gemfile, 'w') do |f|
         f.puts content
         f.puts "\n\n"
-        f.puts "# Include the wagon gems you want attached in Wagonfile. 
+        f.puts "# Include the wagon gems you want attached in Wagonfile.
 # Do not check Wagonfile into source control.
 #
 # To create a Wagonfile suitable for development, run 'rake wagon:file'
@@ -93,7 +93,7 @@ eval(File.read(wagonfile)) if File.exist?(wagonfile)"
       end
     end
   end
-  
+
   namespace :file do
     desc "Create a Wagonfile for production"
     task :prod => :environment do
@@ -105,18 +105,18 @@ eval(File.read(wagonfile)) if File.exist?(wagonfile)"
       end
     end
   end
-  
+
   desc "List the loaded wagons"
   task :list => :environment do  # depend on environment to get correct order
     wagons.each {|p| puts p.wagon_name }
   end
-  
+
   desc "Run the tests of WAGON"
   task :test do
     ENV['CMD'] = "bundle exec rake #{'-t' if Rake.application.options.trace}"
     Rake::Task['wagon:exec'].invoke
   end
-  
+
   desc "Execute CMD in WAGON's base directory"
   task :exec do
     wagons.each do |w|
@@ -129,7 +129,7 @@ eval(File.read(wagonfile)) if File.exist?(wagonfile)"
     end
     Rake::Task['wagon:exec'].reenable
   end
-  
+
   namespace :bundle do
     desc "Run bundle update for all WAGONs"
     task :update do
@@ -137,11 +137,12 @@ eval(File.read(wagonfile)) if File.exist?(wagonfile)"
       Rake::Task['wagon:exec'].invoke
     end
   end
-  
-  
+
+
   # desc "Raises an error if there are pending wagon migrations"
   task :abort_if_pending_migrations => :environment do
-    pending_migrations = ActiveRecord::Migrator.new(:up, wagons.collect(&:migrations_paths).flatten).pending_migrations
+    files = ActiveRecord::Migrator.migrations(wagons.collect(&:migrations_paths).flatten)
+    pending_migrations = ActiveRecord::Migrator.new(:up, files).pending_migrations
 
     if pending_migrations.any?
       puts "You have #{pending_migrations.size} pending migrations:"
@@ -164,17 +165,17 @@ namespace :db do
       desc "Load core and wagon seeds into the current environment's database."
       task :all => ['db:seed', 'wagon:seed']
     end
-    
+
     namespace :setup do
       desc "Create the database, load the schema, initialize with the seed data for core and wagons"
       task :all => ['db:setup', 'wagon:setup']
     end
-    
+
     namespace :reset do
       desc "Recreate the database, load the schema, initialize with the seed data for core and wagons"
       task :all => ['db:reset', 'wagon:setup']
     end
-    
+
     # DB schema should not be dumped if wagon migrations are loaded
     Rake::Task[:'db:_dump'].clear_actions
 
@@ -187,10 +188,10 @@ namespace :db do
       else
         Rake::Task[:'db:_dump_rails'].invoke
       end
-      
+
       Rake::Task[:'db:_dump'].reenable
     end
-    
+
     task :_dump_rails do
       case ActiveRecord::Base.schema_format
       when :ruby then Rake::Task["db:schema:dump"].invoke

data/lib/wagons/version.rb

@@ -1,3 +1,3 @@
 module Wagons
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/test/dummy/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Users/pascal/Code/ruby/wagons
+  remote: /home/pzumkehr/src/ruby/wagons
   specs:
-    wagons (0.3.0)
+    wagons (0.2.2)
       bundler (>= 1.1)
       rails (>= 3.2)
       seed-fu-ndo (>= 0.0.2)
@@ -19,90 +19,86 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.1)
-      actionpack (= 4.1.1)
-      actionview (= 4.1.1)
+    actionmailer (4.0.3)
+      actionpack (= 4.0.3)
       mail (~> 2.5.4)
-    actionpack (4.1.1)
-      actionview (= 4.1.1)
-      activesupport (= 4.1.1)
+    actionpack (4.0.3)
+      activesupport (= 4.0.3)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.1)
-      activesupport (= 4.1.1)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.1)
-      activesupport (= 4.1.1)
-      builder (~> 3.1)
-    activerecord (4.1.1)
-      activemodel (= 4.1.1)
-      activesupport (= 4.1.1)
-      arel (~> 5.0.0)
-    activesupport (4.1.1)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
+    activemodel (4.0.3)
+      activesupport (= 4.0.3)
+      builder (~> 3.1.0)
+    activerecord (4.0.3)
+      activemodel (= 4.0.3)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.3)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.3)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
       thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    builder (3.2.2)
+      tzinfo (~> 0.3.37)
+    arel (4.0.2)
+    atomic (1.1.15)
+    builder (3.1.4)
     erubis (2.7.0)
     hike (1.2.3)
     i18n (0.6.9)
-    json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
     mime-types (1.25.1)
-    minitest (5.3.4)
+    minitest (4.7.5)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.10.1)
+    multi_json (1.8.4)
     polyglot (0.3.4)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.1)
-      actionmailer (= 4.1.1)
-      actionpack (= 4.1.1)
-      actionview (= 4.1.1)
-      activemodel (= 4.1.1)
-      activerecord (= 4.1.1)
-      activesupport (= 4.1.1)
+    rails (4.0.3)
+      actionmailer (= 4.0.3)
+      actionpack (= 4.0.3)
+      activerecord (= 4.0.3)
+      activesupport (= 4.0.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.1)
-      sprockets-rails (~> 2.0)
-    railties (4.1.1)
-      actionpack (= 4.1.1)
-      activesupport (= 4.1.1)
+      railties (= 4.0.3)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.3)
+      actionpack (= 4.0.3)
+      activesupport (= 4.0.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    seed-fu (2.3.1)
-      activerecord (>= 3.1, < 4.2)
-      activesupport (>= 3.1, < 4.2)
+    rake (10.1.1)
+    seed-fu (2.3.0)
+      activerecord (>= 3.1, < 4.1)
+      activesupport (>= 3.1, < 4.1)
     seed-fu-ndo (0.0.2)
       seed-fu (>= 2.2.0)
-    sprockets (2.12.1)
+    sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
+    sprockets-rails (2.0.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.8)
-    thor (0.19.1)
-    thread_safe (0.3.3)
+    sqlite3 (1.3.7)
+    thor (0.18.1)
+    thread_safe (0.2.0)
+      atomic (>= 1.1.7, < 2)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (1.2.0)
-      thread_safe (~> 0.1)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby