gooddata 2.1.15 → 2.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5adf023e855cd9eb5261ed7e6cc143b77bca3536fee24aeedd4aa603aa5793d
-  data.tar.gz: efe55e9bd06d497eb9af4be968c95201170583a419841719676f8dca51fdbd6c
+  metadata.gz: f14e76f590c86838c60c538ccd73ba636da3ab812658e76211a148f2e195b4da
+  data.tar.gz: 2261df5e9488e38560209c2a8df0048f5aad04d3451ba6b637146eb3a3118704
 SHA512:
-  metadata.gz: 29a7eeaf7c2c1241d959ce06c716a7f1a106bcb7f65d80a282497655b4be6b630511eaee6f965da37ed4be46a37fa69083c1c53e3f3eb78390f7096b60bbb368
-  data.tar.gz: eeb950d63670b976c20a812524dab7e65aaa6a7c4dc30f639a8f0a819cd9dd43e1d7b087171da2c0d4418b7d25fc76c80b669e172a8c2dc6aa932c3a8c8c2427
+  metadata.gz: cfdfca51d63852aec59a46ce18f5e746018106f69847bf31cf7b8f845d41ef88d85c9c585af2010164116aab7fc1aa4d5b3ad75199b6c56fe9107d5ed353dcaa
+  data.tar.gz: 97916ca5253a378319414a9fe7f4a5d673f08168085e629ff2462df6a3f0b173f62501529eb965c69d6e361333467e7340842fa217c08075950c34b8f9f2e05e

data/.sonar.settings

