gooddata 0.6.35 → 0.6.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ed8d8970f4e3251134ddbe30ef6a78e4011863a
-  data.tar.gz: 94374f72b58dad355ab82b6e5e71a576beca8d19
+  metadata.gz: 6a418eb31981fffaf7e3a4d2099ee45c13fe94d7
+  data.tar.gz: f99f2d29de0abe85b6aa852c1654a1116df55573
 SHA512:
-  metadata.gz: 0c5f73feffd8973277e8e5146ffd3aaf6fb1a056d921e1599baaade6859e192cf223a638627562f159516d3b7b6ce6004893701b0a43304e2d9f7aa23ff983fb
-  data.tar.gz: 3a9fb83e65f7f0d812ca668c00fae2085ff8873362e1518e9ec2d25c423ae0487f408f95e7940c1a32b1a58a9f6fce5f0eea31ae19187f8b1c01c26223c502c9
+  metadata.gz: 7c3a1ea8b743b34796d6dc6ac208cf0bdf6f2757ba0bf46ba41ef2b81c2170adf12334402129d776f3ce64ad3780765dde57395d50b6ca6b8a63a4a638767d73
+  data.tar.gz: 19d9d787859a139a208ad33f185365ecc0f7272847af0397ec54e71f895028466cf156ac33192d0e39ae8ef252ddbd829109d0ccf0375184260a91a8a1e22bec

data/lib/gooddata/extensions/string.rb

@@ -0,0 +1,7 @@
+class String
+  def to_b
+    return true if self == true || self =~ (/(true|t|yes|y|1)$/i)
+    return false if self == false || self.blank? || self =~ (/(false|f|no|n|0)$/i)
+    raise ArgumentError.new("invalid value for Boolean: \"#{self}\"")
+  end
+end

data/lib/gooddata/lcm/lcm.rb

@@ -27,18 +27,23 @@ module GoodData
         messages
       end
 
-      def transfer_everything(client, domain, migration_spec, filter_on_segment = [])
+      def transfer_everything(client, domain, migration_spec, filter_on_segment = [], opts = {})
         puts 'Ensuring Users - warning: works across whole domain not just provided segment(s)'
         ensure_users(domain, migration_spec, filter_on_segment)
 
         puts 'Migrating Blueprints'
 
+        bp_opts = {
+          update_preference: opts[:update_preference] || opts['update_preference'],
+          maql_replacements: opts[:maql_replacements] || opts['maql_replacements']
+        }
+
         domain.segments.peach do |segment|
           next if !filter_on_segment.empty? && !(filter_on_segment.include?(segment.id))
           bp = segment.master_project.blueprint
           segment.clients.each do |c|
             p = c.project
-            p.update_from_blueprint(bp)
+            p.update_from_blueprint(bp, bp_opts)
           end
         end
 

data/lib/gooddata/models/project_creator.rb

@@ -59,17 +59,32 @@ module GoodData
 
           response = client.get(link)
 
-          chunks = pick_correct_chunks(response['projectModelDiff']['updateScripts'], opts)
-          if !chunks.nil? && !dry_run
-            chunks['updateScript']['maqlDdlChunks'].each do |chunk|
-              result = project.execute_maql(chunk)
-              if result['wTaskStatus']['status'] == 'ERROR'
-                puts JSON.pretty_generate(result)
-                fail 'Creating dataset failed'
+          maqls = pick_correct_chunks(response['projectModelDiff']['updateScripts'], opts)
+          if !maqls.empty? && !dry_run
+            maqls.each_with_index do |maql, _idx|
+              begin
+                chunks = maql[:orig]['updateScript']['maqlDdlChunks']
+                chunks.each do |chunk|
+                  # TODO: Hack the MAQL here
+                  (opts[:maql_replacements] || opts['maql_replacements'] || {}).each do |k, v|
+                    src = Regexp.new(k)
+                    dest = v
+                    chunk.gsub!(src, dest)
+                  end
+
+                  result = project.execute_maql(chunk)
+                  if result['wTaskStatus']['status'] == 'ERROR'
+                    puts JSON.pretty_generate(result)
+                    fail 'Creating dataset failed'
+                  end
+                end
+                return chunks
+              rescue => e
+                puts "Error occured when executing MAQL, project: \"#{project.title}\" reason: \"#{e.message}\", chunks: #{chunks.inspect}"
+                next
               end
             end
           end
-          chunks
         end
 
         def migrate_reports(project, spec)
@@ -109,7 +124,8 @@ module GoodData
         end
 
         def pick_correct_chunks(chunks, opts = {})
-          preference = opts[:preference] || {}
+          preference = opts[:update_preference]
+
           # first is cascadeDrops, second is preserveData
           rules = [
             { priority: 1, cascade_drops: false, preserve_data: true },
@@ -117,11 +133,25 @@ module GoodData
             { priority: 3, cascade_drops: true, preserve_data: true },
             { priority: 4, cascade_drops: true, preserve_data: false }
           ]
-          stuff = chunks.select { |chunk| chunk['updateScript']['maqlDdlChunks'] }.map { |chunk| { cascade_drops: chunk['updateScript']['cascadeDrops'], preserve_data: chunk['updateScript']['preserveData'], maql: chunk['updateScript']['maqlDdlChunks'], orig: chunk } }
-          results = GoodData::Helpers.join(rules, stuff, [:cascade_drops, :preserve_data], [:cascade_drops, :preserve_data], inner: true).sort_by { |l| l[:priority] }
 
-          pick = results.find { |r| r.values_at(:cascade_drops, :preserve_data) == preference.values_at(:cascade_drops, :preserve_data) } || results.first
-          pick[:orig] if pick
+          stuff = chunks.select do |chunk|
+            chunk['updateScript']['maqlDdlChunks']
+          end
+
+          stuff = stuff.map do |chunk|
+            { cascade_drops: chunk['updateScript']['cascadeDrops'], preserve_data: chunk['updateScript']['preserveData'], maql: chunk['updateScript']['maqlDdlChunks'], orig: chunk }
+          end
+
+          results = GoodData::Helpers.join(rules, stuff, [:cascade_drops, :preserve_data], [:cascade_drops, :preserve_data], inner: true).sort_by { |l| l[:priority] } || []
+
+          (preference || {}).each do |k, v|
+            results = results.find_all do |result|
+              sym = k.to_sym
+              !result.has_key?(sym) || result[sym] == v
+            end
+          end
+
+          preference ? results : [results.first]
         end
       end
     end

data/lib/gooddata/version.rb

@@ -6,7 +6,7 @@
 
 # GoodData Module
 module GoodData
-  VERSION = '0.6.35'
+  VERSION = '0.6.36'
 
   class << self
     # Version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gooddata
 version: !ruby/object:Gem::Version
-  version: 0.6.35
+  version: 0.6.36
 platform: ruby
 authors:
 - Pavel Kolesnikov
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -700,6 +700,7 @@ files:
 - lib/gooddata/extensions/nil.rb
 - lib/gooddata/extensions/numeric.rb
 - lib/gooddata/extensions/object.rb
+- lib/gooddata/extensions/string.rb
 - lib/gooddata/extensions/symbol.rb
 - lib/gooddata/extensions/true.rb
 - lib/gooddata/extract.rb