Merge branch 'master' into feat-node-sdk-custom-exception

Author: lohanidamodar

.travis.yml

@@ -1,3 +1,11 @@
+
+dist: xenial
+
+arch:
+  - amd64
+
+os: linux
+
 language: php
 
 php:
@@ -24,4 +32,4 @@ install:
   - composer install
 
 script:
-  - vendor/bin/phpunit
+  - vendor/bin/phpunit

example.php

@@ -45,7 +45,11 @@ function getSSLPage($url) {
     }
 
     // PHP
-    $sdk  = new SDK(new PHP(), new Swagger2($spec));
+    $php = new PHP();
+    $php
+        ->setComposerVendor('appwrite')
+        ->setComposerPackage('appwrite');
+    $sdk  = new SDK($php, new Swagger2($spec));
 
     $sdk
         ->setName('NAME')

src/SDK/Language/CLI.php

@@ -226,6 +226,12 @@ public function getFiles()
                 'template'      => '/cli/app/services/init.php.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '.travis.yml',
+                'template'      => '/cli/.travis.yml.twig',
+                'minify'        => false,
+            ],
         ];
     }
 

src/SDK/Language/Dart.php

@@ -281,6 +281,12 @@ public function getFiles()
                 'template'      => '/dart/lib/client.dart.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => '/lib/exception.dart',
+                'template'      => '/dart/lib/exception.dart.twig',
+                'minify'        => false,
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/lib/{{ language.params.packageName }}.dart',

src/SDK/Language/Flutter.php

@@ -79,6 +79,12 @@ public function getFiles()
 				'template'      => '/flutter/lib/enums.dart.twig',
 				'minify'        => false,
 			],
+            [
+				'scope'         => 'default',
+				'destination'   => '/lib/exception.dart',
+				'template'      => '/flutter/lib/exception.dart.twig',
+				'minify'        => false,
+			],
             [
                 'scope'         => 'service',
                 'destination'   => '/lib/services/{{service.name | caseDash}}.dart',

src/SDK/Language/PHP.php

@@ -169,6 +169,12 @@ public function getFiles()
                 'template'      => '/php/src/Client.php.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'src/{{ spec.title | caseUcfirst}}/{{ spec.title | caseUcfirst}}Exception.php',
+                'template'      => '/php/src/Exception.php.twig',
+                'minify'        => false,
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/src/{{ spec.title | caseUcfirst}}/Service.php',

src/SDK/SDK.php

@@ -54,6 +54,7 @@ class SDK
         'shareVia' => '',
         'shareTags' => '',
         'warning' => '',
+        'gettingStarted' => '',
         'readme' => '',
         'changelog' => '',
         'examples' => '',
@@ -186,6 +187,8 @@ public function __construct(Language $language, Spec $spec)
      */
     public function setDefaultHeaders($headers) {
         $this->defaultHeaders = $headers;
+        
+        return $this;
     }
 
     /**
@@ -386,6 +389,17 @@ public function setWarning($message)
         return $this;
     }
 
+    /**
+     * @param $message string
+     * @return $this
+     */
+    public function setGettingStarted($message)
+    {
+        $this->setParam('gettingStarted', $message);
+
+        return $this;
+    }
+
     /**
      * @param $text string
      * @return $this

templates/cli/.travis.yml.twig

@@ -0,0 +1,31 @@
+os: linux
+dist: xenial
+
+language: shell
+
+services:
+- docker
+
+before_install:
+- curl -fsSL https://get.docker.com | sh
+- echo '{"experimental":"enabled"}' | sudo tee /etc/docker/daemon.json
+- mkdir -p $HOME/.docker
+- echo '{"experimental":"enabled"}' | sudo tee $HOME/.docker/config.json
+- sudo service docker start
+- >
+  if [ ! -z "${DOCKERHUB_PULL_USERNAME:-}" ]; then
+    echo "${DOCKERHUB_PULL_PASSWORD}" | docker login --username "${DOCKERHUB_PULL_USERNAME}" --password-stdin
+  fi
+- docker --version
+- docker run --rm --privileged linuxkit/binfmt:v0.8
+- docker buildx create --use
+
+script:
+- docker ps; docker buildx ls
+
+deploy:
+  - provider: script
+    edge: true
+    script: docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/ppc64le,linux/s390x -t appwrite/cli:$TRAVIS_TAG ./ --push
+    on:
+      tags: true

templates/cli/install.ps1.twig

@@ -25,7 +25,7 @@ ${{ spec.title | upper }}_EXECUTABLE_FILEPATH = Join-Path -Path ${{ spec.title |
 ${{ spec.title | upper }}_CLI_IMAGE_NAME = "{{ spec.title | lower }}/cli"
 
 # {{ spec.title | caseUcfirst }} CLI image version 
-${{ spec.title | upper }}_CLI_IMAGE_VERSION = "{{ spec.version }}"
+${{ spec.title | upper }}_CLI_IMAGE_VERSION = "{{ sdk.version }}"
 
 ${{ spec.title | upper }}_EXECUTABLE_CONTENT = @"
 $allowList = 'help', 'init', 'client' {% for service in spec.services %}, '{{ service.name }}'{% endfor %}

templates/cli/install.sh.twig

@@ -23,11 +23,14 @@
 # {{ spec.title | caseUcfirst }} executable file path 
 {{ spec.title | upper }}_EXECUTABLE_FILEPATH="${{ spec.title | upper }}_INSTALL_DIR/${{ spec.title | upper }}_EXECUTABLE_NAME"
 
+# {{ spec.title | caseUcfirst }} CLI temp name 
+{{ spec.title | upper }}_TEMP_NAME=temp
+
 # {{ spec.title | caseUcfirst }} CLI image name
 {{ spec.title | upper }}_CLI_IMAGE_NAME={{ spec.title | lower }}/cli
 
 # {{ spec.title | caseUcfirst }} CLI image version 
-{{ spec.title | upper }}_CLI_IMAGE_VERSION={{ spec.version }}
+{{ spec.title | upper }}_CLI_IMAGE_VERSION={{ sdk.version }}
 
 # sudo is required to copy executable to {{ spec.title | upper }}_INSTALL_DIR for linux
 USE_SUDO="false"
@@ -124,7 +127,7 @@ fi
 
 # Check if the command is in the whitelist
 if [[ ! " ${allowList[@]} " =~ " ${1} " ]]; then
-    echo "\nLooks like a crazy hamster 🐹 flipped a bit.\n\nUse {{ language.params.executableName }} help for a list of supported commands."
+    printf "\nLooks like a crazy hamster 🐹 flipped a bit.\n\nUse {{ language.params.executableName }} help for a list of supported commands.\n"
     exit 1
 fi
 
@@ -138,30 +141,30 @@ for x in "${@}" ; do
     _args=$_args" "$x
 done
 
-bash -c "docker run -i --rm --volume {{ spec.title | lower }}-cli:/usr/local/code/app/.preferences/ --volume $(pwd):/usr/local/code/files:rw --network host '${{ spec.title | upper }}_CLI_IMAGE_NAME:${{ spec.title | upper }}_CLI_IMAGE_VERSION' $_args" ' > ${{ spec.title | upper }}_EXECUTABLE_NAME
+bash -c "docker run -i --rm --volume {{ spec.title | lower }}-cli:/usr/local/code/app/.preferences/ --volume $(pwd):/usr/local/code/files:rw --network host '${{ spec.title | upper }}_CLI_IMAGE_NAME:${{ spec.title | upper }}_CLI_IMAGE_VERSION' $_args" ' > ${{ spec.title | upper }}_TEMP_NAME
 
     printf "${GREEN}🚧 Setting Permissions ${NC}\n"
-    chmod +x ${{ spec.title | upper }}_EXECUTABLE_NAME
+    chmod +x ${{ spec.title | upper }}_TEMP_NAME
     if [ $? -ne 0 ]; then
         printf "${RED}❌ Failed to set permissions ... ${NC}\n"
         exit 1
     fi
     printSuccess
 
-    printf "${GREEN}📝 Copying file to ${{ spec.title | upper }}_EXECUTABLE_FILEPATH ... ${NC}\n"
-    runAsRoot cp ${{ spec.title | upper }}_EXECUTABLE_NAME ${{ spec.title | upper }}_EXECUTABLE_FILEPATH
+    printf "${GREEN}📝 Copying temporary file to ${{ spec.title | upper }}_EXECUTABLE_FILEPATH ... ${NC}\n"
+    runAsRoot cp ${{ spec.title | upper }}_TEMP_NAME ${{ spec.title | upper }}_EXECUTABLE_FILEPATH
     if [ $? -ne 0 ]; then
-        printf "${RED}❌ Failed to copy file to ${{ spec.title | upper }}_EXECUTABLE_FILEPATH ... ${NC}\n"
+        printf "${RED}❌ Failed to copy temporary file to ${{ spec.title | upper }}_EXECUTABLE_FILEPATH ... ${NC}\n"
         exit 1
     fi
     printSuccess
 }
 
 cleanup() {
     echo "🧹 Cleaning up mess ... "
-    rm ${{ spec.title | upper }}_EXECUTABLE_NAME 
+    rm ${{ spec.title | upper }}_TEMP_NAME 
     if [ $? -ne 0 ]; then
-        printf "${RED}❌ Failed to remove ${{ spec.title | upper }}_EXECUTABLE_NAME ... ${NC}\n"
+        printf "${RED}❌ Failed to remove temporary file ... ${NC}\n"
         exit 1
     fi
     printSuccess