@@ -0,0 +1,4 @@
+# Config scan necessary files/folder only
+sonar.sources=bin,lib
+sonar.tests=spec
+sonar.exclusions=**/lib/templates/project/*.erb

data/.travis.yml

@@ -233,15 +233,15 @@ jobs:
   - &cleanup
     stage: after-merge
     name: staging1 - test environment clean-up
-    script: bundle exec ruby bin/test_projects_cleanup.rb -f
+    script: travis_wait 30 bundle exec ruby bin/test_projects_cleanup.rb -f
     env: GD_ENV=staging
 
   - <<: *cleanup
-    name: staging2 - test environment clean-up
+    name: travis_wait 30 staging2 - test environment clean-up
     env: GD_ENV=testing
 
   - <<: *cleanup
-    name: staging3 - test environment clean-up
+    name: travis_wait 30 staging3 - test environment clean-up
     env: GD_ENV=development
 
   # AFTER MERGE UNIT TESTS ON ALTERNATIVE PLATFORM
@@ -279,6 +279,7 @@ jobs:
     script: bundle exec rake test:unit
     os: osx
     rvm: jruby-9.1.14
+    osx_image: xcode7.3
 
   - stage: gem-release
     name: deploy MRI gem

data/CHANGELOG.md

@@ -1,4 +1,12 @@
 # GoodData Ruby SDK Changelog
+## 2.1.17
+ - BUGFIX:TMA-1704 - Enhance error message when not found clientId in source table 
+ - BUGFIX: TMA-1694 [UsersBrick] Enhance messages add more log for missing users when running remove_from_organization 
+ - FEATURE:TMA-1717 - replace Erbis by standard ERB 
+ - BUGFIX: MSF-20222 Fixing issue using find function of Enumerator 
+ - LR-428: Update the license file for Gooddata-ruby
+ - BUGFIX: TMA-1714 Fixed test failed due to deleting master project and increase timeout 
+
 ## 2.1.15
  - FEATURE: BCO-1119 Introduce data sources API
  - Upgrade active_support to be able used with Rails 6.1

data/Dockerfile

@@ -64,6 +64,10 @@ RUN cp -rf ci/snowflake/target/*.jar ./lib/gooddata/cloud_resources/snowflake/dr
 RUN mvn -f ci/bigquery/pom.xml clean install -P binary-packaging
 RUN cp -rf ci/bigquery/target/*.jar ./lib/gooddata/cloud_resources/bigquery/drivers/
 
+#build postgresql dependencies
+RUN mvn -f ci/postgresql/pom.xml clean install -P binary-packaging
+RUN cp -rf ci/postgresql/target/*.jar ./lib/gooddata/cloud_resources/postgresql/drivers/
+
 RUN bundle install
 
 ARG GIT_COMMIT=unspecified

data/LICENSE

@@ -1,22 +1,30 @@
-(BSD License)
-
-Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided
-that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice, this list of conditions and
-       the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions
-       and the following disclaimer in the documentation and/or other materials provided with the distribution.
-    * Neither the name of the GoodData Corporation nor the names of its contributors may be used to endorse
-       or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+GOODDATA LCM END USER LICENSE AGREEMENT
+
+GoodData Corporation ("GoodData") provides this "LCM", hereafter referred to as the "Software", to you subject to the following terms and conditions.  By using the Software you agree to the terms and conditions of this Agreement. If you do not agree with any of the following terms, then do not use the Software.
+
+1. Use Rights. Subject to the restrictions below, you may download and modify the Software contents for your use solely for the purpose of creating applications related to Your use of the GoodData subscription services platform (“Application(s)”). Open source software components provided with or used by the Software are licensed to you under the terms of the applicable license agreements included with such open source software components, which accompany this Software.
+
+2. No Duty to Support; Reservation of Rights. You expressly acknowledge that GoodData has no duty or obligation to support the Software, or to provide updates or bug fixes to the Software and that GoodData otherwise reserves all rights not expressly granted to you hereunder in connection with Software.
+
+3. Restrictions You agree that you will not (i) use the Software to create, design or develop any functionality other than as set forth above in Section 1; (ii) allow third parties other than those performing work solely on your behalf within the scope of the license herein to modify, create derivative works of, reverse engineer, reverse compile, or disassemble the Software; (iii) distribute, sell, lease, rent, lend, or sublicense any part of the Software to any third party except as incorporated into your Application; or (iv) upload or otherwise transmit any material containing software viruses or other computer code, files or programs designed to interrupt, destroy, or limit the functionality of any software or hardware.
+
+The restrictions in this Section 3 shall not apply if and to the extent they contradict mandatory local law (including, but not limited to, law implementing the EC Software Directive) provided that, before you exercise any rights that you believe to be entitled to based on mandatory law, you provide GoodData with 30 days prior written notice and provide all reasonably requested information to allow GoodData to assess your claim and, at GoodData's sole discretion, to provide alternatives that reduce any adverse impact on GoodData's intellectual property or other rights.
+
+4. GoodData Ownership. Except for those portions licensed to GoodData by third parties, GoodData retains ownership of the Software, including without limitation all copyrights and other intellectual property rights therein. You may not remove, delete or modify any of the GoodData copyright statements in the Software.
+
+
+5. Trademarks. Your use of GoodData product names and trademarks shall comply with the branding guidelines that may be distributed by GoodData from time to time.  You may not use GoodData product names and trademarks, however, except where GoodData provides you express, prior written permission to use such product names and trademarks.  All other marks are the property of third parties subject to applicable use terms such entities may provide.
+6. Term, Termination, and Changes. This Agreement shall continue as long as you are in compliance with the terms specified herein or until otherwise terminated. You and or GoodData each may terminate this Agreement for any reason at any time. This Agreement shall automatically terminate upon the expiration or termination of the agreement that governs your use of the GoodData subscription services. You agree, upon termination, to destroy all copies of the Software within your possession or control. The Limitations of Warranties, Liability and Indemnification sections set out in this Agreement shall survive any termination or expiration of this Agreement.
+
+7. Limitations of Warranties and Liability
+THE SOFTWARE AND ITS SOURCE CODE IS PROVIDED "AS IS" WITHOUT ANY WARRANTIES OF ANY KIND. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, GOODDATA DISCLAIMS ANY IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.  YOU MAY BE ABLE TO EXERCISE ADDITIONAL WARRANTY RIGHTS OFFERED BY THIRD PARTY COMMERCIAL SOFTWARE VENDORS WHOSE COMPONENTS ARE USED BY THE SOFTWARE.  IN THOSE INSTANCES, YOUR SOLE REMEDY AND RECOURSE SHALL BE AGAINST THE LICENSORS OF SUCH COMMERCIAL SOFTWARE, AND NOT AGAINST GOODDATA.
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL GOODDATA BE LIABLE FOR ANY LOST PROFITS OR BUSINESS OPPORTUNITIES, LOSS OF USE, BUSINESS INTERRUPTION, LOSS OF DATA, OR ANY OTHER INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR FROM THE SOFTWARE OR YOUR USE OF THE SOFTWARE, UNDER ANY THEORY OF LIABILITY, WHETHER BASED IN CONTRACT, TORT, NEGLIGENCE, PRODUCT LIABILITY, OR OTHERWISE. BECAUSE SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, THE PRECEDING LIMITATION MAY NOT APPLY TO YOU. GOODDATA'S LIABILITY ARISING OUT OF THE SOFTWARE PROVIDED HEREUNDER WILL NOT, IN ANY EVENT, EXCEED US$100.00.
+
+THE FOREGOING LIMITATIONS SHALL APPLY TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, REGARDLESS OF WHETHER GOODDATA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND REGARDLESS OF WHETHER ANY REMEDY FAILS OF ITS ESSENTIAL PURPOSE.
+
+8. Export Control. The Software is provided subject to the U.S. Export Administration Regulations and the regulations of other jurisdictions (e.g., the European Union). Diversion contrary to applicable law is prohibited. Without limiting the foregoing, you agree that (i) you are not acting on behalf of any person who is a citizen, national, or resident of, or who is controlled by the government of any country to which the United States or other applicable government body has prohibited export transactions (e.g., Iran, North Korea, etc.); (ii) you are not acting on behalf of, any person or entity listed on a relevant list of persons to whom export is prohibited (e.g., the U.S. Treasury Department list of Specially Designated Nationals and Blocked Persons, the U.S. Commerce Department Denied Persons List or Entity List, etc.); and (iii) you will not use the Software for any purpose prohibited by applicable law.
+
+9. Indemnification You agree to defend, indemnify and hold harmless GoodData, and any of its directors, officers, employees, affiliates, subsidiaries or agents, from and against any and all claims, losses, damages, liabilities and other expenses (including reasonable attorneys' fees), arising from or related to: i) your use of the Software; ii) any derivative works you create using Software source code, and iii) your breach of this Agreement.
+
+10. Governing Law These terms are governed by the laws of the State of California and the United States of America without regard to conflict of laws principles. You may not assign any part of this Agreement without the prior written consent of GoodData. Any attempted assignment without consent shall be void. These terms constitute the entire agreement between you and GoodData with respect to the Software and supersede all prior written or oral communications, understandings and agreements. Any waiver of these terms must be in writing to be effective. If any provision of these terms is found to be invalid or unenforceable, the remaining terms will continue to be valid and enforceable to the fullest extent permitted by law.

data/LICENSE.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 #
-# Copyright (c) 2010-2017 GoodData Corporation. All rights reserved.
+# Copyright (c) 2010-2021 GoodData Corporation. All rights reserved.
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.

data/README.md

@@ -95,4 +95,5 @@ For full contributor info see [contributors page](https://github.com/gooddata/go
 
 ## Copyright
 
-Copyright (c) 2010 - 2018 GoodData Corporation and Thomas Watson Steen. See [LICENSE](/LICENSE) for details.
+(c) 2010-2021 GoodData Corporation
+This repository is governed by the terms and conditions in the LICENSE. This repository contains a number of open source packages detailed in NOTICES, including the GoodData Ruby SDK, which is licensed under the BSD-3-Clause license and contains additional open source components detailed in the file called LICENSE_FOR_RUBY_SDK_COMPONENT.

data/Rakefile

@@ -33,7 +33,14 @@ namespace :gem do
   desc "Release gem version #{GoodData::VERSION} to rubygems"
   task :release do
     gem = "gooddata-#{GoodData::VERSION}.gem"
-
+    origin_license_file = 'LICENSE'
+    new_license_file = 'LICENSE_FOR_RUBY_SDK_COMPONENT.txt'
+    notices_file = 'NOTICES.txt'
+    File.delete(origin_license_file) if File.exist?(origin_license_file)
+    File.delete(notices_file) if File.exist?(notices_file)
+    puts "Deleted files: #{origin_license_file} and #{notices_file}"
+    File.rename(new_license_file, origin_license_file) if File.exists?(new_license_file)
+    puts "Renamed file #{new_license_file} to #{origin_license_file}"
     puts "Building #{gem} ..."
     res = `gem build ./gooddata.gemspec`
     file = res.match('File: (.*)')[1]

data/SDK_VERSION

@@ -1 +1 @@
-2.1.15
+2.1.17

data/VERSION

@@ -1 +1 @@
-3.7.24
+3.7.25

data/bin/test_projects_cleanup.rb

@@ -1,6 +1,6 @@
 require 'optparse'
 
-example = 'Usage example: GD_ENV=testing GD_SPEC_PASSWORD=secret bundle exec ruby bin/test_projects_cleanup.rb'
+example = 'Usage example: GD_ENV=testing GD_SPEC_PASSWORD= bundle exec ruby bin/test_projects_cleanup.rb'
 
 options = {}
 OptionParser.new do |opts|

data/ci/postgresql/pom.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.gooddata.lcm</groupId>
+    <artifactId>lcm-postgresql-driver</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.2.19</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.2</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>binary-packaging</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>copy-dependencies</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <!-- compile scope gives runtime and compile dependencies (skips test deps) -->
+                                    <includeScope>runtime</includeScope>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <repositories>
+        <repository>
+            <id>my-repo1</id>
+            <name>my custom repo</name>
+            <url>https://repository.mulesoft.org/nexus/content/repositories/public/</url>
+        </repository>
+    </repositories>
+</project>

data/gooddata.gemspec

@@ -5,7 +5,7 @@ require 'gooddata/version'
 Gem::Specification.new do |s|
   s.name = 'gooddata'
   s.version = GoodData::VERSION
-  s.licenses = ['BSD']
+  s.licenses = ['BSD-3-Clause']
   s.platform = 'java' if RUBY_PLATFORM =~ /java/
 
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.email = 'lcm@gooddata.com'
   s.extra_rdoc_files = %w(LICENSE README.md)
 
-  s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR).map { |f| f unless %w(NOTICES.txt LICENSE_FOR_RUBY_SDK_COMPONENT.txt).include?(f) }
   s.files.reject! { |fn| fn.start_with? 'spec/' }
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
@@ -62,7 +62,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'aws-sdk-s3', '~> 1.16'
   s.add_dependency 'docile', '~> 1.1'
-  s.add_dependency 'erubis', '~> 2.7'
   s.add_dependency 'gli', '~> 2.15'
   s.add_dependency 'gooddata_datawarehouse', '~> 0.0.10' if RUBY_PLATFORM == 'java'
   s.add_dependency 'highline', '= 2.0.0.pre.develop.14'

data/lib/gooddata/cloud_resources/{cloud_resouce_factory.rb → cloud_resource_factory.rb}

@@ -11,7 +11,15 @@ module GoodData
   module CloudResources
     class CloudResourceFactory
       class << self
+        def load_cloud_resource(type)
+          base = "#{Pathname(__FILE__).dirname.expand_path}#{File::SEPARATOR}#{type}#{File::SEPARATOR}"
+          Dir.glob(base + '**/*.rb').each do |file|
+            require file
+          end
+        end
+
         def create(type, data = {}, opts = {})
+          load_cloud_resource(type)
           clients = CloudResourceClient.descendants.select { |c| c.respond_to?("accept?") && c.send("accept?", type) }
           raise "DataSource does not support type \"#{type}\"" if clients.empty?
 

data/lib/gooddata/cloud_resources/cloud_resources.rb

@@ -7,6 +7,6 @@
 require 'pathname'
 
 base = Pathname(__FILE__).dirname.expand_path
-Dir.glob(base + '**/*.rb').each do |file|
+Dir.glob(base + '*.rb').each do |file|
   require file
 end

data/lib/gooddata/cloud_resources/postgresql/postgresql_client.rb

@@ -0,0 +1,107 @@
+# encoding: UTF-8
+# frozen_string_literal: true
+#
+# Copyright (c) 2021 GoodData Corporation. All rights reserved.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
+require 'securerandom'
+require 'java'
+require 'pathname'
+require_relative '../cloud_resource_client'
+
+base = Pathname(__FILE__).dirname.expand_path
+Dir.glob(base + 'drivers/*.jar').each do |file|
+  require file unless file.start_with?('lcm-postgresql-driver')
+end
+
+module GoodData
+  module CloudResources
+    class PostgresClient < CloudResourceClient
+      JDBC_POSTGRES_PATTERN = %r{jdbc:postgresql:\/\/([^:^\/]+)(:([0-9]+))?(\/)?}
+      POSTGRES_DEFAULT_PORT = 5432
+      JDBC_POSTGRES_PROTOCOL = 'jdbc:postgresql://'
+      SSL_JAVA_FACTORY = '&sslfactory=org.postgresql.ssl.DefaultJavaSSLFactory'
+      VERIFY_FULL = 'verify-full'
+      PREFER = 'prefer'
+      REQUIRE = 'require'
+      POSTGRES_SET_SCHEMA_COMMAND = "set search_path to"
+      POSTGRES_FETCH_SIZE = 1000
+
+      class << self
+        def accept?(type)
+          type == 'postgresql'
+        end
+      end
+
+      def initialize(options = {})
+        raise("Data Source needs a client to Postgres to be able to query the storage but 'postgresql_client' is empty.") unless options['postgresql_client']
+
+        if options['postgresql_client']['connection'].is_a?(Hash)
+          @database = options['postgresql_client']['connection']['database']
+          @schema = options['postgresql_client']['connection']['schema'] || 'public'
+          @authentication = options['postgresql_client']['connection']['authentication']
+          @ssl_mode = options['postgresql_client']['connection']['sslMode']
+          raise "SSL Mode should be prefer, require and verify-full" unless @ssl_mode == 'prefer' || @ssl_mode == 'require' || @ssl_mode == 'verify-full'
+
+          @url = build_url(options['postgresql_client']['connection']['url'])
+        else
+          raise('Missing connection info for Postgres client')
+        end
+
+        Java.org.postgresql.Driver
+      end
+
+      def realize_query(query, _params)
+        GoodData.gd_logger.info("Realize SQL query: type=postgresql status=started")
+
+        connect
+        filename = "#{SecureRandom.urlsafe_base64(6)}_#{Time.now.to_i}.csv"
+        measure = Benchmark.measure do
+          statement = @connection.create_statement
+          statement.set_fetch_size(POSTGRES_FETCH_SIZE)
+          has_result = statement.execute(query)
+          if has_result
+            result = statement.get_result_set
+            metadata = result.get_meta_data
+            col_count = metadata.column_count
+            CSV.open(filename, 'wb') do |csv|
+              csv << Array(1..col_count).map { |i| metadata.get_column_name(i) } # build the header
+              csv << Array(1..col_count).map { |i| result.get_string(i)&.to_s } while result.next
+            end
+          end
+        end
+        GoodData.gd_logger.info("Realize SQL query: type=postgresql status=finished duration=#{measure.real}")
+        filename
+      ensure
+        @connection&.close
+        @connection = nil
+      end
+
+      def connect
+        GoodData.logger.info "Setting up connection to Postgresql #{@url}"
+
+        prop = java.util.Properties.new
+        prop.setProperty('user', @authentication['basic']['userName'])
+        prop.setProperty('password', @authentication['basic']['password'])
+        prop.setProperty('schema', @schema)
+
+        @connection = java.sql.DriverManager.getConnection(@url, prop)
+        statement = @connection.create_statement
+        statement.execute("#{POSTGRES_SET_SCHEMA_COMMAND} #{@schema}")
+        @connection.set_auto_commit(false)
+      end
+
+      def build_url(url)
+        matches = url.scan(JDBC_POSTGRES_PATTERN)
+        raise 'Cannot reach the url' unless matches
+
+        host = matches[0][0]
+        port = matches[0][2]&.to_i || POSTGRES_DEFAULT_PORT
+        raise "Custom port #{port} is not supported. Remove it or use the default port '5432'" if POSTGRES_DEFAULT_PORT != port
+
+        "#{JDBC_POSTGRES_PROTOCOL}#{host}:#{port}/#{@database}?sslmode=#{@ssl_mode}#{VERIFY_FULL == @ssl_mode ? SSL_JAVA_FACTORY : ''}"
+      end
+    end
+  end
+end

