Skip to content

Commit

Permalink
Moved development dependencies out of gemspec
Browse files Browse the repository at this point in the history
  • Loading branch information
ankane committed Feb 9, 2021
1 parent 2eb7cdf commit 8508d4b
Show file tree
Hide file tree
Showing 10 changed files with 58 additions and 22 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ jobs:
fail-fast: false
matrix:
include:
- ruby: 2.7
- ruby: 3.0
gemfile: Gemfile
- ruby: 2.7
gemfile: gemfiles/rails60.gemfile
- ruby: 2.6
gemfile: gemfiles/rails52.gemfile
- ruby: 2.5
Expand Down
13 changes: 11 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
source "https://rubygems.org"

# Specify your gem's dependencies in ahoy.gemspec
gemspec

gem "rails", "~> 6.0.0"
gem "rails", "~> 6.1.0"
gem "rake"
gem "minitest"
gem "combustion"
gem "sqlite3"
gem "pg"
gem "mysql2"
# TODO use rubygems when > 7.2.0 is released
gem "mongoid", github: "mongodb/mongoid"
gem "browser", "~> 2.0"
gem "user_agent_parser"
14 changes: 1 addition & 13 deletions ahoy_matey.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
spec.license = "MIT"

spec.author = "Andrew Kane"
spec.email = "andrew@chartkick.com"
spec.email = "andrew@ankane.org"

spec.files = Dir["*.{md,txt}", "{app,config,lib,vendor}/**/*"]
spec.require_path = "lib"
Expand All @@ -19,16 +19,4 @@ Gem::Specification.new do |spec|
spec.add_dependency "geocoder", ">= 1.4.5"
spec.add_dependency "safely_block", ">= 0.2.1"
spec.add_dependency "device_detector"

spec.add_development_dependency "bundler"
spec.add_development_dependency "rake"
spec.add_development_dependency "minitest"
spec.add_development_dependency "combustion"
spec.add_development_dependency "rails"
spec.add_development_dependency "sqlite3"
spec.add_development_dependency "pg"
spec.add_development_dependency "mysql2"
spec.add_development_dependency "mongoid"
spec.add_development_dependency "browser", "~> 2.0"
spec.add_development_dependency "user_agent_parser"
end
8 changes: 8 additions & 0 deletions gemfiles/rails50.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,12 @@ source "https://rubygems.org"
gemspec path: ".."

gem "rails", "~> 5.0.0"
gem "rake"
gem "minitest"
gem "combustion"
gem "sqlite3", "~> 1.3.0"
gem "pg"
gem "mysql2"
gem "mongoid"
gem "browser", "~> 2.0"
gem "user_agent_parser"
9 changes: 9 additions & 0 deletions gemfiles/rails51.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,12 @@ source "https://rubygems.org"
gemspec path: ".."

gem "rails", "~> 5.1.0"
gem "rake"
gem "minitest"
gem "combustion"
gem "sqlite3"
gem "pg"
gem "mysql2"
gem "mongoid"
gem "browser", "~> 2.0"
gem "user_agent_parser"
9 changes: 9 additions & 0 deletions gemfiles/rails52.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,12 @@ source "https://rubygems.org"
gemspec path: ".."

gem "rails", "~> 5.2.0"
gem "rake"
gem "minitest"
gem "combustion"
gem "sqlite3"
gem "pg"
gem "mysql2"
gem "mongoid"
gem "browser", "~> 2.0"
gem "user_agent_parser"
14 changes: 14 additions & 0 deletions gemfiles/rails60.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
source "https://rubygems.org"

gemspec path: ".."

gem "rails", "~> 6.0.0"
gem "rake"
gem "minitest"
gem "combustion"
gem "sqlite3"
gem "pg"
gem "mysql2"
gem "mongoid"
gem "browser", "~> 2.0"
gem "user_agent_parser"
5 changes: 0 additions & 5 deletions gemfiles/rails61.gemfile

This file was deleted.

1 change: 1 addition & 0 deletions lib/ahoy.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# stdlib
require "ipaddr"

# dependencies
Expand Down
3 changes: 2 additions & 1 deletion test/test_helper.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
require "bundler/setup"
Bundler.require(:development)
require "combustion"
Bundler.require(:default)
require "minitest/autorun"
require "minitest/pride"

Expand Down

0 comments on commit 8508d4b

Please sign in to comment.