discourse_theme 0.5.2 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20a594e3cf6429ad7b721ca546710a1f57706a74bb0c8346301dea8b76a58cea
-  data.tar.gz: 477808a79184cc9251865a86a77ccfa33a64318a90a774207a5441b683499546
+  metadata.gz: ddb3a33c31b31e4e097467e73fb6ad83a48b5260ab254043529f0ba0066cee06
+  data.tar.gz: 6db1a2ad3ab1a47fc479250dbcb03aaa21600791ff0cce49eb477be3a43fbcdb
 SHA512:
-  metadata.gz: 8d5ad9c41ca00b3172167b1985cdb5da36ef6d8073ad6b4882f6760da05006f550a12447007d64fb8486e078245eab618979c80e18e78eaa4cc1487269dd780a
-  data.tar.gz: 7e40d9ec1727422c4875307b35b38a3d178330598c4a0b1c207779564fe8cf4dbbd07864e964e8e7eee1d5ffec47ad9cdc2821f28fd24ebe1bdb44677cd659cf
+  metadata.gz: b8acd7de25b128b86d5dff6852aaf89607bd61ef164d0b80fdc983768bc42b47bd2a6583958ca7a5df97467eae1306f1dbaf4b92a483c77698bb06d521fc824f
+  data.tar.gz: 98e8745391c850e49fa5bd1ccee0dabfe6ee2fe3c6584ec49f108360887e51e31036a3115ce08e926c8e279dc642d520406523babb32aa28ba048efa34d8ca8d

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.

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"
@@ -110,6 +111,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,7 @@
 # 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
 
     def initialize(dir, settings, reset:)
       @reset = reset
@@ -105,7 +105,7 @@ module DiscourseTheme
     end
 
     def root
-      @url
+      URI.parse(@url).path
     end
 
     def is_theme_creator
@@ -116,6 +116,12 @@ module DiscourseTheme
 
     def request(request, never_404: false)
       uri = URI.parse(@url)
+
+      if uri.userinfo
+        username, password = uri.userinfo.split(":", 2)
+        request.basic_auth username, password
+      end
+
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = URI::HTTPS === uri
       add_headers(request)

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.5.2"
+  VERSION = "0.7.1"
 end

metadata

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