engineer 0.2.1 → 0.2.2

data/README.rdoc

@@ -63,7 +63,7 @@ content:
     Bundler.definition.dependencies.each do |dependency|
       next if dependency.name == "engineer"
 
-      if (dependency.groups & [:default, :production, :staging]).any?
+      if (dependency.groups & [:default, :production]).any?
         gem.add_dependency dependency.name, *dependency.requirement.as_list
       else
         gem.add_development_dependency dependency.name, *dependency.requirement.as_list

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/features/support/env.rb

@@ -2,7 +2,7 @@
 # http://gravityblast.com/2009/08/11/testing-rails-generators-with-cucumber/
 
 require "rubygems"
-gem "railties", ">= 3.0.0.beta2"
+gem "railties", ">= 3.0.0.beta3"
 
 require "fileutils"
 require "tempfile"

data/lib/generators/engineer/install/templates/lib/generators/%app_name%/install/templates/%app_name%.rake.tt

@@ -1,94 +1,95 @@
-namespace "<%= app_name %><%#%>" do
+if defined? <%= app_module %><%#%>::Engine
+  namespace "<%= app_name %><%#%>" do
 
-  # Migrate after schema in case there is no engine schema: at least we'll get the migrations.
-  task :install => %w{assets db:schema db:migrate db:migrate:seed}
+    # Migrate after schema in case there is no engine schema: at least we'll get the migrations.
+    task :install => %w{assets db:schema db:migrate db:migrate:seed}
 
-  desc "Import <%= app_name %><%#%>'s assets and new db migrations"
-  task :update => %w{assets db:migrate}
+    desc "Import <%= app_name %><%#%>'s assets and new db migrations"
+    task :update => %w{assets db:migrate}
 
-  namespace :db do #<%# TODO: not everyone uses active record. %>
+    namespace :db do #<%# TODO: not everyone uses active record. %>
 
-    def host_migration(new_migration_name, &block)
-      require 'rails/generators/active_record'
-      db_migrate = File.join Rails.root, *%w{db migrate}
-      mkdir_p db_migrate unless File.exists? db_migrate
+      def host_migration(new_migration_name, &block)
+        require 'rails/generators/active_record'
+        db_migrate = File.join Rails.root, *%w{db migrate}
+        mkdir_p db_migrate unless File.exists? db_migrate
 
-      # TODO Kill after https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/4412
-      sleep 1 # wait for timestamp to change.
+        # TODO Kill after https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/4412
+        sleep 1 # wait for timestamp to change.
 
-      migration_number = ActiveRecord::Generators::Base.next_migration_number(db_migrate)
-      new_migration = File.join db_migrate, "#{migration_number}_#{new_migration_name}.rb"
-      tmp_migration = File.join Dir::tmpdir, "#{migration_number}_#{new_migration_name}.rb"
+        migration_number = ActiveRecord::Generators::Base.next_migration_number(db_migrate)
+        new_migration = File.join db_migrate, "#{migration_number}_#{new_migration_name}.rb"
+        tmp_migration = File.join Dir::tmpdir, "#{migration_number}_#{new_migration_name}.rb"
 
-      File.open(tmp_migration, "w") do |f|
-        f << block.call
-      end
-
-      cp tmp_migration, new_migration
-    end
+        File.open(tmp_migration, "w") do |f|
+          f << block.call
+        end
 
-    def import_migration(original_file, new_migration_name, &block)
-      host_migration new_migration_name do
-        block.call File.read original_file
+        cp tmp_migration, new_migration
       end
-    end
-
-    desc "Import <%= app_name %><%#%>'s new db migrations"
-    task :migrate do
-      require 'rails/generators/active_record'
-      db_migrate = File.join Rails.root, *%w{db migrate}
 
