salesforce_bulk_query 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39893db1495deba35f872109eae3fde80d55b506
-  data.tar.gz: 64d1e6f6d2b016d5257004c8e83527372c51d688
+  metadata.gz: 749b0a76eead05e1f7caf14a69107f54941fc05b
+  data.tar.gz: 49ca7c2a0ae1e4558f512d186db4ab394ca2e802
 SHA512:
-  metadata.gz: 8dbda4621053cb70ad98f309feaf6842e0dfa8d3041db06b5cff531f151acd2dc9f41cc09ed60a3844c64d292bf49a9660c00d3c229edc63233ac5f37bcbc5a6
-  data.tar.gz: cf03cdc3d3b34bf587cb26359648af0343ee7a5b0956a789e4e0491d3a1c2ff905d42e52503c120806f385a1814ca969a78370a472319033cf3573b03048d87f
+  metadata.gz: e1b7e9377eaa96b7b6c6641aa581c625339c70b0d33a9420cf3ade36f2667d266db4df11997846642bee14ddb580c0eb0453d5382ab62cdf720309f70f0b551c
+  data.tar.gz: 4945bc91e29daa3e5deb36e51e8c7602d734a236476f9a7102e44a6c8411885e01cbfd039c50fca12d27a5cb28b052d8664254fbe0a08265607a7d29246653d3

data/lib/salesforce_bulk_query.rb

@@ -4,6 +4,7 @@ require 'salesforce_bulk_query/connection'
 require 'salesforce_bulk_query/query'
 require 'salesforce_bulk_query/logger'
 require 'salesforce_bulk_query/utils'
+require 'salesforce_bulk_query/version'
 
 
 # Module where all the stuff is happening
@@ -46,6 +47,7 @@ module SalesforceBulkQuery
     # @param soql SOQL query, e.g. "SELECT Name FROM Opportunity"
     # @return hash with :filenames and other useful stuff
     def query(sobject, soql, options={})
+      @logger.info "Running query: #{soql}. Gem version salesforce_bulk_query: #{SalesforceBulkQuery::VERSION}" if @logger
       check_interval = options[:check_interval] || CHECK_INTERVAL
       time_limit = options[:time_limit] # in seconds
 

data/lib/salesforce_bulk_query/query.rb

@@ -78,7 +78,6 @@ module SalesforceBulkQuery
     # @param options[:directory_path]
     def get_available_results(options={})
 
-      all_done = true
       unfinished_subqueries = []
       jobs_in_progress = []
       jobs_restarted = []
@@ -135,17 +134,15 @@ module SalesforceBulkQuery
           # still in progress
           jobs_in_progress.push(job)
         end
-
-        # we're done if this job is done and it didn't generate any new jobs
-        all_done &&= (job_done && to_split.empty?)
       end
 
       # remove the finished jobs from progress and add there the new ones
       @jobs_in_progress = jobs_in_progress
       @jobs_done += jobs_done
 
+      # we're done if there're no jobs in progress
       return {
-        :succeeded => all_done,
+        :succeeded => @jobs_in_progress.empty?,
         :filenames => @finished_batch_filenames,
         :unfinished_subqueries => unfinished_subqueries,
         :jobs_done => @jobs_done.map { |j| j.job_id }

data/lib/salesforce_bulk_query/version.rb

@@ -1,3 +1,3 @@
 module SalesforceBulkQuery
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_bulk_query
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Petr Cvengros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json