gooddata 0.6.26 → 0.6.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2127d4270e7e7ca7cb11b464bc50764279bccdf8
-  data.tar.gz: 3422d4671cd05b67654483c2d05528935f5c19c7
+  metadata.gz: c7c722429b61df1bed1aaded70e6965395e0fca4
+  data.tar.gz: 053753b93d712a9b425f78ffe01d2d79073f2b40
 SHA512:
-  metadata.gz: 0de341f4966e2955cc650c06ab6af2ae0d4e14d74a995d165bb9b62c72a1f32391691052d80687be74dc84694d93070114fd99460295b72957bff3614a95b69a
-  data.tar.gz: bdcc154ca1a135aaa194f6f6bca3697c1cbef5deb95e8c38eb3220c2b0d71e15367d727ebdd6a221a3fa729cc88acf19d18ffe106af743601e2fd59bc1a944ba
+  metadata.gz: a779370b66fdba96c47a2d56af28a71223b383765a52f4452c6736dd10646fe8296605aa3426e315d67f2af199fce33e3cff6a7ddaaa652734e267749e4571d8
+  data.tar.gz: 176dff8b1c9691c537a43cc7e1cb9c316cee0a9a7efb9d24fa57cc55e211a3b67cdbb4a7193a6988983924bf09fac67371f4eb450c9157441ef062c266ffd782

data/gooddata.gemspec

@@ -29,13 +29,12 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'debase', '~> 0.1', '>= 0.1.7' if !ENV['TRAVIS_BUILD'] && RUBY_VERSION >= '2.0.0'
-  s.add_development_dependency 'guard', '~> 2.13', '>= 2.13.0'
-  s.add_development_dependency 'guard-rspec', '~> 4.6', '>= 4.6.4'
   s.add_development_dependency 'license_finder', '~> 2.0', '>= 2.0.4'
-  s.add_development_dependency 'rake', '~> 10.4', '>= 10.4.2'
+  s.add_development_dependency 'rake', '~> 11.1', '>= 11.1.1'
   s.add_development_dependency 'rake-notes', '~> 0.2', '>= 0.2.0'
   s.add_development_dependency 'redcarpet', '~> 3.1', '>= 3.1.1' if RUBY_PLATFORM != 'java'
-  s.add_development_dependency 'rspec', '~> 3.3', '>= 3.3.0'
+  s.add_development_dependency 'rspec', '~> 3.4', '>= 3.4.0'
+  s.add_development_dependency 'rspec-expectations', '~> 3.4', '>= 3.4.0'
   s.add_development_dependency 'rubocop', '~> 0.34', '>= 0.34.0'
   s.add_development_dependency 'ruby-debug-ide', '~> 0.4' if !ENV['TRAVIS_BUILD'] && RUBY_VERSION >= '2.0.0'
   s.add_development_dependency 'simplecov', '~> 0.10', '>= 0.10.0'

data/lib/gooddata/cli/shared.rb

@@ -40,6 +40,11 @@ module GoodData
     arg_name 'server'
     flag [:s, :server]
 
+    desc 'Verify SSL certificate'
+    default_value true
+    arg_name 'verify-ssl'
+    switch [:'verify-ssl', :verify_ssl]
+
     desc 'WEBDAV Server. Used for uploads of files'
     default_value nil
     arg_name 'web dav server'

data/lib/gooddata/commands/project.rb

@@ -106,7 +106,7 @@ module GoodData
         def jack_in(options)
           goodfile_path = GoodData::Helpers.find_goodfile(Pathname('.'))
 
-          spin_session = proc do |goodfile, _blueprint|
+          spin_session = proc do |goodfile|
             project_id = options[:project_id] || goodfile[:project_id]
 
             begin
@@ -125,10 +125,8 @@ module GoodData
 
           if goodfile_path
             goodfile = MultiJson.load(File.read(goodfile_path), :symbolize_keys => true)
