diff --git a/.forgejo/workflows/publish.yml b/.forgejo/workflows/publish.yml index c9428ce..a09d07b 100644 --- a/.forgejo/workflows/publish.yml +++ b/.forgejo/workflows/publish.yml @@ -31,8 +31,6 @@ jobs: node-version: 20.x - run: yarn install --frozen-lockfile - run: yarn build - - run: yarn package - - run: cp -r ./bin ${{ secrets.PROD_REPO_PATH }} - uses: https://github.com/JS-DevTools/npm-publish@v3 with: token: ${{ secrets.NPM_TOKEN }} \ No newline at end of file diff --git a/.forgejo/workflows/staging.yml b/.forgejo/workflows/staging.yml deleted file mode 100644 index 94f3fce..0000000 --- a/.forgejo/workflows/staging.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Stage - -on: - push: - branches: - - develop - -jobs: - build: - - runs-on: node - - steps: - - uses: actions/checkout@v4 - - name: Use Node.js - uses: actions/setup-node@v4 - with: - node-version: 20.x - - run: yarn install --frozen-lockfile - - run: yarn build - - run: yarn test - - run: yarn lint - - rsync: - needs: build - runs-on: node - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - with: - node-version: 20.x - - run: yarn install --frozen-lockfile - - run: yarn build - - run: yarn package - - run: cp -r ./bin ${{ secrets.STAGE_REPO_PATH }} \ No newline at end of file diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index a70e410..b5ff0f5 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -7,6 +7,7 @@ on: - hotfix/* - renovate/* - dependabot/* + - develop jobs: build: diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..c25343c --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,92 @@ +steps: + build: + # Build and test + image: node + commands: + - yarn install --frozen-lockfile + - yarn build + when: + event: [ push, pull_request ] + branch: [ hotfix/*, feature/*, renovate/*, develop, main ] + lint: + image: node + commands: + - yarn lint + when: + event: [ push, pull_request ] + branch: [ hotfix/*, feature/*, renovate/*, develop, main ] + test: + image: node + commands: + - yarn test + when: + event: [ push, pull_request ] + branch: [ hotfix/*, feature/*, renovate/*, develop, main ] + + # Package production build + package_prod: + image: node + commands: + - apt install unzip -y + - wget https://github.com/xerub/ldid/releases/download/42/ldid.zip + - unzip ldid.zip + - mkdir /opt/ldid/ + - cp linux64/ldid /opt/ldid/ + - export PATH=/opt/ldid:$PATH + - yarn package + when: + event: tag + branch: main + rsync_prod: + image: alpine + secrets: [ ssh_key ] + commands: + - apk add rsync openssh-client + - eval `ssh-agent -s` + - echo "$SSH_KEY" | tr -d '\r' | ssh-add - + - rsync -e "ssh -o StrictHostKeyChecking=no" -r ./bin vylpes@192.168.1.115:/home/vylpes/apps/random-bunny/random-bunny_prod + when: + event: tag + branch: main + + # Package stage build + package_stage: + image: node + commands: + - apt install unzip -y + - wget https://github.com/xerub/ldid/releases/download/42/ldid.zip + - unzip ldid.zip + - mkdir /opt/ldid/ + - cp linux64/ldid /opt/ldid/ + - export PATH=/opt/ldid:$PATH + - yarn package + when: + event: push + branch: develop + rsync_stage: + image: alpine + secrets: [ ssh_key ] + commands: + - apk add rsync openssh-client + - eval `ssh-agent -s` + - echo "$SSH_KEY" | tr -d '\r' | ssh-add - + - rsync -e "ssh -o StrictHostKeyChecking=no" -r ./bin vylpes@192.168.1.115:/home/vylpes/apps/random-bunny/random-bunny_stage + when: + event: push + branch: develop + + # Publish to NPM + publish: + image: plugins/npm + settings: + username: + from_secret: NPM_USERNAME + email: + from_secret: NPM_EMAIL + password: + from_secret: NPM_PASSWORD + api_key: + from_secret: NPM_TOKEN + when: + event: tag + branch: main diff --git a/docs/cli.md b/docs/cli.md index 7eb2858..774398e 100644 --- a/docs/cli.md +++ b/docs/cli.md @@ -25,7 +25,6 @@ By default, the command will fetch a random image from `r/rabbits` and return it $ random-bunny Archived = false -Author = Rabbit_Owner Downvotes = 0 Hidden = false Permalink = /r/Rabbits/comments/1av1rg9/cute_baby_bun/ @@ -73,7 +72,7 @@ $ random-bunny --json $ randon-bunny -j -{"Archived":false,"Author":"Rabbit_Owner","Downs":0,"Hidden":false,"Permalink":"/r/Rabbits/comments/1av1rg9/cute_baby_bun/","Subreddit":"Rabbits","SubredditSubscribers":486085,"Title":"Cute baby bun","Ups":210,"Url":"https://i.redd.it/sfz0srdrimjc1.png"} +{"Archived":false,"Downs":0,"Hidden":false,"Permalink":"/r/Rabbits/comments/1av1rg9/cute_baby_bun/","Subreddit":"Rabbits","SubredditSubscribers":486085,"Title":"Cute baby bun","Ups":210,"Url":"https://i.redd.it/sfz0srdrimjc1.png"} ``` ## Sort diff --git a/readme.md b/readme.md index e7ba49c..9d9dc9d 100644 --- a/readme.md +++ b/readme.md @@ -37,7 +37,6 @@ Returns a `json string` for a random post. Accepts 3 arguments: `subreddit`, `so The json string which gets returned consists of: - archived -- author - downs - hidden - permalink diff --git a/src/contracts/IFetchResult.ts b/src/contracts/IFetchResult.ts index dc5385f..578bbea 100644 --- a/src/contracts/IFetchResult.ts +++ b/src/contracts/IFetchResult.ts @@ -1,7 +1,6 @@ export default interface IFetchResult { data: { archived: boolean, - author: string, downs: number, hidden: boolean, permalink: string, diff --git a/src/contracts/IRedditResult.ts b/src/contracts/IRedditResult.ts index 13fef75..84e726c 100644 --- a/src/contracts/IRedditResult.ts +++ b/src/contracts/IRedditResult.ts @@ -1,6 +1,5 @@ export default interface IRedditResult { Archived: boolean, - Author: string, Downs: number, Hidden: boolean, Permalink: string, diff --git a/src/helpers/outputHelper.ts b/src/helpers/outputHelper.ts index 808634d..2e25935 100644 --- a/src/helpers/outputHelper.ts +++ b/src/helpers/outputHelper.ts @@ -12,7 +12,6 @@ export default class OutputHelper { } outputLines.push(`Archived = ${result.Archived}`); - outputLines.push(`Author = ${result.Author}`); outputLines.push(`Downvotes = ${result.Downs}`); outputLines.push(`Hidden = ${result.Hidden}`); outputLines.push(`Permalink = ${result.Permalink}`); diff --git a/src/index.ts b/src/index.ts index 056fe1f..3e573af 100644 --- a/src/index.ts +++ b/src/index.ts @@ -118,7 +118,6 @@ export default async function randomBunny(subreddit: string, sortBy: "new" | "ho } const redditResult: IRedditResult = { - Author: randomData['author'], Archived: randomData['archived'], Downs: randomData['downs'], Hidden: randomData['hidden'], diff --git a/tests/helpers/__snapshots__/outputHelper.test.ts.snap b/tests/helpers/__snapshots__/outputHelper.test.ts.snap index 39e952e..79f386f 100644 --- a/tests/helpers/__snapshots__/outputHelper.test.ts.snap +++ b/tests/helpers/__snapshots__/outputHelper.test.ts.snap @@ -2,7 +2,6 @@ exports[`GenerateOutput EXPECT standout output to be returned 1`] = ` "Archived = false -Author = author Downvotes = 0 Hidden = false Permalink = /r/Rabbits/comments/1dj8pbt/this_is_my_ms_bear/ @@ -13,11 +12,10 @@ Upvotes = 17 Url = https://preview.redd.it/d5yno653zf7d1.jpg?width=640&crop=smart&auto=webp&s=5064d1caec3c12ac2855eb57ff131d0b313d5e9d" `; -exports[`GenerateOutput GIVEN options.json is true, EXPECT output to be returned as JSON 1`] = `"{"Archived":false,"Author":"author","Downs":0,"Hidden":false,"Permalink":"/r/Rabbits/comments/1dj8pbt/this_is_my_ms_bear/","Subreddit":"Rabbits","SubredditSubscribers":654751,"Title":"This is my Ms Bear!","Ups":17,"Url":"https://preview.redd.it/d5yno653zf7d1.jpg?width=640&crop=smart&auto=webp&s=5064d1caec3c12ac2855eb57ff131d0b313d5e9d"}"`; +exports[`GenerateOutput GIVEN options.json is true, EXPECT output to be returned as JSON 1`] = `"{"Archived":false,"Downs":0,"Hidden":false,"Permalink":"/r/Rabbits/comments/1dj8pbt/this_is_my_ms_bear/","Subreddit":"Rabbits","SubredditSubscribers":654751,"Title":"This is my Ms Bear!","Ups":17,"Url":"https://preview.redd.it/d5yno653zf7d1.jpg?width=640&crop=smart&auto=webp&s=5064d1caec3c12ac2855eb57ff131d0b313d5e9d"}"`; exports[`GenerateOutput GIVEN options.queryMetadata is supplied, EXPECT query metadata to be added 1`] = ` "Archived = false -Author = author Downvotes = 0 Hidden = false Permalink = /r/Rabbits/comments/1dj8pbt/this_is_my_ms_bear/ diff --git a/tests/helpers/outputHelper.test.ts b/tests/helpers/outputHelper.test.ts index 5e90dc8..a0f1959 100644 --- a/tests/helpers/outputHelper.test.ts +++ b/tests/helpers/outputHelper.test.ts @@ -14,7 +14,6 @@ describe("GenerateOutput", () => { }, Result: { Archived: false, - Author: 'author', Downs: 0, Hidden: false, Permalink: "/r/Rabbits/comments/1dj8pbt/this_is_my_ms_bear/", @@ -46,7 +45,6 @@ describe("GenerateOutput", () => { }, Result: { Archived: false, - Author: 'author', Downs: 0, Hidden: false, Permalink: "/r/Rabbits/comments/1dj8pbt/this_is_my_ms_bear/", @@ -80,7 +78,6 @@ describe("GenerateOutput", () => { }, Result: { Archived: false, - Author: 'author', Downs: 0, Hidden: false, Permalink: "/r/Rabbits/comments/1dj8pbt/this_is_my_ms_bear/", diff --git a/tests/index.test.ts b/tests/index.test.ts index 8e49ffd..f70d411 100644 --- a/tests/index.test.ts +++ b/tests/index.test.ts @@ -20,7 +20,6 @@ describe('randomBunny', () => { { data: { archived: false, - author: 'author', downs: 0, hidden: false, permalink: '/r/Rabbits/comments/12pa5te/someone_told_pickles_its_monday_internal_fury/', @@ -53,7 +52,6 @@ describe('randomBunny', () => { { data: { archived: false, - author: 'author', downs: 0, hidden: false, permalink: '/r/Rabbits/comments/12pa5te/someone_told_pickles_its_monday_internal_fury/', @@ -139,7 +137,6 @@ describe('randomBunny', () => { { data: { archived: false, - author: 'author', downs: 0, hidden: false, permalink: '/r/Rabbits/comments/12pa5te/someone_told_pickles_its_monday_internal_fury/', @@ -176,7 +173,6 @@ describe('randomBunny', () => { { data: { archived: false, - author: 'author', downs: 0, hidden: false, permalink: '/r/Rabbits/comments/12pa5te/someone_told_pickles_its_monday_internal_fury/', @@ -213,7 +209,6 @@ describe('randomBunny', () => { { data: { archived: false, - author: 'author', downs: 0, hidden: false, permalink: '/r/Rabbits/comments/12pa5te/someone_told_pickles_its_monday_internal_fury/', @@ -249,7 +244,6 @@ describe('randomBunny', () => { { data: { archived: false, - author: 'author', downs: 0, hidden: false, permalink: '/r/Rabbits/comments/12pa5te/someone_told_pickles_its_monday_internal_fury/', @@ -282,7 +276,6 @@ describe('randomBunny', () => { { data: { archived: false, - author: 'author', downs: 0, hidden: false, permalink: '/r/Rabbits/comments/12pa5te/someone_told_pickles_its_monday_internal_fury/', @@ -318,7 +311,6 @@ describe('randomBunny', () => { { data: { archived: false, - author: 'author', downs: 0, hidden: false, permalink: '/r/Rabbits/comments/12pa5te/someone_told_pickles_its_monday_internal_fury/',