pagecord-cli 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1e156f74ff6f6b5860f2a21cae283aaccf1d3bec27ef02ed5bfc02002a1bdb3
-  data.tar.gz: d05ee18c97ee613d5903e76bf3508c20ed6536b8120a3a3f60dc279539048203
+  metadata.gz: 5e79c8864b73579755f1699da00835d474cae8871b64c5ff21e091d4540e95be
+  data.tar.gz: bbdc8963f7317ec56f55de326898021d1bf5712f15c8833c83f6ccbac533f06f
 SHA512:
-  metadata.gz: f02588d28a65bfd183cd5830f96d88395523960ef7a0ab4584be5e7e386b0f15530a1b5fa8b2c169b629a5cbabac138d77d428cffaeabaada09c2ffbe7a4d105
-  data.tar.gz: 5057321b2a894a091ab7f7e76cb8fb0e9724f3576b9c435f83dc06dac38e59cb78f0e240f942297f34fd4479b2caf8a9de3887b4bd1e7593c2f0f89b796b8e65
+  metadata.gz: b6dab32f1f4884be02388a220d441fbe21041940d5f3c4a6e607ce4c9ff4c60d12582ae9f60435cbcf87b3e3645f9fd58cc144a55b4b453bd2a9f628cde3c0a3
+  data.tar.gz: 208af262450558105da20a6006cf70340e804ad6c4fadf4dbab05aada82a572efd0f5af01cfd12cdec2d1b20511473407d00d5f87c51d1ae36e6b45bebbde3ef

data/README.md

@@ -52,7 +52,7 @@ pagecord publish hello.md myblog
 See configured blogs:
 
 ```bash
-pagecord list
+pagecord blog list
 ```
 
 Remove a saved blog:
@@ -61,7 +61,60 @@ Remove a saved blog:
 pagecord logout myblog
 ```
 
-## Options
+## Choosing a blog
+
+With several blogs configured, pick a default once:
+
+```bash
+pagecord blog use myblog
+```
+
+Every command works out which blog to use in this order: the subdomain passed
+as a positional argument, then `--blog myblog`, then the `PAGECORD_BLOG`
+environment variable, then the default set by `pagecord blog use`, and finally
+the only configured blog if there is just one.
+
+## Appearance
+
+```bash
+pagecord appearance show
+pagecord appearance update --theme sand --font serif
+```
+
+Fields: `--theme`, `--font`, `--width`, `--layout`, the six
+`--custom-theme-*` colours, and `--show-branding true|false`.
+
+## Custom code
+
+```bash
+pagecord custom-code show --css > blog.css
+pagecord custom-code update --css blog.css
+```
+
+`--css`, `--footer-html`, `--head-html` and `--body-html` each take the path to
+a file holding that content, so you can keep all of it under version control:
+
+```bash
+pagecord custom-code update --css blog.css --footer-html footer.html
+```
+
+There is also `--enabled true|false` to switch your head and body code off
+without deleting it.
+
+`custom-code show` prints JSON, or the raw field when you name one, so
+redirecting it to a file round-trips.
+
+## Global options
+
+Accepted by every command, before or after the command name:
+
+```bash
+--blog SUBDOMAIN   # which blog to act on
+--json             # machine-readable output
+--quiet            # suppress confirmation messages
+```
+
+## Publish options
 
 `publish` and `draft` accept:
 

data/lib/pagecord_cli/cli.rb

@@ -1,11 +1,27 @@
 # frozen_string_literal: true
 
 require "io/console"
+require "json"
 require "optparse"
 
 module PagecordCLI
   class CLI
-    attr_reader :argv, :config, :input, :output, :error
+    class Error < StandardError; end
+
+    APPEARANCE_FIELDS = %w[
+      theme font width layout
+      custom_theme_bg_light custom_theme_text_light custom_theme_accent_light
+      custom_theme_bg_dark custom_theme_text_dark custom_theme_accent_dark
+    ].freeze
+
+    CUSTOM_CODE_FIELDS = {
+      "css" => "custom_css",
+      "footer-html" => "custom_footer_html",
+      "head-html" => "custom_head_html",
+      "body-html" => "custom_body_html"
+    }.freeze
+
+    attr_reader :argv, :config, :input, :output, :error, :options
 
     def initialize(argv, config: Config.new, input: $stdin, output: $stdout, error: $stderr)
       @argv = argv.dup
@@ -13,26 +29,30 @@ module PagecordCLI
       @input = input
       @output = output
       @error = error
+      @options = {}
     end
 
     def run
+      return help if argv.empty? || %w[help -h --help].include?(argv.first)
+
+      parser.order!(argv)
       command = argv.shift
 
       case command
       when "login" then login
       when "logout" then logout
       when "list" then list
+      when "blog" then blog
+      when "appearance" then appearance
+      when "custom-code" then custom_code
       when "publish" then publish("published")
       when "draft" then publish("draft")
-      when "help", nil, "-h", "--help" then help
       else
         fail_with("Unknown command: #{command}")
       end
     rescue Client::Error => e
       fail_with(api_error_message(e))
-    rescue Config::Error => e
-      fail_with(e.message)
-    rescue Errno::ENOENT => e
+    rescue Error, Config::Error, OptionParser::ParseError, Errno::ENOENT => e
       fail_with(e.message)
     rescue Interrupt
       error.puts
@@ -42,77 +62,165 @@ module PagecordCLI
     private
 
       def login
-        options = { base_url: Config::DEFAULT_BASE_URL }
-        parser = OptionParser.new do |opts|
-          opts.on("--base-url URL") { |value| options[:base_url] = value }
-        end
-        parser.parse!(argv)
+        base_url = Config::DEFAULT_BASE_URL
+        parser { |opts| opts.on("--base-url URL") { |value| base_url = value } }.parse!(argv)
 
         subdomain = argv.shift
         return fail_with("Usage: pagecord login SUBDOMAIN") unless subdomain
 
-        base_url = Config.normalize_base_url(options[:base_url])
+        base_url = Config.normalize_base_url(base_url)
         api_key = prompt_api_key
-        client = Client.new(api_key: api_key, base_url: base_url)
-        client.verify!
+        Client.new(api_key: api_key, base_url: base_url).verify!
         config.save_blog(subdomain, api_key: api_key, base_url: base_url)
 
-        output.puts "Saved #{subdomain}"
+        say "Saved #{subdomain}"
         0
       end
 
       def logout
+        parser.parse!(argv)
         subdomain = resolve_blog(argv.shift)
-        return fail_with("No blogs are configured") if config.blogs.empty?
-        return fail_with("Please specify a subdomain") unless subdomain
-        return fail_with("Unknown blog: #{subdomain}") unless config.blog(subdomain)
 
         config.delete_blog(subdomain)
-        output.puts "Removed #{subdomain}"
+        say "Removed #{subdomain}"
         0
       end
 
+      def blog
+        case argv.shift
+        when "list" then list
+        when "use" then use
+        else fail_with("Usage: pagecord blog list|use SUBDOMAIN")
+        end
+      end
+
       def list
+        parser.parse!(argv)
         return fail_with("No blogs are configured") if config.blogs.empty?
 
-        config.blogs.each do |subdomain, details|
-          suffix = details["base_url"] == Config::DEFAULT_BASE_URL ? "" : " (#{details["base_url"]})"
-          output.puts "#{subdomain}#{suffix}"
+        if options[:json]
+          print_json(config.blogs.map { |subdomain, details|
+            { subdomain: subdomain, base_url: details["base_url"], default: subdomain == config.default_blog }
+          })
+        else
+          config.blogs.each do |subdomain, details|
+            suffix = details["base_url"] == Config::DEFAULT_BASE_URL ? "" : " (#{details["base_url"]})"
+            suffix += " (default)" if subdomain == config.default_blog
+            output.puts "#{subdomain}#{suffix}"
+          end
         end
 
         0
       end
 
-      def publish(status)
-        options = publish_options
-        parser = OptionParser.new do |opts|
-          opts.on("--title TITLE") { |value| options[:title] = value }
-          opts.on("--slug SLUG") { |value| options[:slug] = value }
-          opts.on("--published-at TIME") { |value| options[:published_at] = value }
-          opts.on("--tags TAGS") { |value| options[:tags] = value }
-          opts.on("--canonical-url URL") { |value| options[:canonical_url] = value }
-          opts.on("--hidden") { options[:hidden] = true }
-          opts.on("--locale LOCALE") { |value| options[:locale] = value }
+      def use
+        parser.parse!(argv)
+        subdomain = argv.shift
+        return fail_with("Usage: pagecord blog use SUBDOMAIN") unless subdomain
+        return fail_with("Unknown blog: #{subdomain}") unless config.blog(subdomain)
+
+        config.save_default_blog(subdomain)
+        say "Using #{subdomain}"
+        0
+      end
+
+      def appearance
+        case argv.shift
+        when "show" then show_appearance
+        when "update" then update_appearance
+        else fail_with("Usage: pagecord appearance show|update [--FIELD VALUE]")
         end
+      end
+
+      def show_appearance
         parser.parse!(argv)
+        settings = client_for(resolve_blog).appearance
 
-        file_path = argv.shift
-        subdomain = resolve_blog(argv.shift)
+        if options[:json]
+          print_json(settings)
+        else
+          settings.each { |key, value| output.puts "#{key}: #{value}" }
+        end
+
+        0
+      end
+
+      def update_appearance
+        params = {}
+        parser do |opts|
+          APPEARANCE_FIELDS.each do |field|
+            opts.on("--#{field.tr("_", "-")} VALUE") { |value| params[field] = value }
+          end
+          opts.on("--show-branding BOOL", TrueClass) { |value| params["show_branding"] = value }
+        end.parse!(argv)
+
+        return fail_with("Nothing to update") if params.empty?
+
+        settings = client_for(resolve_blog).update_appearance(params)
+        options[:json] ? print_json(settings) : say("Updated appearance")
+        0
+      end
+
+      def custom_code
+        case argv.shift
+        when "show" then show_custom_code
+        when "update" then update_custom_code
+        else fail_with("Usage: pagecord custom-code show|update [--FIELD VALUE]")
+        end
+      end
+
+      def show_custom_code
+        field = nil
+        parser do |opts|
+          CUSTOM_CODE_FIELDS.each { |flag, name| opts.on("--#{flag}") { field = name } }
+        end.parse!(argv)
+
+        settings = client_for(resolve_blog).custom_code
+        field ? output.print(settings[field].to_s) : print_json(settings)
+        0
+      end
+
+      def update_custom_code
+        params = {}
+        parser do |opts|
+          CUSTOM_CODE_FIELDS.each do |flag, name|
+            opts.on("--#{flag} PATH") { |path| params[name] = read_file(flag, path) }
+          end
+          opts.on("--enabled BOOL", TrueClass) { |value| params["custom_code_enabled"] = value }
+        end.parse!(argv)
 
+        return fail_with("Nothing to update") if params.empty?
+
+        settings = client_for(resolve_blog).update_custom_code(params)
+        options[:json] ? print_json(settings) : say("Updated custom code")
+        0
+      end
+
+      def publish(status)
+        overrides = {}
+        parser do |opts|
+          opts.on("--title TITLE") { |value| overrides[:title] = value }
+          opts.on("--slug SLUG") { |value| overrides[:slug] = value }
+          opts.on("--published-at TIME") { |value| overrides[:published_at] = value }
+          opts.on("--tags TAGS") { |value| overrides[:tags] = value }
+          opts.on("--canonical-url URL") { |value| overrides[:canonical_url] = value }
+          opts.on("--hidden") { overrides[:hidden] = true }
+          opts.on("--locale LOCALE") { |value| overrides[:locale] = value }
+        end.parse!(argv)
+
+        file_path = argv.shift
         return fail_with("Usage: pagecord #{status == "draft" ? "draft" : "publish"} FILE [SUBDOMAIN]") unless file_path
-        return fail_with("No blogs are configured. Run pagecord login SUBDOMAIN first.") if config.blogs.empty?
-        return fail_with("Please specify a subdomain") unless subdomain
-        return fail_with("Unknown blog: #{subdomain}") unless config.blog(subdomain)
+
+        subdomain = resolve_blog(argv.shift)
 
         post_file = PostFile.new(file_path)
         return fail_with("Unsupported file type: #{file_path}") unless post_file.supported?
 
-        blog_config = config.blog(subdomain)
-        api_key = blog_config.fetch("api_key")
+        api_key = config.blog(subdomain).fetch("api_key")
         return fail_with("This file is linked to another configured blog.") if post_file.wrong_blog?(subdomain, api_key)
 
-        client = Client.new(api_key: blog_config.fetch("api_key"), base_url: blog_config.fetch("base_url", Config::DEFAULT_BASE_URL))
-        params = post_file.params.merge(options.compact).merge(
+        client = client_for(subdomain)
+        params = post_file.params.merge(overrides).merge(
           content: post_file.content_for(subdomain, client: client),
           status: status
         )
@@ -125,27 +233,51 @@ module PagecordCLI
         end
 
         post_file.write_token(subdomain, result.fetch("token"), api_key: api_key, status: status)
-        output.puts "#{status == "draft" ? "Saved draft" : "Published"} #{file_path} to #{subdomain}"
+        say "#{status == "draft" ? "Saved draft" : "Published"} #{file_path} to #{subdomain}"
         0
       end
 
-      def publish_options
-        {
-          title: nil,
-          slug: nil,
-          published_at: nil,
-          tags: nil,
-          canonical_url: nil,
-          hidden: nil,
-          locale: nil
-        }
+      def parser
+        OptionParser.new do |opts|
+          opts.on("--blog SUBDOMAIN") { |value| options[:blog] = value }
+          opts.on("--json") { options[:json] = true }
+          opts.on("--quiet") { options[:quiet] = true }
+          yield opts if block_given?
+        end
+      end
+
+      def resolve_blog(name = nil)
+        raise Error, "No blogs are configured. Run pagecord login SUBDOMAIN first." if config.blogs.empty?
+
+        subdomain = name || options[:blog] || ENV["PAGECORD_BLOG"] || config.default_blog ||
+          (config.blogs.keys.first if config.blogs.size == 1)
+
+        raise Error, "Please specify a subdomain" unless subdomain
+        raise Error, "Unknown blog: #{subdomain}" unless config.blog(subdomain)
+
+        subdomain
+      end
+
+      def client_for(subdomain)
+        blog_config = config.blog(subdomain)
+        Client.new(
+          api_key: blog_config.fetch("api_key"),
+          base_url: blog_config.fetch("base_url", Config::DEFAULT_BASE_URL)
+        )
       end
 
-      def resolve_blog(name)
-        return name if name
-        return config.blogs.keys.first if config.blogs.size == 1
+      def read_file(flag, path)
+        File.read(path)
+      rescue SystemCallError
+        raise Error, path.match?(/[{<]/) ? "--#{flag} takes a file path, not the content itself" : "Could not read #{path}"
+      end
 
-        nil
+      def say(message)
+        output.puts message unless options[:quiet]
+      end
+
+      def print_json(value)
+        output.puts JSON.pretty_generate(value)
       end
 
       def prompt_api_key
@@ -173,10 +305,21 @@ module PagecordCLI
           Usage:
             pagecord login SUBDOMAIN
             pagecord logout [SUBDOMAIN]
-            pagecord list
+            pagecord blog list
+            pagecord blog use SUBDOMAIN
+            pagecord appearance show
+            pagecord appearance update [options]
+            pagecord custom-code show [--css|--footer-html|--head-html|--body-html]
+            pagecord custom-code update --css blog.css
+            pagecord custom-code update [options]
             pagecord publish FILE [SUBDOMAIN] [options]
             pagecord draft FILE [SUBDOMAIN] [options]
 
+          Global options:
+            --blog SUBDOMAIN
+            --json
+            --quiet
+
           Publish options:
             --title TITLE
             --slug SLUG
@@ -185,6 +328,16 @@ module PagecordCLI
             --canonical-url URL
             --hidden
             --locale LOCALE
+
+          Appearance options:
+            --theme, --font, --width, --layout
+            --custom-theme-bg-light, --custom-theme-text-light, --custom-theme-accent-light
+            --custom-theme-bg-dark, --custom-theme-text-dark, --custom-theme-accent-dark
+            --show-branding true|false
+
+          Custom code options:
+            --css, --footer-html, --head-html, --body-html (each takes a file path)
+            --enabled true|false
         HELP
         0
       end

data/lib/pagecord_cli/client.rb

@@ -38,6 +38,22 @@ module PagecordCLI
       request(json_request(Net::HTTP::Patch, "/posts/#{token}", params))
     end
 
+    def appearance
+      request(Net::HTTP::Get.new(uri_for("/settings/appearance")))
+    end
+
+    def update_appearance(params)
+      request(json_request(Net::HTTP::Patch, "/settings/appearance", params))
+    end
+
+    def custom_code
+      request(Net::HTTP::Get.new(uri_for("/settings/custom_code")))
+    end
+
+    def update_custom_code(params)
+      request(json_request(Net::HTTP::Patch, "/settings/custom_code", params))
+    end
+
     def upload_attachment(path)
       uri = uri_for("/attachments")
       http_request = Net::HTTP::Post.new(uri)

data/lib/pagecord_cli/config.rb

@@ -47,16 +47,16 @@ module PagecordCLI
     def delete_blog(name)
       new_data = data
       new_data.fetch("blogs", {}).delete(name)
+      new_data.delete("default_blog") if new_data["default_blog"] == name
       write(new_data)
     end
 
-    def resolve_blog(name = nil)
-      return name if name && blog(name)
-      return name if name
-
-      return blogs.keys.first if blogs.size == 1
+    def default_blog
+      data["default_blog"]
+    end
 
-      nil
+    def save_default_blog(name)
+      write(data.merge("default_blog" => name))
     end
 
     def data

data/lib/pagecord_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PagecordCLI
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagecord-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Olly Headey