chore: publish scripts update

Author: Grzegorz Olszewski

.gitignore

@@ -3,6 +3,7 @@ no-post.api.yaml
 # Dev
 .idea
 .vscode
+scripts/env
 
 # Project specific
 openapi-generator*

aylien/v1/news/api-docs.yaml aylien/v1/news/api-v4-docs.yaml

@@ -1,7 +1,7 @@
 {
   "projectName": "aylien-news-api",
   "moduleName": "AylienNewsApi",
-  "projectVersion": "4.6.0",
+  "projectVersion": "4.6.1",
   "licenseName": "Apache License, Version 2.0",
   "modelPropertyNaming": "camelCase"
 }

aylien/v1/news/api.yaml aylien/v1/news/api-v4.yaml

@@ -12,13 +12,17 @@ sh ./install-openapi-generator.sh
 
 ## Generating the SDKs
 
-The SDKs are generated from the API definition files found in the [`/aylien/v1/`](/aylien/v1) directory. There are also JSON configuration files in these directories for each language (see [`/aylien/v1/news/config`](/aylien/v1/news/config) for example). This process is automatic using the `generate-sdks.sh` script.
+> Note: Make sure you edit package version manually in `/aylien/v1/news/config/*.json` and in `/aylien/v1/news/*.yaml` into either `v4.x.x` or `v5.x.x`.
+
+The SDKs are generated from the API definition files found in the [`/aylien/v1/`](/aylien/v1) directory. There are also JSON configuration files in these directories for each language (see [`/aylien/v1/news/config`](/aylien/v1/news/config) for example). This process is automatic using the `generate-sdks.sh <version>` script.
 
 > Note: Make sure you have `gsed` installed.
 
 ```
-sh ./generate-sdks.sh
+sh ./generate-sdks.sh vX
 ```
+> Note: Where `vX` is your version to generate. `ex. ./generate-sdks.sh v4`
+
 
 Please note that this script calls `install-openapi-generator.sh` if it can't find the `openapi-generator-cli.jar` file.
 
@@ -112,7 +116,8 @@ Go directly retrieves the packages from Github, no publication necessary other t
 There is an automated script available for doing all of this, but you should only use it if you know what you are doing. Read the script before using it to understand how it works.
 
 ```
-sh ./publish.sh 'Release Note here'
+sh ./github-release.sh 'Release Notes here' 'Branch name here' 'x.x.x'
+sh ./publish.sh
 ```
 
 ## Testing

aylien/v1/news/config/javascript.json

@@ -2,6 +2,13 @@
 
 set -eu
 
+VERSION=$1
+
+if [ -z "$VERSION" ]; then
+  echo "Version to generate is required! ex. ./generate-sdks.sh v4 or ./generate-sdks.sh v5"
+  exit -1
+fi
+
 if [ -n "${OPENAPI_CMD+1}" ]
 then
   echo "Using OpenAPI Generator command \`${OPENAPI_CMD}\`."
@@ -24,7 +31,7 @@ if [ "$OS" = 'Darwin' ]; then
     # for MacOS
     cmd=gsed
 fi
-cat ../aylien/v1/news/api-v5.yaml | tr '\n' '\r' | $cmd -e 's/\s\s\+tags:\r\s*- \w*//g' | tr '\r' '\n' > temp.api.yaml
+cat ../aylien/v1/news/api-${VERSION}.yaml | tr '\n' '\r' | $cmd -e 's/\s\s\+tags:\r\s*- \w*//g' | tr '\r' '\n' > temp.api.yaml
 
 python remove-post-body.py temp.api.yaml no-post.api.yaml
 

scripts/README.md

@@ -0,0 +1,60 @@
+cd ../sdks/news-api
+
+release_note=${1:-"minor update"}
+branch_name=${2:-"release"}
+release_version=$3
+
+function git_push() {
+  rm -rf .git
+  git init
+  git add .
+  git commit -m "$release_note"
+  git remote add origin git@github.com:aylien/aylien_newsapi_$lang
+
+  git pull origin master -s recursive -Xtheirs
+  git checkout -b $branch_name
+  git push
+
+  git tag -a v$release_version -m "${release_note}"
+  git push --tags
+}
+
+function git_push_javascript() {
+  rm -rf .git
+  git init
+  git add .
+  git commit -m "$release_note"
+  git remote add origin git@github.com:aylien/aylien_newsapi_nodejs
+
+  git pull origin master -s recursive -Xtheirs
+  git checkout -b $branch_name
+  git rm -r node_modules
+  git rm -r dist
+  git commit -a --amend --no-edit
+  git push
+
+  git tag -a v$release_version -m "${release_note}"
+  git push --tags
+}
+
+cd javascript
+git_push_javascript
+cd ..
+
+echo "python: publishing to pypi"
+echo "- using PYPI_USERNAME and PYPI_PASSWORD env variables"
+cd python
+lang=python
+git_push
+cd ..
+
+cd ruby
+lang=ruby
+git_push
+cd ..
+
+echo "go: there is no publication necessary, users pull directly from github."
+cd go
+lang=go
+git_push
+cd ..

scripts/generate-sdks.sh

@@ -1,43 +1,20 @@
 cd ../sdks/news-api
 
-release_note=${1:-"minor update"}
-
-function git_push() {
-  rm -rf .git
-  git init
-  git add .
-  git commit -m "$release_note"
-  git remote add origin git@github.com:aylien/aylien_newsapi_$lang
-
-  git pull origin master -s recursive -X theirs
-  git cherry-pick --skip
-  git rebase --continue
-  git push origin master
-}
-
 echo "javascript: publishing to npm"
 if [ ! -f "$HOME/.npmrc" ]; then
   echo "- $HOME/.npmrc not found, using NPM_AUTH_TOKEN from env to create it."
   echo "//registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN" >$HOME/.npmrc
 fi
 
 cd javascript
-lang=nodejs
-git_push
-
 npm install
 npm run build
 npm publish
 cd ..
 
-echo "python: publishing to pypi"
-echo "- using PYPI_USERNAME and PYPI_PASSWORD env variables"
 cd python
-lang=python
-git_push
-
-pip install twine
-python setup.py sdist bdist_wheel
+pip3 install twine
+python3 setup.py sdist bdist_wheel
 twine check dist/*
 twine upload --non-interactive -u $PYPI_USERNAME -p $PYPI_PASSWORD dist/*
 cd ..
@@ -48,16 +25,7 @@ if [ ! -f "$HOME/.gem/credentials" ]; then
   mkdir -p $HOME/.gem
   echo ":rubygems_api_key: $GEM_API_KEY" >$HOME/.gem/credentials
 fi
-cd ruby
-lang=ruby
-git_push
-
+cd ruby 
 gem build aylien_news_api.gemspec
 gem push aylien_news_api-*.gem
 cd ..
-
-echo "go: there is no publication necessary, users pull directly from github."
-cd go
-lang=go
-git_push
-cd ..