Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get rid of dummy application #57

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,8 @@ jobs:

- name: Run tests
env:
DATABASE_URL: "sqlite3:test"
RAILS_ENV: test
run: |
bundle exec rails db:test:prepare
bundle exec rails test
ADAPTER: sqlite3
run: bundle exec rake test

postgres:
runs-on: ubuntu-latest
Expand All @@ -74,8 +71,8 @@ jobs:
image: postgres:12
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: password
POSTGRES_DB: test
POSTGRES_PASSWORD: postgres
POSTGRES_DB: sequenced_test
ports: ['5432:5432']

steps:
Expand All @@ -93,8 +90,5 @@ jobs:

- name: Run tests
env:
DATABASE_URL: postgres://postgres:password@localhost:5432/test
RAILS_ENV: test
run: |
bundle exec rails db:test:prepare
bundle exec rails test
ADAPTER: postgresql
run: bundle exec rake test
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
.bundle/
.rvmrc
Gemfile.lock
gemfiles/*.lock
log/*.log
pkg/
test/dummy/db/*.sqlite3
test/dummy/log/*.log
test/dummy/tmp/
test/dummy/.sass-cache
*.sqlite3
*.gem
.ruby-version
.ruby-gemset
10 changes: 5 additions & 5 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
appraise "rails-5-2" do
gem "rails", "~> 5.2.0"
gem "activerecord", "~> 5.2.0"
end

appraise "rails-6" do
gem "rails", "~> 6.0.0"
gem "activerecord", "~> 6.0.0"
end

appraise "rails-6-1" do
gem "rails", "~> 6.1.0"
gem "activerecord", "~> 6.1.0"
end

appraise "rails-7" do
gem "rails", "~> 7.0.0"
gem "activerecord", "~> 7.0.0"
end

appraise "rails-master" do
gem "rails", github: "rails/rails", branch: "main"
gem "activerecord", github: "rails/rails", branch: "main"
end
27 changes: 8 additions & 19 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
source "https://rubygems.org"

# Declare your gem's dependencies in sequenced.gemspec.
# Bundler will treat runtime dependencies like base dependencies, and
# development dependencies will be added by default to the :development group.
gemspec

gem "appraisal"
gem "standardrb"

group :development, :test do
gem "sqlite3", "~> 1.4.4"
# gem 'mysql2'
gem "pg"
gem "net-imap"
gem "net-pop"
gem "net-smtp"
gem "sqlite3", "~> 1.4.4"
gem "pg"

if defined?(@ar_gem_requirement)
gem "activerecord", @ar_gem_requirement
gem "railties", @ar_gem_requirement
else
gem "activerecord" # latest
end

# Declare any dependencies that are still in development here instead of in
# your gemspec. These might include edge Rails or gems from your path or
# Git. Remember to move these dependencies to your gemspec before releasing
# your gem to rubygems.org.

# To use debugger
# gem 'ruby-debug19', :require => 'ruby-debug'
25 changes: 0 additions & 25 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,3 @@ Rake::TestTask.new(:test) do |t|
end

task default: :test

namespace :db do
task :create do
# File.expand_path is executed directory of generated Rails app
rakefile = File.expand_path("Rakefile", "test/dummy/")
command = "rake -f '%s' db:create" % rakefile
sh(command)
end

task :drop do
# File.expand_path is executed directory of generated Rails app
rakefile = File.expand_path("Rakefile", "test/dummy/")
command = "rake -f '%s' db:drop" % rakefile
sh(command)
end

namespace :test do
task :prepare do
# File.expand_path is executed directory of generated Rails app
rakefile = File.expand_path("Rakefile", "test/dummy/")
command = "rake -f '%s' db:test:prepare" % rakefile
sh(command)
end
end
end
12 changes: 3 additions & 9 deletions gemfiles/rails_5_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,8 @@ source "https://rubygems.org"

gem "appraisal"
gem "standardrb"
gem "rails", "~> 5.2.0"

group :development, :test do
gem "sqlite3", "~> 1.4.4"
gem "pg"
gem "net-imap"
gem "net-pop"
gem "net-smtp"
end
gem "sqlite3", "~> 1.4.4"
gem "pg"
gem "activerecord", "~> 5.2.0"

gemspec path: "../"
121 changes: 6 additions & 115 deletions gemfiles/rails_5_2.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,42 +8,12 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.8.1)
actionpack (= 5.2.8.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.8.1)
actionpack (= 5.2.8.1)
actionview (= 5.2.8.1)
activejob (= 5.2.8.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.8.1)
actionview (= 5.2.8.1)
activesupport (= 5.2.8.1)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.8.1)
activesupport (= 5.2.8.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.8.1)
activesupport (= 5.2.8.1)
globalid (>= 0.3.6)
activemodel (5.2.8.1)
activesupport (= 5.2.8.1)
activerecord (5.2.8.1)
activemodel (= 5.2.8.1)
activesupport (= 5.2.8.1)
arel (>= 9.0)
activestorage (5.2.8.1)
actionpack (= 5.2.8.1)
activerecord (= 5.2.8.1)
marcel (~> 1.0.0)
activesupport (5.2.8.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
Expand All @@ -55,80 +25,16 @@ GEM
thor (>= 0.14.0)
arel (9.0.0)
ast (2.4.2)
builder (3.2.4)
byebug (11.1.3)
concurrent-ruby (1.1.10)
crass (1.0.6)
digest (3.1.0)
erubi (1.11.0)
globalid (1.0.0)
activesupport (>= 5.0)
i18n (1.12.0)
concurrent-ruby (~> 1.0)
json (2.6.2)
loofah (2.18.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (1.0.2)
method_source (1.0.0)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
minitest (5.16.2)
net-imap (0.2.3)
digest
net-protocol
strscan
net-pop (0.1.1)
digest
net-protocol
timeout
net-protocol (0.1.3)
timeout
net-smtp (0.3.1)
digest
net-protocol
timeout
nio4r (2.5.8)
nokogiri (1.13.8)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogiri (1.13.8-arm64-darwin)
racc (~> 1.4)
nokogiri (1.13.8-x86_64-linux)
racc (~> 1.4)
minitest (5.16.3)
parallel (1.22.1)
parser (3.1.2.1)
ast (~> 2.4.1)
pg (1.4.3)
racc (1.6.0)
rack (2.2.4)
rack-test (2.0.2)
rack (>= 1.3)
rails (5.2.8.1)
actioncable (= 5.2.8.1)
actionmailer (= 5.2.8.1)
actionpack (= 5.2.8.1)
actionview (= 5.2.8.1)
activejob (= 5.2.8.1)
activemodel (= 5.2.8.1)
activerecord (= 5.2.8.1)
activestorage (= 5.2.8.1)
activesupport (= 5.2.8.1)
bundler (>= 1.3.0)
railties (= 5.2.8.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.4.3)
loofah (~> 2.3)
railties (5.2.8.1)
actionpack (= 5.2.8.1)
activesupport (= 5.2.8.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.5.0)
Expand All @@ -149,45 +55,30 @@ GEM
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
ruby-progressbar (1.11.0)
sprockets (4.1.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.4.4)
standard (1.16.0)
rubocop (= 1.35.0)
rubocop-performance (= 1.14.3)
standardrb (1.0.1)
standard
strscan (3.0.4)
thor (1.2.1)
thread_safe (0.3.6)
timeout (0.3.0)
tzinfo (1.2.10)
thread_safe (~> 0.1)
unicode-display_width (2.2.0)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)

PLATFORMS
arm64-darwin-21
ruby
x86_64-linux
x86_64-darwin-20

DEPENDENCIES
activerecord (~> 5.2.0)
appraisal
net-imap
net-pop
net-smtp
byebug
pg
rails (~> 5.2.0)
sequenced!
sqlite3 (~> 1.4.4)
standardrb

BUNDLED WITH
2.3.16
2.3.17
12 changes: 3 additions & 9 deletions gemfiles/rails_6.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,8 @@ source "https://rubygems.org"

gem "appraisal"
gem "standardrb"
gem "rails", "~> 6.0.0"

group :development, :test do
gem "sqlite3", "~> 1.4.4"
gem "pg"
gem "net-imap"
gem "net-pop"
gem "net-smtp"
end
gem "sqlite3", "~> 1.4.4"
gem "pg"
gem "activerecord", "~> 6.0.0"

gemspec path: "../"
Loading