0.0.4

CHANGELOG.md

@@ -7,7 +7,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-## 0.0.1 - 2020-02-12
+## [v0.0.4](https://github.com/bcomnes/deploy-to-neocities/compare/v0.0.3...v0.0.4) - 2020-02-13
+
+### Commits
+
+- refactor: Dramatically simplify logging [`bc86874`](https://github.com/bcomnes/deploy-to-neocities/commit/bc86874ede188f9c33f0b6dfd2e54b25328b1285)
+
+## [v0.0.3](https://github.com/bcomnes/deploy-to-neocities/compare/v0.0.2...v0.0.3) - 2020-02-13
+
+### Commits
+
+- Fix boolean parsing [`19246fa`](https://github.com/bcomnes/deploy-to-neocities/commit/19246fac798151a3ab80666412f72394c0615c32)
+- bug: Fix reference bug in logging [`2c52eea`](https://github.com/bcomnes/deploy-to-neocities/commit/2c52eeaa2badbb1bcb3c2520e358fcc088bc3879)
+
+## [v0.0.2](https://github.com/bcomnes/deploy-to-neocities/compare/v0.0.1...v0.0.2) - 2020-02-13
+
+### Commits
+
+- bug: Fix some logging bugs and add output [`d9fb789`](https://github.com/bcomnes/deploy-to-neocities/commit/d9fb7899eb50b3386f9f99653b76999419f30a5d)
+
+## v0.0.1 - 2020-02-12
 
 ### Commits
 

action.yml

@@ -4,10 +4,10 @@ branding:
   icon: cat
   color: yellow
 inputs:
-  api-token:  # api token for site to deploy to
+  apiToken:  # api token for site to deploy to
     description: 'Neocities API token for site to deploy to'
     required: true
-  dist-dir:
+  distDir:
     description: 'Local folder to deploy to neocities'
     default: 'public'
     required: true

index.js

@@ -3,99 +3,28 @@ const core = require('@actions/core')
 const Neocities = require('async-neocities')
 const path = require('path')
 const prettyTime = require('pretty-time')
-const prettyBytes = require('pretty-bytes')
+const assert = require('nanoassert')
 
 async function doDeploy () {
-  const token = core.getInput('api-token')
-  const distDir = path.join(process.cwd(), core.getInput('dist-dir'))
-  const cleanup = core.getInput('cleanup')
+  const token = core.getInput('apiToken')
+  const distDir = path.join(process.cwd(), core.getInput('distDir'))
+  const cleanup = JSON.parse(core.getInput('cleanup'))
+  assert(typeof cleanup === 'boolean', 'Cleanup input must be a boolean "true" or "false"')
+  console.log(typeof cleanup)
 
   const client = new Neocities(token)
 
-  const finalStats = await client.deploy(distDir, {
+  const stats = await core.group('Deploying to neocities', client.deploy(distDir, {
     cleanup,
-    statsCb: statsHandler({ cleanup, distDir })
-  })
+    statsCb: Neocities.statsHandler()
+  }))
 
-  return finalStats
+  console.log(`Deployed to Neocities in ${prettyTime([0, stats.time])}:`)
+  console.log(`    Uploaded ${stats.filesToUpload.length} files`)
+  console.log(`    ${cleanup ? 'Deleted' : 'Orphaned'} ${stats.filesToDelete.length} files`)
+  console.log(`    Skipped ${stats.filesSkipped.length} files`)
 }
 
-doDeploy().then((finalStats) => {}).catch(err => {
+doDeploy().catch(err => {
   core.setFailed(err.message)
 })
-
-function statsHandler (opts = {}) {
-  return (stats) => {
-    switch (stats.stage) {
-      case 'inspecting': {
-        switch (stats.status) {
-          case 'start': {
-            core.startGroup('Inspecting')
-            console.log(`Inspecting local (${opts.distDir}) and remote files...`)
-            break
-          }
-          case 'progress': {
-            break
-          }
-          case 'stop': {
-            console.log(`Done inspecting local and remote files in ${prettyTime([0, stats.timer.elapsed])}`)
-            const { tasks: { localScan, remoteScan } } = stats
-            console.log(`Scanned ${localScan.numberOfFiles} local files (${prettyBytes(localScan.totalSize)}) in ${prettyTime([0, localScan.timer.elapsed])}`)
-            console.log(`Scanned ${remoteScan.numberOfFiles} remote files (${prettyBytes(remoteScan.totalSize)}) in ${prettyTime([0, remoteScan.timer.elapsed])}`)
-            core.endGroup()
-            break
-          }
-        }
-        break
-      }
-      case 'diffing': {
-        switch (stats.status) {
-          case 'start': {
-            core.startGroup('Diffing files')
-            console.log('Diffing local and remote files...')
-            break
-          }
-          case 'progress': {
-            // No progress on diffing
-            break
-          }
-          case 'stop': {
-            const { tasks: { diffing } } = stats
-            console.log(`Done diffing local and remote files in ${prettyTime([0, stats.timer.elapsed])}`)
-            console.log(`${diffing.uploadCount} files to upload`)
-            console.log(`${diffing.deleteCount} ` + opts.cleanup ? 'files to delete' : 'orphaned files')
-            console.log(`${diffing.skipCoount} files to skip`)
-            core.endGroup()
-            break
-          }
-        }
-        break
-      }
-      case 'applying': {
-        switch (stats.status) {
-          case 'start': {
-            core.startGroup('Applying diff')
-            console.log('Uploading changes' + opts.cleanup ? ' and deleting orphaned files...' : '...')
-            break
-          }
-          case 'progress': {
-            break
-          }
-          case 'stop': {
-            const { tasks: { uploadFiles, deleteFiles, skippedFiles } } = stats
-            console.log('Done uploading changes' + opts.cleanup ? ' and deleting orphaned files' : '' + ` in ${prettyTime([0, stats.timer.elapsed])}`)
-            console.log(`Average upload speed: ${prettyBytes(uploadFiles.speed)}/s`)
-            if (opts.cleanup) console.log(`Average delete speed: ${prettyBytes(deleteFiles.speed)}/s`)
-            console.log(`Skipped ${skippedFiles.count} files (${prettyBytes(skippedFiles.size)})`)
-            core.endGroup()
-            break
-          }
-        }
-        break
-      }
-      default: {
-        console.log(stats)
-      }
-    }
-  }
-}

node_modules/async-neocities/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [v1.0.1](https://github.com/bcomnes/async-neocities/compare/v1.0.0...v1.0.1) - 2020-02-13
+
+### Commits
+
+- bug: Fix a number of logging bugs [`96fbea2`](https://github.com/bcomnes/async-neocities/commit/96fbea2bbd27ba1ac5105fce37e624d804dcbdb6)
+
 ## [v1.0.0](https://github.com/bcomnes/async-neocities/compare/v0.0.10...v1.0.0) - 2020-02-12
 
 ### Commits

node_modules/async-neocities/index.js

@@ -277,7 +277,7 @@ class NeocitiesAPIClient {
       for await (const file of iterator) {
         localFiles.push(file)
         localScan.numberOfFiles += 1
-        localScan.totalSize += file.stat.blksize
+        localScan.totalSize += file.stat.size
         sendInspectionUpdate(PROGRESS)
       }
       return localFiles
@@ -291,7 +291,7 @@ class NeocitiesAPIClient {
     // Inspection stage finalizer
     const [localFiles, remoteFiles] = await Promise.all([
       localScanJob,
-      this.list().then(res => res.files)
+      remoteScanJob.then(res => res.files)
     ])
     inspectionStats.timer.stop()
     sendInspectionUpdate(STOP)
@@ -315,6 +315,7 @@ class NeocitiesAPIClient {
 
     const { tasks: { diffing } } = diffingStats
     const { filesToUpload, filesToDelete, filesSkipped } = await neocitiesLocalDiff(remoteFiles, localFiles)
+
     diffingStats.timer.stop()
     diffingStats.status = STOP
     diffing.uploadCount = filesToUpload.length
@@ -353,7 +354,7 @@ class NeocitiesAPIClient {
         },
         skippedFiles: {
           count: filesSkipped.length,
-          size: filesSkipped.reduce((accum, file) => accum + file.stat.blksize, 0)
+          size: filesSkipped.reduce((accum, file) => accum + file.stat.size, 0)
         }
       }
     }

node_modules/async-neocities/package.json

@@ -1,26 +1,26 @@
 {
-  "_from": "async-neocities@1.0.0",
-  "_id": "async-neocities@1.0.0",
+  "_from": "async-neocities@1.0.1",
+  "_id": "async-neocities@1.0.1",
   "_inBundle": false,
-  "_integrity": "sha512-iRdvlFfyyqS390fGzs/FJOFG5izOJFVG/0w/xRoqZ6ochmjkxiByp16zjBb1Ade5lvXuKTuBdM/sdqmIQvWe5w==",
+  "_integrity": "sha512-5TVaKLYKnaHoSiluCP0i78e0CBZbeqBL6bgK8/QsM8YOAtrhd5JO9c5DEaW4SFpmf4wV0qcamQXh0A3C7CANLw==",
   "_location": "/async-neocities",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "async-neocities@1.0.0",
+    "raw": "async-neocities@1.0.1",
     "name": "async-neocities",
     "escapedName": "async-neocities",
-    "rawSpec": "1.0.0",
+    "rawSpec": "1.0.1",
     "saveSpec": null,
-    "fetchSpec": "1.0.0"
+    "fetchSpec": "1.0.1"
   },
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/async-neocities/-/async-neocities-1.0.0.tgz",
-  "_shasum": "cdb2d2c4f3a431ab2aba7982693f8922f94d4360",
-  "_spec": "async-neocities@1.0.0",
+  "_resolved": "https://registry.npmjs.org/async-neocities/-/async-neocities-1.0.1.tgz",
+  "_shasum": "3428ae48f48104b205a3537212090b00d9bbce45",
+  "_spec": "async-neocities@1.0.1",
   "_where": "/Users/bret/repos/deploy-to-neocities",
   "author": {
     "name": "Bret Comnes",
@@ -79,5 +79,5 @@
       "dist"
     ]
   },
-  "version": "1.0.0"
+  "version": "1.0.1"
 }

node_modules/async-neocities/test.js

@@ -87,18 +87,18 @@ if (!fakeToken) {
   tap.test('can deploy folders', async t => {
     const client = new NeocitiesAPIClient(token)
 
-    // const statsCb = (stats) => {
-    //   let logLine = `${stats.stage} ${stats.status} ${stats.timer.elapsed}`
-    //   Object.entries(stats.tasks).forEach(([key, val]) => {
-    //     logLine += ` ${key}: ${JSON.stringify(val)}`
-    //   })
-    //   console.log(logLine)
-    // }
+    const statsCb = (stats) => {
+      let logLine = `${stats.stage} ${stats.status} ${stats.timer.elapsed}`
+      Object.entries(stats.tasks).forEach(([key, val]) => {
+        logLine += ` ${key}: ${JSON.stringify(val)}`
+      })
+      console.log(logLine)
+    }
 
     const deployStats = await client.deploy(
       resolve(__dirname, 'fixtures'),
       {
-        // statsCb,
+        statsCb,
         cleanup: false
       }
     )
@@ -110,7 +110,7 @@ if (!fakeToken) {
     const redeployStats = await client.deploy(
       resolve(__dirname, 'fixtures'),
       {
-        // statsCb,
+        statsCb,
         cleanup: false
       }
     )
@@ -122,7 +122,7 @@ if (!fakeToken) {
     const cleanupStats = await client.deploy(
       resolve(__dirname, 'fixtures/empty'),
       {
-        // statsCb,
+        statsCb,
         cleanup: true
       }
     )

package.json

@@ -1,6 +1,6 @@
 {
   "name": "deploy-to-neocities",
-  "version": "0.0.1",
+  "version": "0.0.4",
   "description": "Github Action to deplpoy a folder to Neocities.org",
   "main": "index.js",
   "private": true,
@@ -39,7 +39,7 @@
   "dependencies": {
     "@actions/core": "1.2.2",
     "@actions/github": "2.1.0",
-    "async-neocities": "1.0.0",
+    "async-neocities": "1.0.1",
     "pretty-bytes": "^5.3.0",
     "pretty-time": "^1.1.0"
   },