pagecord-cli 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 128d888cf41e5516fb1266253ff9bd277ac4975aabe4d703d55377b487742a9b
-  data.tar.gz: f1eb62f81e6382bf02babcac836c3ea7f84e855235697950c58e91a3437b4bdb
+  metadata.gz: 99eebd4d84788c1c5176bca0d7b1f036bb54ec2acb9e5f6a9f9fef7b63fc5d1d
+  data.tar.gz: 78d6e0b1623c066f1b9f992cf87e7e80c997ef7abfa2d2f4e6893ba6e34c0f8f
 SHA512:
-  metadata.gz: f392720b150de97d42b8e5d74bf231575e4c90a644653d3d1fb1748c09e1c5896a355be6afc51dbe001c6b95558729728d7387d9b6f66501a24b75b734cdc1f6
-  data.tar.gz: 2c0b4fc00acfb25fbfdf5ef16f7c20a31f7dfb22c1a4886967561558555279fcf2b553706eb30df0cdac378b08fa8d355f9339639a87cb4491f81330a934e0bc
+  metadata.gz: 27842bcc27c07553c69ee4664aad327ab1d1f6155b3eaccc64d66fbcc699d73d543ae09bf2b406f568e6fca1eab83e0976d8f0ed08f62bd30ec63f57e5836796
+  data.tar.gz: 245f7e50410b5b93daca45d14ead9268f447cd9bada1bf580db1c73d3c5ec5d39207f7dacbf09fb21c98cc2debfba5d0b97f39b8e3b931b2d183dee9ead935cd

data/README.md

@@ -22,7 +22,7 @@ The name should be your Pagecord subdomain. The API key is stored in
 For local testing there is an undocumented `--base-url` option:
 
 ```bash
-pagecord login myblog --base-url http://localhost:3000
+pagecord login myblog --base-url http://api.localhost:3000
 ```
 
 ## Publishing
@@ -42,13 +42,6 @@ pagecord draft notes/idea.md
 The first publish creates a post and writes Pagecord metadata back into the
 file. Later publishes update the same post.
 
-If you have one blog configured, `publish`, `draft`, and `logout` can omit the
-subdomain. If you have more than one, pass the subdomain as the final argument:
-
-```bash
-pagecord publish hello.md myblog
-```
-
 See configured blogs:
 
 ```bash
@@ -63,16 +56,26 @@ pagecord logout myblog
 
 ## Choosing a blog
 
-With several blogs configured, pick a default once:
+With one blog configured, every command uses it. With several, set 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.
+or name the blog on the command line:
+
+```bash
+pagecord appearance show --blog myblog
+```
+
+`--blog` wins over the `PAGECORD_BLOG` environment variable, which wins over
+the default. `publish`, `draft` and `logout` also take the subdomain as a
+trailing argument, which wins over all three:
+
+```bash
+pagecord publish hello.md myblog
+```
 
 ## Appearance
 
@@ -88,17 +91,19 @@ Fields: `--theme`, `--font`, `--width`, `--layout`, the six
 
 ```bash
 pagecord custom-code show --css > blog.css
-pagecord custom-code update --css @blog.css
+pagecord custom-code update --css blog.css
 ```
 
-Fields: `--css`, `--footer-html`, `--head-html`, `--body-html`, and
-`--enabled true|false`. A value can be given literally, as `@path` to read a
-file, or as `@-` to read standard input:
+`--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
-cat blog.css | pagecord custom-code update --css @-
+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.
 

data/lib/pagecord_cli/cli.rb

@@ -184,7 +184,7 @@ module PagecordCLI
         params = {}
         parser do |opts|
           CUSTOM_CODE_FIELDS.each do |flag, name|
-            opts.on("--#{flag} VALUE") { |value| params[name] = read_value(value) }
+            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)
@@ -247,12 +247,12 @@ module PagecordCLI
       end
 
       def resolve_blog(name = nil)
-        raise Error, "No blogs are configured. Run pagecord login SUBDOMAIN first." if config.blogs.empty?
+        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, "Several blogs are configured. Pass `--blog SUBDOMAIN`, or run `pagecord blog use SUBDOMAIN` to set a default." unless subdomain
         raise Error, "Unknown blog: #{subdomain}" unless config.blog(subdomain)
 
         subdomain
@@ -266,14 +266,10 @@ module PagecordCLI
         )
       end
 
-      def read_value(value)
-        case value
-        when "@-" then input.read
-        when /\A@/ then File.read(value[1..])
-        else value
-        end
+      def read_file(flag, path)
+        File.read(path)
       rescue SystemCallError
-        raise Error, "Could not read #{value[1..]}"
+        raise Error, path.match?(/[{<]/) ? "--#{flag} takes a file path, not the content itself" : "Could not read #{path}"
       end
 
       def say(message)
@@ -319,9 +315,9 @@ module PagecordCLI
             pagecord draft FILE [SUBDOMAIN] [options]
 
           Global options:
-            --blog SUBDOMAIN
-            --json
-            --quiet
+            --blog SUBDOMAIN   which blog to act on
+            --json             machine-readable output
+            --quiet            suppress confirmation messages
 
           Publish options:
             --title TITLE
@@ -339,10 +335,8 @@ module PagecordCLI
             --show-branding true|false
 
           Custom code options:
-            --css, --footer-html, --head-html, --body-html
+            --css, --footer-html, --head-html, --body-html (each takes a file path)
             --enabled true|false
-
-          Custom code values can be a literal, @path to read a file, or @- to read stdin.
         HELP
         0
       end

data/lib/pagecord_cli/client.rb

@@ -80,7 +80,15 @@ module PagecordCLI
 
       def request(http_request)
         http_request["Authorization"] ||= "Bearer #{api_key}"
-        response = Net::HTTP.start(http_request.uri.hostname, http_request.uri.port, use_ssl: http_request.uri.scheme == "https") do |http|
+        uri = http_request.uri
+        address = uri.hostname
+        if address.end_with?(".localhost")
+          # *.localhost is loopback by definition (RFC 6761); macOS does not resolve it
+          http_request["Host"] = "#{uri.host}:#{uri.port}"
+          address = "127.0.0.1"
+        end
+
+        response = Net::HTTP.start(address, uri.port, use_ssl: uri.scheme == "https") do |http|
           http.open_timeout = OPEN_TIMEOUT
           http.read_timeout = READ_TIMEOUT
           http.write_timeout = WRITE_TIMEOUT if http.respond_to?(:write_timeout=)

data/lib/pagecord_cli/version.rb

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

metadata

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