gooddata 1.3.3-java → 1.3.4-java

data/lib/gooddata/lcm/brick_logger.rb

@@ -9,18 +9,18 @@ module GoodData
   class BrickFileLogger
     # entry-point
     # @param [String] log_directory directory to create log files
-    # @param [String] mode - brick mode (short name if brick)
-    def initialize(log_directory, mode)
+    # @param [String] log_file - file to log
+    def initialize(log_directory, log_file)
       @log_directory = log_directory
-      @mode = mode
+      @log_file = log_file
     end
 
     # Creates file in log directory with given content. Logging is disabled when log_directory is nil.
     #
-    # @param [String] status brick phase/status (start, finished, error,...)
     # @param [String] content log file content
-    def log_action(status, content)
-      File.write("#{@log_directory}/#{@mode}_#{status}.json", content)
+    def log_action(content)
+      FileUtils.mkpath @log_directory
+      File.open("#{@log_directory}/#{@log_file}", 'a') { |file| file.write(content + "\n") }
     end
   end
 end

data/lib/gooddata/lcm/dsl/dsl.rb

@@ -27,13 +27,6 @@ module GoodData
           dsl = type.new
           dsl.instance_eval(&block)
 
-          # puts "#{caption}: #{klass.name}"
-          # puts JSON.pretty_generate(dsl.params)
-          # puts
-
-          # yield if block_given?
-
-          # Return params
           dsl.params
         end
 

data/lib/gooddata/lcm/lcm.rb

@@ -30,10 +30,10 @@ module GoodData
       def transfer_everything(client, domain, migration_spec, opts = {})
         filter_on_segment = migration_spec[:segments] || migration_spec['segments'] || []
 
-        puts 'Ensuring Users - warning: works across whole domain not just provided segment(s)'
+        GoodData.logger.info('Ensuring Users - warning: works across whole domain not just provided segment(s)')
         ensure_users(domain, migration_spec, filter_on_segment)
 
-        puts 'Migrating Blueprints'
+        GoodData.logger.info('Migrating Blueprints')
 
         bp_opts = {
           update_preference: opts[:update_preference] || opts['update_preference'],
@@ -89,7 +89,7 @@ module GoodData
           # GoodData::LCM.transfer_meta(segment.master_project, target_projects)
         end
 
-        puts 'Migrating Processes and Schedules'
+        GoodData.logger.info('Migrating Processes and Schedules')
 
         deployment_client = migration_spec.key?(:user_for_deployment) ? GoodData.connect(migration_spec[:user_for_deployment]) : client
         domain.clients.peach do |c|
@@ -126,7 +126,7 @@ module GoodData
           begin
             GoodData::LCM.transfer_label_types(segment_master, project)
           rescue => e
-            puts "Unable to transfer label_types, reason: #{e.message}"
+            GoodData.logger.error("Unable to transfer label_types, reason: #{e.message}")
           end
 
           # Transfer tagged objects
@@ -137,7 +137,7 @@ module GoodData
 
         do_not_synchronize_clients = migration_spec[:do_not_synchronize_clients]
         if do_not_synchronize_clients.nil? || !do_not_synchronize_clients
-          puts 'Migrating Dashboards'
+          GoodData.logger.info('Migrating Dashboards')
           if filter_on_segment.empty?
             domain.synchronize_clients
           else
@@ -148,7 +148,7 @@ module GoodData
         end
 
         # User groups must be migrated after dashboards
-        puts 'Migrating User Groups'
+        GoodData.logger.info('Migrating User Groups')
         domain.clients.peach do |c|
           segment = c.segment
           segment_master = segment.master_project

data/lib/gooddata/lcm/lcm2.rb

@@ -16,7 +16,6 @@ require 'gooddata/extensions/nil'
 require 'active_support/core_ext/hash/compact'
 
 require_relative 'actions/actions'
-require_relative 'brick_logger'
 require_relative 'dsl/dsl'
 require_relative 'helpers/helpers'
 
@@ -218,7 +217,7 @@ module GoodData
             t.add_separator if index < rows.length - 1
           end
         end
-        puts "\n#{table}"
+        GoodData.logger.info("\n#{table}")
       end
 
       def print_action_result(action, messages)
@@ -255,13 +254,13 @@ module GoodData
           end
         end
 
-        puts "\n#{table}"
+        GoodData.logger.info("\n#{table}")
       end
 
       def print_actions_result(actions, results)
         actions.each_with_index do |action, index|
           print_action_result(action, results[index])
-          puts
+          GoodData.logger.info
         end
         nil
       end
@@ -272,15 +271,6 @@ module GoodData
         # Get actions for mode specified
         actions = get_mode_actions(mode)
 
-        if params.key?('log_directory')
-          brick_logger = BrickFileLogger.new(params['log_directory'], mode)
-          logging_enabled = true
-        else
-          logging_enabled = false
-        end
-        if logging_enabled
-          brick_logger.log_action('start', JSON.pretty_generate(params))
-        end
         if params.actions
           actions = params.actions.map do |action|
             "GoodData::LCM2::#{action}".split('::').inject(Object) do |o, c|
@@ -319,8 +309,7 @@ module GoodData
         errors = []
         results = []
         actions.each do |action|
-          puts
-
+          GoodData.logger.info("\n")
           # Invoke action
           begin
             out = run_action action, params
@@ -346,7 +335,6 @@ module GoodData
           params.merge!(new_params)
 
           # Print action result
-          puts
           print_action_result(action, res)
 
           # Store result for final summary
@@ -365,15 +353,11 @@ module GoodData
           success: errors.empty?
         }
 
+        has_errors = errors.any?
         # Fail whole execution if there is any failed action
-        fail(JSON.pretty_generate(errors)) if strict_mode && errors.any?
+        fail(JSON.pretty_generate(errors)) if strict_mode && has_errors
 
         result
-
-      ensure
-        if logging_enabled
-          brick_logger.log_action('finished', JSON.pretty_generate(result))
-        end
       end
 
       def run_action(action, params)
@@ -420,7 +404,7 @@ module GoodData
           end
 
           table = Terminal::Table.new :headings => ['Action', 'Parameter', 'Description', 'Parameter Type'], :rows => rows
-          puts table.to_s
+          GoodData.logger.info("\n#{table}")
         end
       end
     end

data/lib/gooddata/mixins/inspector.rb

@@ -36,7 +36,6 @@ module GoodData
       end
 
       def self.included(source)
-        # $stdout.puts "Overriding inspect on #{source}"
         inspected << source
         source.class_eval do
           def self.inspector(*fields)

data/lib/gooddata/models/process.rb

@@ -68,7 +68,7 @@ module GoodData
               res = GoodData::Process.deploy(dir, options.merge(:files_to_exclude => params))
               block.call(res)
             rescue => e
-              puts e.inspect
+              GoodData.logger.error(e.inspect)
             ensure
               res.delete if res
             end
@@ -114,7 +114,7 @@ module GoodData
         fail ArgumentError, 'options[:name] can not be nil or empty!' if deploy_name.nil? || deploy_name.empty?
 
         verbose = options[:verbose] || false
-        puts HighLine.color("Deploying #{path}", HighLine::BOLD) if verbose
+        GoodData.logger.info("Deploying #{path}") if verbose
 
         deployed_path = Process.upload_package(path, files_to_exclude, client: client, project: project)
         data = {
@@ -171,7 +171,7 @@ module GoodData
         fail ArgumentError, 'options[:name] can not be nil or empty!' if deploy_name.nil? || deploy_name.empty?
 
         verbose = options[:verbose] || false
-        puts HighLine.color("Deploying #{path}", HighLine::BOLD) if verbose
+        GoodData.logger.info("Deploying #{path}") if verbose
 
         data = {
           process: {
@@ -233,7 +233,7 @@ module GoodData
 
       def zip_and_upload(path, files_to_exclude, opts = {})
         client = opts[:client]
-        puts 'Creating package for upload'
+        GoodData.logger.info('Creating package for upload')
         if !path.directory? && (path.extname == '.grf' || path.extname == '.rb')
           with_zip(opts) do |zipfile|
             zipfile.add(File.basename(path), path)
@@ -248,7 +248,7 @@ module GoodData
         else
           with_zip(opts) do |zipfile|
             files_to_upload = Dir[File.join(path, '**', '**')].reject { |f| files_to_exclude.include?(Pathname(path) + f) }
-            puts "Uploading #{files_to_upload.count} files."
+            GoodData.logger.info("Uploading #{files_to_upload.count} files.")
             files_to_upload.each do |file|
               file_pathname = Pathname.new(file)
               file_relative_pathname = file_pathname.relative_path_from(Pathname.new(path))
@@ -341,6 +341,10 @@ module GoodData
       project.schedules.select { |schedule| schedule.process_id == obj_id }
     end
 
+    def create_manual_schedule(options = {})
+      create_schedule(nil, nil, options)
+    end
+
     def create_schedule(cron, executable, options = {})
       project.create_schedule(process_id, cron, executable, options.merge(client: client, project: project))
     end

data/lib/gooddata/models/project.rb

@@ -483,12 +483,12 @@ module GoodData
       end
 
       def transfer_tagged_stuff(from_project, to_project, tag)
-        puts "Transferring tagged stuff - #{tag}"
+        GoodData.logger.info("Transferring tagged stuff - #{tag}")
 
         objects = from_project.find_by_tag(tag)
 
         if objects.any?
-          puts JSON.pretty_generate(objects)
+          GoodData.logger.info("\n#{JSON.pretty_generate(objects)}")
           from_project.partial_md_export(objects, project: to_project)
         else
           GoodData.logger.info('No tagged objects to transfer')
@@ -1044,7 +1044,7 @@ module GoodData
     #
     # TODO: Return invite object
     def invite(email, role, msg = DEFAULT_INVITE_MESSAGE)
-      puts "Inviting #{email}, role: #{role}"
+      GoodData.logger.info("Inviting #{email}, role: #{role}")
 
       role_url = nil
       if role.index('/gdc/').nil?
@@ -1302,19 +1302,16 @@ module GoodData
       results = blueprint.datasets.pmap do |ds|
         [ds, ds.count(self)]
       end
-      puts title
-      puts GoodData::Helpers.underline(title)
-      puts
-      puts "Datasets - #{results.count}"
-      puts
+      GoodData.logger.info(title)
+      GoodData.logger.info(GoodData::Helpers.underline(title))
+      GoodData.logger.info("\nDatasets - #{results.count}\n")
       results.each do |x|
         dataset, count = x
         dataset.title.tap do |t|
-          puts t
-          puts GoodData::Helpers.underline(t)
-          puts "Size - #{count} rows"
-          puts "#{dataset.attributes_and_anchors.count} attributes, #{dataset.facts.count} facts, #{dataset.references.count} references"
-          puts
+          GoodData.logger.info(t)
+          GoodData.logger.info(GoodData::Helpers.underline(t))
+          GoodData.logger.info("Size - #{count} rows")
+          GoodData.logger.info("#{dataset.attributes_and_anchors.count} attributes, #{dataset.facts.count} facts, #{dataset.references.count} references\n")
         end
       end
       nil
@@ -1357,7 +1354,7 @@ module GoodData
         metrics: metrics,
         report_definitions: rds
       }.each do |key, collection|
-        puts "Replacing #{key}"
+        GoodData.logger.info("Replacing #{key}")
         collection.peach do |item|
           new_item = item.replace(mapping)
           if new_item.json != item.json
@@ -1375,7 +1372,7 @@ module GoodData
 
       GoodData.logger.info 'Replacing hidden metrics'
       local_metrics = mapping.map { |a, _| a }.pmapcat { |a| a.usedby('metric') }.select { |m| m['deprecated'] == '1' }.map { |m| m['link'] }.uniq
-      puts "Found #{local_metrics.count} metrics"
+      GoodData.logger.info("Found #{local_metrics.count} metrics")
       local_metrics.pmap { |m| metrics(m) }.peach do |item|
         new_item = item.replace(mapping)
         if new_item.json != item.json
@@ -1392,7 +1389,7 @@ module GoodData
 
       GoodData.logger.info 'Replacing dashboard saved views'
       contexts = mapping.map { |a, _| a }.pmapcat { |a| a.usedby('executionContext') }.map { |a| GoodData::MdObject[a['link'], client: client, project: self] }
-      puts "Found #{contexts.count} dashboard saved views"
+      GoodData.logger.info("Found #{contexts.count} dashboard saved views")
       contexts.peach do |item|
         new_item = GoodData::MdObject.replace_quoted(item, mapping)
         if new_item.json != item.json

data/lib/gooddata/models/project_creator.rb

@@ -75,7 +75,7 @@ module GoodData
                 project.execute_maql(chunk)
               end
             rescue => e
-              puts "Error occured when executing MAQL, project: \"#{project.title}\" reason: \"#{e.message}\", chunks: #{replaced_maql_chunks.inspect}"
+              GoodData.logger.error("Error occured when executing MAQL, project: \"#{project.title}\" reason: \"#{e.message}\", chunks: #{replaced_maql_chunks.inspect}")
               errors << e
               next
             end
@@ -85,7 +85,7 @@ module GoodData
             begin
               ca_chunks.each { |chunk| project.execute_maql(chunk) }
             rescue => e
-              puts "Error occured when executing MAQL, project: \"#{project.title}\" reason: \"#{e.message}\", chunks: #{ca_chunks.inspect}"
+              GoodData.logger.error("Error occured when executing MAQL, project: \"#{project.title}\" reason: \"#{e.message}\", chunks: #{ca_chunks.inspect}")
               errors << e
             end
           end

data/lib/gooddata/models/schedule.rb

@@ -67,7 +67,8 @@ module GoodData
 
         fail 'Process ID has to be provided' if process_id.blank?
 
-        is_dataload_process = Process[process_id, project: project, client: c].type == :dataload
+        process = Process[process_id, project: project, client: c]
+        is_dataload_process = process.type == :dataload
 
         if is_dataload_process
           dataload_datasets = options[:dataload_datasets] || options['GDC_DATALOAD_DATASETS']
@@ -75,7 +76,9 @@ module GoodData
 
           de_synchronize_all = options[:de_synchronize_all] || options['GDC_DE_SYNCHRONIZE_ALL']
         else
-          fail 'Executable has to be provided' if executable.blank?
+          lcm_component = process.type == :lcm
+          executable_missing = !lcm_component && executable.blank?
+          fail 'Executable has to be provided' if executable_missing
         end
 
         schedule = c.create(GoodData::Schedule, GoodData::Helpers.stringify_keys(GoodData::Helpers.deep_dup(SCHEDULE_TEMPLATE)), client: c, project: project)

data/lib/gooddata/models/user_filters/user_filter_builder.rb

@@ -209,6 +209,8 @@ module GoodData
 
     # Creates a MAQL expression(s) based on the filter defintion.
     # Takes the filter definition looks up any necessary values and provides API executable MAQL
+    # @param labels_cache e.g. { 'label_uri': label_object }
+    # @param lookups_cache e.g. { 'label_uri': { "jirka@gooddata.com": 'value_uri' }}
     def self.create_expression(filter, labels_cache, lookups_cache, attr_cache, options = {})
       values = filter[:values]
       label = labels_cache[filter[:label]]

data/lib/gooddata/rest/client.rb

@@ -194,8 +194,8 @@ module GoodData
 
       def disconnect
         if stats_on?
-          puts "API call statistics to server #{@connection.server}"
-          puts @connection.stats_table
+          GoodData.logger.info("API call statistics to server #{@connection.server}")
+          GoodData.logger.info(@connection.stats_table)
         end
         @connection.disconnect
       end
@@ -221,7 +221,7 @@ module GoodData
 
       # Gets resource by name
       def resource(res_name)
-        puts "Getting resource '#{res_name}'"
+        GoodData.logger.info("Getting resource '#{res_name}'")
         nil
       end
 

data/lib/gooddata/rest/connection.rb

@@ -175,13 +175,13 @@ module GoodData
           merge_headers!(headers)
           get('/gdc/account/token', @request_params)
 
-          @user = get(get('/gdc/app/account/bootstrap')['bootstrapResource']['accountSetting']['links']['self'])
+          @user = get('/gdc/account/profile/current')
           GoodData.logger.info("Connected using SST to server #{@server.url} to profile \"#{@user['accountSetting']['login']}\"")
           @auth = {}
           refresh_token :dont_reauth => true
         elsif  options[:headers][:x_gdc_authsst]
           @request_params = options[:headers]
-          @user = get('/gdc/app/account/bootstrap')['bootstrapResource']
+          @user = get('/gdc/account/profile/current')
           GoodData.logger.info("Connected using SST to server #{@server.url} to profile \"#{@user['accountSetting']['login']}\"")
           @auth = {}
           refresh_token :dont_reauth => true
@@ -293,7 +293,7 @@ module GoodData
           # Remove when TT sent in headers. Currently we need to parse from body
           merge_headers!(:x_gdc_authtt => GoodData::Helpers.get_path(response, %w(userToken token)))
         rescue Exception => e # rubocop:disable RescueException
-          puts e.message
+          GoodData.logger.error(e.message)
           raise e
         end
       end

data/lib/gooddata/version.rb

@@ -6,14 +6,24 @@
 
 # GoodData Module
 module GoodData
-  VERSION = '1.3.3'
+  VERSION = File.read('SDK_VERSION')
+  BRICKS_VERSION = File.read('VERSION')
 
   class << self
-    # Version
+    # SDK version
+    # @return SDK version
     def version
       VERSION
     end
 
+    alias_method :sdk_version, :version
+
+    # LCM bricks version
+    # @return brick version
+    def bricks_version
+      BRICKS_VERSION
+    end
+
     # Identifier of gem version
     # @return Formatted gem version
     def gem_version_string

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: java
 authors:
 - Pavel Kolesnikov
@@ -14,22 +14,8 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-  name: bundler
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -63,7 +49,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.5.0
   name: rspec
   prerelease: false
   type: :development
@@ -71,7 +57,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -170,20 +156,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.11'
-  name: ZenTest
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.11'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -215,17 +187,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 4.2.9
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
   name: activesupport
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 4.2.9
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -529,6 +507,7 @@ files:
 - README.md
 - RELEASING.md
 - Rakefile
+- SDK_VERSION
 - TODO.md
 - VERSION
 - authors.sh
@@ -571,6 +550,7 @@ files:
 - lib/gooddata/bricks/middleware/fs_upload_middleware.rb
 - lib/gooddata/bricks/middleware/gooddata_middleware.rb
 - lib/gooddata/bricks/middleware/logger_middleware.rb
+- lib/gooddata/bricks/middleware/mask_logger_decorator.rb
 - lib/gooddata/bricks/middleware/middleware.rb
 - lib/gooddata/bricks/middleware/restforce_middleware.rb
 - lib/gooddata/bricks/middleware/stdout_middleware.rb