Skip to content

Commit c3fafdc

Browse files
authored
Merge pull request #27 from blocknotes/v1.0.0
v1.0.0
2 parents f9649bb + 198cf1e commit c3fafdc

33 files changed

Lines changed: 2313 additions & 55 deletions

.fasterer.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
exclude_paths:
33
- bin/*
44
- db/schema.rb
5+
- gemfiles/**/*
56
- spec/dummy/**/*
67
- vendor/**/*
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
name: Specs Rails 6.0
3+
4+
on:
5+
push:
6+
branches:
7+
- master
8+
pull_request:
9+
branches:
10+
- master
11+
12+
jobs:
13+
tests:
14+
runs-on: ubuntu-latest
15+
16+
strategy:
17+
matrix:
18+
ruby: ['2.6', '2.7']
19+
gemfile: ['rails60_activeadmin22', 'rails60_activeadmin']
20+
21+
env:
22+
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
23+
24+
steps:
25+
- name: Checkout repository
26+
uses: actions/checkout@v2
27+
28+
- name: Set up Ruby
29+
uses: ruby/setup-ruby@v1
30+
with:
31+
ruby-version: ${{ matrix.ruby }}
32+
bundler-cache: true
33+
34+
- name: Run tests
35+
run: bundle exec rspec --profile
36+
37+
- name: On failure, archive screenshots as artifacts
38+
uses: actions/upload-artifact@v2
39+
if: failure()
40+
with:
41+
name: test-failed-screenshots
42+
path: spec/dummy/tmp/screenshots
Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
---
2-
name: Tests
2+
name: Specs Rails 6.1
33

44
on:
55
push:
6-
branches: [develop, master]
6+
branches:
7+
- master
78
pull_request:
8-
branches: [develop, master]
9+
branches:
10+
- master
911

1012
jobs:
1113
tests:
@@ -14,9 +16,13 @@ jobs:
1416
strategy:
1517
matrix:
1618
ruby: ['2.6', '2.7', '3.0']
19+
gemfile: ['rails61_activeadmin29', 'rails61_activeadmin']
20+
21+
env:
22+
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
1723

1824
steps:
19-
- name: Checkout
25+
- name: Checkout repository
2026
uses: actions/checkout@v2
2127

2228
- name: Set up Ruby
@@ -26,9 +32,9 @@ jobs:
2632
bundler-cache: true
2733

2834
- name: Run tests
29-
run: bin/rspec --profile
35+
run: bundle exec rspec --profile
3036

31-
- name: Archive screenshots for failed tests
37+
- name: On failure, archive screenshots as artifacts
3238
uses: actions/upload-artifact@v2
3339
if: failure()
3440
with:
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
name: Specs Rails 7.0
3+
4+
on:
5+
push:
6+
branches:
7+
- master
8+
pull_request:
9+
branches:
10+
- master
11+
12+
jobs:
13+
tests:
14+
runs-on: ubuntu-latest
15+
16+
strategy:
17+
matrix:
18+
ruby: ['2.7', '3.0']
19+
gemfile: ['rails70_activeadmin']
20+
21+
env:
22+
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
23+
24+
steps:
25+
- name: Checkout repository
26+
uses: actions/checkout@v2
27+
28+
- name: Set up Ruby
29+
uses: ruby/setup-ruby@v1
30+
with:
31+
ruby-version: ${{ matrix.ruby }}
32+
bundler-cache: true
33+
34+
- name: Run tests
35+
run: bundle exec rspec --profile
36+
37+
- name: On failure, archive screenshots as artifacts
38+
uses: actions/upload-artifact@v2
39+
if: failure()
40+
with:
41+
name: test-failed-screenshots
42+
path: spec/dummy/tmp/screenshots

.rubocop.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,7 @@ AllCops:
66
Exclude:
77
- bin/*
88
- db/schema.rb
9+
- gemfiles/**/*
910
- spec/dummy/**/*
1011
- vendor/**/*
1112
NewCops: enable
12-
13-
Gemspec/RequiredRubyVersion:
14-
Enabled: false
15-
16-
Naming/FileName:
17-
Enabled: false
18-
19-
Layout/LineLength:
20-
Enabled: true
21-
Max: 120
22-
23-
Style/HashEachMethods:
24-
Enabled: true
25-
26-
Style/HashTransformKeys:
27-
Enabled: true
28-
29-
Style/HashTransformValues:
30-
Enabled: true

Appraisals

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# frozen_string_literal: true
2+
3+
appraise 'rails52-activeadmin20' do
4+
gem 'activeadmin', '~> 2.0.0'
5+
gem 'rails', '~> 5.2.0'
6+
end
7+
8+
appraise 'rails60-activeadmin22' do
9+
gem 'activeadmin', '~> 2.2.0'
10+
gem 'rails', '~> 6.0.0'
11+
gem 'selenium-webdriver', require: false
12+
end
13+
14+
appraise 'rails60-activeadmin' do
15+
gem 'activeadmin'
16+
gem 'rails', '~> 6.0.0'
17+
gem 'selenium-webdriver', require: false
18+
end
19+
20+
appraise 'rails61-activeadmin29' do
21+
gem 'activeadmin', '~> 2.9.0'
22+
gem 'rails', '~> 6.1.0'
23+
end
24+
25+
appraise 'rails61-activeadmin' do
26+
gem 'activeadmin'
27+
gem 'rails', '~> 6.1.0'
28+
end
29+
30+
appraise 'rails70-activeadmin' do
31+
gem 'activeadmin'
32+
gem 'rails', '~> 7.0.0'
33+
gem 'sprockets-rails'
34+
end

