Skip to content

Commit

Permalink
refactor: electron-builder-publisher to electron-publish
Browse files Browse the repository at this point in the history
  • Loading branch information
develar committed Feb 17, 2017
1 parent 91613a9 commit 8344fdd
Show file tree
Hide file tree
Showing 15 changed files with 29 additions and 30 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"private": true,
"license": "MIT",
"scripts": {
"compile": "ts-babel packages/electron-builder-http packages/electron-builder-core packages/electron-builder-util packages/electron-builder-publisher packages/electron-builder packages/electron-builder-squirrel-windows packages/electron-updater packages/electron-publisher-s3 test && node ./test/vendor/yarn.js scheme",
"compile": "ts-babel packages/electron-builder-http packages/electron-builder-core packages/electron-builder-util packages/electron-publish packages/electron-builder packages/electron-builder-squirrel-windows packages/electron-updater packages/electron-publisher-s3 test && node ./test/vendor/yarn.js scheme",
"lint": "node test/out/helpers/lint.js",
"pretest": "node ./test/vendor/yarn.js compile && node ./test/vendor/yarn.js lint && node ./test/vendor/yarn.js lint-deps",
"lint-deps": "node ./test/out/helpers/checkDeps.js",
Expand All @@ -15,7 +15,7 @@
"whitespace": "whitespace 'src/**/*.ts'",
"docker-images": "docker/build.sh",
"test-deps-mac": "brew install rpm dpkg mono lzip gnu-tar graphicsmagick xz && brew install wine --without-x11",
"update-deps": "lerna exec -- npm-check-updates --reject 'electron-builder-http,electron-builder-util,electron-builder-core,electron-builder-publisher' -a",
"update-deps": "lerna exec -- npm-check-updates --reject 'electron-builder-http,electron-builder-util,electron-builder-core,electron-publish' -a",
"set-versions": "node test/out/helpers/setVersions.js",
"npm-publish": "yarn compile && ./packages/npm-publish.sh && conventional-changelog -p angular -i CHANGELOG.md -s",
"scheme": "typescript-json-schema packages/electron-builder/tsconfig.json Config --out packages/electron-builder/scheme.json"
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"electron-builder-core": "0.0.0-semantic-release",
"electron-builder-http": "0.0.0-semantic-release",
"electron-builder-util": "0.0.0-semantic-release",
"electron-builder-publisher": "0.0.0-semantic-release",
"electron-publish": "0.0.0-semantic-release",
"electron-download-tf": "3.2.0",
"electron-macos-sign": "~1.6.0",
"fs-extra-p": "^4.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-builder/src/builder.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import BluebirdPromise from "bluebird-lst"
import { Arch, archFromString, Platform } from "electron-builder-core"
import { CancellationToken } from "electron-builder-http/out/CancellationToken"
import { PublishOptions } from "electron-builder-publisher"
import { isEmptyOrSpaces } from "electron-builder-util"
import { warn } from "electron-builder-util/out/log"
import { executeFinally } from "electron-builder-util/out/promise"
import { PublishOptions } from "electron-publish"
import { normalizePlatforms, Packager } from "./packager"
import { PackagerOptions } from "./packagerApi"
import { PublishManager } from "./publish/PublishManager"
Expand Down
8 changes: 4 additions & 4 deletions packages/electron-builder/src/publish/PublishManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import { createHash } from "crypto"
import { Arch, Platform } from "electron-builder-core"
import { CancellationToken } from "electron-builder-http/out/CancellationToken"
import { GenericServerOptions, GithubOptions, githubUrl, PublishConfiguration, S3Options, s3Url, UpdateInfo, VersionInfo } from "electron-builder-http/out/publishOptions"
import { HttpPublisher, PublishContext, Publisher, PublishOptions } from "electron-builder-publisher"
import { BintrayPublisher } from "electron-builder-publisher/out/BintrayPublisher"
import { GitHubPublisher } from "electron-builder-publisher/out/gitHubPublisher"
import { MultiProgress } from "electron-builder-publisher/out/multiProgress"
import { asArray, debug, isEmptyOrSpaces } from "electron-builder-util"
import { log } from "electron-builder-util/out/log"
import { throwError } from "electron-builder-util/out/promise"
import { HttpPublisher, PublishContext, Publisher, PublishOptions } from "electron-publish"
import { BintrayPublisher } from "electron-publish/out/BintrayPublisher"
import { GitHubPublisher } from "electron-publish/out/gitHubPublisher"
import { MultiProgress } from "electron-publish/out/multiProgress"
import { createReadStream, ensureDir, outputJson, writeFile } from "fs-extra-p"
import isCi from "is-ci"
import { safeDump } from "js-yaml"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "electron-builder-publisher",
"name": "electron-publish",
"version": "0.0.0-semantic-release",
"main": "out/publisher.js",
"author": "Vladimir Krivosheev",
Expand All @@ -19,5 +19,5 @@
"chalk": "^1.1.3",
"progress-ex": "^2.0.0"
},
"typings": "./out/electron-builder-publisher.d.ts"
"typings": "./out/electron-publish.d.ts"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# electron-builder-publisher
# electron-publish

Part of [electron-builder](https://github.com/electron-userland/electron-builder).

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ProgressBar from "progress-ex"
import { setPrinter } from "electron-builder-util/out/log"
import ProgressBar from "progress-ex"

export class MultiProgress {
private readonly stream = <any>process.stdout
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { green } from "chalk"
import { CancellationToken } from "electron-builder-http/out/CancellationToken"
import { ProgressCallbackTransform } from "electron-builder-http/out/ProgressCallbackTransform"
import { log } from "electron-builder-util/out/log"
import { createReadStream, stat, Stats } from "fs-extra-p"
import { ClientRequest } from "http"
import { stat, Stats, createReadStream } from "fs-extra-p"
import { basename } from "path"
import ProgressBar from "progress-ex"
import { ProgressCallbackTransform } from "electron-builder-http/out/ProgressCallbackTransform"
import { MultiProgress } from "./multiProgress"
import { CancellationToken } from "electron-builder-http/out/CancellationToken"
import { green } from "chalk"
import { log } from "electron-builder-util/out/log"

export type PublishPolicy = "onTag" | "onTagOrDraft" | "always" | "never"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"outDir": "out"
},
"declaration": {
"electron-builder-publisher": "out/electron-builder-publisher.d.ts"
"electron-publish": "out/electron-publish.d.ts"
},
"include": [
"src/**/*.ts"
Expand Down
3 changes: 1 addition & 2 deletions packages/electron-publisher-s3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
"fs-extra-p": "^4.0.1",
"aws-sdk": "^2.15.0",
"mime": "^1.3.4",
"bluebird-lst": "^1.0.1",
"electron-builder-publisher": "~0.0.0-semantic-release",
"electron-publish": "~0.0.0-semantic-release",
"electron-builder-util": "~0.0.0-semantic-release"
},
"typings": "./out/electron-publisher-s3.d.ts"
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-publisher-s3/src/s3Publisher.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { S3 } from "aws-sdk"
import { S3Options } from "electron-builder-http/out/publishOptions"
import { PublishContext, Publisher } from "electron-builder-publisher"
import { debug, isEmptyOrSpaces } from "electron-builder-util"
import { PublishContext, Publisher } from "electron-publish"
import { stat } from "fs-extra-p"
import mime from "mime"
import { basename } from "path"
Expand Down
2 changes: 1 addition & 1 deletion packages/npm-publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ln -f README.md packages/electron-builder/README.md
npm publish packages/electron-builder-http || true
npm publish packages/electron-builder-core || true
npm publish packages/electron-builder-util || true
npm publish packages/electron-builder-publisher || true
npm publish packages/electron-publish || true
npm publish packages/electron-publisher-s3 || true
npm publish packages/electron-builder || true
npm publish packages/electron-builder-squirrel-windows || true
Expand Down
16 changes: 8 additions & 8 deletions test/src/ArtifactPublisherTest.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { GitHubPublisher } from "electron-builder-publisher/out/gitHubPublisher"
import { join } from "path"
import { BintrayPublisher } from "electron-builder-publisher/out/BintrayPublisher"
import isCi from "is-ci"
import { HttpError } from "electron-builder-http"
import { createPublisher } from "electron-builder/out/publish/PublishManager"
import { S3Options } from "electron-builder-http/out/publishOptions"
import { PublishContext } from "electron-builder-publisher"
import { CancellationToken } from "electron-builder-http/out/CancellationToken"
import { copy } from "fs-extra-p"
import { S3Options } from "electron-builder-http/out/publishOptions"
import { TmpDir } from "electron-builder-util/out/tmp"
import { createPublisher } from "electron-builder/out/publish/PublishManager"
import { PublishContext } from "electron-publish"
import { BintrayPublisher } from "electron-publish/out/BintrayPublisher"
import { GitHubPublisher } from "electron-publish/out/gitHubPublisher"
import { copy } from "fs-extra-p"
import isCi from "is-ci"
import { join } from "path"

if (isCi && process.platform === "win32") {
fit("Skip ArtifactPublisherTest suite on Windows CI", () => {
Expand Down

0 comments on commit 8344fdd

Please sign in to comment.