discourse_theme 2.1.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd374430e4fb62d3c7ee98ebdc23af4709f699dc5b2580c216a12dd0d52fd6fb
-  data.tar.gz: db348e6b482980219f236b1fbbdf9a6a2d1d8e72fe46fce6386fcad35358878a
+  metadata.gz: 1a1b176be2b726cec5d2c4217e000357d48044bc220f4730cd4b1f4a21405230
+  data.tar.gz: 822de35cae0fffa0996b32f1c77a384ecb460df586eae15ef3b1cee8f132f5fb
 SHA512:
-  metadata.gz: 79bf80af701810f3f9e35c0b17a1c2d8d854222a09ae9451eecd1796776cb2f0f6d4f5a931a529236f7eebc23c687eb040bce941c8df581b08b633b24dea1f7b
-  data.tar.gz: 77f09a916e25c7bd87407bd6f5c466bd75709a941c2930543977079f175916193d209db336886107dd650dd4a3be128d4c0524784d915fafee048549e3364fa2
+  metadata.gz: 30d3d32f3df8d65702daa5d7ca9bb1f34b9730e4118bf4dbfb696afe2426c0379e36cefc17a0c75c370206b1d335eff8ba1b3fefbfa67b730bc5b2212e469f1b
+  data.tar.gz: dc5e86580dbf0f4350ae4a06978a3750844b9a90afbf2c3c885968f64e8b77e5076a0eccadb939c749ec9096fe9a3ebefbc275125ed2b080696bd05cfb8fdd7c

data/.github/workflows/ci.yml

@@ -45,6 +45,9 @@ jobs:
           git config --global user.email "ci@ci.invalid"
           git config --global user.name "Discourse CI"
 
+      - name: Install pnpm
+        run: npm install -g pnpm
+
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:

data/CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.1.3] - 2024-10-09
+
+### Added
+
+- Made `new` command compatible with the replacement of `yarn` with `pnpm` as a package manager, and will prompt users to install `pnpm` if not installed already.
+
+## [2.1.2] - 2024-04-16
+
+### Added
+
+- Suggest the root URL of the local site when running `watch` command
+
 ## [2.1.1] - 2024-03-25
 
 ### Added

data/discourse_theme.gemspec

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+$LOAD_PATH.unshift(lib) if !$LOAD_PATH.include?(lib)
 require "discourse_theme/version"
 
 Gem::Specification.new do |spec|
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "rubocop-discourse", "~> 3.6.0"
+  spec.add_development_dependency "rubocop-discourse", "~> 3.8.1"
   spec.add_development_dependency "m"
   spec.add_development_dependency "syntax_tree"
   spec.add_development_dependency "mocha"

data/lib/discourse_theme/cli.rb

@@ -61,6 +61,7 @@ module DiscourseTheme
         end
         raise DiscourseTheme::ThemeError.new "git is not installed" if !command?("git")
         raise DiscourseTheme::ThemeError.new "yarn is not installed" if !command?("yarn")
+        raise DiscourseTheme::ThemeError.new "pnpm is not installed" if !command?("pnpm")
 
         DiscourseTheme::Scaffold.generate(dir, name: args[1])
         watch_theme?(args)

data/lib/discourse_theme/client.rb

@@ -177,7 +177,10 @@ module DiscourseTheme
       end
 
       if !url || @reset
-        url = normalize_url(UI.ask("What is the root URL of your Discourse site?", default: url))
+        url =
+          normalize_url(
+            UI.ask("What is the root URL of your Discourse site?", default: settings.possible_url),
+          )
         url = "http://#{url}" unless url =~ %r{^https?://}
 
         # maybe this is an HTTPS redirect

data/lib/discourse_theme/config.rb

@@ -22,6 +22,13 @@ class DiscourseTheme::Config
       set("url", val)
     end
 
+    def possible_url
+      return safe_config["url"] if safe_config["url"]
+
+      first_config = @config.raw_config.values.find { |config| config["url"] }
+      first_config["url"] if first_config
+    end
+
     def theme_id
       safe_config["theme_id"].to_i
     end

data/lib/discourse_theme/scaffold.rb

@@ -65,7 +65,14 @@ module DiscourseTheme
                exception: true
 
         UI.info "Installing dependencies"
-        system "yarn", exception: true
+        if File.exist?("yarn.lock")
+          system "yarn", exception: true
+        elsif File.exist?("pnpm-lock.yaml")
+          system "pnpm", "install", exception: true
+        else
+          UI.warn "No lock file found. Defaulting to pnpm."
+          system "pnpm", "install", exception: true
+        end
       end
 
       puts "✅ Done!"

data/lib/discourse_theme/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_theme
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Sam Saffron
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-26 00:00:00.000000000 Z
+date: 2024-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.8.1
 - !ruby/object:Gem::Dependency
   name: m
   requirement: !ruby/object:Gem::Requirement
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: CLI helper for creating Discourse themes