distributed-press-api-client 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae448e05caf1d538ac277c028958db6d002f18d623940b34f107f9fffb9ceb69
-  data.tar.gz: 52a18426f835670fd078cd73fd9aa65b0b3f18ec83d58f76dcf3dee0a79e7007
+  metadata.gz: 9629ab7d59c1d050b2bab1917411f46ca1d1e23eede72d0ea99341d0dd2aca01
+  data.tar.gz: 5d755057e6eb43e84ae65409bdd864635c8135307a4377290ecc384ce8fc97e4
 SHA512:
-  metadata.gz: 4bd3a517a48151f9e50ad237f694c936e8942177ef886aa244534e45212532655d09858f5912d51a8f9f841dfa6bbf074af84c34e3f1e70a9ab781b8a001f22f
-  data.tar.gz: 3d012f7c84984cbb94f291aab7ea10ca0ce717ad9328042de8e07a84a9b8873bbe3ab38009e2fbb42f65714305ad5008997f01df776ad22056cacd09d3fc9b66
+  metadata.gz: d6bbbae13ac80552f7b83a3967ac74530a916c29ed8896f577b93028e3e5eb9002f7a23554cc8c84b5bc7fb150802873f862bf541c5f06da639767d0867895e2
+  data.tar.gz: f796cb6a9f5ed258a55580a32e8ba8625adc50ae367ec6eb29c885ddbd7f589d4b8ea9565eb019550f2045ba18928a2d6c8def03a21b1f329b6185066e622c41

data/README.md

@@ -62,6 +62,13 @@ Build and publish site:
 JEKYLL_ENV=production DISTRIBUTED_PRESS_API_KEY=the_api_key bundle exec jekyll build
 ```
 
+Other env vars:
+
+```bash
+DISTRIBUTED_PRESS_PROJECT_DOMAIN=your.domain.at.distributed.press
+DISTRIBUTED_PRESS_API_URL=https://api.distributed.press
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on 0xacab.org at

data/lib/distributed_press.rb

@@ -7,16 +7,18 @@ require 'open3'
 class DistributedPress
   include ::HTTParty
 
+  DEFAULT_URL = 'https://api.distributed.press'
   NEWLINE  = "\r\n"
   BOUNDARY = '--'
 
-  attr_reader :api_key, :project_domain
+  attr_reader :api_key, :project_domain, :configure_result, :publish_result
 
   # @param options [Hash]
   # @option options [String] :url API URL
   # @option options [String] :api_key API Key
   # @option options [String] :project_domain Domain name
-  def initialize(url: 'https://api.distributed.press', api_key: nil, project_domain: nil)
+  def initialize(url: DEFAULT_URL, api_key: nil, project_domain: nil)
+    url ||= DEFAULT_URL
     @api_key = api_key || ENV['DISTRIBUTED_PRESS_API_KEY']
     @project_domain = project_domain || ENV['DISTRIBUTED_PRESS_PROJECT_DOMAIN']
 
@@ -40,9 +42,9 @@ class DistributedPress
       config.close
     end
 
-    result = upload_io('/v0/publication/configure', stream)
+    @configure_result = upload_io('/v0/publication/configure', stream)
 
-    result['errorCode'].zero?
+    configure_result['errorCode'].zero?
   end
 
   # Publishes a directory by tarballing it on the fly.
@@ -66,11 +68,11 @@ class DistributedPress
         body.close
       end
 
-      result = upload_io '/v0/publication/publish', stream
+      @publish_result = upload_io '/v0/publication/publish', stream
 
       # wait
       thread.value
-      result['errorCode'].zero?
+      publish_result['errorCode'].zero?
     end
   end
 

data/lib/jekyll-distributed-press.rb

@@ -3,9 +3,40 @@
 require 'distributed_press'
 
 Jekyll::Hooks.register :site, :post_write, priority: :low do |site|
-  next unless ENV['JEKYLL_ENV'] == 'production'
-  if site.config['locales']
-    next unless site.config['locale'] == site.config['locales'].last
+  def logger(message:, level: :info)
+    Jekyll.logger.public_send(level, 'Distributed Press:', message)
+  end
+
+  def warn(message)
+    logger level: :warn, message: message
+  end
+
+  def debug(message)
+    logger level: :debug, message: message
+  end
+
+  def info(message)
+    logger message: message
+  end
+
+  unless ENV['JEKYLL_ENV'] == 'production'
+    debug "Ignoring publication in #{ENV['JEKYLL_ENV']} mode"
+    next
+  end
+
+  # Compatibility with jekyll-locales, only publish on the last locale
+  dest = site.dest
+  locales_enabled = site.config['plugins'].include?('jekyll-locales')
+
+  if locales_enabled
+    if site.locales?
+      if site.locale != site.locales.last
+        info "Ignoring #{site.locale}"
+        next
+      else
+        dest = File.realpath(File.join(site.dest, '..'))
+      end
+    end
   end
 
   hostname   = ENV['DISTRIBUTED_PRESS_PROJECT_DOMAIN']
@@ -14,12 +45,19 @@ Jekyll::Hooks.register :site, :post_write, priority: :low do |site|
 
   raise URI::Error unless hostname
 
-  Jekyll.logger.info 'Distributed Press:', 'Publishing website'
+  info 'Publishing website'
 
-  distributed_press = DistributedPress.new project_domain: hostname
-  distributed_press.configure && distributed_press.publish(site.dest)
+  distributed_press = DistributedPress.new(url: ENV['DISTRIBUTED_PRESS_API_URL'], project_domain: hostname)
 
-  Jekyll.logger.info 'Distributed Press:', 'Published!'
+  if distributed_press.configure
+    if distributed_press.publish(dest)
+      info 'Published!'
+    else
+      warn distributed_press.publish_result['error']
+    end
+  else
+    warn distributed_press.configure_result['error']
+  end
 rescue URI::Error
-  Jekyll.logger.warn 'Distributed Press:', '`hostname` or `url` keys missing on _config.yml, skipping publication.'
+  warn '`hostname` or `url` keys missing on _config.yml, skipping publication.'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: distributed-press-api-client
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - f
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2022-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -59,7 +59,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="