nanoc-neocities 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c451c9c2cbe22e5d830cefa46802952636ddd188335f34d918f749bd2f140057
-  data.tar.gz: b134e94655e426838555e0a4c3645a1bacfcc8597f4d8408b3db5882b51b6bfc
+  metadata.gz: 37e9b3973ef2acc2feaac5cfb954b189c01604427d01564af88bae1cbaad81c2
+  data.tar.gz: b6409f078acc51c2e6015ae1077e8cc8845fbeed3de2cb5679dcef6b0b515a43
 SHA512:
-  metadata.gz: 07d6bfe9990387c8ee884e69df2b32cc02620b3a6aaa51cf1ce2fc4225e74997f293248762262f047ba06d56ae327151761b0e85915cb432cca232da0954873b
-  data.tar.gz: 3dcbf814630686dd8a1cb4cb4036e9574a3a446f9b823f51f1cbc5f698531318588456fd7ab64c9eabc50890621b9ab445d751c24ccddbd5708d066fd0a3e9bb
+  metadata.gz: f475e040548c27436b09fd659de3c036c243c66bf663bcc38a8b078fd11fa5527a1d54d4e0efd25ab9ac881c754b897dcefdbb2635e2f61538ce7ce3d34b3986
+  data.tar.gz: f279969041f12a7a408fe697239700df7d3bc9d4dfc2c05e76b7fb07b23574e147dd6f2e67523e38a9e85653f86b7c01497b51064a2a601b126d6d7447f696ca

data/README.md

@@ -12,7 +12,7 @@ from your Nanoc site’s `lib/`.
 
 Or add `nanoc-neocities` to the `nanoc` group of your Gemfile:
 
-```ruby
+```
 group :nanoc do
   gem 'nanoc-neocities'
 end
@@ -25,16 +25,17 @@ Available on [RubyGem](https://rubygems.org/gems/nanoc-neocities/).
 Add a deployment target to your `nanoc.yaml` file and provide the
 sitename (without the `.neocities.org` TLD) and your site API key:
 
-```deploy:
-  my-example-neocities:
+```
+deploy:
+  my_neocities:
     kind: neocities
     sitename: example-site
     api_key: example-api-key
-filter :external, exec: 'wc'
+    prune_remote: true
 ```
 
-You can then run `nanoc deploy my-example-neocities` from inside your
-Nanoc site directory to deploy it to your configured Neocities™ site.
+You can then run `nanoc deploy my_neocities` from inside your Nanoc
+site directory to deploy it to your configured Neocities™ site.
 
 You can find the API key for your Neocities™ site on the Site
 settings page on the main Neocities™ website.
@@ -42,4 +43,4 @@ settings page on the main Neocities™ website.
 ---
 
 The project is licensed under the MIT License (see LICENSE).
-“Neocities” is a trademark of Neocities Ltd.
+“Neocities” is a trademark of Neocities Ltd.

data/lib/nanoc-neocities.rb

@@ -12,9 +12,10 @@ module Nanoc::Deploying::Deployers
   #
   #   deploy:
   #     default:
-  #       kind:       neocities
-  #       api_key:    1234abcd
-  #       sitename:   mysite
+  #       kind:         neocities
+  #       api_key:      1234abcd
+  #       sitename:     mysite
+  #       prune_remote: true
   #
   class NeocitiesDeployer < ::Nanoc::Deploying::Deployer
     identifier :neocities
@@ -42,8 +43,8 @@ module Nanoc::Deploying::Deployers
       end
 
       class UploadFailed < Generic
-        def initialize(path)
-          super("Failed to upload file #{path} to Neocities.")
+        def initialize(path, message)
+          super("Failed to upload file #{path} to Neocities: #{message}")
         end
       end
 
@@ -61,6 +62,7 @@ module Nanoc::Deploying::Deployers
 
       api_key  = config.fetch(:api_key,  '')
       sitename = config.fetch(:sitename, '')
+      prune    = config.fetch(:prune_remote, true)
 
       client = Neocities::Client.new({api_key: api_key, sitename: sitename})
 
@@ -84,26 +86,29 @@ puts remote_files
             if upload[:result] == 'success'
               puts "Uploaded file “#{path}”."
             elsif upload[:error_type] == 'file_exists'
-              puts "Existing file “#{path}” was identical. Skipping upload."
+              puts "Existing file “#{path}” is identical. Skipping upload."
             else 
-              raise Errors::UploadFailed.new(path)
+              raise Errors::UploadFailed.new(path, upload[:message] || 'unknown problem')
             end
           end
         }
 
         puts "Neocities site “#{sitename}” deployed."
 
-        remote_files = client.list
-        puts "Deleting orphaned files from Neocities site “#{sitename}”…"
+        if prune
+          remote_files = client.list
+          puts "Deleting orphaned files from Neocities site “#{sitename}”…"
 
-        orphans = client.list[:files].map{|file| file[:path]} - Dir.glob("**/*")
+          orphans = client.list[:files].map{|file| file[:path]} - Dir.glob("**/*")
 
-        for path in orphans
-          puts "Deleting “#{path}”."
-          unless client.delete(orphan)[:result] == 'success'
-            raise Errors::DeleteOrphanFailed.new(path)
+          for path in orphans
+            puts "Deleting “#{path}”."
+            unless client.delete(orphan)[:result] == 'success'
+              raise Errors::DeleteOrphanFailed.new(path)
+            end
           end
         end
+
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-neocities
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Daniel Aleksandersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-13 00:00:00.000000000 Z
+date: 2019-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nanoc