gd_bam 0.1.39 → 0.1.40

data/lib/bam/version.rb

@@ -1,3 +1,3 @@
 module Bam
-  VERSION = '0.1.39'
+  VERSION = '0.1.40'
 end

data/lib/cloud_connect/dsl/helpers.rb

@@ -63,12 +63,12 @@ module GoodData
           }) do
             builder.Global do
               builder.Metadata({:id   => "list_metadata"}) do |builder|
-                Helpers::csv_metadata(builder, {
+                CloudConnect::Helpers::csv_metadata(builder, {
                   :name => "list_metadata",
                   :fields => [{:name=>"filePath", :type=>"string"}]
                 })
               end
-              Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+              CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
             end
             builder.Phase(:number => 0) do
 

data/lib/cloud_connect/dsl/structure_helpers.rb

@@ -26,12 +26,12 @@ module GoodData
             :name => "Contract Checker: File list reader"
           }) do
             builder.Global do
-              Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
-              Helpers::property_file(builder, {:id => "skiplines_params", :fileURL => "#{token}_counter.prm"})
+              CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+              CloudConnect::Helpers::property_file(builder, {:id => "skiplines_params", :fileURL => "#{token}_counter.prm"})
 
-              Helpers::create_trash_meta(builder)
-              Helpers::create_run_graph_failure_metadata(builder)
-              Helpers::create_file_list_meta(builder)
+              CloudConnect::Helpers::create_trash_meta(builder)
+              CloudConnect::Helpers::create_run_graph_failure_metadata(builder)
+              CloudConnect::Helpers::create_file_list_meta(builder)
 
             end
 

data/lib/commands/commands.rb

@@ -148,8 +148,6 @@ module GoodData
 
         files_in_from_bucket = bucket_from.objects.map {|o| o.key}
 
-        binding.pry
-
         incremental_taps = Taps.get_incremental(project[:taps])
 
         taps_to_process = if only.blank?

data/lib/commands/deployment.rb

@@ -36,7 +36,7 @@ module GoodData
         dir = Pathname(dir)
         result = GoodData.post(link, {
           :execution => {
-           :graph => dir + "graphs/main.grf",
+           :graph => (dir + "graphs/main.grf").to_s,
            :params => {}  
           }
         })
@@ -138,8 +138,8 @@ module GoodData
             res = deploy_graph(dir, options)
             block.call(res)
           ensure
-            self_link = res["process"]["links"]["self"]
-            GoodData.delete(self_link)
+            self_link = res && res["process"] && res["process"]["links"]["self"]
+            GoodData.delete(self_link) unless self_link.nil?
           end
         else
           deploy_graph(dir, options)
@@ -166,7 +166,7 @@ module GoodData
             end
           end
 
-          GoodData.connection.upload(temp.path)
+          GoodData.upload_to_user_webdav(temp.path, options)
           process_id = options[:process]
 
           data = {

data/lib/commands/gd_commands.rb

@@ -4,7 +4,7 @@ module GoodData
 
       def self.connect_to_gd(options={})
         server = options[:server]
-        GoodData.connect(PARAMS[:gd_login], PARAMS[:gd_pass], server, options)
+        GoodData.connect(PARAMS[:gd_login], PARAMS[:gd_pass], options)
         GoodData.project = PARAMS[:project_pid] if !PARAMS[:project_pid].nil? && !PARAMS[:project_pid].empty?
       end
 

data/lib/generators/downloaders.rb

@@ -15,12 +15,12 @@ module GoodData
               :name => "Run graph"
             }) do
               builder.Global do
-                Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
-                Helpers::property_file(builder, {:id => "params_params", :fileURL => "params.prm"})
-                Helpers::create_trash_meta(builder)
-                Helpers::create_lookup_meta(builder)
-                Helpers::create_file_list_meta(builder)
-                Helpers::create_run_graph_failure_metadata(builder)
+                CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+                CloudConnect::Helpers::property_file(builder, {:id => "params_params", :fileURL => "params.prm"})
+                CloudConnect::Helpers::create_trash_meta(builder)
+                CloudConnect::Helpers::create_lookup_meta(builder)
+                CloudConnect::Helpers::create_file_list_meta(builder)
+                CloudConnect::Helpers::create_run_graph_failure_metadata(builder)
 
                 Core::build_node2(builder, Nodes.lookup2({:name => "gdLookup0", :id => "gdLookup0", :type => Nodes::GD_LOOKUP, :metadata => "lookup_metadata"}))
 
@@ -297,13 +297,13 @@ HEREDOC
             builder.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
             builder.Graph({:name => "Goodsales incremental Downloader"}) do
               builder.Global do
-                Helpers::property_file(builder, {:id => "params_params", :fileURL => "params.prm"})
-                Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+                CloudConnect::Helpers::property_file(builder, {:id => "params_params", :fileURL => "params.prm"})
+                CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
 
-                Helpers::create_lookup_meta(builder)
-                Helpers::create_deleted_records_meta(builder)
+                CloudConnect::Helpers::create_lookup_meta(builder)
+                CloudConnect::Helpers::create_deleted_records_meta(builder)
                 builder.Metadata({:id   => "reformat_deleted_records"}) do |builder|
-                  Helpers::csv_metadata(builder, {
+                  CloudConnect::Helpers::csv_metadata(builder, {
                     :name   => "reformat_deleted_records",
                     :fields => [
                       {:type => "string", :name => "Id"},
@@ -318,30 +318,30 @@ HEREDOC
                   file = tap[:id] || module_name
 
                   builder.Metadata({:id   => "#{file}_s3_metadata"}) do |builder|
-                    Helpers::csv_metadata(builder, GoodData::Bam::Metadata.add_field(Metadata.get_target_metadata(Tap.prepare_for_s3_backup(tap)), {:name => "Timestamp"}))
+                    CloudConnect::Helpers::csv_metadata(builder, GoodData::Bam::Metadata.add_field(Metadata.get_target_metadata(Tap.prepare_for_s3_backup(tap)), {:name => "Timestamp"}))
                   end
 
                   tap = Tap.prepare_for_sf_downloader(tap)
                   builder.Metadata({:id   => "#{file}_source_metadata"}) do |builder|
-                    Helpers::csv_metadata(builder, Metadata.get_source_metadata(tap))
+                    CloudConnect::Helpers::csv_metadata(builder, Metadata.get_source_metadata(tap))
                   end
                   
                   builder.Metadata({:id   => "#{file}_es_metadata"}) do |builder|
-                    Helpers::csv_metadata(builder, Metadata.add_timestamp_as_date(Metadata.get_target_metadata(tap)))
+                    CloudConnect::Helpers::csv_metadata(builder, Metadata.add_timestamp_as_date(Metadata.get_target_metadata(tap)))
                   end
 
                   Core::build_node2(builder, Nodes.lookup2({:name => "gdLookup0", :id => "gdLookup0", :type => Nodes::GD_LOOKUP, :metadata => "lookup_metadata"}))
 
                 end
 
-                Helpers::sf_connection(builder, {})
-                Helpers::property(builder, {:id => "SFDC_CLIENT_ID", :value => "gooddata/gooddata/"})
-                Helpers::property(builder, {:id => "SFDC_LOGIN_HOSTNAME", :value => options[:sf_server] || "login.salesforce.com"})
-                Helpers::property(builder, {:id => "SFDC_NAME", :value => "Salesforce connection"})
-                Helpers::property(builder, {:id => "SFDC_PASSWORD", :value => options[:sf_password]})
-                Helpers::property(builder, {:id => "SFDC_TOKEN", :value => options[:sf_token]})
-                Helpers::property(builder, {:id => "SFDC_USERNAME", :value => options[:sf_login]})
-                Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+                CloudConnect::Helpers::sf_connection(builder, {})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_CLIENT_ID", :value => "gooddata/gooddata/"})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_LOGIN_HOSTNAME", :value => options[:sf_server] || "login.salesforce.com"})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_NAME", :value => "Salesforce connection"})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_PASSWORD", :value => options[:sf_password]})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_TOKEN", :value => options[:sf_token]})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_USERNAME", :value => options[:sf_login]})
+                CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
               end
 
               phase = 1
