discourse_theme 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e820c35e9086c9f9e72fd374815e5514279db2ebb9609ef83482490313829586
-  data.tar.gz: 974908e9946ff58d402e94dbbf8bdb375f640c8fe017cbd091d397dc48771758
+  metadata.gz: 20a594e3cf6429ad7b721ca546710a1f57706a74bb0c8346301dea8b76a58cea
+  data.tar.gz: 477808a79184cc9251865a86a77ccfa33a64318a90a774207a5441b683499546
 SHA512:
-  metadata.gz: d62b36ed3b6c05522af40b2ea7b88dee89b80b0a35262bd99cdecdb6f4dcd2330ba621b65603f703291b3322f73e9c1338f398c136db2c9453f9f76e1d5b2a88
-  data.tar.gz: 21c02268e21bb43a231ed0667ffdc4e9887b467f4da280fd02f63bf358ecad3be43972b69c9c98e8b179907d2b04b7e0ad3c409141f3935c920e43e061527088
+  metadata.gz: 8d5ad9c41ca00b3172167b1985cdb5da36ef6d8073ad6b4882f6760da05006f550a12447007d64fb8486e078245eab618979c80e18e78eaa4cc1487269dd780a
+  data.tar.gz: 7e40d9ec1727422c4875307b35b38a3d178330598c4a0b1c207779564fe8cf4dbbd07864e964e8e7eee1d5ffec47ad9cdc2821f28fd24ebe1bdb44677cd659cf

data/lib/discourse_theme.rb

@@ -14,15 +14,15 @@ require 'json'
 require 'yaml'
 require 'tty/prompt'
 
-require 'discourse_theme/version'
-require 'discourse_theme/config'
-require 'discourse_theme/ui'
-require 'discourse_theme/cli'
-require 'discourse_theme/client'
-require 'discourse_theme/downloader'
-require 'discourse_theme/uploader'
-require 'discourse_theme/watcher'
-require 'discourse_theme/scaffold'
+require_relative 'discourse_theme/version'
+require_relative 'discourse_theme/config'
+require_relative 'discourse_theme/ui'
+require_relative 'discourse_theme/cli'
+require_relative 'discourse_theme/client'
+require_relative 'discourse_theme/downloader'
+require_relative 'discourse_theme/uploader'
+require_relative 'discourse_theme/watcher'
+require_relative 'discourse_theme/scaffold'
 
 module DiscourseTheme
   class ThemeError < StandardError; end

data/lib/discourse_theme/cli.rb

@@ -29,7 +29,10 @@ module DiscourseTheme
       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.exists?(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"
@@ -120,6 +123,18 @@ module DiscourseTheme
 
     private
 
+    def command?(cmd)
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each do |ext|
+          exe = File.join(path, "#{cmd}#{ext}")
+          return true if File.executable?(exe) && !File.directory?(exe)
+        end
+      end
+
+      false
+    end
+
     def watch_theme?(args)
       if UI.yes?("Would you like to start 'watching' this theme?")
         args[0] = "watch"

data/lib/discourse_theme/scaffold.rb

@@ -67,11 +67,30 @@ module DiscourseTheme
     def self.generate(dir)
       UI.progress "Generating a scaffold theme at #{dir}"
 
-      name = UI.ask("What would you like to call your theme?").strip
+      name = loop do
+        input = UI.ask("What would you like to call your theme?").to_s.strip
+        if input.empty?
+          UI.error("Theme name cannot be empty")
+        else
+          break input
+        end
+      end
+
       is_component = UI.yes?("Is this a component?")
 
       FileUtils.mkdir_p dir
       Dir.chdir dir do
+        author = loop do
+          input = UI.ask("Who is authoring the theme?", default: ENV['USER']).to_s.strip
+          if input.empty?
+            UI.error("Author cannot be empty")
+          else
+            break input
+          end
+        end
+
+        description = UI.ask("How would you describe this theme?").to_s.strip
+
         UI.info "Creating about.json"
         about_template = ABOUT_JSON.dup
         about_template[:name] = name
@@ -86,7 +105,6 @@ module DiscourseTheme
         File.write('HELP', HELP)
 
         UI.info "Creating package.json"
-        author = UI.ask("Who is authoring the theme?").strip
         File.write('package.json', PACKAGE_JSON.sub("#AUTHOR", author))
 
         UI.info "Creating .template-lintrc.js"
@@ -101,10 +119,10 @@ module DiscourseTheme
         locale = "locales/en.yml"
         UI.info "Creating #{locale}"
         FileUtils.mkdir_p(File.dirname(locale))
-        description = UI.ask("How would you describe this theme?").strip
         File.write(locale, EN_YML.sub("#DESCRIPTION", description))
 
-        initializer = "javascripts/discourse/api-initializers/#{name}.js"
+        encoded_name = name.downcase.gsub(/[^\w_-]+/, '_')
+        initializer = "javascripts/discourse/api-initializers/#{encoded_name}.js"
         UI.info "Creating #{initializer}"
         FileUtils.mkdir_p(File.dirname(initializer))
         File.write(initializer, API_INITIALIZER)
@@ -116,7 +134,7 @@ module DiscourseTheme
         end
 
         UI.info "Initializing git repo"
-        puts `git init .`
+        puts `git init . --initial-branch=main`
 
         UI.info "Installing dependencies"
         puts `yarn`

data/lib/discourse_theme/version.rb

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

metadata

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