data/lib/gooddata/commands/scaffold.rb

@@ -4,7 +4,7 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-require 'erubis'
+require 'erb'
 require 'fileutils'
 require 'pathname'
 
@@ -18,15 +18,14 @@ module GoodData
         # TODO: Add option for custom output dir
         def project(name)
           fail ArgumentError, 'No name specified' if name.nil?
-
           FileUtils.mkdir(name)
           FileUtils.cd(name) do
             FileUtils.mkdir('model')
             FileUtils.cd('model') do
               input = File.read(TEMPLATES_PATH + 'project/model/model.rb.erb')
-              eruby = Erubis::Eruby.new(input)
+              erb = ERB.new(input)
               File.open('model.rb', 'w') do |f|
-                f.write(eruby.result(:name => name))
+                f.write(erb.result_with_hash(:name => name))
               end
             end
 
@@ -36,9 +35,9 @@ module GoodData
             end
 
             input = File.read(TEMPLATES_PATH + 'project/Goodfile.erb')
-            eruby = Erubis::Eruby.new(input)
+            erb = ERB.new(input)
             File.open('Goodfile', 'w') do |f|
-              f.write(eruby.result)
+              f.write(erb.result)
             end
           end
         end
@@ -51,15 +50,15 @@ module GoodData
           FileUtils.mkdir(name)
           FileUtils.cd(name) do
             input = File.read(TEMPLATES_PATH + 'bricks/brick.rb.erb')
-            eruby = Erubis::Eruby.new(input)
+            erb = ERB.new(input)
             File.open('brick.rb', 'w') do |f|
-              f.write(eruby.result)
+              f.write(erb.result)
             end
 
             input = File.read(TEMPLATES_PATH + 'bricks/main.rb.erb')
-            eruby = Erubis::Eruby.new(input)
+            erb = ERB.new(input)
             File.open('main.rb', 'w') do |f|
-              f.write(eruby.result)
+              f.write(erb.result)
             end
           end
         end