-      # Consider the set of engine migrations, in chronological order.
-      migrations = Dir[File.join <%= app_module %><%#%>::Engine.root, *%w{db migrate [0-9]*_*.rb}]
-      migrations.sort!
-
-      # See if the host already has a schema migration.
-      last_migration_in_schema = migrations.reverse.detect do |migration|
-        name = File.basename(migration).match(/\d+_(.*)\.rb/)[1]
-        Dir[File.join(db_migrate, "[0-9]*_<%= app_name %><%#%>_schema_after_#{name}.rb")].any?
+      def import_migration(original_file, new_migration_name, &block)
+        host_migration new_migration_name do
+          block.call File.read original_file
+        end
       end
 
-      # If so, do not import any migrations implied by the schema
-      # (recall slice! *removes* the indicated range, leaving the rest.)
-      migrations.slice! 0..migrations.index(last_migration_in_schema) if last_migration_in_schema
+      desc "Import <%= app_name %><%#%>'s new db migrations"
+      task :migrate do
+        require 'rails/generators/active_record'
+        db_migrate = File.join Rails.root, *%w{db migrate}
 
-      # Of the remainder
-      migrations.each do |old_migration|
-        old_name = File.basename(old_migration).match(/\d+_(.*)\.rb/)[1]
-        new_name = "<%= app_name %><%#%>_#{old_name}"
-
-        # Skip this single migration if we already have it
-        next if Dir[File.join(db_migrate, "[0-9]*_#{new_name}.rb")].any?
+        # Consider the set of engine migrations, in chronological order.
+        migrations = Dir[File.join <%= app_module %><%#%>::Engine.root, *%w{db migrate [0-9]*_*.rb}]
+        migrations.sort!
 
-        import_migration old_migration, new_name do |migration_source|
-          migration_source.gsub "class #{old_name.camelize}", "class #{new_name.camelize}"
+        # See if the host already has a schema migration.
+        last_migration_in_schema = migrations.reverse.detect do |migration|
+          name = File.basename(migration).match(/\d+_(.*)\.rb/)[1]
+          Dir[File.join(db_migrate, "[0-9]*_<%= app_name %><%#%>_schema_after_#{name}.rb")].any?
         end
-      end
-    end
 
-    desc "Import <%= app_name %><%#%>'s schema as a db migration"
-    task :schema do
-      schema = File.join <%= app_module %><%#%>::Engine.root, *%w{db schema.rb}
-      if File.exist? schema
-        migrations = Dir[File.join <%= app_module %><%#%>::Engine.root, *%w{db migrate [0-9]*_*.rb}]
-        latest_migration = migrations.sort.last
+        # If so, do not import any migrations implied by the schema
+        # (recall slice! *removes* the indicated range, leaving the rest.)
+        migrations.slice! 0..migrations.index(last_migration_in_schema) if last_migration_in_schema
 
-        migration_name = if latest_migration
-          latest_migration_name = File.basename(latest_migration).match(/^\d+_(.+)\.rb$/)[1]
-          "<%= app_name %><%#%>_schema_after_#{latest_migration_name}"
-        else
-          "<%= app_name %><%#%>_schema"
-        end
+        # Of the remainder
+        migrations.each do |old_migration|
+          old_name = File.basename(old_migration).match(/\d+_(.*)\.rb/)[1]
+          new_name = "<%= app_name %><%#%>_#{old_name}"
 
-        import_migration schema, migration_name do |schema_source|
-          # Strip schema declaration
-          schema_source.gsub! /\A.*^ActiveRecord::Schema.define\(:version => \d+\) do/m, ''
-          schema_source.strip!.gsub!(/^end\Z/m, '').strip!
+          # Skip this single migration if we already have it
+          next if Dir[File.join(db_migrate, "[0-9]*_#{new_name}.rb")].any?
 
-          # Indent everything 2 and strip trailing white space
-          schema_source.gsub!(/^/, '  ').gsub!(/[\t ]+$/, '')
+          import_migration old_migration, new_name do |migration_source|
+            migration_source.gsub "class #{old_name.camelize}", "class #{new_name.camelize}"
+          end
+        end
+      end
 
-          # Wrap with migration class declaration
+      desc "Import <%= app_name %><%#%>'s schema as a db migration"
+      task :schema do
+        schema = File.join <%= app_module %><%#%>::Engine.root, *%w{db schema.rb}
+        if File.exist? schema
+          migrations = Dir[File.join <%= app_module %><%#%>::Engine.root, *%w{db migrate [0-9]*_*.rb}]
+          latest_migration = migrations.sort.last
+
+          migration_name = if latest_migration
+            latest_migration_name = File.basename(latest_migration).match(/^\d+_(.+)\.rb$/)[1]
+            "<%= app_name %><%#%>_schema_after_#{latest_migration_name}"
+          else
+            "<%= app_name %><%#%>_schema"
+          end
+
+          import_migration schema, migration_name do |schema_source|
+            # Strip schema declaration
+            schema_source.gsub! /\A.*^ActiveRecord::Schema.define\(:version => \d+\) do/m, ''
+            schema_source.strip!.gsub!(/^end\Z/m, '').strip!
+
+            # Indent everything 2 and strip trailing white space
+            schema_source.gsub!(/^/, '  ').gsub!(/[\t ]+$/, '')
+
+            # Wrap with migration class declaration
 <<-EOF
 class #{migration_name.camelize} < ActiveRecord::Migration
   def self.up
@@ -96,14 +97,14 @@ class #{migration_name.camelize} < ActiveRecord::Migration
   end
 end
 EOF
+          end
         end
       end
-    end
 
-    task "migrate:seed" do
-      migration_name = "<%= app_name %><%#%>_seed"
-      if File.exist? File.join(<%= app_module %><%#%>::Engine.root, 'db', 'seeds.rb')
-        host_migration migration_name do
+      task "migrate:seed" do
+        migration_name = "<%= app_name %><%#%>_seed"
+        if File.exist? File.join(<%= app_module %><%#%>::Engine.root, 'db', 'seeds.rb')
+          host_migration migration_name do
 <<-EOF
 class #{migration_name.camelize} < ActiveRecord::Migration
   def self.up
@@ -111,57 +112,58 @@ class #{migration_name.camelize} < ActiveRecord::Migration
   end
 end
 EOF
+          end
         end
       end
-    end
 
-    desc "Load <%= app_name %><%#%>'s seed data"
-    task :seed => :environment do
-      seed_file = File.join(<%= app_module %><%#%>::Engine.root, 'db', 'seeds.rb')
-      load(seed_file) if File.exist?(seed_file)
-    end
+      desc "Load <%= app_name %><%#%>'s seed data"
+      task :seed => :environment do
+        seed_file = File.join(<%= app_module %><%#%>::Engine.root, 'db', 'seeds.rb')
+        load(seed_file) if File.exist?(seed_file)
+      end
 
-  end
+    end
 
-  desc "Link (or copy) <%= app_name %><%#%>'s static assets"
-  task :assets, [:copy] => :environment do |t, args|
-    engine_asset_path = File.join(
-      Rails.application.paths.public.to_a.first,
-      <%= app_module %><%#%>::Engine::ASSET_PREFIX)
-
-    rm_rf engine_asset_path
-    host_asset_path = <%= app_module %><%#%>::Engine.paths.public.to_a.first
-
-    link = lambda do
-      begin
-        ln_s host_asset_path, engine_asset_path
-        true
-      rescue NotImplementedError
-        false
+    desc "Link (or copy) <%= app_name %><%#%>'s static assets"
+    task :assets, [:copy] => :environment do |t, args|
+      engine_asset_path = File.join(
+        Rails.application.paths.public.to_a.first,
+        <%= app_module %><%#%>::Engine::ASSET_PREFIX)
+
+      rm_rf engine_asset_path
+      host_asset_path = <%= app_module %><%#%>::Engine.paths.public.to_a.first
+
+      link = lambda do
+        begin
+          ln_s host_asset_path, engine_asset_path
+          true
+        rescue NotImplementedError
+          false
+        end
       end
-    end
 
-    copy = lambda { cp_r host_asset_path, engine_asset_path }
+      copy = lambda { cp_r host_asset_path, engine_asset_path }
+
+      not args[:copy] and link.call or copy.call
+    end
 
-    not args[:copy] and link.call or copy.call
   end
 
-end
+  namespace :engines do
 
-namespace :engines do
+    desc "Load seed data from all engines"
+    task "db:seed" => "<%= app_name %><%#%>:db:seed"
 
-  desc "Load seed data from all engines"
-  task "db:seed" => "<%= app_name %><%#%>:db:seed"
+    desc "Import new migrations from all engines"
+    task "db:migrate" => "<%= app_name %><%#%>:db:migrate"
 
-  desc "Import new migrations from all engines"
-  task "db:migrate" => "<%= app_name %><%#%>:db:migrate"
+    desc "Link (or copy) static assets from all engines"
+    task :assets, [:copy] => "<%= app_name %><%#%>:assets"
 
-  desc "Link (or copy) static assets from all engines"
-  task :assets, [:copy] => "<%= app_name %><%#%>:assets"
+    desc "Import assets and new db migrations from all engines"
+    task :update => "<%= app_name %><%#%>:update"
 
-  desc "Import assets and new db migrations from all engines"
-  task :update => "<%= app_name %><%#%>:update"
+  end
 
+  task "db:seed" => "engines:db:seed"
 end
-
-task "db:seed" => "engines:db:seed"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Phil Smith
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-16 00:00:00 -07:00
+date: 2010-05-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency