discourse_theme 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddb3a33c31b31e4e097467e73fb6ad83a48b5260ab254043529f0ba0066cee06
-  data.tar.gz: 6db1a2ad3ab1a47fc479250dbcb03aaa21600791ff0cce49eb477be3a43fbcdb
+  metadata.gz: ffe67e68e2ee480c68cb8ce8031c9a09bfdd16025a01ba873eebca2228c821fe
+  data.tar.gz: 5094e13dc147c656a15b9b0d9ad790daf54c8f8ff2501f81f540cd0cfb2d95d2
 SHA512:
-  metadata.gz: b8acd7de25b128b86d5dff6852aaf89607bd61ef164d0b80fdc983768bc42b47bd2a6583958ca7a5df97467eae1306f1dbaf4b92a483c77698bb06d521fc824f
-  data.tar.gz: 98e8745391c850e49fa5bd1ccee0dabfe6ee2fe3c6584ec49f108360887e51e31036a3115ce08e926c8e279dc642d520406523babb32aa28ba048efa34d8ca8d
+  metadata.gz: 4afb46c9e254275d537990d9e91240aa4269def484c0c5be5db1963092643b5e2b24bef42bd5cd1ace7dd3d402b84fb36e6e98e2addc37d3eda281fbb32d9d54
+  data.tar.gz: 5894640522c7c3491a2fb7d7bab2dc55e334f70e445bd06198ae5628d748a87d99c1033f5df0b369ac29ad694f490752ded9ccc3208853c4fd107db40f1bc790

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/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

@@ -3,6 +3,8 @@ module DiscourseTheme
   class Client
     THEME_CREATOR_REGEX = /^https:\/\/(theme-creator\.discourse\.org|discourse\.theme-creator\.io)$/i
 
+    attr_reader :url
+
     def initialize(dir, settings, reset:)
       @reset = reset
       @url = guess_url(settings)
@@ -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,7 @@ module DiscourseTheme
     end
 
     def root
-      URI.parse(@url).path
+      URI.parse(@url)
     end
 
     def is_theme_creator

data/lib/discourse_theme/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_theme
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar