effective_developer 0.6.8 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f51117606ee26c0266dfac742502712dc318a8b09148d722f928b3efd8dc404e
-  data.tar.gz: 4fd2b3a0fd954b1c0f0d9716e6ee33c911365a3f71aa0141c7e60b5294c8a7bc
+  metadata.gz: 7c82e5a358ef279b2ccccaaf54c097ca549449b4d7c4c076eea41f88f5646f3e
+  data.tar.gz: c66fce38e2b60d3796964d51fd718911736c2be3f4f0e0413235b84095e25dd5
 SHA512:
-  metadata.gz: f5c5588277544f359c0e8481f9f273dc90f34f3831c8e2b3a8e3394a93657a0c863b1d699db00aa707fd7c716e29c47e9904319ac4405b1f82bac8ca89a4c759
-  data.tar.gz: 6f55724df58ff196884dcd26ff7e2e274b800eae283bacf1b9ef5759f338edc8dfca73d0bc7b1fbf5ba90e6c3e1f9bbfabd434bc88bedb8dbcbe5a6f040a1975
+  metadata.gz: d9fc0933cede1643a01fa8000c46d5beb1d8184e5eb74750adf6120cb4747789a65df62079f96b1a2946a78c177739a05880bfd925366e082b3493b2a2c6f1ec
+  data.tar.gz: f74388c2dd737bf879ff0a3b147c577b20eac0407a8d4b176942716a93cb75292c9ec2376211d176256e9aae0f50484d40adb4fac153f613283f24ed1b84991c

data/README.md

@@ -238,6 +238,12 @@ rake pg:pull
 rake pg:pull[staging]
 ```
 
+By default, any data in the `logs` table will be excluded. To include the logs data:
+
+```ruby
+rake pg:pull logs=true
+```
+
 ## pg:load
 
 Drops and re-creates the local database then initializes database with the contents of latest.dump

data/app/models/effective/form_upgrader.rb

@@ -38,6 +38,8 @@ module Effective
     private
 
     SIMPLE_FORM_FOR_REGEX = /simple_form_for( |\()(\[:[^,]+, ?[^,]+\])?(([^,]+),)?.+do \|(\w+)\|/
+    SIMPLE_FORM_FOR_REGEX2 = /simple_form_for\((\w+).+?\) do \|(\w+)\|/
+
     SIMPLE_FORM_INPUT_ATTRIBUTE = /\.input( |\():(\w+)/
     SIMPLE_FORM_INPUT_AS_ONE = /(as: :(\w+))/
     SIMPLE_FORM_INPUT_AS_TWO = /(:as => :(\w+))/
@@ -53,17 +55,38 @@ module Effective
       # Replace simple_form_for
       writer.all { |line| line.include?('simple_form_for') }.each do |line|
         content = writer.lines[line]
+
+        # Try first time
         matched = content.match(SIMPLE_FORM_FOR_REGEX)
-        raise("unable to match simple_form_for from:\n#{content}") unless matched.present?
 
-        original = matched[0]
-        model = matched[2] || matched[4]
-        letter = matched[5]
+        if matched.present?
+          original = matched[0]
+          model = matched[2] || matched[4]
+          letter = matched[5]
 
-        raise("unable to determine simple_form_for subject from:\n#{content}") unless original && model && letter
+          if original && model && letter
+            content.sub!(original, "effective_form_with(model: #{model}) do |#{letter}|")
+            writer.replace(line, content)
+            next
+          end
+        end
 
-        content.sub!(original, "effective_form_with(model: #{model}) do |#{letter}|")
-        writer.replace(line, content)
+        # Try second time
+        matched = content.match(SIMPLE_FORM_FOR_REGEX2)
+
+        if matched.present?
+          original = matched[0]
+          model = matched[1]
+          letter = matched[2]
+
+          if original && model && letter
+            content.sub!(original, "effective_form_with(model: #{model}) do |#{letter}|")
+            writer.replace(line, content)
+            next
+          end
+        end
+
+        puts("unable to determine simple_form_for subject from:\n#{content}")
       end
 
       # Try to figure out klass again if its missing from filename
@@ -189,7 +212,8 @@ module Effective
       when 'text' then 'text_area'
       when 'url' then 'url_field'
       else
-        raise("unknown input type #{input_type} (for attribute :#{attribute})")
+        puts("unknown input type #{input_type} (for attribute :#{attribute})")
+        'text_field'
       end
     end
 

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.6.8'.freeze
+  VERSION = '0.6.11'.freeze
 end

data/lib/tasks/pg_pull.rake

@@ -8,18 +8,20 @@ namespace :pg do
   # bundle exec rake pg:pull
   # bundle exec rake pg:pull[staging]
   # bundle exec rake pg:pull[158.204.33.124]
+  # bundle exec rake pg:pull logs=true
   # bundle exec rake pg:pull filename=latest.dump database=example
+  # bundle exec rake pg:pull filename=latest.dump database=example logs=true
   # DATABASE=example bundle exec rake pg:load
   desc 'Creates a new backup on remote server and downloads it to latest.dump'
   task :pull, [:remote] => :environment do |t, args|
     defaults = { database: nil, filename: (ENV['DATABASE'] || 'latest') + '.dump' }
-    env_keys = { database: ENV['DATABASE'], filename: ENV['FILENAME'] }
+    env_keys = { database: ENV['DATABASE'], filename: ENV['FILENAME'], logs: ENV['LOGS'] }
     keywords = ARGV.map { |a| a.split('=') if a.include?('=') }.compact.inject({}) { |h, (k, v)| h[k.to_sym] = v; h }
     args.with_defaults(defaults.compact.merge(env_keys.compact).merge(keywords))
 
     # Validate Config
-    config = ActiveRecord::Base.configurations[Rails.env]
     configs = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env)
+    config = configs.first
 
     if configs.length > 1 && args.database.blank?
       puts "Multiple database configs exist for #{Rails.env} environment."
@@ -62,7 +64,7 @@ namespace :pg do
       # SSH into hatchbox and call rake pg:save there to create latest.dump
       unless(result = `ssh -T #{args.user}@#{args.remote} << EOF
         cd ~/#{args.app}/current/
-        bundle exec rake pg:save database=#{args.database} filename=#{args.filename}
+        bundle exec rake pg:save database=#{args.database} filename=#{args.filename} logs=#{args.logs}
       `).include?('Saving database completed') # The output of pg:save down below
         puts("Error calling ssh #{args.user}@#{args.remote} and running rake pg:save on hatchbox from ~/#{args.app}/current/")
         abort(result)
@@ -102,8 +104,8 @@ namespace :pg do
     end
 
     # Validate Config
-    config = ActiveRecord::Base.configurations[Rails.env]
     configs = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env)
+    config = configs.first
 
     if configs.length > 1 && args.database.blank?
       puts "Multiple database configs exist for #{Rails.env} environment."
@@ -140,7 +142,7 @@ namespace :pg do
   desc 'Saves the development database to a postgresql .dump file (latest.dump by default)'
   task :save, [:filename] => :environment do |t, args|
     defaults = { database: nil, filename: (ENV['DATABASE'] || 'latest') + '.dump' }
-    env_keys = { database: ENV['DATABASE'], filename: ENV['FILENAME'] }
+    env_keys = { database: ENV['DATABASE'], filename: ENV['FILENAME'], logs: ENV['LOGS'] }
     keywords = ARGV.map { |a| a.split('=') if a.include?('=') }.compact.inject({}) { |h, (k, v)| h[k.to_sym] = v; h }
     args.with_defaults(defaults.compact.merge(env_keys.compact).merge(keywords))
 
@@ -151,8 +153,8 @@ namespace :pg do
       { username: uri.user, password: uri.password, host: uri.host, port: (uri.port || 5432), database: uri.path.sub('/', '') }
     else
       # Validate Config
-      config = ActiveRecord::Base.configurations[Rails.env]
       configs = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env)
+      config = configs.first
 
       if configs.length > 1 && args.database.blank?
         puts "Multiple database configs exist for #{Rails.env} environment."
@@ -179,7 +181,9 @@ namespace :pg do
 
     puts "=== Saving local '#{db[:database]}' database to #{args.filename}"
 
-    if system("export PGPASSWORD=#{db[:password]}; pg_dump -Fc --no-acl --no-owner -h #{db[:host]} -p #{db[:port]} -U #{db[:username]} #{db[:database]} > #{args.filename}")
+    exclude_table_data = "--exclude-table-data=logs" unless (args.logs == 'true')
+
+    if system("export PGPASSWORD=#{db[:password]}; pg_dump -Fc --no-acl --no-owner #{exclude_table_data} -h #{db[:host]} -p #{db[:port]} -U #{db[:username]} #{db[:database]} > #{args.filename}")
       puts "Saving database completed"
     else
       abort "Error saving database"
@@ -189,11 +193,10 @@ namespace :pg do
   desc 'Clones the production (--remote heroku by default) database to staging (--remote staging by default)'
   task :clone, [:source_remote, :target_remote] => :environment do |t, args|
     args.with_defaults(:source_remote => 'heroku', :target_remote => 'staging')
-    db = ActiveRecord::Base.configurations[Rails.env]
 
     puts "=== Cloning remote '#{args.source_remote}' to '#{args.target_remote}'"
 
-    Bundler.with_clean_env do
+    Bundler.with_unbundled_env do
       unless system("heroku pg:backups:capture --remote #{args.source_remote}")
         abort "Error capturing heroku backup"
       end
@@ -240,7 +243,7 @@ namespace :pg do
     puts "=== Cloning local table '#{args.table}' to remote #{args.remote} database"
 
     # Dump my local database table
-    db = ActiveRecord::Base.configurations[Rails.env]
+    db = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env).first
     tmpfile = "tmp/#{args.table}.sql"
 
     unless system("pg_dump --data-only --table=#{args.table} -h localhost -U '#{db['username']}' '#{db['database']}' > #{tmpfile}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails