discourse_theme 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffe67e68e2ee480c68cb8ce8031c9a09bfdd16025a01ba873eebca2228c821fe
-  data.tar.gz: 5094e13dc147c656a15b9b0d9ad790daf54c8f8ff2501f81f540cd0cfb2d95d2
+  metadata.gz: 47b628418ce66dfc84cec377019bb57e6ab82a82d681acda24d5d69c4a20f64c
+  data.tar.gz: 7bc2abbb64c101c59dc282f8cd24d340ca22a08ed805b4bd82d392f3a4358007
 SHA512:
-  metadata.gz: 4afb46c9e254275d537990d9e91240aa4269def484c0c5be5db1963092643b5e2b24bef42bd5cd1ace7dd3d402b84fb36e6e98e2addc37d3eda281fbb32d9d54
-  data.tar.gz: 5894640522c7c3491a2fb7d7bab2dc55e334f70e445bd06198ae5628d748a87d99c1033f5df0b369ac29ad694f490752ded9ccc3208853c4fd107db40f1bc790
+  metadata.gz: 323c310d872c6c0efad7f2044404d3e53c754da50fbcba764cc52f32349f54c31a95ff7cb1dc756603dcd20215afb5801b5ab3c7654ec40962a67b725294983c
+  data.tar.gz: 1be9095c46371db3ab45dcd090e49d3a8f09185d06da44b8f3421579255882acc1a2952d75a1f7078e3369fdf08e64f277a3a460018ec6aa0f86e4507c4bd8e7

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/discourse_theme.gemspec

@@ -36,7 +36,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-minitest", "~> 2.4"
-  spec.add_development_dependency "webmock", "~> 3.5"
+  spec.add_development_dependency "webmock", "~> 3.17"
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "rubocop-discourse"
+  spec.add_development_dependency "m"
 end

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

@@ -107,7 +107,12 @@ module DiscourseTheme
     end
 
     def root
-      URI.parse(@url)
+      parsed = URI.parse(@url)
+      # we must strip the username/password so it does not
+      # confuse AWS albs
+      parsed.user = nil
+      parsed.password = nil
+      parsed
     end
 
     def is_theme_creator
@@ -155,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
@@ -169,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
@@ -187,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.2"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_theme
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-21 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.17'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CLI helper for creating Discourse themes
 email:
 - sam.saffron@gmail.com