Gemfile

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,23 @@ source 'https://rubygems.org'
55
gemspec
66

77
group :development, :test do
8-
gem 'activestorage', '~> 6.0'
9-
gem 'puma', '~> 4.3'
10-
gem 'sassc', '~> 2.4'
11-
gem 'sprockets-rails', '~> 3.2'
12-
gem 'sqlite3', '~> 1.4'
8+
gem 'puma'
9+
gem 'sassc'
10+
gem 'sqlite3'
1311

1412
# Testing
15-
gem 'capybara', '~> 3.33'
16-
gem 'rspec_junit_formatter', '~> 0.4'
17-
gem 'rspec-rails', '~> 5.1'
18-
gem 'selenium-webdriver', '~> 3.142'
13+
gem 'capybara'
14+
gem 'cuprite'
15+
gem 'rspec_junit_formatter'
16+
gem 'rspec-rails'
1917

2018
# Linters
21-
gem 'fasterer', '~> 0.9'
22-
gem 'rubocop', '~> 1.25'
23-
gem 'rubocop-packaging', '~> 0.5'
24-
gem 'rubocop-performance', '~> 1.13'
25-
gem 'rubocop-rails', '~> 2.13'
26-
gem 'rubocop-rspec', '~> 2.8'
19+
gem 'fasterer'
20+
gem 'rubocop'
21+
gem 'rubocop-packaging'
22+
gem 'rubocop-performance'
23+
gem 'rubocop-rails'
24+
gem 'rubocop-rspec'
2725

2826
# Tools
2927
gem 'pry-rails'

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2020 Mattia Roccoberton
1+
Copyright (c) 2020-2022 Mattia Roccoberton
22

33
MIT License
44

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
[![gem version](https://badge.fury.io/rb/activeadmin_blaze_theme.svg)](https://badge.fury.io/rb/activeadmin_blaze_theme)
33
[![gem downloads](https://badgen.net/rubygems/dt/activeadmin_blaze_theme)](https://rubygems.org/gems/activeadmin_blaze_theme)
44
[![linters](https://github.com/blocknotes/activeadmin_blaze_theme/actions/workflows/linters.yml/badge.svg)](https://github.com/blocknotes/activeadmin_blaze_theme/actions/workflows/linters.yml)
5-
[![specs](https://github.com/blocknotes/activeadmin_blaze_theme/actions/workflows/specs.yml/badge.svg)](https://github.com/blocknotes/activeadmin_blaze_theme/actions/workflows/specs.yml)
5+
[![specs Rails 6.0](https://github.com/blocknotes/activeadmin_blaze_theme/actions/workflows/specs_rails6.0.yml/badge.svg)](https://github.com/blocknotes/activeadmin_blaze_theme/actions/workflows/specs_rails6.0.yml)
6+
[![specs Rails 6.1](https://github.com/blocknotes/activeadmin_blaze_theme/actions/workflows/specs_rails6.1.yml/badge.svg)](https://github.com/blocknotes/activeadmin_blaze_theme/actions/workflows/specs_rails6.1.yml)
7+
[![specs Rails 7.0](https://github.com/blocknotes/activeadmin_blaze_theme/actions/workflows/specs_rails7.0.yml/badge.svg)](https://github.com/blocknotes/activeadmin_blaze_theme/actions/workflows/specs_rails7.0.yml)
68

79
A theme for Active Admin based on [Blaze CSS](http://blazecss.com) 3.x
810

activeadmin_blaze_theme.gemspec

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,16 @@ Gem::Specification.new do |spec|
1414
spec.homepage = 'https://github.com/blocknotes/activeadmin_blaze_theme'
1515
spec.license = 'MIT'
1616

17+
spec.required_ruby_version = '>= 2.6.0'
18+
19+
spec.metadata['homepage_uri'] = spec.homepage
20+
spec.metadata['source_code_uri'] = spec.homepage
21+
spec.metadata['rubygems_mfa_required'] = 'true'
22+
1723
spec.files = Dir["{app,lib}/**/*", 'LICENSE.txt', 'README.md', 'index.js', 'package.json']
1824
spec.require_paths = ['lib']
19-
spec.metadata = { "rubygems_mfa_required" => "true" }
2025

2126
spec.add_runtime_dependency 'activeadmin', '~> 2.0'
27+
28+
spec.add_development_dependency 'appraisal', '~> 2.4'
2229
end

0 commit comments

Comments
 (0)