discourse_theme 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5277924c1a14b59cf66cc403616680f3c980743c657a3cd7613d6236f3c1073e
-  data.tar.gz: 2fee23e13d30c6401ce95d6519f5fe98390002a1829c4bdc7b7bad1cc98493e0
+  metadata.gz: de1cb65ed52d9dd44bbe0039b0a40f00f55897e68106d5193cfb0717937b4ff9
+  data.tar.gz: 8192308474973266925422876401c974c3daf0ffb331d7423ac06d2368c3db68
 SHA512:
-  metadata.gz: 1323a77a6cd64fb095def5d735b673ad9be3cd9f7c55d6a3a2bb3eb8842024a0055926a650f64ea1ddac46656f8de32266b3dc205cafe0904f781ce7d69eade6
-  data.tar.gz: a24107efa821c1ab3b3c387aef80152c0ee13b675a3261aa2efc38e86ccc3e37f29e5e4f058d50a1e98dc36249082f0ed57d7bc1458c385b7701898b915d3d2e
+  metadata.gz: 2dcbaf4918cf88082c27270a05e1fb888d5d2e462160834c7a2b82ab79acfb3eaf62d0732ea5da840f83d1656f36d6aadda4633cdec86b77149d57c5188c0514
+  data.tar.gz: 3c095bcfcc224691d30405353a06eb6ccf64446331175dc28e7f8eebf1347b8b2707c37313e1c29668a35937a4a550c8ef81bc2701201674a5baf8b525d72211

data/lib/discourse_theme/cli.rb

@@ -91,7 +91,12 @@ module DiscourseTheme
           theme = theme_list.find { |t| t["id"] == theme_id }
         end
 
-        if !theme || theme["component"] == false
+        about_json = JSON.parse(File.read(File.join(dir, 'about.json'))) rescue nil
+        already_uploaded = !!theme
+        is_component = theme&.[]("component")
+        component_count = about_json&.[]("components")&.length || 0
+
+        if !already_uploaded && !is_component && component_count > 0
           options = {}
           options["Yes"] = :sync
           options["No"] = :none
@@ -106,6 +111,12 @@ module DiscourseTheme
         settings.theme_id = theme_id = uploader.upload_full_theme
 
         Cli.success "Theme uploaded (id:#{theme_id})"
+        Cli.info "Preview: #{client.root}/?preview_theme_id=#{theme_id}"
+        if client.is_theme_creator
+          Cli.info "Manage: #{client.root}/my/themes"
+        else
+          Cli.info "Manage: #{client.root}/admin/customize/themes/#{theme_id}"
+        end
         watcher = DiscourseTheme::Watcher.new(dir: dir, uploader: uploader)
 
         Cli.progress "Watching for changes in #{dir}..."

data/lib/discourse_theme/client.rb

@@ -103,12 +103,16 @@ module DiscourseTheme
       json["about"]["version"]
     end
 
-    private
-
     def root
       @url
     end
 
+    def is_theme_creator
+      @is_theme_creator
+    end
+
+    private
+
     def request(request, never_404: false)
       uri = URI.parse(@url)
       http = Net::HTTP.new(uri.host, uri.port)

data/lib/discourse_theme/version.rb

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

data/lib/discourse_theme/watcher.rb

@@ -1,5 +1,13 @@
 module DiscourseTheme
   class Watcher
+    def self.return_immediately!
+      @return_immediately = true
+    end
+
+    def self.return_immediately?
+      !!@return_immediately
+    end
+
     def initialize(dir:, uploader:)
       @dir = dir
       @uploader = uploader
@@ -40,7 +48,7 @@ module DiscourseTheme
       end
 
       listener.start
-      sleep
+      sleep unless self.class.return_immediately?
     end
 
     protected

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_theme
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler