Merge pull request #496 from vyper/fix-rakefile-w-rspec

Fix Rakefile generation when using RSpec
hanami · Feb 7, 2016 · a55fd59 · a55fd59
2 parents fbcd70a + a8f8edd
commit a55fd59
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/lib/hanami/generators/application/app/Rakefile.rspec.tt b/lib/hanami/generators/application/app/Rakefile.rspec.tt
@@ -1,6 +1,9 @@
 require 'rake'
 require 'hanami/rake_tasks'
-require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
-task default: :spec
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+  task default: :spec
+rescue LoadError
+end
diff --git a/lib/hanami/generators/application/container/Rakefile.rspec.tt b/lib/hanami/generators/application/container/Rakefile.rspec.tt
@@ -1,6 +1,9 @@
 require 'rake'
 require 'hanami/rake_tasks'
-require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
-task default: :spec
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+  task default: :spec
+rescue LoadError
+end
diff --git a/test/fixtures/commands/application/new_app/Rakefile.rspec b/test/fixtures/commands/application/new_app/Rakefile.rspec
@@ -1,6 +1,9 @@
 require 'rake'
 require 'hanami/rake_tasks'
-require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
-task default: :spec
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+  task default: :spec
+rescue LoadError
+end
diff --git a/test/fixtures/commands/application/new_container/Rakefile.rspec b/test/fixtures/commands/application/new_container/Rakefile.rspec
@@ -1,6 +1,9 @@
 require 'rake'
 require 'hanami/rake_tasks'
-require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
-task default: :spec
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+  task default: :spec
+rescue LoadError
+end