brillo 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1b61984d544d65ece11ac029344d31a7d3bc111
-  data.tar.gz: 38187ebba9e25dda6be33418813e457a292cfb6f
+  metadata.gz: c263c71c0f71009368727fa986bca2553feeea80
+  data.tar.gz: 6d529dd2c34696b1e8c5f2c314d0080b0b3228d8
 SHA512:
-  metadata.gz: 285e40acd59b6ebd01809c99d4c13285f36b6366022df3ed781c6d0e89198c7448ecd72ba9245bd54ffbe2c08dfb93dbcecacf88d600a4a231c4062421f00b9e
-  data.tar.gz: 4665c6cf7c9a59736a577e9db36f17725ca453328aba4486a20ef66bb20eada68407b13dc847b452558fa430d64b0d1a16228eecf97f09d8d618c14972a3190b
+  metadata.gz: cb5931545ee10c680b82921423315ecbe8aa55bc4a882dc2858fbdef2f8e41d19d4c29095e05327ecd17e3d1f175f0a857a6bcc95225df7772264a47ce4d1a79
+  data.tar.gz: 04f7580eda0674af8f4c60cf77519eaab5c190d333de77f9e62dd51ed1bce18d5f6d75a14cb32942ede04a5147d5c4a9f44fb6d8d6fb1c5ad69e92e193241220

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## 1.1.1
+Fixed postgres sequence not being set to MAX(id).
+
 ## 1.1.0
 **New**
 - **BREAKING** Brillo used to support loading your credentials from a YAML file at `/etc/ec2_secure_env.yml`

data/lib/brillo/adapter/base.rb

@@ -13,6 +13,10 @@ module Brillo
         ""
       end
 
+      def table_footer(klass)
+        ""
+      end
+
       def dump_structure_and_migrations(config)
         # Overrides the path the structure is dumped to in Rails >= 3.2
         ENV['SCHEMA'] = ENV['DB_STRUCTURE'] = config.dump_path.to_s

data/lib/brillo/adapter/postgres.rb

@@ -6,6 +6,16 @@ module Brillo
         password = config[:password] ? "-W#{config[:password]}" : ""
         "psql #{host} -U #{config[:username]} #{password} #{config[:database]}"
       end
+
+      # pgdump without schema does not set sequences, so we have to do it ourselves, or the first insert
+      # into a scrubbed table will fail on duplicate primary key
+      def table_footer(klass)
+        table_name = klass.table_name
+        <<-SQL
+          SELECT setval(pg_get_serial_sequence('#{table_name}', 'id'), coalesce(MAX(id),0) + 1, false)
+          FROM #{table_name};
+        SQL
+      end
     end
   end
 end

data/lib/brillo/config.rb

@@ -3,11 +3,11 @@ module Brillo
     attr_reader :app_name, :compress, :obfuscations, :klass_association_map, :db, :transfer_config
 
     def initialize(options = {})
-      @app_name =               options.fetch("name")
-      @klass_association_map =  options["explore"] || {}
-      @compress =               options.fetch("compress",  true)
-      @transfer_config =        Transferrer::Config.new(options.fetch("transfer", {}))
-      @obfuscations =           parse_obfuscations(options["obfuscations"] || {})
+      @app_name =               options.fetch(:name)
+      @klass_association_map =  options[:explore] || {}
+      @compress =               options.fetch(:compress,  true)
+      @transfer_config =        Transferrer::Config.new(**options.fetch(:transfer, {}))
+      @obfuscations =           parse_obfuscations(options[:obfuscations] || {})
     rescue KeyError => e
       raise ConfigParseError, e
     end
@@ -18,7 +18,7 @@ module Brillo
         raise ConfigParseError, "Scrub strategy '#{strategy}' not found, but required by '#{field}'"
       end
       @klass_association_map.each do |klass, _|
-        next if klass.camelize.safe_constantize
+        next if klass.to_s.camelize.safe_constantize
         raise ConfigParseError, "Class #{klass} not found"
       end
       self
@@ -73,13 +73,13 @@ module Brillo
     end
 
     # Convert generic cross table obfuscations to symbols so Polo parses them correctly
