sc_analytics 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 174fbe2000c4f79d76fc86330eac07a14d9f4807
-  data.tar.gz: 51f8eb358ef21862d6ae311e0c8bc45671e45045
+  metadata.gz: ad7b46ef538fe53b0f49427d9a463c01974219a6
+  data.tar.gz: f04a324d58419b59e5e71d6476cba83db1c12ee6
 SHA512:
-  metadata.gz: 3ae18c5a68627339343f6d15c6076c161d30dfe87bf98a656a76cd1fc0c01d094a35ec011fbe17b2e242aa0114676a82bc745a9953277bfe960b9ec5b2fc3f19
-  data.tar.gz: 101e0b4cb37f6cda59b7131ee7ac536f1132677f5cb339796ea0f865a3dd8c8e2bdde37668260680e5a492377a0091fed783ef8dd4c4793c8956e3ef65f48f4e
+  metadata.gz: ee4936d4feb370c7a9787b6a4634ad94e1b791cd4d3e43c253d526ee8ab820f76e167bbdf9098b3e72d7310d6cb72f7e109343ff2796e6d35606ea9fd2a49e35
+  data.tar.gz: fc16d994afc77015de624ccd7b01989b207d5ffcf660ea8d2c9105c51c580b2e9d5d216a4ec648fd7b784c97ca19cca7ef1e8ad16ba05e515c6391134275978e

data/lib/sc_analytics/query.rb

@@ -3,7 +3,7 @@ module SCAnalytics
   class Query
     require 'erb'
 
-    attr_reader :connection, :results, :query_name, :bind_variables, :csv_file, :combined_csv_file, :csv_dir, :csv_combined_dir, :cursor, :columns_to_cast, :start_time, :end_time
+    attr_reader :connection, :threads, :results, :query_name, :bind_variables, :csv_file, :combined_csv_file, :csv_dir, :csv_combined_dir, :cursor, :columns_to_cast, :start_time, :end_time
     attr_accessor :sql, :database, :auto_cast, :concurrent
     alias_method :result, :results
     alias_method :name, :query_name
@@ -233,7 +233,7 @@ module SCAnalytics
     end
 
     def suggest_dir(file_name, dir)
-      return file_name unless File.dirname(file_name) == "."
+      return file_name unless File.dirname(file_name) == "." && dir != "."
 
       FileUtils.mkdir_p(dir.to_s)
       "#{dir}/" + file_name
@@ -255,23 +255,15 @@ module SCAnalytics
       @start_time = Time.now
 
       results = {}
-      threads = []
-      @tines.each_value do |query|
-        threads << Thread.new do
-          Thread.stop
-          query.run
-          results[query.database.first] = query.results
+      @threads = {}
+      @tines.each_pair do |db, query|
+        @threads[db] = Thread.new(query) do |qry|
+          qry.run
+          results[qry.database.first] = qry.results
         end
       end
 
-      threads.each{|thread| until thread.stop?; end}
-
-      threads.each do |thread|
-        thread.run
-        thread.join if @concurrent == false
-      end
-
-      threads.each{|thread| thread.join }
+      @threads.each_value{|thread| thread.join }
 
       @end_time = Time.now
       return results

data/lib/sc_analytics/version.rb

@@ -1,3 +1,3 @@
 module SCAnalytics
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/sc_analytics.rb

@@ -8,6 +8,7 @@ require 'fileutils'
 require 'csv'
 require 'win32ole'
 require 'thread'
+Thread.abort_on_exception = true
 
 begin
   # for development environment
@@ -27,8 +28,8 @@ module SCAnalytics
 
     threads = []
     queries.each do |query|
-      threads << Thread.new do
-        query.run
+      threads << Thread.new(query) do |qry|
+        qry.run
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sc_analytics
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dave Rowan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,6 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/run_report.rb
 - bin/setup
 - example/db_configs_sample.yml
 - lib/sc_analytics.rb

data/bin/run_report.rb

@@ -1,22 +0,0 @@
-require 'sc_analytics'
-include SCAnalytics
-
-report = ARGV[0]
-unless report
-	puts "Please enter the name of the report you wish to run"
-	report = STDIN.gets.strip
-	raise unless report
-end
-
-*report_path, report_name = report.split("/")
-report_name = report_name.sub(/(\.rb)*$/, ".rb")
-
-puts
-job_start = alert("BEGINNING JOB #{report_name.gsub(/\.rb$/,'')}")
-
-Dir.chdir(report_path.join("/")) unless report_path.empty?
-
-instructions = File.read(report_name)
-SCAnalytics.instance_eval(instructions, report_name)
-
-alert("COMPLETED JOB #{report_name} in #{(Time.now - job_start)/60} minutes")