discourse_theme 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97a862e2ac58f510af5689963a9ce8fecbf2f8d9c2394b8b7472989576bdd3a3
-  data.tar.gz: 4c9c71524bbd6ab86c41c9b48c08636444b0ca7c861b16552767521b7dc3d009
+  metadata.gz: fa9710726909f2b5a1381132fb5e68748965bf8af6cf50893c013126e1c6db0d
+  data.tar.gz: 6446feb3d912101d7193a07776d4aa5dc476fd00ef649e7b4c94e10e1ac21b56
 SHA512:
-  metadata.gz: 6c4fc7f7ddc8c9213f54cf3c3b184a451a4da2aa44cbcf22218589ca0fc88dc67c186bde660f39f53ce13e2ffd4c0399bd6df0975a305c90f722df195c9e0f66
-  data.tar.gz: 26157e131f6db3fcfb48de880bbb1016bde6d102e1e916e4ef5c0b3f0acafc3f009d1611f9a2b44bcadd6bfc94643e2cff619ae6433456f76298aa90bd146412
+  metadata.gz: 72cead3a6060f62bc7e3fd225b82a98ee59e0852559506bcd2d5bd0f83196e4372ca1331c14654d51edc9ff20dad665a7c29777391db85789b4d6367b61a64ea
+  data.tar.gz: 65b6d6b3d547867b706be85beab21f7d2a47daa521e1b9a5dbd71420a80126a32740f8f3286d5c6ab5c52ee85b92ea9e71a7395def9f2ed8ec4d6bc6aa7f0959

data/.github/workflows/ci.yml

@@ -16,6 +16,7 @@ jobs:
           - "2.7"
           - "3.0"
           - "3.1"
+          - "3.2"
 
     steps:
       - uses: actions/checkout@v3

data/Guardfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 directories %w(app lib test) \
-  .select { |d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist") }
+  .select { |d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist") }
 
 guard :minitest do
   # with Minitest::Unit

data/lib/discourse_theme/cli.rb

@@ -1,7 +1,15 @@
 # frozen_string_literal: true
 module DiscourseTheme
   class Cli
-    SETTINGS_FILE = File.expand_path("~/.discourse_theme")
+    @@cli_settings_filename = File.expand_path("~/.discourse_theme")
+
+    def self.settings_file
+      @@cli_settings_filename
+    end
+
+    def self.settings_file=(filename)
+      @@cli_settings_filename = filename
+    end
 
     def usage
       puts "Usage: discourse_theme COMMAND [--reset]"
@@ -23,21 +31,21 @@ module DiscourseTheme
       command = args[0].to_s.downcase
       dir = File.expand_path(args[1])
 
-      config = DiscourseTheme::Config.new(SETTINGS_FILE)
+      config = DiscourseTheme::Config.new(self.class.settings_file)
       settings = config[dir]
 
       theme_id = settings.theme_id
       components = settings.components
 
       if command == "new"
-        raise DiscourseTheme::ThemeError.new "'#{dir}' is not empty" if Dir.exists?(dir) && !Dir.empty?(dir)
+        raise DiscourseTheme::ThemeError.new "'#{dir}' is not empty" if Dir.exist?(dir) && !Dir.empty?(dir)
         raise DiscourseTheme::ThemeError.new "git is not installed" if !command?("git")
         raise DiscourseTheme::ThemeError.new "yarn is not installed" if !command?("yarn")
 
         DiscourseTheme::Scaffold.generate(dir)
         watch_theme?(args)
       elsif command == "watch"
-        raise DiscourseTheme::ThemeError.new "'#{dir} does not exist" unless Dir.exists?(dir)
+        raise DiscourseTheme::ThemeError.new "'#{dir} does not exist" unless Dir.exist?(dir)
         client = DiscourseTheme::Client.new(dir, settings, reset: reset)
 
         theme_list = client.get_themes_list
@@ -97,7 +105,7 @@ module DiscourseTheme
         client = DiscourseTheme::Client.new(dir, settings, reset: reset)
         downloader = DiscourseTheme::Downloader.new(dir: dir, client: client)
 
-        FileUtils.mkdir_p dir unless Dir.exists?(dir)
+        FileUtils.mkdir_p dir unless Dir.exist?(dir)
         raise DiscourseTheme::ThemeError.new "'#{dir} is not empty" unless Dir.empty?(dir)
 
         UI.progress "Loading theme list..."
@@ -115,7 +123,7 @@ module DiscourseTheme
 
         watch_theme?(args)
       elsif command == "upload"
-        raise DiscourseTheme::ThemeError.new "'#{dir} does not exist" unless Dir.exists?(dir)
+        raise DiscourseTheme::ThemeError.new "'#{dir} does not exist" unless Dir.exist?(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)
 

data/lib/discourse_theme/client.rb

@@ -112,7 +112,7 @@ module DiscourseTheme
       # confuse AWS albs
       parsed.user = nil
       parsed.password = nil
-      parsed
+      parsed.to_s
     end
 
     def is_theme_creator
@@ -160,7 +160,7 @@ module DiscourseTheme
 
       if !url && settings.url
         url = settings.url
-        UI.progress "Using #{url} from #{DiscourseTheme::Cli::SETTINGS_FILE}"
+        UI.progress "Using #{url} from #{DiscourseTheme::Cli.settings_file}"
       end
 
       if !url || @reset
@@ -174,7 +174,7 @@ module DiscourseTheme
           url = url.sub("http", "https")
         end
 
-        if UI.yes?("Would you like this site name stored in #{DiscourseTheme::Cli::SETTINGS_FILE}?")
+        if UI.yes?("Would you like this site name stored in #{DiscourseTheme::Cli.settings_file}?")
           settings.url = url
         else
           settings.url = nil
@@ -192,12 +192,12 @@ module DiscourseTheme
 
       if !api_key && settings.api_key
         api_key = settings.api_key
-        UI.progress "Using api key from #{DiscourseTheme::Cli::SETTINGS_FILE}"
+        UI.progress "Using api key from #{DiscourseTheme::Cli.settings_file}"
       end
 
       if !api_key || @reset
         api_key = UI.ask("What is your API key?", default: api_key).strip
-        if UI.yes?("Would you like this API key stored in #{DiscourseTheme::Cli::SETTINGS_FILE}?")
+        if UI.yes?("Would you like this API key stored in #{DiscourseTheme::Cli.settings_file}?")
           settings.api_key = api_key
         else
           settings.api_key = nil

data/lib/discourse_theme/scaffold.rb

@@ -125,7 +125,7 @@ module DiscourseTheme
         FileUtils.mkdir_p(File.dirname(locale))
         File.write(locale, EN_YML.sub("#DESCRIPTION", description))
 
-        encoded_name = name.downcase.gsub(/[^\w_-]+/, '_')
+        encoded_name = name.downcase.gsub(/[^a-zA-Z0-9_-]+/, '_')
         initializer = "javascripts/discourse/api-initializers/#{encoded_name}.js"
         UI.info "Creating #{initializer}"
         FileUtils.mkdir_p(File.dirname(initializer))

data/lib/discourse_theme/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_theme
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2023-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar