discourse_theme 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c42bbee99e84d60c23d79bdb0dd289d9b2be382bdfd1c609c77b31f7c689ccda
-  data.tar.gz: 5c1c7bf95a1c83fe52d677ed766cb77c5d764d6e559f493e71b9bf2e7672bd1c
+  metadata.gz: a5c78e3947eb3207c1deec8de4326ca852efabb4c45c9dc616ff8cee76695747
+  data.tar.gz: d5024d27d0f687d6300f4c34cfd3ac6c72ef5049f03f10e15397e9d45dcd8bbf
 SHA512:
-  metadata.gz: e65319a323e96446890fd013c642bfadcc5fce7e623097a37cb731d5f20f4f9ea7b107adfa8a3db555935a0ee332a244b161c87f9e93cc54618695881e147d42
-  data.tar.gz: 9706b11b32d297faddd26875a78f6fb9e9b0816e152197f4698ca50c4c03c033406579045cfde2dd5fea34e102ee10f89300e6f8d619bfe168f601c8f1ce8eeb
+  metadata.gz: 5aff9397fbe13616f9012bef9e3f41dc4ea0587d09ae8f040e806d7ef51c9f79dc71e911ec0808e16a631a46636ff72ebec244ef543b7a69852bd24265cb40fd
+  data.tar.gz: ff3cc429ef37e484c96af103d130140b54c42a07e74a222270fd1f533ede61a3b9e8ee1bf8a4fbeb94d1e047e95481251561ad821eaa58001d2c02fe38d89189

data/.gitignore

@@ -7,3 +7,5 @@
 /spec/reports/
 /tmp/
 Gemfile.lock
+
+.rubocop-https---raw-githubusercontent-com-discourse-discourse-master--rubocop-yml

data/.rubocop.yml

@@ -1,110 +1 @@
-AllCops:
-  TargetRubyVersion: 2.2
-  DisabledByDefault: true
-  Exclude:
-    - 'bundle/**/*'
-    - 'pkg/**/*'
-
-# Prefer &&/|| over and/or.
-Style/AndOr:
-  Enabled: true
-
-# Do not use braces for hash literals when they are the last argument of a
-# method call.
-Style/BracesAroundHashParameters:
-  Enabled: true
-
-# Align `when` with `case`.
-Layout/CaseIndentation:
-  Enabled: true
-
-# Align comments with method definitions.
-Layout/CommentIndentation:
-  Enabled: true
-
-# No extra empty lines.
-Layout/EmptyLines:
-  Enabled: true
-
-# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
-Style/HashSyntax:
-  Enabled: true
-
-# Two spaces, no tabs (for indentation).
-Layout/IndentationWidth:
-  Enabled: true
-
-Layout/SpaceAfterColon:
-  Enabled: true
-
-Layout/SpaceAfterComma:
-  Enabled: true
-
-Layout/SpaceAroundEqualsInParameterDefault:
-  Enabled: true
-
-Layout/SpaceAroundKeyword:
-  Enabled: true
-
-Layout/SpaceAroundOperators:
-  Enabled: true
-
-Layout/SpaceBeforeFirstArg:
-    Enabled: true
-
-# Defining a method with parameters needs parentheses.
-Style/MethodDefParentheses:
-  Enabled: true
-
-# Use `foo {}` not `foo{}`.
-Layout/SpaceBeforeBlockBraces:
-  Enabled: true
-
-# Use `foo { bar }` not `foo {bar}`.
-Layout/SpaceInsideBlockBraces:
-  Enabled: true
-
-# Use `{ a: 1 }` not `{a:1}`.
-Layout/SpaceInsideHashLiteralBraces:
-  Enabled: true
-
-Layout/SpaceInsideParens:
-  Enabled: true
-
-# Detect hard tabs, no hard tabs.
-Layout/Tab:
-  Enabled: true
-
-# Blank lines should not have any spaces.
-Layout/TrailingBlankLines:
-  Enabled: true
-
-# No trailing whitespace.
-Layout/TrailingWhitespace:
-  Enabled: true
-
-Lint/Debugger:
-  Enabled: true
-
-Layout/BlockAlignment:
-  Enabled: true
-
-# Align `end` with the matching keyword or starting expression except for
-# assignments, where it should be aligned with the LHS.
-Layout/EndAlignment:
-  Enabled: true
-  EnforcedStyleAlignWith: variable
-
-# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
-Lint/RequireParentheses:
-  Enabled: true
-
-Layout/MultilineMethodCallIndentation:
-  Enabled: true
-  EnforcedStyle: indented
-
-Layout/AlignHash:
-  Enabled: true
-
-Bundler/OrderedGems:
-  Enabled: false
+inherit_from: https://raw.githubusercontent.com/discourse/discourse/master/.rubocop.yml

data/Rakefile

@@ -7,4 +7,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task :default => :test
+task default: :test

data/bin/discourse_theme

@@ -2,4 +2,4 @@
 
 require_relative '../lib/discourse_theme'
 
-DiscourseTheme::Cli.new.run
+DiscourseTheme::Cli.new.run(ARGV)

data/discourse_theme.gemspec

@@ -23,15 +23,17 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.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.required_ruby_version = '>= 2.2.0'
 end

data/lib/discourse_theme.rb

@@ -11,13 +11,17 @@ require 'uri'
 require 'listen'
 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'
 
 module DiscourseTheme
+  class ThemeError < StandardError; end
 end

data/lib/discourse_theme/cli.rb

@@ -1,123 +1,148 @@
-class DiscourseTheme::Cli
+module DiscourseTheme
+  class Cli
 
-  SETTINGS_FILE = File.expand_path("~/.discourse_theme")
+    @@prompt = ::TTY::Prompt.new(help_color: :cyan)
+    @@pastel = Pastel.new
 
-  def usage
-    puts "Usage: discourse_theme COMMAND"
-    puts
-    puts "discourse_theme new DIR : Creates a new theme in the designated directory"
-    puts "discourse_theme watch DIR : Watches the theme directory and synchronizes with Discourse"
-    exit 1
-  end
+    def self.yes?(message)
+      @@prompt.yes?(@@pastel.cyan("? ") + message)
+    end
 
-  def guess_api_key(settings)
-    api_key = ENV['DISCOURSE_API_KEY']
-    if api_key
-      puts "Using api_key provided by DISCOURSE_API_KEY"
+    def self.ask(message, default: nil)
+      @@prompt.ask(@@pastel.cyan("? ") + message, default: default)
     end
 
-    if !api_key && settings.api_key
-      api_key = settings.api_key
-      puts "Using previously stored api key in #{SETTINGS_FILE}"
+    def self.select(message, options)
+      @@prompt.select(@@pastel.cyan("? ") + message, options)
     end
 
-    if !api_key
-      puts "No API key found in DISCOURSE_API_KEY env var enter your API key: "
-      api_key = STDIN.gets.strip
-      puts "Would you like me to store this API key in #{SETTINGS_FILE}? (Yes|No)"
-      answer = STDIN.gets.strip
-      if answer =~ /y(es)?/i
-        settings.api_key = api_key
-      end
+    def self.info(message)
+      puts @@pastel.blue("i ") + message
     end
 
-    api_key
-  end
+    def self.progress(message)
+      puts @@pastel.yellow("» ") + message
+    end
 
-  def is_https_redirect?(url)
-    url = URI.parse(url)
-    path = url.path
-    path = "/" if path.empty?
-    req = Net::HTTP::Get.new("/")
-    response = Net::HTTP.start(url.host, url.port) { |http| http.request(req) }
-    Net::HTTPRedirection === response && response['location'] =~ /^https/i
-  end
+    def self.error(message)
+      puts @@pastel.red("✘ #{message}")
+    end
 
-  def guess_url(settings)
-    url = ENV['DISCOURSE_URL']
-    if url
-      puts "Site provided by DISCOURSE_URL"
+    def self.success(message)
+      puts @@pastel.green("✔ #{message}")
     end
 
-    if !url && settings.url
-      url = settings.url
-      puts "Using #{url} defined in #{SETTINGS_FILE}"
+    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
+      puts "Use --reset to change the configuration for a directory"
+      exit 1
     end
 
-    if !url
-      puts "No site found! Where would you like to synchronize the theme to: "
-      url = STDIN.gets.strip
-      url = "http://#{url}" unless url =~ /^https?:\/\//
+    def run(args)
+      usage unless args[1]
 
-      # maybe this is an HTTPS redirect
-      uri = URI.parse(url)
-      if URI::HTTP === uri && uri.port == 80 && is_https_redirect?(url)
-        puts "Detected an #{url} is an HTTPS domain"
-        url = url.sub("http", "https")
-      end
+      reset = !!args.delete("--reset")
 
-      puts "Would you like me to store this site name at: #{SETTINGS_FILE}? (Yes|No)"
-      answer = STDIN.gets.strip
-      if answer =~ /y(es)?/i
-        settings.url = url
-      end
-    end
+      command = args[0].to_s.downcase
+      dir = File.expand_path(args[1])
 
-    url
-  end
+      config = DiscourseTheme::Config.new(SETTINGS_FILE)
+      settings = config[dir]
 
-  def run
-    usage unless ARGV[1]
+      theme_id = settings.theme_id
 
-    command = ARGV[0].to_s.downcase
-    dir = File.expand_path(ARGV[1])
+      if command == "new"
+        raise DiscourseTheme::ThemeError.new "'#{dir} is not empty" if Dir.exists?(dir) && !Dir.empty?(dir)
+        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
+      elsif command == "watch"
+        raise DiscourseTheme::ThemeError.new "'#{dir} does not exist" unless Dir.exists?(dir)
+        client = DiscourseTheme::Client.new(dir, settings, reset: reset)
 
-    dir_exists = File.exist?(dir)
+        theme_list = client.get_themes_list
 
-    if command == "new" && !dir_exists
-      DiscourseTheme::Scaffold.generate(dir)
-    elsif command == "watch" && dir_exists
-      if !File.exist?("#{dir}/about.json")
-        puts "No about.json file found in #{dir}!"
-        puts
-        usage
-      end
+        options = {}
+        if theme_id && theme = theme_list.find { |t| t["id"] == theme_id }
+          options["Sync with existing theme: '#{theme["name"]}' (id:#{theme_id})"] = :default
+        end
+        options["Create and sync with a new theme"] = :create
+        options["Select a different theme"] = :select
 
-      config = DiscourseTheme::Config.new(SETTINGS_FILE)
-      settings = config[dir]
+        choice = Cli.select('How would you like to sync this theme?', options.keys)
 
-      url = guess_url(settings)
-      api_key = guess_api_key(settings)
+        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)
+          theme_id = extract_theme_id(choice)
+        end
 
-      if !url
-        puts "Missing site to synchronize with!"
-        usage
-      end
+        uploader = DiscourseTheme::Uploader.new(dir: dir, client: client, theme_id: theme_id)
+
+        Cli.progress "Uploading theme from #{dir}"
+        settings.theme_id = theme_id = uploader.upload_full_theme
+
+        Cli.success "Theme uploaded (id:#{theme_id})"
+        watcher = DiscourseTheme::Watcher.new(dir: dir, uploader: uploader)
+
+        Cli.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)
+
+        FileUtils.mkdir_p dir unless Dir.exists?(dir)
+        raise DiscourseTheme::ThemeError.new "'#{dir} is not empty" unless Dir.empty?(dir)
 
-      if !api_key
-        puts "Missing api key!"
+        Cli.progress "Loading theme list..."
+        themes = render_theme_list(client.get_themes_list)
+
+        choice = Cli.select('Which theme would you like to download?', themes)
+        theme_id = extract_theme_id(choice)
+
+        Cli.progress "Downloading theme into #{dir}"
+
+        downloader.download_theme(theme_id)
+        settings.theme_id = theme_id
+
+        Cli.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
+      else
         usage
       end
 
-      uploader = DiscourseTheme::Uploader.new(dir: dir, api_key: api_key, site: url)
-      print "Uploading theme from #{dir} to #{url} : "
-      uploader.upload_full_theme
+      Cli.progress "Exiting..."
+    rescue DiscourseTheme::ThemeError => e
+      Cli.error "#{e.message}"
+    rescue Interrupt, TTY::Reader::InputInterrupt => e
+      Cli.error "Interrupted"
+    end
 
-      watcher = DiscourseTheme::Watcher.new(dir: dir, uploader: uploader)
+    def render_theme_list(themes)
+      themes.sort_by { |t| t["updated_at"] }
+        .reverse.map { |theme| "#{theme["name"]} (id:#{theme["id"]})" }
+    end
 
-      watcher.watch
-    else
-      usage
+    def extract_theme_id(rendered_name)
+      /\(id:([0-9]+)\)$/.match(rendered_name)[1].to_i
     end
   end
 end

data/lib/discourse_theme/client.rb

@@ -0,0 +1,183 @@
+module DiscourseTheme
+  class Client
+    THEME_CREATOR_REGEX = /^https:\/\/theme-creator.discourse.org$/i
+
+    def initialize(dir, settings, reset:)
+      @reset = reset
+      @url = guess_url(settings)
+      @api_key = guess_api_key(settings)
+
+      raise "Missing site to synchronize with!" if !@url
+      raise "Missing api key!" if !@api_key
+
+      @is_theme_creator = !!(THEME_CREATOR_REGEX =~ @url)
+
+      parts = discourse_version.split(".").map { |s| s.sub('beta', '').to_i }
+      if parts[0] < 2 || parts[1] < 2 || parts[2] < 0 || (!parts[3].nil? && parts[3] < 10)
+        Cli.info "discourse_theme is designed for Discourse 2.2.0.beta10 or above"
+        Cli.info "download will not function, and syncing destination will be unpredictable"
+      end
+    end
+
+    def get_themes_list
+      endpoint = root +
+        if @is_theme_creator
+          "/user_themes.json"
+        else
+          "/admin/customize/themes.json?api_key=#{@api_key}"
+        end
+
+      response = request(Net::HTTP::Get.new(endpoint), never_404: true)
+      JSON.parse(response.body)["themes"]
+    end
+
+    def get_raw_theme_export(id)
+      endpoint = root +
+        if @is_theme_creator
+          "/user_themes/#{id}/export"
+        else
+          "/admin/customize/themes/#{id}/export?api_key=#{@api_key}"
+        end
+
+      response = request(Net::HTTP::Get.new endpoint)
+      raise "Error downloading theme: #{response.code}" unless response.code.to_i == 200
+      response.body
+    end
+
+    def update_theme(id, args)
+      endpoint = root +
+        if @is_theme_creator
+          "/user_themes/#{id}"
+        else
+          "/admin/themes/#{id}?api_key=#{@api_key}"
+        end
+
+      put = Net::HTTP::Put.new(endpoint, 'Content-Type' => 'application/json')
+      put.body = args.to_json
+      request(put)
+    end
+
+    def upload_full_theme(tgz, theme_id:)
+      endpoint = root +
+        if @is_theme_creator
+          "/user_themes/import.json"
+        else
+          "/admin/themes/import.json?api_key=#{@api_key}"
+        end
+
+      post = Net::HTTP::Post::Multipart.new(
+        endpoint,
+        "theme_id" => theme_id,
+        "bundle" => UploadIO.new(tgz, "application/tar+gzip", "bundle.tar.gz")
+      )
+      request(post)
+    end
+
+    def discourse_version
+      endpoint = root +
+        if @is_theme_creator
+          "/about.json"
+        else
+          "/about.json?api_key=#{@api_key}"
+        end
+
+      response = request(Net::HTTP::Get.new(endpoint), never_404: true)
+      json = JSON.parse(response.body)
+      json["about"]["version"]
+    end
+
+    private
+
+    def root
+      @url
+    end
+
+    def request(request, never_404: false)
+      uri = URI.parse(@url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = URI::HTTPS === uri
+      add_headers(request)
+      http.request(request).tap do |response|
+        if response.code == '404' && never_404
+          raise DiscourseTheme::ThemeError.new "Error: Incorrect site URL, or API key does not have the correct privileges"
+        elsif !['200', '201'].include?(response.code)
+          errors = JSON.parse(response.body)["errors"].join(', ') rescue nil
+          raise DiscourseTheme::ThemeError.new "Error #{response.code} for #{request.path.split("?")[0]}#{(": " + errors) if errors}"
+        end
+      end
+    rescue Errno::ECONNREFUSED
+      raise DiscourseTheme::ThemeError.new "Connection refused for #{request.path}"
+    end
+
+    def add_headers(request)
+      if @is_theme_creator
+        request["User-Api-Key"] = @api_key
+      end
+    end
+
+    def guess_url(settings)
+      url = ENV['DISCOURSE_URL']
+      if url
+        Cli.progress "Using #{url} from DISCOURSE_URL"
+      end
+
+      if !url && settings.url
+        url = settings.url
+        Cli.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 = "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"
+          url = url.sub("http", "https")
+        end
+
+        if Cli.yes?("Would you like this site name stored in #{DiscourseTheme::Cli::SETTINGS_FILE}?")
+          settings.url = url
+        else
+          settings.url = nil
+        end
+      end
+
+      url
+    end
+
+    def guess_api_key(settings)
+      api_key = ENV['DISCOURSE_API_KEY']
+      if api_key
+        Cli.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}"
+      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}?")
+          settings.api_key = api_key
+        else
+          settings.api_key = nil
+        end
+      end
+
+      api_key
+    end
+
+    def is_https_redirect?(url)
+      url = URI.parse(url)
+      path = url.path
+      path = "/" if path.empty?
+      req = Net::HTTP::Get.new("/")
+      response = Net::HTTP.start(url.host, url.port) { |http| http.request(req) }
+      Net::HTTPRedirection === response && response['location'] =~ /^https/i
+    end
+
+  end
+end

data/lib/discourse_theme/config.rb

@@ -7,11 +7,11 @@ class DiscourseTheme::Config
     end
 
     def api_key
-      safe_config["api_key"]
+      search_api_key(url) || safe_config["api_key"]
     end
 
     def api_key=(val)
-      set("api_key", val)
+      set_api_key(url, val)
     end
 
     def url
@@ -22,6 +22,14 @@ class DiscourseTheme::Config
       set("url", val)
     end
 
+    def theme_id
+      safe_config["theme_id"].to_i
+    end
+
+    def theme_id=(theme_id)
+      set("theme_id", theme_id.to_i)
+    end
+
     protected
 
     def set(name, val)
@@ -39,6 +47,18 @@ class DiscourseTheme::Config
         {}
       end
     end
+
+    def search_api_key(url)
+      hash = @config.raw_config["api_keys"]
+      hash[url] if hash
+    end
+
+    def set_api_key(url, api_key)
+      hash = @config.raw_config["api_keys"] ||= {}
+      hash[url] = api_key
+      @config.save
+      api_key
+    end
   end
 
   attr_reader :raw_config, :filename
@@ -59,13 +79,6 @@ class DiscourseTheme::Config
     end
   end
 
-  def set(path, url:, api_key:)
-    @raw_config[path] = {
-      "url" => url,
-      "api_key" => api_key
-    }
-  end
-
   def save
     File.write(@filename, @raw_config.to_yaml)
   end

data/lib/discourse_theme/downloader.rb

@@ -0,0 +1,31 @@
+class DiscourseTheme::Downloader
+
+  def initialize(dir:, client:)
+    @dir = dir
+    @client = client
+    @theme_id = nil
+  end
+
+  def download_theme(id)
+    raw = @client.get_raw_theme_export(id)
+    sio = StringIO.new(raw)
+    gz = Zlib::GzipReader.new(sio)
+    Minitar.unpack(gz, @dir)
+
+    # Minitar extracts into a sub directory, move all the files up one dir
+    Dir.chdir(@dir) do
+      folders = Dir.glob('*/')
+      raise "Extraction failed" unless folders.length == 1
+      FileUtils.mv(Dir.glob("#{folders[0]}*"), "./")
+      FileUtils.remove_dir(folders[0])
+    end
+  end
+
+  private
+
+  def add_headers(request)
+    if @is_theme_creator
+      request["User-Api-Key"] = @api_key
+    end
+  end
+end

data/lib/discourse_theme/scaffold.rb

@@ -1,36 +1,39 @@
-class DiscourseTheme::Scaffold
+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
+    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
+      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
+      mobile/mobile.scss
+      mobile/header.html
+      mobile/after_header.html
+      mobile/footer.html
+      mobile/head_tag.html
+      mobile/body_tag.html
 
-    settings.yml
-  }
+      locales/en.yml
 
-  ABOUT_JSON = <<~STR
+      settings.yml
+    }
+
+    ABOUT_JSON = <<~STR
     {
       "name": "#NAME#",
-      "about_url": "URL",
-      "license_url": "URL",
+      "about_url": null,
+      "license_url": null,
       "assets": {
       },
       "color_schemes": {
@@ -38,39 +41,35 @@ class DiscourseTheme::Scaffold
     }
   STR
 
-  HELP = <<~STR
-    Are you a bit lost? Be sure to read https://meta.discourse.org/t/how-to-develop-custom-themes/60848
-  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
+    GIT_IGNORE = <<~STR
     .discourse-site
     HELP
   STR
 
-  def self.generate(dir)
-    puts "Generating a scaffold theme at #{dir}"
+    def self.generate(dir)
+      Cli.progress "Generating a scaffold theme at #{dir}"
 
-    puts "What would you like to call your theme? "
-    name = STDIN.gets.strip
-    if name.length == 0
-      puts "Please pick a name"
-      exit 1
-    end
+      name = Cli.ask("What would you like to call your theme?").strip
 
-    FileUtils.mkdir_p dir
-    Dir.chdir dir do
-      File.write('about.json', ABOUT_JSON.sub("#NAME#", name))
-      File.write('HELP', HELP)
-      File.write('.gitignore', GIT_IGNORE)
+      FileUtils.mkdir_p dir
+      Dir.chdir dir do
+        File.write('about.json', ABOUT_JSON.sub("#NAME#", name))
+        File.write('HELP', HELP)
+        File.write('.gitignore', GIT_IGNORE)
 
-      BLANK_FILES.each do |f|
-        puts "#{f}"
-        FileUtils.mkdir_p File.dirname(f)
-        FileUtils.touch f
-      end
+        BLANK_FILES.each do |f|
+          Cli.info "Creating #{f}"
+          FileUtils.mkdir_p File.dirname(f)
+          FileUtils.touch f
+        end
 
-      puts "Initializing git repo"
-      puts `git init .`
+        Cli.info "Initializing git repo"
+        puts `git init .`
+      end
     end
   end
 end

data/lib/discourse_theme/uploader.rb

@@ -2,12 +2,10 @@ class DiscourseTheme::Uploader
 
   THEME_CREATOR_REGEX = /^https:\/\/theme-creator.discourse.org$/i
 
-  def initialize(dir:, api_key:, site:)
+  def initialize(dir:, client:, theme_id: nil)
     @dir = dir
-    @api_key = api_key
-    @site = site
-    @is_theme_creator = !!(THEME_CREATOR_REGEX =~ site)
-    @theme_id = nil
+    @client = client
+    @theme_id = theme_id
   end
 
   def compress_dir(gzip, dir)
@@ -36,16 +34,15 @@ class DiscourseTheme::Uploader
           puts
         end
         count += 1
-        puts
-        puts "Error in #{row["target"]} #{row["name"]}: #{row["error"]}"
-        puts
+        Cli.error
+        Cli.error "Error in #{row["target"]} #{row["name"]}: #{row["error"]}"
+        Cli.error
       end
     end
     count
   end
 
   def upload_theme_field(target: , name: , type_id: , value:)
-
     raise "expecting theme_id to be set!" unless @theme_id
 
     args = {
@@ -59,77 +56,29 @@ class DiscourseTheme::Uploader
       }
     }
 
-    endpoint =
-      if @is_theme_creator
-        "/user_themes/#{@theme_id}"
-      else
-        "/admin/themes/#{@theme_id}?api_key=#{@api_key}"
+    response = @client.update_theme(@theme_id, args)
+    json = JSON.parse(response.body)
+      if diagnose_errors(json) != 0
+        Cli.error "(end of errors)"
       end
-
-    uri = URI.parse(@site + endpoint)
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = URI::HTTPS === uri
-
-    request = Net::HTTP::Put.new(uri.request_uri, 'Content-Type' => 'application/json')
-    request.body = args.to_json
-    add_headers(request)
-    http.start do |h|
-      response = h.request(request)
-      if response.code.to_i == 200
-        json = JSON.parse(response.body)
-        if diagnose_errors(json) == 0
-          puts "(done)"
-        end
-      else
-        puts "Error importing field status: #{response.code}"
-      end
-    end
   end
 
   def upload_full_theme
     filename = "#{Pathname.new(Dir.tmpdir).realpath}/bundle_#{SecureRandom.hex}.tar.gz"
     compress_dir(filename, @dir)
 
-    endpoint =
-      if @is_theme_creator
-        "/user_themes/import.json"
-      else
-        "/admin/themes/import.json?api_key=#{@api_key}"
-      end
-
-    uri = URI.parse(@site + endpoint)
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = URI::HTTPS === uri
     File.open(filename) do |tgz|
+      response = @client.upload_full_theme(tgz, theme_id: @theme_id)
 
