Merge remote-tracking branch 'origin/master' into release

Author: dynabic-billing-team

.gitattributes

@@ -0,0 +1,18 @@
+# default behavior
+* text=auto
+
+# code files
+*.rb text eol=lf
+
+# test files
+*.xml text eol=lf
+*.json text eol=lf
+
+# scripts
+*.bat text eol=crlf
+*.ps1 text eol=crlf
+*.sh text eol=lf
+
+
+
+

.gitignore

@@ -27,7 +27,6 @@ packages/
 Plugins/Aspose_Words_NET_for_PHP/.idea/*
 Plugins/Aspose_Words_NET_for_PHP/vendor/*
 Plugins/Aspose_Words_NET_for_PHP/composer.lock
-*.gitattributes
 *.pyc
 # Built application files
 *.apk
@@ -115,6 +114,7 @@ vendor/*
 testReports/*
 Gemfile.lock
 servercreds.json
+test/*
 
 # VS files
 .vscode

Jenkinsfile

@@ -1,43 +1,62 @@
-parameters {
-        string(name: 'branch', defaultValue: 'master', description: 'branch to test')		
-		string(name: 'apiUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'server url')		
-		booleanParam(name: 'debugMode', defaultValue: 'false', description: 'start tests in debug mode')		
-}
+properties([
+	gitLabConnection('gitlab'),
+	[$class: 'ParametersDefinitionProperty', 
+		parameterDefinitions: [
+			[$class: 'StringParameterDefinition', name: 'branch', defaultValue: 'master', description: 'the branch to build'],
+			[$class: 'StringParameterDefinition', name: 'apiUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'api url'],
+			[$class: 'BooleanParameterDefinition', name: 'debugMode', defaultValue: 'false', description: 'debug mode'],
+            [$class: 'BooleanParameterDefinition', name: 'ignoreCiSkip', defaultValue: false, description: 'ignore CI Skip'],
+		]
+	]
+])
 
 def runtests(dockerImageVersion)
 {
+    def needToBuild = false
+
     dir(dockerImageVersion){
         try {
             stage('checkout'){
 				checkout([$class: 'GitSCM', branches: [[name: params.branch]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-ruby.git']]])
-                withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'AppKey', usernameVariable: 'AppSid')]) {
-					sh 'mkdir -p Settings'
-                    sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"$apiUrl\\", \\"Debug\\" : $debugMode}" > Settings/servercreds.json'
+                
+                sh 'git show -s HEAD > gitMessage'
+                def commitMessage = readFile('gitMessage').trim()
+                echo commitMessage
+                needToBuild = params.ignoreCiSkip || !commitMessage.contains('[ci skip]')               
+                sh 'git clean -fdx'
+                
+                if (needToBuild) {
+                    withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'AppKey', usernameVariable: 'AppSid')]) {
+                        sh 'mkdir -p Settings'
+                        sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"$apiUrl\\", \\"Debug\\" : $debugMode}" > Settings/servercreds.json'
+                    }
                 }
             }
 
-            docker.image('ruby:' + dockerImageVersion).inside('-u root'){
-                stage('build'){
-						sh "mkdir testReports"
-						sh "gem install bundler -v 2.0.2 && bundle install"
-                }
-            
-                stage('tests'){   
-					try{
-						sh 'rake test'
-					} finally{
-						junit 'testReports/report/*.xml'
-					}
-                }
-            
-                stage('bdd-tests'){
-					
-                }
-				
-				stage('clean-compiled'){
-					sh "rm -rf %s"
-				}
-            }        
+            if (needToBuild) {
+                docker.image('ruby:' + dockerImageVersion).inside('-u root'){
+                    stage('build'){
+                            sh "mkdir testReports"
+                            sh "gem install bundler -v 2.0.2 && bundle install"
+                    }
+                
+                    stage('tests'){   
+                        try{
+                            sh 'rake test'
+                        } finally{
+                            junit 'testReports/report/*.xml'
+                        }
+                    }
+                
+                    stage('bdd-tests'){
+                        
+                    }
+                    
+                    stage('clean-compiled'){
+                        sh "rm -rf %s"
+                    }
+                }   
+            }
         } finally {
 			cleanWs()
         }

README.md

@@ -1,7 +1,7 @@
 # Aspose.Words Cloud SDK for Ruby  
 This repository contains Aspose.Words Cloud SDK for Ruby source code. This SDK allows you to work with Aspose.Words Cloud REST APIs in your Ruby applications quickly and easily, with zero initial cost.
 
-[Aspose.Words Cloud](https://products.aspose.cloud/words/family "Aspose.Words Cloud")  
+[Aspose.Words Cloud](https://products.aspose.cloud/words/family "Aspose.Words for Cloud")  
 [API Reference](https://apireference.aspose.cloud/words/)  
 
 ## Key Features
@@ -24,7 +24,7 @@ To use Aspose Words for Cloud Ruby SDK you need to register an account with [Asp
 To install this package do the following:
 update your Gemfile
 ```ruby
-gem 'aspose_words_cloud', '~> 20.3'
+gem 'aspose_words_cloud', '~> 20.7'
 ```
 or install directly
 ```bash
@@ -33,47 +33,36 @@ gem install aspose_words_cloud
 
 ### Sample usage
 ```ruby
-        # Start README example
-
-        AsposeWordsCloud.configure do |config|
-          config.api_key['api_key'] = appKey
-          config.api_key['app_sid'] = appSid
-          config.baseUrl = baseUrl
-        end
-
-        api = WordsApi.new
-
-        uploadRequest = UploadFileRequest.new File.new(File.join(local_common_folder, filename), 'rb'), File.join(remote_folder, remote_name)
-        #api.upload_file uploadRequest
-  
-        request = DeleteWatermarkRequest.new remote_name, remote_folder
-        #result = api.delete_watermark request
-
-        # End README example
+AsposeWordsCloud.configure do |config|
+        config.api_key['api_key'] = AppKey
+        config.api_key['app_sid'] = AppSid
+        config.host = host
+request = DeleteWatermarkRequest.new remote_name, remote_test_folder + test_folder
+result = @words_api.delete_watermark request
 ```
-      
+
 [Tests](tests/) contain various examples of using the SDK.
 
 ## Dependencies
 - Ruby 2.3 or later
 - referenced packages (see [here](Gemfile) for more details)
 
 ## Licensing
- 
+
 All Aspose.Words Cloud SDKs, helper scripts and templates are licensed under [MIT License](https://github.com/aspose-words-cloud/aspose-words-cloud-ruby/blob/master/LICENSE). 
 
 ## Contact Us
 Your feedback is very important to us. Please feel free to contact us using our [Support Forums](https://forum.aspose.cloud/c/words).
 
 ## Resources
- 
+
 [Website](https://www.aspose.cloud/)  
 [Product Home](https://products.aspose.cloud/words/family)  
 [API Reference](https://apireference.aspose.cloud/words/)  
 [Documentation](https://docs.aspose.cloud/display/wordscloud/Home)  
 [Blog](https://blog.aspose.cloud/category/words/)  
- 
+
 ## Other languages
 We generate our SDKs in different languages so you may check if yours is available in our [list](https://github.com/aspose-words-cloud).
- 
+
 If you don't find your language in the list, feel free to request it from us, or use raw REST API requests as you can find it [here](https://products.aspose.cloud/words/curl).