-    # "my_table.field" => "my_table.field"
-    # "my_field"       => :my_field
+    # :"my_table.field" => "my_table.field"
+    # :my_field         => :my_field
     def parse_obfuscations(obfuscations)
       obfuscations.each_pair.with_object({}) do |field_and_strategy, hash|
         field, strategy = field_and_strategy
         strategy = strategy.to_sym
-        field.match(/\./) ? hash[field] = strategy : hash[field.to_sym] = strategy
+        field.to_s.match(/\./) ? hash[field.to_s] = strategy : hash[field] = strategy
       end
     end
   end

data/lib/brillo/scrubber.rb

@@ -46,16 +46,19 @@ module Brillo
         klass_association_map.each do |klass, options|
           begin
             klass = deserialize_class(klass)
-            tactic = deserialize_tactic(options)
+            tactic = deserialize_tactic(klass, options)
           rescue ConfigParseError => e
             logger.error "Error in brillo.yml: #{e.message}"
             next
           end
-          associations = options.fetch("associations", [])
+          associations = options.fetch(:associations, [])
           explore_class(klass, tactic, associations) do |insert|
             sql_file.puts(insert)
           end
         end
+        ActiveRecord::Base.descendants.each do |klass|
+          sql_file.puts(adapter.table_footer(klass))
+        end
         sql_file.puts(adapter.footer)
       end
     end
@@ -97,13 +100,13 @@ module Brillo
     end
 
     def deserialize_class(klass)
-      klass.camelize.constantize
+      klass.to_s.camelize.constantize
     rescue
-      raise Config::ConfigParseError, "Could not process class '#{klass}'"
+      raise ConfigParseError, "Could not process class '#{klass}'"
     end
 
-    def deserialize_tactic(options)
-      options.fetch("tactic").to_sym
+    def deserialize_tactic(klass, options)
+      options.fetch(:tactic).to_sym
     rescue KeyError
       raise ConfigParseError, "Tactic not specified for class #{klass}"
     end

data/lib/brillo/transferrer/s3.rb

@@ -24,6 +24,7 @@ module Brillo
 
       def download
         return unless enabled
+        logger.info("download from s3 #{bucket} #{path}")
         FileUtils.rm path, force: true
         client.get_object({bucket: bucket, key: path.to_s}, target: path)
       rescue Aws::S3::Errors::NoSuchBucket
@@ -33,6 +34,7 @@ module Brillo
 
       def upload
         return unless enabled
+        logger.info("uploading to s3 #{bucket} #{path}")
         object = resource.bucket(bucket).object(path.to_s)
         object.upload_file(path)
       rescue Aws::S3::Errors::NoSuchBucket

data/lib/brillo/version.rb

@@ -1,3 +1,3 @@
 module Brillo
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/brillo.rb

@@ -1,5 +1,5 @@
 require 'yaml'
-require 'active_support'
+require 'active_support/hash_with_indifferent_access'
 require 'active_support/core_ext/string/inflections'
 require 'active_record'
 require "brillo/version"
@@ -44,7 +44,7 @@ module Brillo
 
   def self.config
     @config ||= begin
-      static_config = YAML.load_file("#{Rails.root.to_s}/config/brillo.yml")
+      static_config = YAML.load_file("#{Rails.root.to_s}/config/brillo.yml").deep_symbolize_keys
       Config.new(static_config)
     end
   end

data/lib/tasks/brillo.rake

@@ -8,7 +8,7 @@ namespace :db do
     logger.level = ENV["VERBOSE"] ? Logger::DEBUG : Logger::WARN
     begin
       Brillo.scrub!(logger: logger)
-    rescue CredentialsError => e
+    rescue Brillo::CredentialsError => e
       puts e
       exit(1)
     end
@@ -18,7 +18,7 @@ namespace :db do
   task :load => :environment do
     begin
       Brillo.load!
-    rescue CredentialsError => e
+    rescue Brillo::CredentialsError => e
       puts e
       exit(1)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brillo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Matt Bessey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake