WIP: move test dependencies to gemspec

TODO: some dependencies are still needed in the Gemfile ...

Gemfile

@@ -25,24 +25,16 @@ end
 
 group :test do
   # unit tests
-  gem "rspec-instafail",           "0.2.6",  require: false
+  gem "fuubar",                    "2.0.0",  require: false
-  gem "fuubar",                    "2.0.0"
   gem "nyan-cat-formatter",                  require: false
 
   # test coverage
   gem "simplecov",                 "0.10.0", require: false
   gem "simplecov-rcov",            "0.2.3",  require: false
   gem "codeclimate-test-reporter",           require: false
-
-  # test helpers
-  gem "fixture_builder",           "0.4.1"
-  gem "factory_girl_rails",        "4.5.0"
 end
 
 group :development, :test do
-  # unit tests
-  gem "rspec-rails", "3.3.2"
-
   # automatic test runs
   gem "guard-rspec", require: false
 
@@ -50,11 +42,9 @@ group :development, :test do
   gem "spring"
   gem "spring-commands-rspec"
 
-  # GUID generation
+  # TODO: development dependencies from gemspec
-  gem "uuid", "2.3.8"
+  gem "rspec-rails", "~> 3.3.2"
-
+  gem "uuid",        "~> 2.3.8"
-  # test database
-  gem "sqlite3"
 end
 
 group :development, :production do

Gemfile.lock

@@ -174,8 +174,6 @@ GEM
     rspec-expectations (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-instafail (0.2.6)
-      rspec
     rspec-mocks (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
@@ -231,8 +229,8 @@ PLATFORMS
 DEPENDENCIES
   codeclimate-test-reporter
   diaspora_federation!
-  factory_girl_rails (= 4.5.0)
+  factory_girl_rails (~> 4.5.0)
-  fixture_builder (= 0.4.1)
+  fixture_builder (~> 0.4.1)
   fuubar (= 2.0.0)
   guard-rspec
   logging-rails (= 0.5.0)
@@ -240,15 +238,14 @@ DEPENDENCIES
   pry
   pry-byebug
   pry-debundle
-  rspec-instafail (= 0.2.6)
+  rspec-rails (~> 3.3.2)
-  rspec-rails (= 3.3.2)
   rubocop (= 0.32.0)
   simplecov (= 0.10.0)
   simplecov-rcov (= 0.2.3)
   spring
   spring-commands-rspec
-  sqlite3
+  sqlite3 (~> 1.3.10)
-  uuid (= 2.3.8)
+  uuid (~> 2.3.8)
   yard
 
 BUNDLED WITH

Rakefile

@@ -22,4 +22,5 @@ Bundler::GemHelper.install_tasks
 
 Rails.application.load_tasks
 
-task default: :spec
+task test: %w(spec:prepare spec)
+task default: :test

diaspora_federation.gemspec

@@ -14,9 +14,25 @@ Gem::Specification.new do |s|
   s.description = "A rails engine that adds the diaspora* federation protocol to a rails app"
   s.license     = "AGPL 3.0 - http://www.gnu.org/licenses/agpl-3.0.html"
 
-  s.files = Dir["{app,config,db,lib}/**/*", "LICENSE", "Rakefile", "README.md"]
+  s.files      = Dir["{app,lib}/**/*", "config/routes.rb", "LICENSE", "Rakefile", "README.md"]
-  s.test_files = Dir["test/**/*"]
+  s.test_files = `git ls-files -- {test,spec}/*`.split("\n")
 
   s.add_dependency "rails",    "~> 4.2.2"
   s.add_dependency "nokogiri", "~> 1.6.6.2"
+
+  ############################
+  # development dependencies #
+  ############################
+
+  # unit tests
+  s.add_development_dependency "rspec-rails",        "~> 3.3.2"
+  # test helpers
+  s.add_development_dependency "fixture_builder",    "~> 0.4.1"
+  s.add_development_dependency "factory_girl_rails", "~> 4.5.0"
+
+  # GUID generation
+  s.add_development_dependency "uuid",               "~> 2.3.8"
+
+  # test database
+  s.add_development_dependency "sqlite3",            "~> 1.3.10"
 end

lib/tasks/tests.rake

@@ -1,22 +1,17 @@
-namespace :ci do
+if defined?(RSpec)
-  namespace :travis do
+  namespace :spec do
     task prepare_db: %w(db:create db:test:load)
     task :prepare_fixtures do
       ENV["NO_COVERAGE"] = "true"
       Rake::Task["spec:generate_fixtures"].invoke
       ENV["NO_COVERAGE"] = "false"
     end
+
+    desc "Prepare for rspec"
     task prepare: %w(prepare_db prepare_fixtures)
 
-    desc "Run specs"
-    task run: %w(prepare spec)
-  end
-end
-
-if defined?(RSpec)
-  namespace :spec do
     desc "Run all specs that generate fixtures for rspec"
-    RSpec::Core::RakeTask.new(generate_fixtures: "spec:prepare") do |t|
+    RSpec::Core::RakeTask.new(:generate_fixtures) do |t|
       t.rspec_opts = ["--tag fixture"]
     end
   end

script/ci/travis.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-command="bundle exec rake --trace ci:travis:run"
+command="bundle exec rake --trace"
 exec $command

test/dummy/bin/rails

@@ -1,8 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
-end
 APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'