discourse_theme 0.6.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0626e7865ec3b7d06ae9e198351dfd51f111897393bf393aa7da26b52c19777
-  data.tar.gz: 77856b459abd70854c9350960d98eb0887420222732390a22f4f52b69fbcd691
+  metadata.gz: ffe67e68e2ee480c68cb8ce8031c9a09bfdd16025a01ba873eebca2228c821fe
+  data.tar.gz: 5094e13dc147c656a15b9b0d9ad790daf54c8f8ff2501f81f540cd0cfb2d95d2
 SHA512:
-  metadata.gz: adf9a56c7ffb98ea9b14df04220096105c0b2e63074e4dc789984a1c9c01e6162b7118651cb9e1b95ed8a8c64740d97358d5c3fa7fb7614c3ca8416126c8d1dc
-  data.tar.gz: 1550d47250f811999035af55efc28dd3a081a22a5f9961a9e2fdfe9ee522a688de402064ed9df339a6c67395bf41ba6eb76b9db812d8bde4470f8dba8e178e40
+  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

@@ -32,6 +32,10 @@ Downloads a theme from the server and stores in the designated directory.
 
 Monitors a theme or component for changes. When changed the program will synchronize the theme or component to your Discourse of choice.
 
+### `discourse_theme upload PATH`
+
+Uploads a theme to the server. Requires the theme to have been previously synchronized via `watch`.
+
 ## Contributing
 
 Bug reports and pull requests are welcome at [Meta Discourse](https://meta.discourse.org). This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
@@ -42,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

@@ -8,6 +8,7 @@ module DiscourseTheme
       puts
       puts "discourse_theme new DIR - Creates a new theme in the designated directory"
       puts "discourse_theme download DIR - Downloads a theme from the server and stores in the designated directory"
+      puts "discourse_theme upload DIR - Uploads the theme directory to Discourse"
       puts "discourse_theme watch DIR - Watches the theme directory and synchronizes with Discourse"
       puts
       puts "Use --reset to change the configuration for a directory"
@@ -79,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"
@@ -110,6 +114,28 @@ module DiscourseTheme
         UI.success "Theme downloaded"
 
         watch_theme?(args)
+      elsif command == "upload"
+        raise DiscourseTheme::ThemeError.new "'#{dir} does not exist" unless Dir.exists?(dir)
+        raise DiscourseTheme::ThemeError.new "No theme_id is set, please sync via the 'watch' command initially" if theme_id == 0
+        client = DiscourseTheme::Client.new(dir, settings, reset: reset)
+
+        theme_list = client.get_themes_list
+
+        theme = theme_list.find { |t| t["id"] == theme_id }
+        raise DiscourseTheme::ThemeError.new "theme_id is set, but the theme does not exist in Discourse" unless theme
+
+        uploader = DiscourseTheme::Uploader.new(dir: dir, client: client, theme_id: theme_id, components: components)
+
+        UI.progress "Uploading theme (id:#{theme_id}) from #{dir} "
+        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}"
+        if client.is_theme_creator
+          UI.info "Manage: #{client.root}/my/themes"
+        else
+          UI.info "Manage: #{client.root}/admin/customize/themes/#{theme_id}"
+        end
       else
         usage
       end

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,7 @@ module DiscourseTheme
     end
 
     def root
-      URI.parse(@url).path
+      URI.parse(@url)
     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.6.0"
+  VERSION = "0.7.2"
 end

metadata

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