brillo 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dca2fe9bf5bd40152028f30723ec28bf20b277b6
-  data.tar.gz: b3fd67ef708fdeac5f980889fe40d8f46b618bb0
+  metadata.gz: ed51adc58208694cd352025dbd773637176c70f8
+  data.tar.gz: 0556c7bad489affaccba0e9341af4863240d4b28
 SHA512:
-  metadata.gz: 9288c13a235a8e14569e19a5e9e4949675c164a60c926c7b5da381870893d781f2d7c4c9c477ca7d3d96d1632fae224cc6dc20004955f66bec234683ba663d49
-  data.tar.gz: a5b3663b86b43f5a74843e8d7018cb1ba293b1913b21e7cd41502e46c6b8316e52c0be0b44379b32a73b225d878d5d6508eb607bf2ce7cee0b4f8d5482a5eebd
+  metadata.gz: 45accea61c2b9cd61dee2a4b4d95e82a353ed6e2c3ed146dc9445462f7afc33bb327c003895aa4b4f6300df3a19d7d6e503691f0c092259e48f6a31d3889c985
+  data.tar.gz: fa0b361deb1ff96feeede5a1068bcd475182f93ecec877c07e68b81ebdd07e82c7b39519e89f30616804fcec19d0f3ba7fc8fe43d0da76c89a185f8fb709dbd9

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 1.3.0
+Remove Caring specific scrubber code
+
+Fix Postgres load failing because of existing connection
+
 ## 1.2.2
 Fixed initializer. `Brillo.configure` pre-initialization will now work.
 

data/lib/brillo/adapter/base.rb

@@ -1,6 +1,8 @@
 module Brillo
   module Adapter
     class Base
+      include Logger
+
       attr_reader :config
       def initialize(db_config)
         @config = db_config
@@ -26,6 +28,13 @@ module Brillo
       def load_command
         raise NotImplementedError
       end
+
+      def recreate_db
+        ["db:drop", "db:create"].each do |t|
+          logger.info "Running\n\trake #{t}"
+          Rake::Task[t].invoke
+        end
+      end
     end
   end
 end

data/lib/brillo/adapter/postgres.rb

@@ -16,6 +16,21 @@ module Brillo
           FROM #{table_name};
         SQL
       end
+
+      def recreate_db
+        logger.info "Dropping all connections to #{config[:database]}"
+        ActiveRecord::Base.connection.execute(
+          <<-SQL
+          -- Disconnect all others from the database we are about to drop.
+          -- Without this, the drop will fail and so the load will abort.
+          SELECT pg_terminate_backend(pg_stat_activity.pid)
+          FROM pg_stat_activity
+          WHERE pg_stat_activity.datname = '#{config[:database]}'
+            AND pid <> pg_backend_pid();
+          SQL
+        )
+        super
+      end
     end
   end
 end

data/lib/brillo/loader.rb

@@ -18,10 +18,7 @@ module Brillo
     end
 
     def recreate_db
-      ["db:drop", "db:create"].each do |t|
-        logger.info "Running\n\trake #{t}"
-        Rake::Task[t].invoke
-      end
+      config.adapter.recreate_db
     end
 
     def import_sql

data/lib/brillo/scrubber.rb

@@ -10,9 +10,10 @@ module Brillo
     # Define some procs as scrubbing strategies for Polo
     SCRUBBERS = {
       default_time: ->(t) { t.nil? ? Time.now.to_s(:sql) : t },
-      email:        ->(e) { e.match(/@caring.com/) ? e : Digest::MD5.hexdigest(e) + "@example.com".freeze },
+      email:        ->(e) { Digest::MD5.hexdigest(e) + "@example.com".freeze },
       jumble:       ->(j) { j.downcase.chars.shuffle!(random: JUMBLE_PRNG.clone).join },
-      phone:        ->(n) { n = n.split(' ').first; n && n.length > 9 ? n[0..-5] + n[-1] + n[-2] + n[-3] + n[-4] : n},   # strips extensions
+      # strips extensions
+      phone:        ->(n) { n = n.split(' ').first; n && n.length > 9 ? n[0..-5] + n[-1] + n[-2] + n[-3] + n[-4] : n},
       name:         ->(n) { n.downcase.split(' ').map do |word|
           word.chars.shuffle!(random: JUMBLE_PRNG.clone).join
         end.each(&:capitalize!).join(' ')

data/lib/brillo/version.rb

@@ -1,3 +1,3 @@
 module Brillo
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brillo
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Matt Bessey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake