pagecord-cli 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e79c8864b73579755f1699da00835d474cae8871b64c5ff21e091d4540e95be
-  data.tar.gz: bbdc8963f7317ec56f55de326898021d1bf5712f15c8833c83f6ccbac533f06f
+  metadata.gz: 99eebd4d84788c1c5176bca0d7b1f036bb54ec2acb9e5f6a9f9fef7b63fc5d1d
+  data.tar.gz: 78d6e0b1623c066f1b9f992cf87e7e80c997ef7abfa2d2f4e6893ba6e34c0f8f
 SHA512:
-  metadata.gz: b6dab32f1f4884be02388a220d441fbe21041940d5f3c4a6e607ce4c9ff4c60d12582ae9f60435cbcf87b3e3645f9fd58cc144a55b4b453bd2a9f628cde3c0a3
-  data.tar.gz: 208af262450558105da20a6006cf70340e804ad6c4fadf4dbab05aada82a572efd0f5af01cfd12cdec2d1b20511473407d00d5f87c51d1ae36e6b45bebbde3ef
+  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
 

data/lib/pagecord_cli/cli.rb

@@ -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
@@ -310,15 +310,14 @@ module PagecordCLI
             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
+            --blog SUBDOMAIN   which blog to act on
+            --json             machine-readable output
+            --quiet            suppress confirmation messages
 
           Publish options:
             --title TITLE

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.1"
+  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.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Olly Headey