discourse_theme 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a1f5b1cee83b53b139cb01af57e7e7ea7687cd1a97cc55ef293703d5500f17c
-  data.tar.gz: c67b2363cba3ab789eb20f987775c90f0821105dbbf32ddf3a7e564e77d35d7f
+  metadata.gz: 97aee15a1f43095bc2c3ceb628dc56490f089b0e0aec4d30e724e2467d0ac7fa
+  data.tar.gz: 045d1945d862aa40a3f365552f9b4fccfa1e8164a263946414c6b12fb25af487
 SHA512:
-  metadata.gz: a93ecd60d0cab2284697e183595fe5caf76c0a137e476551461ee189a81382ec9ea34480b1c3ac78058641aa4ca391d4fd567373bf81c700cc5843a90685aa6a
-  data.tar.gz: eefffe552afaf7a461c55a04258714a2204be39b0190c4337f2ed928ffd8ed15e27fd09c9b6f5889fb1e5e4c0162810b850194819542daaa9cef7187072c731c
+  metadata.gz: f429459aaab31d0a3110552a50dcf9b804e9ff6e42dd2c18481882c238fe9b459744e206abcb6553b0df4c1241b0bd1b94282c0456a9c99ca994eaac8beb2a34
+  data.tar.gz: 45cda79f27c1415fe6f3671f42547432fc105ac911ebd9be9f90b4781459a303fe7f41f740cf05e5c22d75ddd84f7840fa28c00f208a9fc37a3e5d35932e2dad

data/README.md

@@ -32,6 +32,10 @@ Downloads a theme from the server and stores in the designated directory.
 
 Monitors a theme or component for changes. When changed the program will synchronize the theme or component to your Discourse of choice.
 
+### `discourse_theme upload PATH`
+
+Uploads a theme to the server. Requires the theme to have been previously synchronized via `watch`.
+
 ## Contributing
 
 Bug reports and pull requests are welcome at [Meta Discourse](https://meta.discourse.org). This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/lib/discourse_theme/cli.rb

@@ -8,6 +8,7 @@ module DiscourseTheme
       puts
       puts "discourse_theme new DIR - Creates a new theme in the designated directory"
       puts "discourse_theme download DIR - Downloads a theme from the server and stores in the designated directory"
+      puts "discourse_theme upload DIR - Uploads the theme directory to Discourse"
       puts "discourse_theme watch DIR - Watches the theme directory and synchronizes with Discourse"
       puts
       puts "Use --reset to change the configuration for a directory"
@@ -29,7 +30,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"
@@ -107,6 +111,28 @@ module DiscourseTheme
         UI.success "Theme downloaded"
 
         watch_theme?(args)
+      elsif command == "upload"
+        raise DiscourseTheme::ThemeError.new "'#{dir} does not exist" unless Dir.exists?(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)
+
+        theme_list = client.get_themes_list
+
+        theme = theme_list.find { |t| t["id"] == theme_id }
+        raise DiscourseTheme::ThemeError.new "theme_id is set, but the theme does not exist in Discourse" unless theme
+
+        uploader = DiscourseTheme::Uploader.new(dir: dir, client: client, theme_id: theme_id, components: components)
+
+        UI.progress "Uploading theme (id:#{theme_id}) from #{dir} "
+        settings.theme_id = theme_id = uploader.upload_full_theme
+
+        UI.success "Theme uploaded (id:#{theme_id})"
+        UI.info "Preview: #{client.root}/?preview_theme_id=#{theme_id}"
+        if client.is_theme_creator
+          UI.info "Manage: #{client.root}/my/themes"
+        else
+          UI.info "Manage: #{client.root}/admin/customize/themes/#{theme_id}"
+        end
       else
         usage
       end
@@ -120,6 +146,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/client.rb

@@ -105,7 +105,7 @@ module DiscourseTheme
     end
 
     def root
-      @url
+      URI.parse(@url).path
     end
 
     def is_theme_creator
@@ -116,6 +116,12 @@ module DiscourseTheme
 
     def request(request, never_404: false)
       uri = URI.parse(@url)
+
+      if uri.userinfo
+        username, password = uri.userinfo.split(":", 2)
+        request.basic_auth username, password
+      end
+
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = URI::HTTPS === uri
       add_headers(request)

data/lib/discourse_theme/scaffold.rb

@@ -60,21 +60,37 @@ module DiscourseTheme
 
     EN_YML = <<~YAML
       en:
-        #my_locale_key: My Translation
         theme_metadata:
           description: "#DESCRIPTION"
-          settings:
-            # my_setting_name: My Setting Description
     YAML
 
     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
@@ -89,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"
@@ -104,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)
@@ -119,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.0"
+  VERSION = "0.7.0"
 end

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_theme
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Sam Saffron
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar
@@ -225,7 +225,7 @@ homepage: https://github.com/discourse/discourse_theme
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -240,8 +240,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: CLI helper for creating Discourse themes
 test_files: []