-            model_key = goodfile[:model]
-            blueprint = GoodData::Model::ProjectBlueprint.new(eval(File.read(model_key)).to_hash) if File.exist?(model_key) && !File.directory?(model_key)
             FileUtils.cd(goodfile_path.dirname) do
-              spin_session.call(goodfile, blueprint)
+              spin_session.call(goodfile)
             end
           else
             spin_session.call({}, nil)

data/lib/gooddata/core/logging.rb

@@ -4,33 +4,40 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
+require 'rest-client'
+
 require_relative 'nil_logger'
 
 module GoodData
+  DEFAULT_LOG_LEVEL = Logger::INFO
+  DEFAULT_LOG_OUTPUT = STDOUT
+  DEFAULT_LOGGER_CLASS = Logger
+
+  DEFAULT_RESTLOG_LEVEL = Logger::INFO
+  DEFAULT_RESTLOG_OUTPUT = STDOUT
+  DEFAULT_RESTLOGGER_CLASS = Logger
+
   class << self
-    attr_writer :logger
+    attr_accessor :logger, :rest_logger
     attr_writer :stats
 
     # Turn logging on
     #
     # ### Example
     #
+    #     # Turn of default logging
     #     GoodData.logging_on
     #
-    def logging_on(level = nil)
-      @logger = default_logger if logger.is_a? NilLogger
-      @logger.level = level if level
-      @logger
-    end
-
-    # Turn logging on with HTTP included
+    #     # Log only WARN and higher
+    #     GoodData.logging_on(Logger::WARN)
     #
-    # ### Example
-    #
-    #     GoodData.logging_http_on
+    #     # Log DEBUG and above to file
+    #     GoodData.logging_on(Logger::DEBUG, 'log.txt')
     #
-    def logging_http_on
-      logging_on(Logger::DEBUG)
+    def logging_on(level = DEFAULT_LOG_LEVEL, output = DEFAULT_LOG_OUTPUT, klass = DEFAULT_LOGGER_CLASS)
+      @logger = klass.new(output)
+      @logger.level = level
+      @logger
     end
 
     # Turn logging on
@@ -47,18 +54,30 @@ module GoodData
       !@logger.instance_of?(NilLogger)
     end
 
-    # Returns the logger instance. The default implementation
-    # is a logger to stdout on INFO level
-    # For some serious logging, set the logger instance using
-    # the logger= method
+    # Turn logging on with HTTP included
     #
     # ### Example
     #
-    #     require 'logger'
-    #     GoodData.logger = Logger.new(STDOUT)
+    #     GoodData.logging_http_on
     #
-    def logger
-      @logger ||= default_logger
+    def logging_http_on(level = DEFAULT_RESTLOG_LEVEL, output = DEFAULT_RESTLOG_OUTPUT, klass = DEFAULT_RESTLOGGER_CLASS)
+      @logger = klass.new(output)
+      @logger.level = level
+      @logger
+    end
+
+    # Turn logging on
+    #
+    # ### Example
+    #
+    #     GoodData.logging_http_off
+    #
+    def logging_http_off
+      @rest_client = NilLogger.new
+    end
+
+    def logging_http_on?
+      !@rest_client.instance_of?(NilLogger)
     end
 
     def stats_on
@@ -73,14 +92,14 @@ module GoodData
       @stats = false
     end
 
-    private
+    # Initial setup of logger
+    GoodData.logger = GoodData.logging_on
 
-    # The default logger - stdout and INFO level
-    #
-    def default_logger
-      log = Logger.new(STDOUT)
-      log.level = Logger::INFO
-      log
-    end
+    # Initial setup of rest logger
+    GoodData.rest_logger = GoodData.logging_http_on(
+      nil,
+      DEFAULT_RESTLOG_OUTPUT,
+      NilLogger
+    )
   end
 end

data/lib/gooddata/core/nil_logger.rb