@@ -373,7 +373,7 @@ HEREDOC
                     ctl = "function integer generate() {$out.0.Id = \"GD_FAKE_DELETED_RECORD\";$out.0.Timestamp = $out.0.Timestamp = str2date(\"2038-01-01T00:00:00.000+0000\", \"yyyy-MM-dd'T'HH:mm:ss.SSSZZ\");$out.0.IsDeleted = \"true\";$out.0.DeletedAt = \"2038-01-01T00:00:00.000+0000\";return OK;}"
                     Core::build_node2(builder, Nodes.data_generator2({:name => "#{file}_fake_deleted_records_generator", :id => "#{file}_fake_deleted_records_generator", :generate => ctl}))
                     Core::build_node2(builder, Nodes.edge2({:toNode => "#{file}_fake_deleted_records_es:0", :fromNode => "#{file}_fake_deleted_records_generator:0", :metadata => "reformat_deleted_records"}))
-                    Core::build_node2(builder, Nodes.es_writer2({:name => "#{file} es Writer", :id => "#{file}_fake_deleted_records_es", :store => store, :entityFieldsMapping => Helpers::create_es_write_json(deleted_records_tap).to_json}))
+                    Core::build_node2(builder, Nodes.es_writer2({:name => "#{file} es Writer", :id => "#{file}_fake_deleted_records_es", :store => store, :entityFieldsMapping => CloudConnect::Helpers::create_es_write_json(deleted_records_tap).to_json}))
                   end
                 end
 
@@ -397,7 +397,7 @@ HEREDOC
                     Core::build_node2(builder, Nodes.edge2({:toNode => "#{file}_deleted_records_reformat:0", :fromNode => "#{file}_deleted_records_downlader:0", :metadata => "deleted_records_metadata"}))
                     Core::build_node2(builder, Nodes.sort2({:sortKey => "Timestamp(a)",:name => "#{file} es Sort", :id => "#{file}_deleted_records_es_sort"}))
                     Core::build_node2(builder, Nodes.edge2({:toNode => "#{file}_deleted_records_es_sort:0", :fromNode => "#{file}_deleted_records_reformat:0", :metadata => "reformat_deleted_records"}))
-                    Core::build_node2(builder, Nodes.es_writer2({:name => "#{file} es Writer", :id => "#{file}_deleted_records_es", :store => store, :entityFieldsMapping => Helpers::create_es_write_json(deleted_records_tap).to_json}))
+                    Core::build_node2(builder, Nodes.es_writer2({:name => "#{file} es Writer", :id => "#{file}_deleted_records_es", :store => store, :entityFieldsMapping => CloudConnect::Helpers::create_es_write_json(deleted_records_tap).to_json}))
                     Core::build_node2(builder, Nodes.edge2({:toNode => "#{file}_deleted_records_es:0", :fromNode => "#{file}_deleted_records_es_sort:0", :metadata => "reformat_deleted_records"}))
                   end
                 end
@@ -412,7 +412,7 @@ HEREDOC
 
                   mandatory_fields = fields.reject {|f| f[:is_mandatory] == false }.map {|f| f[:name] + ";"}.join
 
-                  Core::build_node2(builder, Nodes.sfdc_reader2({:name => "#{file} SF Reader", :id => "#{file}_reader", :soql => Helpers::generate_incremental_select(tap), :sfdcConnection => "SFDC", :fieldsMapping => stuff, :mandatoryFields => mandatory_fields}))
+                  Core::build_node2(builder, Nodes.sfdc_reader2({:name => "#{file} SF Reader", :id => "#{file}_reader", :soql => CloudConnect::Helpers::generate_incremental_select(tap), :sfdcConnection => "SFDC", :fieldsMapping => stuff, :mandatoryFields => mandatory_fields}))
 
 
                   es_transformation_source = if has_timestamp
@@ -451,7 +451,7 @@ HEREDOC
                   Core::build_node2(builder, Nodes.sort2({:sortKey => "Timestamp(a)",:name => "#{file} es Sort", :id => "#{file}_es_sort"}))
                   Core::build_node2(builder, Nodes.edge2({:toNode => "#{file}_es_sort:0", :fromNode => "#{file}_es_reformat:0", :metadata => "#{file}_es_metadata"}))
 
-                  Core::build_node2(builder, Nodes.es_writer2({:name => "#{file} es Writer", :id => "#{file}_es", :store => store, :entityFieldsMapping => Helpers::create_es_write_json(Tap.add_timestamp_field(tap)).to_json}))
+                  Core::build_node2(builder, Nodes.es_writer2({:name => "#{file} es Writer", :id => "#{file}_es", :store => store, :entityFieldsMapping => CloudConnect::Helpers::create_es_write_json(Tap.add_timestamp_field(tap)).to_json}))
                   Core::build_node2(builder, Nodes.edge2({:toNode => "#{file}_es:0", :fromNode => "#{file}_es_sort:0", :metadata => "#{file}_es_metadata"}))
 
                 end
@@ -491,12 +491,12 @@ HEREDOC
             builder.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
             builder.Graph({:name => "Goodsales incremental Downloader"}) do
               builder.Global do
-                Helpers::property_file(builder, {:id => "params_params", :fileURL => "params.prm"})
-                Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+                CloudConnect::Helpers::property_file(builder, {:id => "params_params", :fileURL => "params.prm"})
+                CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
 
-                Helpers::create_deleted_records_meta(builder)
+                CloudConnect::Helpers::create_deleted_records_meta(builder)
                 builder.Metadata({:id   => "reformat_deleted_records"}) do |builder|
-                  Helpers::csv_metadata(builder, {
+                  CloudConnect::Helpers::csv_metadata(builder, {
                     :name   => "reformat_deleted_records",
                     :fields => [
                       {:type => "string", :name => "Id"},
@@ -506,25 +506,25 @@ HEREDOC
                   })
                 end
 
-                Helpers::create_lookup_meta(builder)
+                CloudConnect::Helpers::create_lookup_meta(builder)
                 builder.Metadata({:id   => "data_metadata"}) do |builder|
-                  Helpers::csv_metadata(builder, {:name => "data_metadata",:fields => [{:name => "Id"}, {:name => "Timestamp"}, {:name => "Value"}]})
+                  CloudConnect::Helpers::csv_metadata(builder, {:name => "data_metadata",:fields => [{:name => "Id"}, {:name => "Timestamp"}, {:name => "Value"}]})
                 end
 
                 builder.Metadata({:id   => "es_metadata"}) do |builder|
-                  Helpers::csv_metadata(builder, {:name => "data_metadata",:fields => [{:name => "Id"}, {:name => "Timestamp", :type => "date"}, {:name => "Value"}]})
+                  CloudConnect::Helpers::csv_metadata(builder, {:name => "data_metadata",:fields => [{:name => "Id"}, {:name => "Timestamp", :type => "date"}, {:name => "Value"}]})
                 end
 
                 Core::build_node2(builder, Nodes.lookup2({:name => "gdLookup0", :id => "gdLookup0", :type => Nodes::GD_LOOKUP, :metadata => "lookup_metadata"}))
 
-                Helpers::sf_connection(builder, {})
-                Helpers::property(builder, {:id => "SFDC_CLIENT_ID", :value => "gooddata/gooddata/"})
-                Helpers::property(builder, {:id => "SFDC_LOGIN_HOSTNAME", :value => options[:sf_server] || "login.salesforce.com"})
-                Helpers::property(builder, {:id => "SFDC_NAME", :value => "Salesforce connection"})
-                Helpers::property(builder, {:id => "SFDC_PASSWORD", :value => options[:sf_password]})
-                Helpers::property(builder, {:id => "SFDC_TOKEN", :value => options[:sf_token]})
-                Helpers::property(builder, {:id => "SFDC_USERNAME", :value => options[:sf_login]})
-                Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+                CloudConnect::Helpers::sf_connection(builder, {})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_CLIENT_ID", :value => "gooddata/gooddata/"})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_LOGIN_HOSTNAME", :value => options[:sf_server] || "login.salesforce.com"})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_NAME", :value => "Salesforce connection"})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_PASSWORD", :value => options[:sf_password]})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_TOKEN", :value => options[:sf_token]})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_USERNAME", :value => options[:sf_login]})
+                CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
               end
 
               taps_memo = {}
@@ -546,7 +546,7 @@ HEREDOC
                 id_field = Tap.find_output_field(tap, "Id")
                 timestamp_field = Tap.find_output_field(tap, "Timestamp")
 
-                objects_to_get = Helpers.objects_for_history(client, tap)
+                objects_to_get = CloudConnect::Helpers.objects_for_history(client, tap)
 
                 (tap[:fields] - [id_field, timestamp_field]).each_with_index do |field, i|
                   f = field[:name]
@@ -691,7 +691,7 @@ HEREDOC
                   file = field[:tap][:id]
                   sf_object = field[:tap][:object]
                   f = field[:field]
-                  Core::build_node2(builder, Nodes.es_writer2({:name => "#{file} es Writer", :id => "#{f}_#{sf_object}_es", :store => store, :entityFieldsMapping => Helpers::create_es_write_json({:type => :tap, :id => tap[:id], :fields => [{:name => "Id"}, {:name => "Timestamp"}, {:name => f, :meta => "Value"}]}).to_json}))
+                  Core::build_node2(builder, Nodes.es_writer2({:name => "#{file} es Writer", :id => "#{f}_#{sf_object}_es", :store => store, :entityFieldsMapping => CloudConnect::Helpers::create_es_write_json({:type => :tap, :id => tap[:id], :fields => [{:name => "Id"}, {:name => "Timestamp"}, {:name => f, :meta => "Value"}]}).to_json}))
                   Core::build_node2(builder, Nodes.edge2({:toNode => "#{f}_#{sf_object}_es:0", :fromNode => "#{f}_#{sf_object}_reformat:0", :metadata => "es_metadata"}))
                 end
               end
@@ -727,7 +727,7 @@ HEREDOC
                     Core::build_node2(builder, Nodes.edge2({:toNode => "#{file}_deleted_records_reformat:0", :fromNode => "#{file}_deleted_records_downlader:0", :metadata => "deleted_records_metadata"}))
                     Core::build_node2(builder, Nodes.sort2({:sortKey => "Timestamp(a)",:name => "#{file} es Sort", :id => "#{file}_deleted_records_es_sort"}))
                     Core::build_node2(builder, Nodes.edge2({:toNode => "#{file}_deleted_records_es_sort:0", :fromNode => "#{file}_deleted_records_reformat:0", :metadata => "reformat_deleted_records"}))
-                    Core::build_node2(builder, Nodes.es_writer2({:name => "#{file} es Writer", :id => "#{file}_deleted_records_es", :store => store, :entityFieldsMapping => Helpers::create_es_write_json(deleted_records_tap).to_json}))
+                    Core::build_node2(builder, Nodes.es_writer2({:name => "#{file} es Writer", :id => "#{file}_deleted_records_es", :store => store, :entityFieldsMapping => CloudConnect::Helpers::create_es_write_json(deleted_records_tap).to_json}))
                     Core::build_node2(builder, Nodes.edge2({:toNode => "#{file}_deleted_records_es:0", :fromNode => "#{file}_deleted_records_es_sort:0", :metadata => "reformat_deleted_records"}))
                   end
                 end
@@ -785,12 +785,12 @@ HEREDOC
               :name => "Run graph"
             }) do
               builder.Global do
-                Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
-                Helpers::property_file(builder, {:id => "params_params", :fileURL => "params.prm"})
-                Helpers::create_trash_meta(builder)
-                Helpers::create_lookup_meta(builder)
-                Helpers::create_file_list_meta(builder)
-                Helpers::create_run_graph_failure_metadata(builder)
+                CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+                CloudConnect::Helpers::property_file(builder, {:id => "params_params", :fileURL => "params.prm"})
+                CloudConnect::Helpers::create_trash_meta(builder)
+                CloudConnect::Helpers::create_lookup_meta(builder)
+                CloudConnect::Helpers::create_file_list_meta(builder)
+                CloudConnect::Helpers::create_run_graph_failure_metadata(builder)
 
                 Core::build_node2(builder, Nodes.lookup2({:name => "gdLookup0", :id => "gdLookup0", :type => Nodes::GD_LOOKUP, :metadata => "lookup_metadata"}))
 
@@ -865,26 +865,26 @@ HEREDOC
             builder.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
             builder.Graph({:name => "Goodsales incremental Downloader"}) do
               builder.Global do
-                Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
-                Helpers::create_lookup_meta(builder)
+                CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+                CloudConnect::Helpers::create_lookup_meta(builder)
                 taps.each do |tap|
 
                   module_name = tap[:object]
                   file    = tap[:id] || module_name
 
-                  Helpers::property_file(builder, {:id => "params_params", :fileURL => "#{file}_item.prm"})
+                  CloudConnect::Helpers::property_file(builder, {:id => "params_params", :fileURL => "#{file}_item.prm"})
 
                   builder.Metadata({:id   => "#{file}_s3_metadata"}) do |builder|
-                    Helpers::csv_metadata(builder, GoodData::Bam::Metadata.add_field(Metadata.get_target_metadata(Tap.prepare_for_s3_backup(tap)), {:name => "Timestamp"}))
+                    CloudConnect::Helpers::csv_metadata(builder, GoodData::Bam::Metadata.add_field(Metadata.get_target_metadata(Tap.prepare_for_s3_backup(tap)), {:name => "Timestamp"}))
                   end
 
                   tap = Tap.prepare_for_sf_downloader(tap)
                   builder.Metadata({:id   => "#{file}_source_metadata"}) do |builder|
-                    Helpers::csv_metadata(builder, Metadata.get_source_metadata(tap))
+                    CloudConnect::Helpers::csv_metadata(builder, Metadata.get_source_metadata(tap))
                   end
 
                   builder.Metadata({:id   => "#{file}_es_metadata"}) do |builder|
-                    Helpers::csv_metadata(builder, GoodData::Bam::Metadata.add_timestamp_as_date(Metadata.get_target_metadata(tap)))
+                    CloudConnect::Helpers::csv_metadata(builder, GoodData::Bam::Metadata.add_timestamp_as_date(Metadata.get_target_metadata(tap)))
                   end
                   Core::build_node2(builder, Nodes.lookup2({:name => "gdLookup0", :id => "gdLookup0", :type => Nodes::GD_LOOKUP, :metadata => "lookup_metadata"}))
                 end
@@ -944,7 +944,7 @@ HEREDOC
 
                   Core::build_node2(builder, Nodes.sort2({:sortKey => "Timestamp(a)",:name => "#{file} es Sort", :id => "#{file}_es_sort"}))
                   Core::build_node2(builder, Nodes.edge2({:toNode => "#{file}_es_sort:0", :fromNode => "#{file}_es_reformat:0", :metadata => "#{file}_es_metadata"}))
-                  Core::build_node2(builder, Nodes.es_writer2({:name => "#{file} es Writer", :id => "#{file}_es", :store => store, :entityFieldsMapping => Helpers::create_es_write_json(Tap.add_timestamp_field(tap)).to_json}))
+                  Core::build_node2(builder, Nodes.es_writer2({:name => "#{file} es Writer", :id => "#{file}_es", :store => store, :entityFieldsMapping => CloudConnect::Helpers::create_es_write_json(Tap.add_timestamp_field(tap)).to_json}))
                   Core::build_node2(builder, Nodes.edge2({:toNode => "#{file}_es:0", :fromNode => "#{file}_es_sort:0", :metadata => "#{file}_es_metadata"}))
                 end
 

data/lib/generators/etl.rb

@@ -80,9 +80,9 @@ module GoodData
               :name => "GoodData Data loader"
             }) do
               builder.Global do
-                Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+                CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
                 builder.Metadata({:id => "load_metadata"}) do |builder| 
-                  Helpers::csv_metadata(builder, state[:metadata][input_name])
+                  CloudConnect::Helpers::csv_metadata(builder, state[:metadata][input_name])
                 end
               end
               builder.Phase(:number => 0) do
@@ -104,12 +104,12 @@ module GoodData
               :name => "GoodData Data loader"
             }) do
               builder.Global do
-                Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+                CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
                 builder.Metadata({:id => "load_metadata"}) do |builder| 
-                  Helpers::csv_metadata(builder, state[:metadata][input_name])
+                  CloudConnect::Helpers::csv_metadata(builder, state[:metadata][input_name])
                 end
                 builder.Metadata({:id => "gd_sink_metadata"}) do |builder| 
-                  Helpers::csv_metadata(builder, Helpers::sink_out_gd_metadata(state[:metadata][input_name], sink))
+                  CloudConnect::Helpers::csv_metadata(builder, CloudConnect::Helpers::sink_out_gd_metadata(state[:metadata][input_name], sink))
                 end
                 
               end
@@ -180,13 +180,13 @@ HEREDOC
               :name => "File Downloader"
             }) do
               builder.Global do
-                Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+                CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
 
                 builder.Metadata({:id   => "file_metadata"}) do |builder|
-                  Helpers::csv_metadata(builder, Metadata.get_source_metadata(tap))
+                  CloudConnect::Helpers::csv_metadata(builder, Metadata.get_source_metadata(tap))
                 end
                 builder.Metadata({:id   => "clover_metadata"}) do |builder|
-                  Helpers::csv_metadata(builder, Metadata.get_target_metadata(tap))
+                  CloudConnect::Helpers::csv_metadata(builder, Metadata.get_target_metadata(tap))
                 end
               end
 
@@ -222,21 +222,21 @@ HEREDOC
               builder.Global do
 
                 builder.Metadata({:id  => "clover_metadata"}) do |builder|
-                  Helpers::csv_metadata(builder, Metadata.get_target_metadata(tap))
+                  CloudConnect::Helpers::csv_metadata(builder, Metadata.get_target_metadata(tap))
                 end
 
                 builder.Metadata({:id   => "sf_metadata"}) do |builder|
-                  Helpers::csv_metadata(builder, Metadata.get_source_metadata(tap))
+                  CloudConnect::Helpers::csv_metadata(builder, Metadata.get_source_metadata(tap))
                 end
 
-                Helpers::sf_connection(builder, {})
-                Helpers::property(builder, {:id => "SFDC_CLIENT_ID", :value => "gooddata/gooddata/"})
-                Helpers::property(builder, {:id => "SFDC_LOGIN_HOSTNAME", :value => options[:params][:sf_server] || "login.salesforce.com"})
-                Helpers::property(builder, {:id => "SFDC_NAME", :value => "Salesforce connection"})
-                Helpers::property(builder, {:id => "SFDC_PASSWORD", :value => options[:params][:sf_password]})
-                Helpers::property(builder, {:id => "SFDC_TOKEN", :value => options[:params][:sf_token]})
-                Helpers::property(builder, {:id => "SFDC_USERNAME", :value => options[:params][:sf_login]})
-                Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+                CloudConnect::Helpers::sf_connection(builder, {})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_CLIENT_ID", :value => "gooddata/gooddata/"})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_LOGIN_HOSTNAME", :value => options[:params][:sf_server] || "login.salesforce.com"})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_NAME", :value => "Salesforce connection"})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_PASSWORD", :value => options[:params][:sf_password]})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_TOKEN", :value => options[:params][:sf_token]})
+                CloudConnect::Helpers::property(builder, {:id => "SFDC_USERNAME", :value => options[:params][:sf_login]})
+                CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
               end
 
               builder.Phase(:number => 0) do
@@ -249,7 +249,7 @@ HEREDOC
                 stuff = mapping + add.join(",") + "]}}"
                 mandatory_fields = fields.reject {|f| f[:is_mandatory] == false }.map {|f| f[:name] + ";"}.join
 
-                Core::build_node2(builder, Nodes.sfdc_reader2({:name => "SF Writer", :id => "sf", :soql => Helpers::generate_select(tap), :sfdcConnection => "SFDC", :fieldsMapping => stuff, :mandatoryFields => mandatory_fields}))
+                Core::build_node2(builder, Nodes.sfdc_reader2({:name => "SF Writer", :id => "sf", :soql => CloudConnect::Helpers::generate_select(tap), :sfdcConnection => "SFDC", :fieldsMapping => stuff, :mandatoryFields => mandatory_fields}))
 
                 Core::build_node2(builder, Nodes.copy2({:name => "copy", :id => "copy"}))
                 Core::build_node2(builder, Nodes.edge2({:toNode => "copy:0", :fromNode => "sf:0", :metadata => "sf_metadata"}))
