discourse_theme 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de1cb65ed52d9dd44bbe0039b0a40f00f55897e68106d5193cfb0717937b4ff9
-  data.tar.gz: 8192308474973266925422876401c974c3daf0ffb331d7423ac06d2368c3db68
+  metadata.gz: 20a594e3cf6429ad7b721ca546710a1f57706a74bb0c8346301dea8b76a58cea
+  data.tar.gz: 477808a79184cc9251865a86a77ccfa33a64318a90a774207a5441b683499546
 SHA512:
-  metadata.gz: 2dcbaf4918cf88082c27270a05e1fb888d5d2e462160834c7a2b82ab79acfb3eaf62d0732ea5da840f83d1656f36d6aadda4633cdec86b77149d57c5188c0514
-  data.tar.gz: 3c095bcfcc224691d30405353a06eb6ccf64446331175dc28e7f8eebf1347b8b2707c37313e1c29668a35937a4a550c8ef81bc2701201674a5baf8b525d72211
+  metadata.gz: 8d5ad9c41ca00b3172167b1985cdb5da36ef6d8073ad6b4882f6760da05006f550a12447007d64fb8486e078245eab618979c80e18e78eaa4cc1487269dd780a
+  data.tar.gz: 7e40d9ec1727422c4875307b35b38a3d178330598c4a0b1c207779564fe8cf4dbbd07864e964e8e7eee1d5ffec47ad9cdc2821f28fd24ebe1bdb44677cd659cf

data/.github/workflows/ci.yml

@@ -1,21 +1,50 @@
 name: CI
 
 on:
+  pull_request:
   push:
     branches:
       - master
-    tags:
-      - v*
+      - main
 
 jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby:
+          - 2.5
+          - 2.6
+          - 2.7
+          - 3.0
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Lint
+        run: bundle exec rubocop
+
+      - name: Tests
+        run: bundle exec rake test
+
   publish:
-    if: contains(github.ref, 'refs/tags/v')
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')
+    needs: build
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
 
       - name: Release Gem
-        uses: CvX/publish-rubygems-action@master
+        uses: discourse/publish-rubygems-action@v2-beta
         env:
-          RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+          RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
+          GIT_EMAIL: team@discourse.org
+          GIT_NAME: discoursebot

data/.gitignore

@@ -1,11 +1 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
 Gemfile.lock
-
-.rubocop-https---raw-githubusercontent-com-discourse-discourse-master--rubocop-yml

data/.rubocop.yml

@@ -1 +1,7 @@
-inherit_from: https://raw.githubusercontent.com/discourse/discourse/master/.rubocop.yml
+inherit_gem:
+  rubocop-discourse: default.yml
+inherit_mode:
+  merge:
+    - Exclude
+Discourse/NoChdir:
+  Enabled: false

data/Gemfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 source "https://rubygems.org"
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