@@ -7,6 +7,12 @@
 module GoodData
   # Dummy implementation of logger
   class NilLogger
+    attr_accessor :level
+
+    def initialize(*_args)
+      @level = nil
+    end
+
     def debug(*_args)
     end
 

data/lib/gooddata/helpers/global_helpers.rb

@@ -28,10 +28,10 @@ module GoodData
         root = Pathname(options[:root] || '/')
         pwd = Pathname(pwd).expand_path
         loop do
-          gf = pwd + 'Goodfile'
-          return gf if gf.exist?
+          gf = pwd + '.gooddata'
+          return gf if File.exist?(gf)
           pwd = pwd.parent
-          break unless root == pwd
+          break if root == pwd
         end
         nil
       end

data/lib/gooddata/models/domain.rb

@@ -14,6 +14,8 @@ module GoodData
   class Domain < Rest::Resource
     attr_reader :name
 
+    ProvisioningResult = Struct.new('ProvisioningResult', :id, :status, :project_uri, :error)
+
     class << self
       # Looks for domain
       #
@@ -230,11 +232,11 @@ module GoodData
         domain = client.domain(default_domain_name)
 
         # Prepare cache for domain users
-        domain_users_cache = Hash[domain.users.map { |u| [u.login, u] }]
+        domain_users_cache = Hash[domain.users.map { |u| [u.login.downcase, u] }]
 
         list.pmapcat do |user|
           begin
-            user_data = user.to_hash
+            user_data = user.to_hash.tap { |uh| uh[:login].downcase }
             domain_user = domain_users_cache[user_data[:login]]
             if !domain_user
               added_user = domain.add_user(user_data, opts)
@@ -387,7 +389,6 @@ module GoodData
     def provision_client_projects
       res = client.post(segments_uri + '/provisionClientProjects', nil)
       res = client.poll_on_code(res['asyncTask']['links']['poll'])
-      klass = Struct.new('ProvisioningResult', :id, :status, :project_uri, :error)
       failed_count = GoodData::Helpers.get_path(res, %w(clientProjectProvisioningResult failed count), 0)
       created_count = GoodData::Helpers.get_path(res, %w(clientProjectProvisioningResult created count), 0)
       return Enumerator.new([]) if failed_count + created_count == 0
@@ -396,7 +397,7 @@ module GoodData
         loop do
           result = client.get(uri)
           (GoodData::Helpers.get_path(result, %w(clientProjectProvisioningResultDetails items)) || []).each do |item|
-            y << klass.new(item['id'], item['status'], item['project'], item['error'])
+            y << ProvisioningResult.new(item['id'], item['status'], item['project'], item['error'])
           end
           uri = GoodData::Helpers.get_path(res, %w(clientProjectProvisioningResultDetails paging next))
           break if uri.nil?

data/lib/gooddata/models/metadata.rb

@@ -194,7 +194,8 @@ module GoodData
         explicit_identifier = meta['identifier']
         # Pre-check to provide a user-friendly error rather than
         # failing later
-        if explicit_identifier && MdObject[explicit_identifier, opts]
+        klass = self.class
+        if explicit_identifier && klass[explicit_identifier, opts]
           fail "Identifier '#{explicit_identifier}' already in use"
         end
 

data/lib/gooddata/models/metadata/report.rb

@@ -27,7 +27,11 @@ module GoodData
         title = options[:title]
         fail 'Report needs a title specified' unless title
         summary = options[:summary] || ''
-        rd = options[:rd] || ReportDefinition.create(options)
+
+        options_rd = options.dup
+        options_rd.delete(:identifier)
+
+        rd = options[:rd] || ReportDefinition.create(options_rd)
         rd.save
 
         report = {

data/lib/gooddata/models/model.rb

@@ -175,7 +175,7 @@ module GoodData
             data.zip(manifest['dataSetSLIManifestList']).each do |item|
               path = item[0][:data]
               path = item[0][:data].path if item[0][:data].respond_to? :path
-              inline_data = path.is_a?(String) ? false : true
+              inline_data = !path.is_a?(String)
               csv_header = nil
 
               filename = item[1]['dataSetSLIManifest']['file']

data/lib/gooddata/models/process.rb

@@ -170,6 +170,7 @@ module GoodData
       private
 
       def with_zip(opts = {})
+        client = opts[:client]
         Tempfile.open('deploy-graph-archive') do |temp|
           zip_filename = temp.path
           File.open(zip_filename, 'w') do |zip|
@@ -183,6 +184,7 @@ module GoodData
       end
 
       def zip_and_upload(path, files_to_exclude, opts = {})
+        client = opts[:client]
         puts 'Creating package for upload'
         if !path.directory? && (path.extname == '.grf' || path.extname == '.rb')
           with_zip(opts) do |zipfile|

data/lib/gooddata/models/project.rb

@@ -207,7 +207,11 @@ module GoodData
                      else
                        client.projects(to_project)
                      end
+        transfer_processes(from_project, to_project)
+        transfer_schedules(from_project, to_project)
+      end
 
+      def transfer_processes(from_project, to_project)
         from_project.processes.each do |process|
           Dir.mktmpdir('etl_transfer') do |dir|
             dir = Pathname(dir)
@@ -224,7 +228,6 @@ module GoodData
           .select { |_, procs| procs.length == 1 }
           .flat_map { |_, procs| procs.select { |p| p[0].project.pid == to_project.pid }.map { |p| p[0] } }
           .peach(&:delete)
-        transfer_schedules(from_project, to_project)
       end
 
       # Clones project along with etl and schedules.
@@ -352,8 +355,8 @@ module GoodData
     # @param [options] Optional report options
     # @return [GoodData::Report] Instance of new report
     def add_report(options = {})
-      rep = GoodData::Report.create(options.merge(client: client, project: self))
-      rep.save
+      report = GoodData::Report.create(options.merge(client: client, project: self))
+      report.save
     end
 
     alias_method :create_report, :add_report
@@ -1283,7 +1286,7 @@ module GoodData
     # Imports users
     def import_users(new_users, options = {})
       role_list = roles
-      users_list = users(all: true)
+      users_list = users
       new_users = new_users.map { |x| (x.is_a?(Hash) && x[:user] && x[:user].to_hash.merge(role: x[:role])) || x.to_hash }
 
       GoodData.logger.warn("Importing users to project (#{pid})")
@@ -1305,6 +1308,11 @@ module GoodData
           role && role.uri
         end
 
+        u[:role_title] = u[:role].map do |r|
+          role = get_role(r, role_list)
+          role && role.title
+        end
+
         if u[:role].all?(&:nil?)
           u[:type] = :error
           u[:reason] = 'Invalid role(s) specified'
@@ -1321,6 +1329,18 @@ module GoodData
 
       # Diff users. Only login and role is important for the diff
       diff = GoodData::Helpers.diff(whitelisted_users, diffable_new, key: :login, fields: [:login, :role, :status])
+      diff_results = diff.flat_map do |operation, users|
+        if operation == :changed
+          users.map { |u| u[:new_obj].merge(operation: operation) }
+        else
+          users.map { |u| u.merge(operation: operation) }
+        end
+      end
+      diff_results = diff_results.map do |u|
+        u[:login_uri] = "/gdc/account/profile/" + u[:login]
+        u
+      end
+      return diff_results if options[:dry_run]
 
       # Create new users
       u = diff[:added].map { |x| { user: x, role: x[:role] } }
@@ -1337,7 +1357,7 @@ module GoodData
       # Remove old users
       to_remove = diff[:removed].reject { |user| user[:status] == 'DISABLED' || user[:status] == :disabled }
       GoodData.logger.warn("Removing #{to_remove.count} users from project (#{pid})")
-      results.concat(disable_users(to_remove))
+      results.concat(disable_users(to_remove, roles: role_list, project_users: whitelisted_users))
 
       # reassign to groups
       mappings = new_users.map(&:to_hash).flat_map do |user|
@@ -1361,19 +1381,20 @@ module GoodData
           g.set_members(whitelist_users(g.members.map(&:to_hash), [], options[:whitelists], :include).first.map { |x| x[:uri] })
         end
       end
-      results
+      GoodData::Helpers.join(results, diff_results, [:user], [:login_uri])
     end
 
-    def disable_users(list)
+    def disable_users(list, options = {})
       list = list.map(&:to_hash)
       url = "#{uri}/users"
       payloads = list.map do |u|
-        generate_user_payload(u[:uri], 'DISABLED')
+        uri, = resolve_roles(u, [], options)
+        generate_user_payload(uri, 'DISABLED')
       end
 
       payloads.each_slice(100).mapcat do |payload|
         result = client.post(url, 'users' => payload)
-        result['projectUsersUpdateResult'].mapcat { |k, v| v.map { |x| { type: k.to_sym, uri: x } } }
+        result['projectUsersUpdateResult'].mapcat { |k, v| v.map { |x| { type: k.to_sym, user: x } } }
       end
     end
 

data/lib/gooddata/models/project_metadata.rb

@@ -14,16 +14,22 @@ module GoodData
       def [](key, opts = { :client => GoodData.connection, :project => GoodData.project })
         client, project = GoodData.get_client_and_project(opts)
 
+        get_opts = {
+          do_not_log: [
+            RestClient::ResourceNotFound
+          ]
+        }
+
         if key == :all
           uri = "/gdc/projects/#{project.pid}/dataload/metadata"
-          res = client.get(uri)
+          res = client.get(uri, get_opts)
           res['metadataItems']['items'].reduce({}) do |memo, i|
             memo[i['metadataItem']['key']] = i['metadataItem']['value']
             memo
           end
         else
           uri = "/gdc/projects/#{project.pid}/dataload/metadata/#{key}"
-          res = client.get(uri)
+          res = client.get(uri, get_opts)
           res['metadataItem']['value']
         end
       end

data/lib/gooddata/rest/connection.rb

@@ -330,7 +330,7 @@ module GoodData
       # @param uri [String] Target URI
       def delete(uri, options = {})
         options = log_info(options)
-        GoodData.logger.debug "DELETE: #{@server.url}#{uri}"
+        GoodData.rest_logger.info "DELETE: #{@server.url}#{uri}"
         profile "DELETE #{uri}" do
           b = proc do
             params = fresh_request_params(options[:request_id])
@@ -338,7 +338,7 @@ module GoodData
               @server[uri].delete(params)
             rescue RestClient::Exception => e
               # log the error if it happens
-              log_error(e, uri, params)
+              log_error(e, uri, params, options)
               raise e
             end
           end
@@ -351,9 +351,12 @@ module GoodData
       # @param e [RuntimeException] Exception to log
       # @param uri [String] Uri on which the request failed
       # @param uri [Hash] Additional params
-      def log_error(e, uri, params)
+      def log_error(e, uri, params, options = {})
         return if e.response && e.response.code == 401 && !uri.include?('token') && !uri.include?('login')
-        GoodData.logger.error(format_error(e, params))
+
+        if options[:do_not_log].nil? || options[:do_not_log].index(e.class).nil?
+          GoodData.logger.error(format_error(e, params))
+        end
       end
 
       # HTTP GET
@@ -361,7 +364,7 @@ module GoodData
       # @param uri [String] Target URI
       def get(uri, options = {}, &user_block)
         options = log_info(options)
-        GoodData.logger.debug "GET: #{@server.url}#{uri}, #{options}"
+        GoodData.rest_logger.info "GET: #{@server.url}#{uri}, #{options}"
         profile "GET #{uri}" do
           b = proc do
             params = fresh_request_params(options[:request_id]).merge(options)
@@ -369,7 +372,7 @@ module GoodData
               @server[uri].get(params, &user_block)
             rescue RestClient::Exception => e
               # log the error if it happens
-              log_error(e, uri, params)
+              log_error(e, uri, params, options)
               raise e
             end
           end
@@ -383,7 +386,7 @@ module GoodData
       def put(uri, data, options = {})
         options = log_info(options)
         payload = data.is_a?(Hash) ? data.to_json : data
-        GoodData.logger.debug "PUT: #{@server.url}#{uri}, #{scrub_params(data, KEYS_TO_SCRUB)}"
+        GoodData.rest_logger.info "PUT: #{@server.url}#{uri}, #{scrub_params(data, KEYS_TO_SCRUB)}"
         profile "PUT #{uri}" do
           b = proc do
             params = fresh_request_params(options[:request_id])
@@ -391,7 +394,7 @@ module GoodData
               @server[uri].put(payload, params)
             rescue RestClient::Exception => e
               # log the error if it happens
-              log_error(e, uri, params)
+              log_error(e, uri, params, options)
               raise e
             end
           end
@@ -404,7 +407,7 @@ module GoodData
       # @param uri [String] Target URI
       def post(uri, data = nil, options = {})
         options = log_info(options)
-        GoodData.logger.debug "POST: #{@server.url}#{uri}, #{scrub_params(data, KEYS_TO_SCRUB)}"
+        GoodData.rest_logger.info "POST: #{@server.url}#{uri}, #{scrub_params(data, KEYS_TO_SCRUB)}"
         profile "POST #{uri}" do
           payload = data.is_a?(Hash) ? data.to_json : data
           b = proc do
@@ -413,7 +416,7 @@ module GoodData
               @server[uri].post(payload, params)
             rescue RestClient::Exception => e
               # log the error if it happens
-              log_error(e, uri, params)
+              log_error(e, uri, params, options)
               raise e
             end
           end
@@ -506,7 +509,6 @@ module GoodData
         return if webdav_dir_exists?(url)
 
         method = :mkcol
-        GoodData.logger.debug "#{method}: #{url}"
         b = proc do
           raw = {
             :method => method,
@@ -595,25 +597,25 @@ module GoodData
 
         if content_type == 'application/json' || content_type == 'application/json;charset=UTF-8'
           result = response.to_str == '""' ? {} : MultiJson.load(response.to_str)
-          GoodData.logger.debug "Request ID: #{response.headers[:x_gdc_request]} - Response: #{result.inspect}"
+          GoodData.rest_logger.debug "Request ID: #{response.headers[:x_gdc_request]} - Response: #{result.inspect}"
         elsif ['text/plain;charset=UTF-8', 'text/plain; charset=UTF-8', 'text/plain'].include?(content_type)
           result = response
-          GoodData.logger.debug 'Response: plain text'
+          GoodData.rest_logger.debug 'Response: plain text'
         elsif content_type == 'application/zip'
           result = response
-          GoodData.logger.debug 'Response: a zipped stream'
+          GoodData.rest_logger.debug 'Response: a zipped stream'
         elsif response.headers[:content_length].to_s == '0'
           result = nil
-          GoodData.logger.debug 'Response: Empty response possibly 204'
+          GoodData.rest_logger.debug 'Response: Empty response possibly 204'
         elsif response.code == 204
           result = nil
-          GoodData.logger.debug 'Response: 204 no content'
+          GoodData.rest_logger.debug 'Response: 204 no content'
         else
           fail "Unsupported response content type '%s':\n%s" % [content_type, response.to_str[0..127]]
         end
         result
       rescue RestClient::Exception => e
-        GoodData.logger.debug "Response: #{e.response}"
+        GoodData.logger.error "Response: #{e.response}"
         raise $ERROR_INFO
       end