@@ -283,14 +283,14 @@ HEREDOC
               :name => "GoodData EventStore Downloader"
             }) do
               builder.Global do
-                Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+                CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
 
                 builder.Metadata({:id   => "es_metadata"}) do |builder|
-                  Helpers::csv_metadata(builder, metadata_from_es)
+                  CloudConnect::Helpers::csv_metadata(builder, metadata_from_es)
                 end
 
                 builder.Metadata({:id   => "output_metadata"}) do |builder|
-                  Helpers::csv_metadata(builder, output_metadata)
+                  CloudConnect::Helpers::csv_metadata(builder, output_metadata)
                 end
               end
 

data/lib/generators/validators.rb

@@ -35,11 +35,11 @@ module GoodData
             :name => "Contract Checker: File list reader"
           }) do
             builder.Global do
-              Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
-              Helpers::property_file(builder, {:id => "now_params", :fileURL => "now.prm"})
+              CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+              CloudConnect::Helpers::property_file(builder, {:id => "now_params", :fileURL => "now.prm"})
 
-              Helpers::create_trash_meta(builder)
-              Helpers::create_file_list_meta(builder)
+              CloudConnect::Helpers::create_trash_meta(builder)
+              CloudConnect::Helpers::create_file_list_meta(builder)
 
             end
 
@@ -80,12 +80,12 @@ module GoodData
             :name => "Contract Checker: File list reader"
           }) do
             builder.Global do
-              Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+              CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
 
-              Helpers::create_trash_meta(builder)
+              CloudConnect::Helpers::create_trash_meta(builder)
 
               builder.Metadata({:id   => "file_list"}) do |builder|
-                Helpers::csv_metadata(builder, {
+                CloudConnect::Helpers::csv_metadata(builder, {
                   :name   => "file_list",
                   :fields => [
                     {:name => "filePath", :type => "string"},
@@ -139,13 +139,13 @@ HEREDOC
             :name => "Contract Checker: File list reader"
           }) do
             builder.Global do
-              Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+              CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
 
-              Helpers::create_trash_meta(builder)
-              Helpers::create_run_graph_failure_metadata(builder)
+              CloudConnect::Helpers::create_trash_meta(builder)
+              CloudConnect::Helpers::create_run_graph_failure_metadata(builder)
 
               builder.Metadata({:id => "file_list"}) do |builder|
-                Helpers::csv_metadata(builder, {
+                CloudConnect::Helpers::csv_metadata(builder, {
                   :name   => "file_list",
                   :fields => [
                     {:name => "filePath", :type => "string"},
@@ -311,14 +311,14 @@ HEREDOC
             :name => "Contract Checker"
           }) do
             builder.Global do
-              Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
-              Helpers::property_file(builder, {:id => "file_params", :fileURL => "#{id}_item.prm"})
+              CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+              CloudConnect::Helpers::property_file(builder, {:id => "file_params", :fileURL => "#{id}_item.prm"})
 
-              Helpers::create_trash_meta(builder)
-              Helpers::create_read_error_meta(builder)
+              CloudConnect::Helpers::create_trash_meta(builder)
+              CloudConnect::Helpers::create_read_error_meta(builder)
 
               builder.Metadata({:id   => "#{name}_clover_metadata"}) do |builder|
-                Helpers::csv_metadata(builder, Metadata.get_source_metadata(tap))
+                CloudConnect::Helpers::csv_metadata(builder, Metadata.get_source_metadata(tap))
               end
             end
 
@@ -405,7 +405,7 @@ HEREDOC
       #             :name => "Contract Checker"
       #           }) do
       #             builder.Global do
-      #               Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
+      #               CloudConnect::Helpers::property_file(builder, {:id => "workspace_params", :fileURL => "workspace.prm"})
       #             end
       # 
       #             builder.Phase(:number => 0) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gd_bam
 version: !ruby/object:Gem::Version
-  version: 0.1.39
+  version: 0.1.40
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake