Skip to content

Commit 8fb25fc

Browse files
authored
DEV: Update deps, add syntax_tree (#4)
1 parent edd56ee commit 8fb25fc

File tree

7 files changed

+66
-39
lines changed

7 files changed

+66
-39
lines changed

.github/workflows/ci.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,33 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515

1616
- name: Set up Ruby
1717
uses: ruby/setup-ruby@v1
1818
with:
19-
ruby-version: '2.7'
19+
ruby-version: "3.3"
2020
bundler-cache: true
2121

2222
- name: Lint
2323
run: bundle exec rubocop
2424

25+
- name: syntax_tree
26+
if: ${{ !cancelled() }}
27+
run: |
28+
set -E
29+
bundle exec stree check Gemfile $(git ls-files '*.rb') $(git ls-files '*.rake') $(git ls-files '*.thor')
30+
2531
publish:
2632
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
2733
needs: build
2834
runs-on: ubuntu-latest
2935

3036
steps:
31-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v4
3238

3339
- name: Release Gem
34-
uses: discourse/publish-rubygems-action@v2
40+
uses: discourse/publish-rubygems-action@v3
3541
env:
3642
RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
3743
GIT_EMAIL: [email protected]

.rubocop.yml

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,15 @@
11
inherit_gem:
2-
rubocop-discourse: default.yml
2+
rubocop-discourse: stree-compat.yml
3+
4+
inherit_mode:
5+
merge:
6+
- Exclude
7+
8+
Discourse/NoChdir:
9+
Enabled: false
10+
11+
Discourse/Plugins/NamespaceConstants:
12+
Enabled: false
13+
14+
Discourse/Plugins/NamespaceMethods:
15+
Enabled: false

.streerc

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--print-width=100
2+
--plugins=plugin/trailing_comma,plugin/disable_auto_ternary

discourse_dev_assets.gemspec

+16-15
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
# frozen_string_literal: true
22

33
lib = File.expand_path("../lib", __FILE__)
4-
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4+
$LOAD_PATH.unshift(lib) if !$LOAD_PATH.include?(lib)
55
require "discourse_dev_assets/version"
66

77
Gem::Specification.new do |spec|
8-
spec.name = "discourse_dev_assets"
9-
spec.version = DiscourseDevAssets::VERSION
10-
spec.authors = ["Vinoth Kannan"]
11-
spec.email = ["[email protected]"]
8+
spec.name = "discourse_dev_assets"
9+
spec.version = DiscourseDevAssets::VERSION
10+
spec.authors = ["Vinoth Kannan"]
11+
spec.email = ["[email protected]"]
1212

13-
spec.summary = %q{Assets for Discourse dev module}
14-
spec.description = %q{Assets for Discourse dev module}
15-
spec.homepage = "https://github.com/discourse/discourse_dev_assets"
16-
spec.license = "MIT"
13+
spec.summary = "Assets for Discourse dev module"
14+
spec.description = "Assets for Discourse dev module"
15+
spec.homepage = "https://github.com/discourse/discourse_dev_assets"
16+
spec.license = "MIT"
1717

18-
spec.files = `git ls-files`.split($/).reject { |s| s =~ /^(spec)/ }
18+
spec.files = `git ls-files`.split($/).reject { |s| s =~ /^(spec)/ }
1919
spec.require_paths = ["lib"]
2020

21-
spec.add_runtime_dependency "faker", "~> 2.16"
21+
spec.add_runtime_dependency "faker", "~> 3.5.1"
2222
spec.add_runtime_dependency "literate_randomizer"
2323

24-
spec.add_development_dependency "bundler", "~> 2.0"
25-
spec.add_development_dependency "rake", ">= 12.3.3"
26-
spec.add_development_dependency "rubocop-discourse", "~> 2.5.0"
24+
spec.add_development_dependency "bundler"
25+
spec.add_development_dependency "rake"
26+
spec.add_development_dependency "rubocop-discourse"
27+
spec.add_development_dependency "syntax_tree"
2728

28-
spec.required_ruby_version = '>= 2.6.0'
29+
spec.required_ruby_version = ">= 3.3.0"
2930
end

lib/discourse_dev_assets.rb

+21-17
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# frozen_string_literal: true
22

3-
Dir[File.dirname(__FILE__) + '/**/*.rb'].each { |file| require file }
3+
Dir[File.dirname(__FILE__) + "/**/*.rb"].each { |file| require file }
44

55
module DiscourseDevAssets
6-
require 'discourse_dev_assets/engine'
6+
require "discourse_dev_assets/engine"
77

88
def self.avatars
99
# Using the stock avatar images from https://tinyfac.es
1010
# Tiny Faces is a free crowd-sourced avatar gallery
11-
Dir[File.join(__dir__, '..', 'avatars', '*.*')]
11+
Dir[File.join(__dir__, "..", "avatars", "*.*")]
1212
end
1313
end
1414

@@ -18,41 +18,45 @@ def self.avatars
1818
alias_method :rails_each_current_configuration, :each_current_configuration
1919

2020
private
21+
2122
def each_current_configuration(environment, name = nil)
22-
rails_each_current_configuration(environment, name) { |db_config|
23-
next if environment == "development" &&
24-
ENV["SKIP_TEST_DATABASE"] == "1" &&
25-
db_config.configuration_hash[:database] != "discourse_development"
23+
rails_each_current_configuration(environment, name) do |db_config|
24+
if environment == "development" && ENV["SKIP_TEST_DATABASE"] == "1" &&
25+
db_config.configuration_hash[:database] != "discourse_development"
26+
next
27+
end
2628

2729
yield db_config
28-
}
30+
end
2931
end
3032
end
3133

32-
require 'faker'
34+
require "faker"
3335

3436
Faker::Base.instance_eval do
35-
alias :faker_translate :translate
37+
alias faker_translate translate
3638

3739
def translate(*args, **opts)
38-
if args[0] == "faker.lorem.words"
39-
args[0] = "faker.discourse.words"
40-
end
40+
args[0] = "faker.discourse.words" if args[0] == "faker.lorem.words"
4141

4242
faker_translate(*args, **opts)
4343
end
4444
end
4545

46-
require 'literate_randomizer'
46+
require "literate_randomizer"
4747

4848
Faker::Lorem.instance_eval do
49-
alias :faker_sentence :sentence
50-
alias :faker_paragraph :paragraph
49+
alias faker_sentence sentence
50+
alias faker_paragraph paragraph
5151

5252
NOT_GIVEN = Object.new
5353

5454
def sentence(word_count: 4, supplemental: false, random_words_to_add: 15)
55-
faker_sentence(word_count: word_count, supplemental: supplemental, random_words_to_add: random_words_to_add)
55+
faker_sentence(
56+
word_count: word_count,
57+
supplemental: supplemental,
58+
random_words_to_add: random_words_to_add,
59+
)
5660
end
5761

5862
def paragraph(options = {})

lib/discourse_dev_assets/engine.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# frozen_string_literal: true
22

33
module DiscourseDevAssets
4-
class Engine < Rails::Engine; end
4+
class Engine < Rails::Engine
5+
end
56
end

lib/discourse_dev_assets/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
22

33
module DiscourseDevAssets
4-
VERSION = "0.0.4"
4+
VERSION = "0.0.5"
55
end

0 commit comments

Comments
 (0)