-      request = Net::HTTP::Post::Multipart.new(
-        uri.request_uri,
-        "bundle" => UploadIO.new(tgz, "application/tar+gzip", "bundle.tar.gz"),
-      )
-      add_headers(request)
-      response = http.request(request)
-      if response.code.to_i == 201
-        json = JSON.parse(response.body)
-        @theme_id = json["theme"]["id"]
-        if diagnose_errors(json) == 0
-          puts "(done)"
-        end
-      else
-        puts "Error importing theme status: #{response.code}"
-
-        puts response.body
+      json = JSON.parse(response.body)
+      @theme_id = json["theme"]["id"]
+      if diagnose_errors(json) != 0
+        Cli.error "(end of errors)"
       end
+      @theme_id
     end
-
   ensure
     FileUtils.rm_f filename
   end
 
-  private
-
-    def add_headers(request)
-      if @is_theme_creator
-        request["User-Api-Key"] = @api_key
-      end
-    end
 end

data/lib/discourse_theme/version.rb

@@ -1,3 +1,3 @@
 module DiscourseTheme
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

data/lib/discourse_theme/watcher.rb

@@ -1,51 +1,63 @@
-class DiscourseTheme::Watcher
-  def initialize(dir:, uploader:)
-    @dir = dir
-    @uploader = uploader
-  end
-
-  def watch
-    listener = Listen.to(@dir) do |modified, added, removed|
-      if modified.length == 1 &&
-          added.length == 0 &&
-          removed.length == 0 &&
-          (resolved = resolve_file(modified[0]))
-
-        target, name, type_id = resolved
-        print "Updating #{target} #{name}: "
-
-        @uploader.upload_theme_field(
-          target: target,
-          name: name,
-          value: File.read(modified[0]),
-          type_id: type_id
-        )
-      else
-        print "Full re-sync is required, re-uploading theme: "
-        @uploader.upload_full_theme
-      end
+module DiscourseTheme
+  class Watcher
+    def initialize(dir:, uploader:)
+      @dir = dir
+      @uploader = uploader
     end
 
-    listener.start
-    sleep
+    def watch
+      listener = Listen.to(@dir) do |modified, added, removed|
+        begin
+          if modified.length == 1 &&
+              added.length == 0 &&
+              removed.length == 0 &&
+              (resolved = resolve_file(modified[0]))
+
+            target, name, type_id = resolved
+            Cli.progress "Fast updating #{target}.scss"
+
+            @uploader.upload_theme_field(
+              target: target,
+              name: name,
+              value: File.read(modified[0]),
+              type_id: type_id
+            )
+          else
+            count = modified.length + added.length + removed.length
+            if count > 1
+              Cli.progress "Detected changes in #{count} files, uploading theme"
+            else
+              Cli.progress "Detected changes in #{modified[0].gsub(@dir, '')}, uploading theme"
+            end
+            @uploader.upload_full_theme
+          end
+          Cli.success "Done! Watching for changes..."
+        rescue DiscourseTheme::ThemeError => e
+          Cli.error "#{e.message}"
+          Cli.progress "Watching for changes..."
+        end
+      end
 
-  end
+      listener.start
+      sleep
+    end
 
-  protected
+    protected
 
-  def resolve_file(path)
-    dir_len = File.expand_path(@dir).length
-    name = File.expand_path(path)[dir_len + 1..-1]
+    def resolve_file(path)
+      dir_len = File.expand_path(@dir).length
+      name = File.expand_path(path)[dir_len + 1..-1]
 
-    target, file = name.split("/")
+      target, file = name.split("/")
 
-    if ["common", "desktop", "mobile"].include?(target)
-      if file == "#{target}.scss"
-        # a CSS file
-        return [target, "scss", 1]
+      if ["common", "desktop", "mobile"].include?(target)
+        if file == "#{target}.scss"
+          # a CSS file
+          return [target, "scss", 1]
+        end
       end
-    end
 
-    nil
+      nil
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discourse_theme
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
 description: CLI helper for creating Discourse themes
 email:
 - sam.saffron@gmail.com
@@ -143,7 +171,9 @@ files:
 - discourse_theme.gemspec
 - lib/discourse_theme.rb
 - lib/discourse_theme/cli.rb
+- lib/discourse_theme/client.rb
 - lib/discourse_theme/config.rb
+- lib/discourse_theme/downloader.rb
 - lib/discourse_theme/scaffold.rb
 - lib/discourse_theme/uploader.rb
 - lib/discourse_theme/version.rb
@@ -168,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: CLI helper for creating Discourse themes