data/Guardfile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 directories %w(app lib test) \
   .select { |d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist") }
 

data/README.md

@@ -20,11 +20,17 @@ For help run:
 discourse_theme
 ```
 
-it contains two helpers:
+### `discourse_theme new PATH`
 
-You can use `discourse_theme new PATH` to crate a new blank theme, the CLI will guide you through the process.
+Creates a new blank theme. The CLI will guide you through the process.
 
-You can use `discourse_theme watch PATH` to monitor your theme or component for changes, when changed the program will synchronize the theme or component to your Discourse of choice.
+### `discourse_theme download PATH`
+
+Downloads a theme from the server and stores in the designated directory.
+
+### `discourse_theme watch PATH`
+
+Monitors a theme or component for changes. When changed the program will synchronize the theme or component to your Discourse of choice.
 
 ## Contributing
 

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/gem_tasks"
 require "rake/testtask"
 

data/bin/discourse_theme

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require_relative '../lib/discourse_theme'
 

data/discourse_theme.gemspec

@@ -23,18 +23,20 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.5.0'
+
+  spec.add_runtime_dependency "minitar", "~> 0.6"
+  spec.add_runtime_dependency "listen", "~> 3.1"
+  spec.add_runtime_dependency "multipart-post", "~> 2.0"
+  spec.add_runtime_dependency "tty-prompt", "~> 0.18"
+  spec.add_runtime_dependency "rubyzip", "~> 1.2"
+
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   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_dependency "minitar", "~> 0.6"
-  spec.add_dependency "listen", "~> 3.1"
-  spec.add_dependency "multipart-post", "~> 2.0"
-  spec.add_dependency "tty-prompt", "~> 0.18"
-  spec.add_dependency "rubyzip", "~> 1.2"
-
-  spec.required_ruby_version = '>= 2.6.0'
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop-discourse"
 end

data/lib/discourse_theme.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'fileutils'
 require 'pathname'
 require 'tempfile'
@@ -13,14 +14,15 @@ require 'json'
 require 'yaml'
 require 'tty/prompt'
 
-require 'discourse_theme/version'
-require 'discourse_theme/config'
-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

@@ -1,45 +1,14 @@
+# frozen_string_literal: true
 module DiscourseTheme
   class Cli
-
-    @@prompt = ::TTY::Prompt.new(help_color: :cyan)
-    @@pastel = Pastel.new
-
-    def self.yes?(message)
-      @@prompt.yes?(@@pastel.cyan("? ") + message)
-    end
-
-    def self.ask(message, default: nil)
-      @@prompt.ask(@@pastel.cyan("? ") + message, default: default)
-    end
-
-    def self.select(message, options)
-      @@prompt.select(@@pastel.cyan("? ") + message, options)
-    end
-
-    def self.info(message)
-      puts @@pastel.blue("i ") + message
-    end
-
-    def self.progress(message)
-      puts @@pastel.yellow("» ") + message
-    end
-
-    def self.error(message)
-      puts @@pastel.red("✘ #{message}")
-    end
-
-    def self.success(message)
-      puts @@pastel.green("✔ #{message}")
-    end
-
     SETTINGS_FILE = File.expand_path("~/.discourse_theme")
 
     def usage
       puts "Usage: discourse_theme COMMAND [--reset]"
       puts
-      puts "discourse_theme new DIR : Creates a new theme in the designated directory"
-      puts "discourse_theme download DIR : Download a theme from the server, and store in the designated directory"
-      puts "discourse_theme watch DIR : Watches the theme directory and synchronizes with Discourse"
+      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 watch DIR - Watches the theme directory and synchronizes with Discourse"
       puts
       puts "Use --reset to change the configuration for a directory"
       exit 1
@@ -60,13 +29,12 @@ 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)
-        if Cli.yes?("Would you like to start 'watching' this theme?")
-          args[0] = "watch"
-          Cli.progress "Running discourse_theme #{args.join(' ')}"
-          run(args)
-        end
+        watch_theme?(args)
       elsif command == "watch"
         raise DiscourseTheme::ThemeError.new "'#{dir} does not exist" unless Dir.exists?(dir)
         client = DiscourseTheme::Client.new(dir, settings, reset: reset)
@@ -80,13 +48,13 @@ module DiscourseTheme
         options["Create and sync with a new theme"] = :create
         options["Select a different theme"] = :select
 
-        choice = Cli.select('How would you like to sync this theme?', options.keys)
+        choice = UI.select('How would you like to sync this theme?', options.keys)
 
         if options[choice] == :create
           theme_id = nil
         elsif options[choice] == :select
           themes = render_theme_list(theme_list)
-          choice = Cli.select('Which theme would you like to sync with?', themes)
+          choice = UI.select('Which theme would you like to sync with?', themes)
           theme_id = extract_theme_id(choice)
           theme = theme_list.find { |t| t["id"] == theme_id }
         end
@@ -101,27 +69,26 @@ module DiscourseTheme
           options["Yes"] = :sync
           options["No"] = :none
           options = options.sort_by { |_, b| b == components.to_sym ? 0 : 1 }.to_h if components
-          choice = Cli.select('Would you like to update child theme components?', options.keys)
+          choice = UI.select('Would you like to update child theme components?', options.keys)
           settings.components = components = options[choice].to_s
         end
 
         uploader = DiscourseTheme::Uploader.new(dir: dir, client: client, theme_id: theme_id, components: components)
 
-        Cli.progress "Uploading theme from #{dir}"
+        UI.progress "Uploading theme from #{dir}"
         settings.theme_id = theme_id = uploader.upload_full_theme
 
-        Cli.success "Theme uploaded (id:#{theme_id})"
-        Cli.info "Preview: #{client.root}/?preview_theme_id=#{theme_id}"
+        UI.success "Theme uploaded (id:#{theme_id})"
+        UI.info "Preview: #{client.root}/?preview_theme_id=#{theme_id}"
         if client.is_theme_creator
-          Cli.info "Manage: #{client.root}/my/themes"
+          UI.info "Manage: #{client.root}/my/themes"
         else
-          Cli.info "Manage: #{client.root}/admin/customize/themes/#{theme_id}"
+          UI.info "Manage: #{client.root}/admin/customize/themes/#{theme_id}"
         end
         watcher = DiscourseTheme::Watcher.new(dir: dir, uploader: uploader)
 
-        Cli.progress "Watching for changes in #{dir}..."
+        UI.progress "Watching for changes in #{dir}..."
         watcher.watch
-
       elsif command == "download"
         client = DiscourseTheme::Client.new(dir, settings, reset: reset)
         downloader = DiscourseTheme::Downloader.new(dir: dir, client: client)
@@ -129,33 +96,51 @@ module DiscourseTheme
         FileUtils.mkdir_p dir unless Dir.exists?(dir)
         raise DiscourseTheme::ThemeError.new "'#{dir} is not empty" unless Dir.empty?(dir)
 
-        Cli.progress "Loading theme list..."
+        UI.progress "Loading theme list..."
         themes = render_theme_list(client.get_themes_list)
 
-        choice = Cli.select('Which theme would you like to download?', themes)
+        choice = UI.select('Which theme would you like to download?', themes)
         theme_id = extract_theme_id(choice)
 
-        Cli.progress "Downloading theme into #{dir}"
+        UI.progress "Downloading theme into #{dir}"
 
         downloader.download_theme(theme_id)
         settings.theme_id = theme_id
 
-        Cli.success "Theme downloaded"
+        UI.success "Theme downloaded"
 
-        if Cli.yes?("Would you like to start 'watching' this theme?")
-          args[0] = "watch"
-          Cli.progress "Running discourse_theme #{args.join(' ')}"
-          run(args)
-        end
+        watch_theme?(args)
       else
         usage
       end
 
-      Cli.progress "Exiting..."
+      UI.progress "Exiting..."
     rescue DiscourseTheme::ThemeError => e
-      Cli.error "#{e.message}"
+      UI.error "#{e.message}"
     rescue Interrupt, TTY::Reader::InputInterrupt => e
-      Cli.error "Interrupted"
+      UI.error "Interrupted"
+    end
+
+    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"
+        UI.progress "Running discourse_theme #{args.join(' ')}"
+        run(args)
+      end
     end
 
     def render_theme_list(themes)

data/lib/discourse_theme/client.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module DiscourseTheme
   class Client
     THEME_CREATOR_REGEX = /^https:\/\/theme-creator.discourse.org$/i
@@ -13,8 +14,8 @@ module DiscourseTheme
       @is_theme_creator = !!(THEME_CREATOR_REGEX =~ @url)
 
       if !self.class.has_needed_version?(discourse_version, "2.3.0.beta1")
-        Cli.info "discourse_theme is designed for Discourse 2.3.0.beta1 or above"
-        Cli.info "download will not function, and syncing destination will be unpredictable"
+        UI.info "discourse_theme is designed for Discourse 2.3.0.beta1 or above"
+        UI.info "download will not function, and syncing destination will be unpredictable"
       end
     end
 
@@ -141,26 +142,26 @@ module DiscourseTheme
     def guess_url(settings)
       url = ENV['DISCOURSE_URL']
       if url
-        Cli.progress "Using #{url} from DISCOURSE_URL"
+        UI.progress "Using #{url} from DISCOURSE_URL"
       end
 
       if !url && settings.url
         url = settings.url
-        Cli.progress "Using #{url} from #{DiscourseTheme::Cli::SETTINGS_FILE}"
+        UI.progress "Using #{url} from #{DiscourseTheme::Cli::SETTINGS_FILE}"
       end
 
       if !url || @reset
-        url = Cli.ask("What is the root URL of your Discourse site?", default: url).strip
+        url = UI.ask("What is the root URL of your Discourse site?", default: url).strip
         url = "http://#{url}" unless url =~ /^https?:\/\//
 
         # maybe this is an HTTPS redirect
         uri = URI.parse(url)
         if URI::HTTP === uri && uri.port == 80 && is_https_redirect?(url)
-          Cli.info "Detected that #{url} should be accessed over https"
+          UI.info "Detected that #{url} should be accessed over https"
           url = url.sub("http", "https")
         end
 
-        if Cli.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
@@ -173,17 +174,17 @@ module DiscourseTheme
     def guess_api_key(settings)
       api_key = ENV['DISCOURSE_API_KEY']
       if api_key
-        Cli.progress "Using api key from DISCOURSE_API_KEY"
+        UI.progress "Using api key from DISCOURSE_API_KEY"
       end
 
       if !api_key && settings.api_key
         api_key = settings.api_key
-        Cli.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 = Cli.ask("What is your API key?", default: api_key).strip
-        if Cli.yes?("Would you like this API key stored in #{DiscourseTheme::Cli::SETTINGS_FILE}?")
+        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}?")
           settings.api_key = api_key
         else
           settings.api_key = nil

data/lib/discourse_theme/config.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class DiscourseTheme::Config
 
   class PathSetting

data/lib/discourse_theme/downloader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'zip'
 
 class DiscourseTheme::Downloader

data/lib/discourse_theme/scaffold.rb

@@ -1,74 +1,143 @@
+# frozen_string_literal: true
+
+require 'json'
+
 module DiscourseTheme
   class Scaffold
 
     BLANK_FILES = %w{
       common/common.scss
-      common/header.html
-      common/after_header.html
-      common/footer.html
-      common/head_tag.html
-      common/body_tag.html
-      common/embedded.scss
-
-      desktop/desktop.scss
-      desktop/header.html
-      desktop/after_header.html
-      desktop/footer.html
-      desktop/head_tag.html
-      desktop/body_tag.html
-
-      mobile/mobile.scss
-      mobile/header.html
-      mobile/after_header.html
-      mobile/footer.html
-      mobile/head_tag.html
-      mobile/body_tag.html
-
-      locales/en.yml
 
       settings.yml
     }
 
-    ABOUT_JSON = <<~STR
-    {
-      "name": "#NAME#",
-      "about_url": null,
-      "license_url": null,
-      "assets": {
-      },
-      "color_schemes": {
-      }
+    ABOUT_JSON = {
+      about_url: nil,
+      license_url: nil,
+      assets: {}
     }
-  STR
 
     HELP = <<~STR
       Are you a bit lost? Be sure to read https://meta.discourse.org/t/how-to-develop-custom-themes/60848
     STR
 
     GIT_IGNORE = <<~STR
-    .discourse-site
-    HELP
-  STR
+      .discourse-site
+      node_modules
+      HELP
+    STR
+
+    API_INITIALIZER = <<~STR
+      import { apiInitializer } from "discourse/lib/api";
+
+      export default apiInitializer("0.11.1", api => {
+        console.log("hello world from api initializer!");
+      });
+    STR
+
+    PACKAGE_JSON = <<~STR
+      {
+        "author": "#AUTHOR",
+        "license": "MIT",
+        "devDependencies": {
+          "eslint-config-discourse": "latest"
+        }
+      }
+    STR
+
+    ESLINT_RC = <<~STR
+      {
+        "extends": "eslint-config-discourse"
+      }
+    STR
+
+    TEMPLATE_LINT_RC = <<~STR
+      module.exports = {
+        plugins: ["ember-template-lint-plugin-discourse"],
+        extends: "discourse:recommended",
+      };
+    STR
+
+    EN_YML = <<~YAML
+      en:
+        theme_metadata:
+          description: "#DESCRIPTION"
+    YAML
 
     def self.generate(dir)
-      Cli.progress "Generating a scaffold theme at #{dir}"
+      UI.progress "Generating a scaffold theme at #{dir}"
 
-      name = Cli.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
-        File.write('about.json', ABOUT_JSON.sub("#NAME#", name))
+        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
+        if is_component
+          about_template[:component] = true
+        else
+          about_template[:color_schemes] = {}
+        end
+        File.write('about.json', JSON.pretty_generate(about_template))
+
+        UI.info "Creating HELP"
         File.write('HELP', HELP)
+
+        UI.info "Creating package.json"
+        File.write('package.json', PACKAGE_JSON.sub("#AUTHOR", author))
+
+        UI.info "Creating .template-lintrc.js"
+        File.write('.template-lintrc.js', TEMPLATE_LINT_RC)
+
+        UI.info "Creating .eslintrc"
+        File.write('.eslintrc', ESLINT_RC)
+
+        UI.info "Creating .gitignore"
         File.write('.gitignore', GIT_IGNORE)
 
+        locale = "locales/en.yml"
+        UI.info "Creating #{locale}"
+        FileUtils.mkdir_p(File.dirname(locale))
+        File.write(locale, EN_YML.sub("#DESCRIPTION", description))
+
+        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)
+
         BLANK_FILES.each do |f|
-          Cli.info "Creating #{f}"
+          UI.info "Creating #{f}"
           FileUtils.mkdir_p File.dirname(f)
           FileUtils.touch f
         end
 
-        Cli.info "Initializing git repo"
-        puts `git init .`
+        UI.info "Initializing git repo"
+        puts `git init . --initial-branch=main`
+
+        UI.info "Installing dependencies"
+        puts `yarn`
       end
     end
   end

data/lib/discourse_theme/ui.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+module DiscourseTheme
+  class UI
+    @@prompt = ::TTY::Prompt.new(help_color: :cyan)
+    @@pastel = Pastel.new
+
+    def self.yes?(message)
+      @@prompt.yes?(@@pastel.cyan("? ") + message)
+    end
+
+    def self.ask(message, default: nil)
+      @@prompt.ask(@@pastel.cyan("? ") + message, default: default)
+    end
+
+    def self.select(message, options)
+      @@prompt.select(@@pastel.cyan("? ") + message, options)
+    end
+
+    def self.info(message)
+      puts @@pastel.blue("i ") + message
+    end
+
+    def self.progress(message)
+      puts @@pastel.yellow("» ") + message
+    end
+
+    def self.error(message)
+      puts @@pastel.red("✘ #{message}")
+    end
+
+    def self.success(message)
+      puts @@pastel.green("✔ #{message}")
+    end
+  end
+end

data/lib/discourse_theme/uploader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module DiscourseTheme
   class Uploader
 
@@ -33,9 +34,9 @@ module DiscourseTheme
       json["theme"]["theme_fields"].each do |row|
         if (error = row["error"]) && error.length > 0
           count += 1
-          Cli.error ""
-          Cli.error "Error in #{row["target"]} #{row["name"]}: #{row["error"]}"
-          Cli.error ""
+          UI.error ""
+          UI.error "Error in #{row["target"]} #{row["name"]}: #{row["error"]}"
+          UI.error ""
         end
       end
       count
@@ -58,7 +59,7 @@ module DiscourseTheme
       response = @client.update_theme(@theme_id, args)
       json = JSON.parse(response.body)
         if diagnose_errors(json) != 0
-          Cli.error "(end of errors)"
+          UI.error "(end of errors)"
         end
     end
 
@@ -72,7 +73,7 @@ module DiscourseTheme
         json = JSON.parse(response.body)
         @theme_id = json["theme"]["id"]
         if diagnose_errors(json) != 0
-          Cli.error "(end of errors)"
+          UI.error "(end of errors)"
         end
         @theme_id
       end

data/lib/discourse_theme/version.rb

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

data/lib/discourse_theme/watcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module DiscourseTheme
   class Watcher
     def self.return_immediately!
@@ -22,7 +23,7 @@ module DiscourseTheme
               (resolved = resolve_file(modified[0]))
 
             target, name, type_id = resolved
-            Cli.progress "Fast updating #{target}.scss"
+            UI.progress "Fast updating #{target}.scss"
 
             @uploader.upload_theme_field(
               target: target,
@@ -33,17 +34,17 @@ module DiscourseTheme
           else
             count = modified.length + added.length + removed.length
             if count > 1
-              Cli.progress "Detected changes in #{count} files, uploading theme"
+              UI.progress "Detected changes in #{count} files, uploading theme"
             else
               filename = modified[0] || added[0] || removed[0]
-              Cli.progress "Detected changes in #{filename.gsub(@dir, '')}, uploading theme"
+              UI.progress "Detected changes in #{filename.gsub(@dir, '')}, uploading theme"
             end
             @uploader.upload_full_theme
           end
-          Cli.success "Done! Watching for changes..."
+          UI.success "Done! Watching for changes..."
         rescue DiscourseTheme::ThemeError => e
-          Cli.error "#{e.message}"
-          Cli.progress "Watching for changes..."
+          UI.error "#{e.message}"
+          UI.progress "Watching for changes..."
         end
       end
 

metadata

@@ -1,169 +1,197 @@
 --- !ruby/object:Gem::Specification
 name: discourse_theme
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: '0.6'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '3.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: multipart-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
+        version: '0.18'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
+        version: '1.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: minitar
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
+        version: '13.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
+        version: '5.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: multipart-post
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
+        version: '2.14'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: tty-prompt
+  name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
-  type: :runtime
+        version: '2.4'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
+        version: '3.5'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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'
+- !ruby/object:Gem::Dependency
+  name: rubocop-discourse
+  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
@@ -175,7 +203,6 @@ files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile
@@ -190,6 +217,7 @@ files:
 - lib/discourse_theme/config.rb
 - lib/discourse_theme/downloader.rb
 - lib/discourse_theme/scaffold.rb
+- lib/discourse_theme/ui.rb
 - lib/discourse_theme/uploader.rb
 - lib/discourse_theme/version.rb
 - lib/discourse_theme/watcher.rb
@@ -205,14 +233,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: CLI helper for creating Discourse themes

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.4.2
-before_install: gem install bundler -v 1.16.1