Skip to content

Commit

Permalink
Move example app geneators.
Browse files Browse the repository at this point in the history
Change the directory name from "templates" to "example_app_generator" to
better describe what this directory holds. It is both custom Rails
templates, as well as, generator files.
  • Loading branch information
cupakromer committed Aug 28, 2014
1 parent 09ad7b3 commit c8a7ad7
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 7 deletions.
12 changes: 6 additions & 6 deletions Rakefile
Expand Up @@ -27,7 +27,7 @@ namespace :generate do

# Rails 4 cannot use a `rails` binstub generated by Bundler
sh "rm -f #{bindir}/rails"
sh "bundle exec rails new ./tmp/example_app --skip-javascript --skip-sprockets --skip-git --skip-test-unit --skip-bundle --template=templates/generate_app.rb"
sh "bundle exec rails new ./tmp/example_app --skip-javascript --skip-sprockets --skip-git --skip-test-unit --skip-bundle --template=example_app_generator/generate_app.rb"

if test 'd', bindir
in_example_app do
Expand All @@ -51,7 +51,7 @@ namespace :generate do

desc "generate a bunch of stuff with generators"
task :stuff do
in_example_app "bin/rake rails:template LOCATION='../../templates/generate_stuff.rb'"
in_example_app "bin/rake rails:template LOCATION='../../example_app_generator/generate_stuff.rb'"
end
end

Expand Down Expand Up @@ -83,7 +83,7 @@ end

desc "run a variety of specs against the generated app"
task :smoke do
in_example_app "LOCATION='../../templates/run_specs.rb' bin/rake rails:template --backtrace"
in_example_app "LOCATION='../../example_app_generator/run_specs.rb' bin/rake rails:template --backtrace"
end

namespace :smoke do
Expand Down Expand Up @@ -124,7 +124,7 @@ namespace :no_active_record do

desc "run a vairety of specs against a non-ActiveRecord generated app"
task :smoke do
in_example_app "LOCATION='../../templates/run_specs.rb' bin/rake rails:template --backtrace",
in_example_app "LOCATION='../../example_app_generator/run_specs.rb' bin/rake rails:template --backtrace",
:app_dir => example_app_dir
end

Expand All @@ -151,7 +151,7 @@ namespace :no_active_record do

# Rails 4 cannot use a `rails` binstub generated by Bundler
sh "rm -f #{bindir}/rails"
sh "bundle exec rails new #{example_app_dir} --skip-active-record --skip-javascript --skip-sprockets --skip-git --skip-test-unit --skip-bundle --template=templates/generate_app.rb"
sh "bundle exec rails new #{example_app_dir} --skip-active-record --skip-javascript --skip-sprockets --skip-git --skip-test-unit --skip-bundle --template=example_app_generator/generate_app.rb"

if test 'd', bindir
in_example_app(:app_dir => example_app_dir) do
Expand All @@ -175,7 +175,7 @@ namespace :no_active_record do

desc "generate a bunch of stuff with generators"
task :stuff do
in_example_app "bin/rake rails:template LOCATION='../../templates/generate_stuff.rb'",
in_example_app "bin/rake rails:template LOCATION='../../example_app_generator/generate_stuff.rb'",
:app_dir => example_app_dir
end
end
Expand Down
Expand Up @@ -3,7 +3,11 @@
rails_dependencies_gemfile = File.join(rspec_rails_repo_path, 'Gemfile-rails-dependencies')
bundle_install_path = File.join(rspec_rails_repo_path, '..', 'bundle')
maintenance_branch_file = File.join(rspec_rails_repo_path, 'maintenance-branch')
travis_retry_script = File.join(rspec_rails_repo_path, 'templates', 'travis_retry_bundle_install.sh')
travis_retry_script = File.join(
rspec_rails_repo_path,
'example_app_generator',
'travis_retry_bundle_install.sh'
)
function_script_file = File.join(rspec_rails_repo_path, 'script/functions.sh')

in_root do
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit c8a7ad7

Please sign in to comment.