discourse_theme 0.7.0 → 0.7.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/ci.yml +7 -9
- data/README.md +1 -1
- data/discourse_theme.gemspec +2 -1
- data/lib/discourse_theme/cli.rb +7 -4
- data/lib/discourse_theme/client.rb +10 -3
- data/lib/discourse_theme/scaffold.rb +5 -1
- data/lib/discourse_theme/uploader.rb +0 -3
- data/lib/discourse_theme/version.rb +1 -1
- metadata +18 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 97a862e2ac58f510af5689963a9ce8fecbf2f8d9c2394b8b7472989576bdd3a3
|
4
|
+
data.tar.gz: 4c9c71524bbd6ab86c41c9b48c08636444b0ca7c861b16552767521b7dc3d009
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6c4fc7f7ddc8c9213f54cf3c3b184a451a4da2aa44cbcf22218589ca0fc88dc67c186bde660f39f53ce13e2ffd4c0399bd6df0975a305c90f722df195c9e0f66
|
7
|
+
data.tar.gz: 26157e131f6db3fcfb48de880bbb1016bde6d102e1e916e4ef5c0b3f0acafc3f009d1611f9a2b44bcadd6bfc94643e2cff619ae6433456f76298aa90bd146412
|
data/.github/workflows/ci.yml
CHANGED
@@ -4,7 +4,6 @@ on:
|
|
4
4
|
pull_request:
|
5
5
|
push:
|
6
6
|
branches:
|
7
|
-
- master
|
8
7
|
- main
|
9
8
|
|
10
9
|
jobs:
|
@@ -14,13 +13,12 @@ jobs:
|
|
14
13
|
strategy:
|
15
14
|
matrix:
|
16
15
|
ruby:
|
17
|
-
- 2.
|
18
|
-
-
|
19
|
-
-
|
20
|
-
- 3.0
|
16
|
+
- "2.7"
|
17
|
+
- "3.0"
|
18
|
+
- "3.1"
|
21
19
|
|
22
20
|
steps:
|
23
|
-
- uses: actions/checkout@
|
21
|
+
- uses: actions/checkout@v3
|
24
22
|
|
25
23
|
- name: Setup ruby
|
26
24
|
uses: ruby/setup-ruby@v1
|
@@ -35,15 +33,15 @@ jobs:
|
|
35
33
|
run: bundle exec rake test
|
36
34
|
|
37
35
|
publish:
|
38
|
-
if: github.event_name == 'push' &&
|
36
|
+
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
39
37
|
needs: build
|
40
38
|
runs-on: ubuntu-latest
|
41
39
|
|
42
40
|
steps:
|
43
|
-
- uses: actions/checkout@
|
41
|
+
- uses: actions/checkout@v3
|
44
42
|
|
45
43
|
- name: Release Gem
|
46
|
-
uses: discourse/publish-rubygems-action@v2
|
44
|
+
uses: discourse/publish-rubygems-action@v2
|
47
45
|
env:
|
48
46
|
RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
|
49
47
|
GIT_EMAIL: team@discourse.org
|
data/README.md
CHANGED
@@ -46,4 +46,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
|
|
46
46
|
|
47
47
|
## Code of Conduct
|
48
48
|
|
49
|
-
Everyone interacting in the DiscourseTheme project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/
|
49
|
+
Everyone interacting in the DiscourseTheme project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/discourse/discourse_theme/blob/main/CODE_OF_CONDUCT.md).
|
data/discourse_theme.gemspec
CHANGED
@@ -36,7 +36,8 @@ Gem::Specification.new do |spec|
|
|
36
36
|
spec.add_development_dependency "minitest", "~> 5.0"
|
37
37
|
spec.add_development_dependency "guard", "~> 2.14"
|
38
38
|
spec.add_development_dependency "guard-minitest", "~> 2.4"
|
39
|
-
spec.add_development_dependency "webmock", "~> 3.
|
39
|
+
spec.add_development_dependency "webmock", "~> 3.17"
|
40
40
|
spec.add_development_dependency "rubocop"
|
41
41
|
spec.add_development_dependency "rubocop-discourse"
|
42
|
+
spec.add_development_dependency "m"
|
42
43
|
end
|
data/lib/discourse_theme/cli.rb
CHANGED
@@ -80,14 +80,17 @@ module DiscourseTheme
|
|
80
80
|
settings.theme_id = theme_id = uploader.upload_full_theme
|
81
81
|
|
82
82
|
UI.success "Theme uploaded (id:#{theme_id})"
|
83
|
-
UI.info "Preview: #{client.
|
83
|
+
UI.info "Preview: #{client.url}/?preview_theme_id=#{theme_id}"
|
84
|
+
|
84
85
|
if client.is_theme_creator
|
85
|
-
UI.info "Manage: #{client.
|
86
|
+
UI.info "Manage: #{client.url}/my/themes"
|
86
87
|
else
|
87
|
-
UI.info "Manage: #{client.
|
88
|
+
UI.info "Manage: #{client.url}/admin/customize/themes/#{theme_id}"
|
88
89
|
end
|
89
|
-
watcher = DiscourseTheme::Watcher.new(dir: dir, uploader: uploader)
|
90
90
|
|
91
|
+
UI.info "Tests: #{client.url}/theme-qunit?id=#{theme_id}"
|
92
|
+
|
93
|
+
watcher = DiscourseTheme::Watcher.new(dir: dir, uploader: uploader)
|
91
94
|
UI.progress "Watching for changes in #{dir}..."
|
92
95
|
watcher.watch
|
93
96
|
elsif command == "download"
|
@@ -1,7 +1,9 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
module DiscourseTheme
|
3
3
|
class Client
|
4
|
-
THEME_CREATOR_REGEX = /^https:\/\/theme-creator
|
4
|
+
THEME_CREATOR_REGEX = /^https:\/\/(theme-creator\.discourse\.org|discourse\.theme-creator\.io)$/i
|
5
|
+
|
6
|
+
attr_reader :url
|
5
7
|
|
6
8
|
def initialize(dir, settings, reset:)
|
7
9
|
@reset = reset
|
@@ -19,7 +21,7 @@ module DiscourseTheme
|
|
19
21
|
end
|
20
22
|
end
|
21
23
|
|
22
|
-
# From https://github.com/discourse/discourse/blob/
|
24
|
+
# From https://github.com/discourse/discourse/blob/main/lib/version.rb
|
23
25
|
def self.has_needed_version?(current, needed)
|
24
26
|
current_split = current.split('.')
|
25
27
|
needed_split = needed.split('.')
|
@@ -105,7 +107,12 @@ module DiscourseTheme
|
|
105
107
|
end
|
106
108
|
|
107
109
|
def root
|
108
|
-
URI.parse(@url)
|
110
|
+
parsed = URI.parse(@url)
|
111
|
+
# we must strip the username/password so it does not
|
112
|
+
# confuse AWS albs
|
113
|
+
parsed.user = nil
|
114
|
+
parsed.password = nil
|
115
|
+
parsed
|
109
116
|
end
|
110
117
|
|
111
118
|
def is_theme_creator
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: discourse_theme
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.7.
|
4
|
+
version: 0.7.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sam Saffron
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2022-08-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: minitar
|
@@ -156,14 +156,14 @@ dependencies:
|
|
156
156
|
requirements:
|
157
157
|
- - "~>"
|
158
158
|
- !ruby/object:Gem::Version
|
159
|
-
version: '3.
|
159
|
+
version: '3.17'
|
160
160
|
type: :development
|
161
161
|
prerelease: false
|
162
162
|
version_requirements: !ruby/object:Gem::Requirement
|
163
163
|
requirements:
|
164
164
|
- - "~>"
|
165
165
|
- !ruby/object:Gem::Version
|
166
|
-
version: '3.
|
166
|
+
version: '3.17'
|
167
167
|
- !ruby/object:Gem::Dependency
|
168
168
|
name: rubocop
|
169
169
|
requirement: !ruby/object:Gem::Requirement
|
@@ -192,6 +192,20 @@ dependencies:
|
|
192
192
|
- - ">="
|
193
193
|
- !ruby/object:Gem::Version
|
194
194
|
version: '0'
|
195
|
+
- !ruby/object:Gem::Dependency
|
196
|
+
name: m
|
197
|
+
requirement: !ruby/object:Gem::Requirement
|
198
|
+
requirements:
|
199
|
+
- - ">="
|
200
|
+
- !ruby/object:Gem::Version
|
201
|
+
version: '0'
|
202
|
+
type: :development
|
203
|
+
prerelease: false
|
204
|
+
version_requirements: !ruby/object:Gem::Requirement
|
205
|
+
requirements:
|
206
|
+
- - ">="
|
207
|
+
- !ruby/object:Gem::Version
|
208
|
+
version: '0'
|
195
209
|
description: CLI helper for creating Discourse themes
|
196
210
|
email:
|
197
211
|
- sam.saffron@gmail.com
|