crop-duster 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d305d8ea487f314cd5e1be6d0fb615fbe4eb3905
-  data.tar.gz: 79120de446c415b64b23b0a32ccdfb7c647ddd6d
+  metadata.gz: ec065087078cb2ec65e5aeb9907ef1984fb1d7ae
+  data.tar.gz: 544a4f044b27bd6e43371cc320cacf571cbbb1e1
 SHA512:
-  metadata.gz: d95155eb2b0d5f002e5cd152a7bda7e6c00d7f0bd2693e8f60015ca0a5bd6a8176bf639a16c0f2954dd01c10afaeb1da5ae532e0e97d119a0877831c3972d445
-  data.tar.gz: ce5f7e0dc72eb54a3be1d1a8f8aa209764ab20878983880efbff361579c3fa9a6a3a63728b56f241c0680cb41854a3d9c0254494721e741042b0a152971cd924
+  metadata.gz: e031da7623557bcf5cdad96fad0d34cfb8a2016b40ba6d505dcab3766d1317d9652b2b36ce5bb125b4c99582c2d0a22ae4810dc7185e7ecf5693e364191d563d
+  data.tar.gz: b397508fb1ac8599cc366b8ba449b93ae88d5bd84928690ecc33b1c3511c92cab6934ac69cadf700d67f16b2a35966240354b5c991758129bf8e1606cd6ad284

data/lib/crop_duster/importer.rb

@@ -45,7 +45,11 @@ module CropDuster
       end
 
       def import_billing(import_id = SecureRandom.hex)
-        ActiveRecord::Base.connection.instance_variable_get("@connection").exec("TRUNCATE aws_billing_imports")
+        ar_conn = ActiveRecord::Base.connection_pool.checkout
+        conn = ar_conn.raw_connection
+
+        conn.exec("TRUNCATE aws_billing_imports")
+
         s = Fog::Storage.new CropDuster.aws_keys
         path = "#{CropDuster.tmp_dir}/#{import_id}"
         Dir.mkdir path
@@ -60,8 +64,6 @@ module CropDuster
           next if file =~ /^\./
           headers = nil
 
-          ar_conn = ActiveRecord::Base.connection_pool.checkout
-          conn = ar_conn.raw_connection
           conn.copy_data "COPY aws_billing_imports FROM STDIN CSV" do
             File.new(File.join(path, file)).each_line do |line|
               if headers.nil?
@@ -71,9 +73,10 @@ module CropDuster
               end
             end
           end
-          ActiveRecord::Base.connection_pool.checkin(ar_conn)
         end
 
+        ActiveRecord::Base.connection_pool.checkin(ar_conn)
+
         `rm #{path}/*.csv`
       end
     end

data/lib/crop_duster/version.rb

@@ -1,5 +1,5 @@
 module Crop
   module Duster
-    VERSION = "0.0.11"
+    VERSION = "0.0.12"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crop-duster
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Chris Winslett