discourse_theme 0.7.0 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97aee15a1f43095bc2c3ceb628dc56490f089b0e0aec4d30e724e2467d0ac7fa
-  data.tar.gz: 045d1945d862aa40a3f365552f9b4fccfa1e8164a263946414c6b12fb25af487
+  metadata.gz: 97a862e2ac58f510af5689963a9ce8fecbf2f8d9c2394b8b7472989576bdd3a3
+  data.tar.gz: 4c9c71524bbd6ab86c41c9b48c08636444b0ca7c861b16552767521b7dc3d009
 SHA512:
-  metadata.gz: f429459aaab31d0a3110552a50dcf9b804e9ff6e42dd2c18481882c238fe9b459744e206abcb6553b0df4c1241b0bd1b94282c0456a9c99ca994eaac8beb2a34
-  data.tar.gz: 45cda79f27c1415fe6f3671f42547432fc105ac911ebd9be9f90b4781459a303fe7f41f740cf05e5c22d75ddd84f7840fa28c00f208a9fc37a3e5d35932e2dad
+  metadata.gz: 6c4fc7f7ddc8c9213f54cf3c3b184a451a4da2aa44cbcf22218589ca0fc88dc67c186bde660f39f53ce13e2ffd4c0399bd6df0975a305c90f722df195c9e0f66
+  data.tar.gz: 26157e131f6db3fcfb48de880bbb1016bde6d102e1e916e4ef5c0b3f0acafc3f009d1611f9a2b44bcadd6bfc94643e2cff619ae6433456f76298aa90bd146412

data/.github/workflows/ci.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
   push:
     branches:
-      - master
       - main
 
 jobs:
@@ -14,13 +13,12 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 2.5
-          - 2.6
-          - 2.7
-          - 3.0
+          - "2.7"
+          - "3.0"
+          - "3.1"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
@@ -35,15 +33,15 @@ jobs:
         run: bundle exec rake test
 
   publish:
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     needs: build
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Release Gem
-        uses: discourse/publish-rubygems-action@v2-beta
+        uses: discourse/publish-rubygems-action@v2
         env:
           RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
           GIT_EMAIL: team@discourse.org

data/README.md

@@ -46,4 +46,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-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/SamSaffron/discourse_theme/blob/master/CODE_OF_CONDUCT.md).
+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

@@ -36,7 +36,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-minitest", "~> 2.4"
-  spec.add_development_dependency "webmock", "~> 3.5"
+  spec.add_development_dependency "webmock", "~> 3.17"
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "rubocop-discourse"
+  spec.add_development_dependency "m"
 end

data/lib/discourse_theme/cli.rb

@@ -80,14 +80,17 @@ module DiscourseTheme
         settings.theme_id = theme_id = uploader.upload_full_theme
 
         UI.success "Theme uploaded (id:#{theme_id})"
-        UI.info "Preview: #{client.root}/?preview_theme_id=#{theme_id}"
+        UI.info "Preview: #{client.url}/?preview_theme_id=#{theme_id}"
+
         if client.is_theme_creator
-          UI.info "Manage: #{client.root}/my/themes"
+          UI.info "Manage: #{client.url}/my/themes"
         else
-          UI.info "Manage: #{client.root}/admin/customize/themes/#{theme_id}"
+          UI.info "Manage: #{client.url}/admin/customize/themes/#{theme_id}"
         end
-        watcher = DiscourseTheme::Watcher.new(dir: dir, uploader: uploader)
 
+        UI.info "Tests: #{client.url}/theme-qunit?id=#{theme_id}"
+
+        watcher = DiscourseTheme::Watcher.new(dir: dir, uploader: uploader)
         UI.progress "Watching for changes in #{dir}..."
         watcher.watch
       elsif command == "download"

data/lib/discourse_theme/client.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 module DiscourseTheme
   class Client
-    THEME_CREATOR_REGEX = /^https:\/\/theme-creator.discourse.org$/i
+    THEME_CREATOR_REGEX = /^https:\/\/(theme-creator\.discourse\.org|discourse\.theme-creator\.io)$/i
+
+    attr_reader :url
 
     def initialize(dir, settings, reset:)
       @reset = reset
@@ -19,7 +21,7 @@ module DiscourseTheme
       end
     end
 
-    # From https://github.com/discourse/discourse/blob/master/lib/version.rb
+    # From https://github.com/discourse/discourse/blob/main/lib/version.rb
     def self.has_needed_version?(current, needed)
       current_split = current.split('.')
       needed_split = needed.split('.')
@@ -105,7 +107,12 @@ module DiscourseTheme
     end
 
     def root
-      URI.parse(@url).path
+      parsed = URI.parse(@url)
+      # we must strip the username/password so it does not
+      # confuse AWS albs
+      parsed.user = nil
+      parsed.password = nil
+      parsed
     end
 
     def is_theme_creator

data/lib/discourse_theme/scaffold.rb

@@ -47,7 +47,11 @@ module DiscourseTheme
 
     ESLINT_RC = <<~STR
       {
-        "extends": "eslint-config-discourse"
+        "extends": "eslint-config-discourse",
+        "globals": {
+          "settings": "readonly",
+          "themePrefix": "readonly"
+        }
       }
     STR
 

data/lib/discourse_theme/uploader.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 module DiscourseTheme
   class Uploader
-
-    THEME_CREATOR_REGEX = /^https:\/\/theme-creator.discourse.org$/i
-
     def initialize(dir:, client:, theme_id: nil, components: nil)
       @dir = dir
       @client = client

data/lib/discourse_theme/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module DiscourseTheme
-  VERSION = "0.7.0"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_theme
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.3
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2022-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.17'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CLI helper for creating Discourse themes
 email:
 - sam.saffron@gmail.com