effective_developer 0.5.4 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b1e21ed1c3b2080e07244e8e7d01cb9b611ce045c9c8ffa2073caded089f6c1
-  data.tar.gz: a0be18c08741489856b6aff27861d4b5408c4db12bd9e33b9e8898f072c47fd6
+  metadata.gz: 7e76b8818691ec2238e08a818d209ba7e4d1746734ef3c7c2c2cbe8f4e08aa12
+  data.tar.gz: a283fca85ffd1c0dc6d73287bd6c239c898e6b6e2aa8500ebc08642960f7ad5f
 SHA512:
-  metadata.gz: 8c2822c02d0ce42a2f875ff1efa2dd84df01063e2d18dd14dcbb08b1379e9eaa19bcb6dafa1453943c953b8debaae210054973d6de7d6def7a3a4f0eb22ce6e0
-  data.tar.gz: a0f964f2d4e70ee5624618cd44819d8a97cd3875e9a3dac2531552fe12484d1a09031d96a12ac1729e28522c4110ece5208c49e9d8765acd0efa649537d2e1e2
+  metadata.gz: 0dc45f6f25c607353f5ea9651cda2054e2d6f2996fac603ebd37df05191d4a2d7981662e7e68681163856a566eeb452c4b0030623d130f2d33507bea36956548
+  data.tar.gz: 8a4ec7eab0237e8f0ac37a80e1cb7ea3974514b8228a6f8711a9fa00b66e0d2cecb5b22d336c28afd954bb916337b809a1205b8820d3637fb66574829710b73d

data/app/models/effective/annotator.rb

@@ -0,0 +1,81 @@
+# Writes the effective_resource do .. end block into the model file
+module Effective
+  class Annotator
+
+    def initialize(resource: 'All', folders: 'app/models/')
+      @resources = Array(resource).map { |resource| resource.to_s.classify }
+      @folders = Array(folders)
+    end
+
+    def annotate!
+      @folders.each do |folder|
+        Dir.glob(folder + '**/*').each do |path|
+          next if File.directory?(path)
+
+          name = path.sub(folder, '').split('.')[0...-1].join('.')
+          resource = Effective::Resource.new(name)
+          klass = resource.klass
+
+          next if klass.blank?
+          next unless klass.ancestors.include?(ActiveRecord::Base)
+          next if klass.abstract_class?
+          next unless @resources.include?('All') || @resources.include?(klass.name)
+
+          annotate(resource, path)
+        end
+      end
+
+      puts 'All Done. Have a great day.'
+      true
+    end
+
+    private
+
+    def annotate(resource, path)
+      puts "Annotate: #{path}"
+
+      Effective::CodeWriter.new(path) do |writer|
+        index = find_insert_at(writer)
+        content = build_content(resource)
+
+        remove_existing(writer)
+        writer.insert(content, index)
+      end
+    end
+
+    def find_insert_at(writer)
+      index = writer.first { |line| line.include?('effective_resource do') || line.include?('structure do') }
+
+      index ||= begin
+        index = writer.first { |line| line.include?('validates :') || line.include?('scope :') || line.include?('def ') }
+        index - 1 if index
+      end
+
+      [1, index.to_i-1].max
+    end
+
+    def remove_existing(writer)
+      from = writer.first { |line| line.include?('effective_resource do') || line.include?('structure do') }
+      return unless from.present?
+
+      to = writer.first(from: from) { |line| line == 'end' || line == '# end' }
+      return unless to.present?
+
+      writer.remove(from: from, to: to+1)
+    end
+
+    def build_content(resource)
+      attributes = resource.klass_attributes(all: true)
+      atts = attributes.except(resource.klass.primary_key.to_sym, :created_at, :updated_at)
+
+      max = atts.map { |k, v| k.to_s.length }.max.to_i + 4
+      max = max + 1 unless (max % 2 == 0)
+
+      lines = atts.map { |k, v| k.to_s + (' ' * (max - k.to_s.length)) + ":#{v.first}" }
+      lines += ['', 'timestamps'] if attributes.key?(:created_at) && attributes.key?(:updated_at)
+
+      ['effective_resource do'] + lines + ['end']
+    end
+
+  end
+end

data/app/models/effective/code_writer.rb

@@ -228,13 +228,17 @@ module Effective
       lines.each { |line| @changed = true if line.gsub!(source, target) }
     end
 
+    def remove(from:, to:)
+      raise('expected from to be less than to') unless from.present? && to.present? && (from < to)
+      @changed = true
+      (to - from).times { lines.delete_at(from) }
+    end
+
     def replace(index, content)
       @changed = true
       lines[index].replace(content.to_s)
     end
 
-    private
-
     def write!
       return false unless changed?
 
@@ -245,6 +249,8 @@ module Effective
       true
     end
 
+    private
+
     def open?(content)
       stripped = ss(content)
 

data/app/models/effective/profiler.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# Effective::Profiler.allocations { my_method() }
+
+module Effective
+  class Profiler
+
+    def self.allocations(sourcefiles: ['effective_'], &block)
+      raise('please install the allocation_stats gem') unless defined?(AllocationStats)
+
+      # Run block
+      retval = nil
+      stats = AllocationStats.trace { retval = yield(block) }
+
+      # Compute Allocations
+      allocations = stats.allocations.to_a
+
+      # Filter
+      if sourcefiles.present?
+        sourcefiles = Array(sourcefiles)
+        allocations = allocations.select! { |allocation| sourcefiles.any? { |str| allocation.sourcefile.include?(str) } }
+      end
+
+      # Sort
+      allocations = allocations.sort_by { |allocation| allocation.memsize }
+
+      # Print
+      puts AllocationStats::AllocationsProxy.new(allocations).to_text
+
+      puts "Total allocations: #{allocations.length}. Total size: #{allocations.sum(&:memsize)}"
+
+      retval
+    end
+
+  end
+end

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.5.4'.freeze
+  VERSION = '0.6.3'.freeze
 end

data/lib/generators/effective/ability_generator.rb

@@ -15,20 +15,26 @@ module Effective
 
       argument :actions, type: :array, default: ['crud'], banner: 'action action'
 
+      def validate_resource
+        exit unless resource_valid?
+      end
+
       def invoke_ability
         say_status :invoke, :ability, :white
       end
 
       def create_ability
-        unless File.exists?('app/models/ability.rb')
+        unless File.exists?(resource.abilities_file)
           say_status(:skipped, :ability, :yellow) and return
         end
 
-        Effective::CodeWriter.new('app/models/ability.rb') do |w|
-          if w.find { |line, depth| depth == 2 && line == ability }
+        Effective::CodeWriter.new(resource.abilities_file) do |w|
+          if w.find { |line, depth| (depth == 2 || depth == 3) && line == ability }
             say_status :identical, ability, :blue
           else
-            w.insert_into_first(ability) { |line, depth| line.start_with?('def initialize') }
+            w.insert_into_first(ability + "\n") { |line, depth| line.start_with?('def initialize') || line.end_with?('abilities(user)') }
+
+            say_status :ability, ability
           end
         end
       end
@@ -55,7 +61,13 @@ module Effective
             abilities = '[' + abilities.map { |action| ':' + action }.join(', ') + ']'
           end
 
-          "can #{abilities}, #{resource.class_name}"
+          name = if resource.module_name.present?
+            resource.class_name.split('::').last
+          else
+            resource.class_name
+          end
+
+          "can #{abilities}, #{name}"
         )
       end
     end

data/lib/generators/effective/controller_generator.rb

@@ -17,6 +17,10 @@ module Effective
       argument :actions, type: :array, default: ['crud'], banner: 'action action'
       class_option :attributes, type: :array, default: [], desc: 'Included permitted params, otherwise read from model'
 
+      def validate_resource
+        exit unless resource_valid?
+      end
+
       def assign_actions
         @actions = invoked_actions
       end

data/lib/generators/effective/datatable_generator.rb

@@ -4,7 +4,7 @@
 
 # Generates a datatable
 # rails generate effective:datatable Thing
-# rails generate effective:controller Thing name:string description:text
+# rails generate effective:datatable Thing name:string description:text
 
 module Effective
   module Generators
@@ -18,6 +18,10 @@ module Effective
       argument :actions, type: :array, default: ['crud'], banner: 'action action'
       class_option :attributes, type: :array, default: [], desc: 'Included permitted params, otherwise read from model'
 
+      def validate_resource
+        exit unless resource_valid?
+      end
+
       def assign_attributes
         @attributes = invoked_attributes.presence || resource_attributes(all: true)
         self.class.send(:attr_reader, :attributes)
@@ -32,7 +36,10 @@ module Effective
           say_status(:skipped, :datatable, :yellow) and return
         end
 
-        template 'datatables/datatable.rb', resource.datatable_file
+        with_resource_tenant do
+          template 'datatables/datatable.rb', resource.datatable_file
+        end
+
       end
 
     end

data/lib/generators/effective/form_generator.rb

@@ -20,6 +20,10 @@ module Effective
       argument :attributes, type: :array, default: [], banner: 'field[:type] field[:type]'
       class_option :tabbed, type: :string, default: 'true'
 
+      def validate_resource
+        exit unless resource_valid?
+      end
+
       def assign_attributes
         @attributes = invoked_attributes.presence || resource_attributes
         self.class.send(:attr_reader, :attributes)
@@ -30,15 +34,19 @@ module Effective
       end
 
       def create_flat_form
-        if options[:tabbed] == 'false'
-          template 'forms/flat/_form.html.haml', resource.view_file('form', partial: true)
+        with_resource_tenant do
+          if options[:tabbed] == 'false'
+            template 'forms/flat/_form.html.haml', resource.view_file('form', partial: true)
+          end
         end
       end
 
       def create_tabbed_form
-        if options[:tabbed] == 'true'
-          template 'forms/tabbed/_form.html.haml', resource.view_file('form', partial: true)
-          template 'forms/tabbed/_form_resource.html.haml', resource.flat_view_file("form_#{resource.name}", partial: true)
+        with_resource_tenant do
+          if options[:tabbed] == 'true'
+            template 'forms/tabbed/_form.html.haml', resource.view_file('form', partial: true)
+            template 'forms/tabbed/_form_resource.html.haml', resource.view_file("form_#{resource.name}", partial: true)
+          end
         end
       end
 

data/lib/generators/effective/helpers.rb

@@ -4,6 +4,24 @@ module Effective
 
       protected
 
+      # This is kind of a validate for the resource
+      def resource_valid?
+        if resource.klass.blank?
+          say_status(:error, "Unable to find resource klass from #{name}", :red)
+          return false
+        end
+
+        true
+      end
+
+      def with_resource_tenant(&block)
+        if defined?(Tenant) && resource.tenant.present?
+          Tenant.as(resource.tenant) { yield }
+        else
+          yield
+        end
+      end
+
       def resource
         @resource ||= Effective::Resource.new(name)
       end
@@ -55,24 +73,26 @@ module Effective
       end
 
       def resource_attributes(all: false)
-        klass_attributes = resource.klass_attributes(all: all)
+        with_resource_tenant do
+          klass_attributes = resource.klass_attributes(all: all)
 
-        if klass_attributes.blank?
-          if ActiveRecord::Migration.respond_to?(:check_pending!)
-            pending = (ActiveRecord::Migration.check_pending! rescue true)
-          else
-            pending = ActiveRecord::Migrator.new(:up, ActiveRecord::Migrator.migrations(ActiveRecord::Migrator.migrations_paths)).pending_migrations.present?
-          end
+          if klass_attributes.blank?
+            if ActiveRecord::Migration.respond_to?(:check_pending!)
+              pending = (ActiveRecord::Migration.check_pending! rescue true)
+            else
+              pending = ActiveRecord::Migrator.new(:up, ActiveRecord::Migrator.migrations(ActiveRecord::Migrator.migrations_paths)).pending_migrations.present?
+            end
 
-          if pending
-            migrate = ask("Unable to read the attributes of #{resource.klass || resource.name}. There are pending migrations. Run db:migrate now? [y/n]")
-            system('bundle exec rake db:migrate') if migrate.to_s.include?('y')
+            if pending
+              migrate = ask("Unable to read the attributes of #{resource.klass || resource.name}. There are pending migrations. Run db:migrate now? [y/n]")
+              system('bundle exec rake db:migrate') if migrate.to_s.include?('y')
+            end
+
+            klass_attributes = resource.klass_attributes(all: all)
           end
 
-          klass_attributes = resource.klass_attributes(all: all)
+          klass_attributes.presence || resource.model_attributes(all: all)
         end
-
-        klass_attributes.presence || resource.model_attributes(all: all)
       end
 
     end

data/lib/generators/effective/menu_generator.rb

@@ -13,6 +13,10 @@ module Effective
 
       desc 'Adds a menu link to an existing _navbar.html.haml'
 
+      def validate_resource
+        exit unless resource_valid?
+      end
+
       def invoke_menu
         say_status :invoke, :menu, :white
       end
@@ -22,7 +26,7 @@ module Effective
         return unless resource.namespaces.blank?
 
         begin
-          Effective::CodeWriter.new('app/views/layouts/_navbar.html.haml') do |w|
+          Effective::CodeWriter.new(resource.menu_file) do |w|
             if w.find { |line, _| line == menu_content.second.strip }
               say_status :identical, menu_path, :blue
             else
@@ -44,7 +48,7 @@ module Effective
         return unless resource.namespaces == ['admin']
 
         begin
-          Effective::CodeWriter.new('app/views/layouts/_navbar_admin.html.haml') do |w|
+          Effective::CodeWriter.new(resource.admin_menu_file) do |w|
             if w.find { |line, _| line == menu_content.second.strip }
               say_status :identical, menu_path, :blue
             else
@@ -72,7 +76,8 @@ module Effective
       end
 
       def menu_path
-        [resource.namespace, resource.plural_name, 'path'].compact * '_'
+        path = [resource.namespace, resource.plural_name, 'path'].compact * '_'
+        resource.tenant.present? ? "#{resource.tenant}.#{path}" : path
       end
     end
   end

data/lib/generators/effective/migration_generator.rb

@@ -16,21 +16,47 @@ module Effective
       desc 'Creates a migration.'
 
       argument :attributes, type: :array, default: [], banner: 'field[:type] field[:type]'
+      class_option :database, type: :string, desc: "Database to generate the migration for"
+
+      def validate_resource
+        exit unless resource_valid?
+      end
 
       def invoke_migration
         say_status :invoke, :migration, :white
       end
 
+      # rails generate effective:migration courses body:text --database example
       def create_migration
         if invoked_attributes.present?
-          Rails::Generators.invoke('migration', ["create_#{plural_name}"] + (invokable(invoked_attributes) | timestamps))
-        elsif resource.klass_attributes.present?
-          raise 'klass_attributes already exist.  We cant migrate (yet). Exiting.'
-        elsif resource.model_attributes.present?
-          Rails::Generators.invoke('migration', ["create_#{plural_name}"] + invokable(resource.model_attributes))
-        else
-          raise 'You need to specify some attributes or have a model file present'
+          args = ["create_#{plural_name}"] + (invokable(invoked_attributes) | timestamps)
+          args += ["--database", options['database']] if options['database']
+          Rails::Generators.invoke('migration', args)
+          return
+        end
+
+        return if with_resource_tenant do
+          table_name = resource.klass.table_name
+
+          if ActiveRecord::Base.connection.table_exists?(table_name)
+            say_status(:error, "#{table_name} table already exist. We can't migrate (yet). Exiting.", :red)
+            true
+          end
         end
+
+        if resource.model_attributes.blank?
+          say_status(:error, "No model attributes present. Please add the effective_resource do ... end block and try again", :red)
+          return
+        end
+
+        args = ["create_#{plural_name}"] + invokable(resource.model_attributes) - timestamps
+        args += ["--database", options['database']] if options['database']
+
+        if options['database'].blank? && defined?(Tenant)
+          args += ["--database", resource.klass.name.split('::').first.downcase]
+        end
+
+        Rails::Generators.invoke('migration', args)
       end
 
       protected

data/lib/generators/effective/route_generator.rb

@@ -15,6 +15,10 @@ module Effective
 
       argument :actions, type: :array, default: ['crud'], banner: 'action action'
 
+      def validate_resource
+        exit unless resource_valid?
+      end
+
       def invoke_route
         say_status :invoke, :route, :white
       end
@@ -22,7 +26,7 @@ module Effective
       def create_route
         blocks = []
 
-        Effective::CodeWriter.new('config/routes.rb') do |w|
+        Effective::CodeWriter.new(resource.routes_file) do |w|
           resource.namespaces.each do |namespace|
             index = nil
 
@@ -54,7 +58,7 @@ module Effective
 
       def resources
         @resources ||= (
-          resources = "resources :#{plural_name}"
+          resources = "resources :#{resource.plural_name}"
 
           if ((crud_actions - ['show']) == invoked_actions)
             resources << ', except: [:show]'

data/lib/generators/effective/views_generator.rb

@@ -16,6 +16,10 @@ module Effective
       argument :actions, type: :array, default: ['crud'], banner: 'action action'
       class_option :attributes, type: :array, default: [], desc: 'Included form attributes, otherwise read from model'
 
+      def validate_resource
+        exit unless resource_valid?
+      end
+
       def assign_attributes
         @attributes = (invoked_attributes.presence || resource_attributes).except(:archived)
         self.class.send(:attr_reader, :attributes)

data/lib/scaffolds/controllers/controller.rb

@@ -1,3 +1,11 @@
-class <%= resource.namespaced_class_name.pluralize %>Controller < <%= [resource.namespace.try(:classify).presence, ApplicationController].compact.join('::') %>
+<% if resource.module_name.present? -%>
+module <%= resource.module_name %>
+  class <%= resource.module_namespaced %>Controller < <%= resource.module_namespace %>ApplicationController
+    include Effective::CrudController
+  end
+end
+<% else -%>
+class <%= resource.namespaced_class_name.pluralize %>Controller < <%= resource.module_namespace %>ApplicationController
   include Effective::CrudController
 end
+<% end -%>

data/lib/scaffolds/datatables/datatable.rb

@@ -1,14 +1,43 @@
-class <%= resource.namespaced_class_name.pluralize %>Datatable < Effective::Datatable
+<% if resource.module_name.present? -%>
+module <%= resource.module_name %>
+  class <%= resource.module_namespaced %>Datatable < Effective::Datatable
+    datatable do
+      order :updated_at
 
-  bulk_actions do
-    bulk_action 'Delete selected', <%= [resource.namespaces, resource, 'path'].flatten.compact.join('_') %>(:ids), data: { method: :delete, confirm: 'Really delete selected?' }
-  end
+      col :updated_at, visible: false
+      col :created_at, visible: false
+      col :id, visible: false
+
+<% if resource.belong_tos.present? || resource.has_anys.present? -%>
+<% resource.belong_tos.each do |reference| -%>
+      col :<%= reference.name %>
+<% end -%>
+<% resource.has_anys.each do |reference| -%>
+      col :<%= reference.name %>
+<% end -%>
+
+<% end -%>
+<% attributes.except(:created_at, :updated_at, :id, :archived).each do |name, _| -%>
+      col :<%= name %>
+<% end -%>
+<% if attributes.key?(:archived) -%>
+
+      col :archived, search: { value: false }
+<% end -%>
+
+      actions_col
+    end
 
+    collection do
+      <%= resource.class_name %>.deep.all
+    end
+  end
+end
+<% else -%>
+class <%= resource.namespaced_class_name.pluralize %>Datatable < Effective::Datatable
   datatable do
     order :updated_at
 
-    bulk_actions_col
-
     col :updated_at, visible: false
     col :created_at, visible: false
     col :id, visible: false
@@ -36,5 +65,5 @@ class <%= resource.namespaced_class_name.pluralize %>Datatable < Effective::Data
   collection do
     <%= resource.class_name %>.deep.all
   end
-
 end
+<% end -%>

data/lib/scaffolds/forms/tabbed/_form.html.haml

@@ -1,6 +1,6 @@
 = tabs do
   = tab '<%= resource.human_name.titleize %>' do
-    = render '/<%= resource.plural_name %>/form_<%= resource.name %>', <%= resource.name %>: <%= resource.name %>, namespace: <%= resource.namespace ? ":#{resource.namespace}" : 'nil' %>
+    = render '<%= resource.view_file_path("form_#{resource.name}") %>', <%= resource.name %>: <%= resource.name %>
 
 <%- if resource.nested_resources.present? || resource.instance.respond_to?(:log_changes_datatable) %>
   - if <%= resource.name %>.persisted?

data/lib/scaffolds/forms/tabbed/_form_resource.html.haml

@@ -1,4 +1,8 @@
-= effective_form_with(model: [(namespace if defined?(namespace)), <%= resource.name %>]) do |f|
+<% if resource.namespace.present? -%>
+= effective_form_with(model: [:<%= resource.namespace %>, <%= resource.name %>]) do |f|
+<% else -%>
+= effective_form_with(model: <%= resource.name %>) do |f|
+<% end -%>
 <% resource.belong_tos.each do |reference| -%>
 <%= render_field(reference, depth: 1) %>
 <% end -%>

data/lib/tasks/annotate.rake

@@ -0,0 +1,8 @@
+# bundle exec rake annotate
+# bundle exec rake annotate[user]
+
+desc 'Adds an effective_resources do .. end block to all ActiveRecord model files'
+task :annotate, [:resource] => :environment do |t, args|
+  args.with_defaults(resource: 'all')
+  Effective::Annotator.new(resource: args.resource).annotate!
+end

data/lib/tasks/pg_pull.rake

@@ -4,14 +4,35 @@ 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
+  # bundle exec rake pg:pull[staging]
+  # bundle exec rake pg:pull[158.204.33.124]
+  # bundle exec rake pg:pull filename=latest.dump database=example
+  # 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'] }
+    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)
+
+    if configs.length > 1 && args.database.blank?
+      puts "Multiple database configs exist for #{Rails.env} environment."
+      puts "Please run bundle exec rake pg:pull database=x"
+      puts "Where x is one of: #{configs.map { |config| config.name }.to_sentence}"
+      exit
+    end
 
     # Heroku mode
     if `git remote -v | grep heroku`.length > 0
       args.with_defaults(remote: 'heroku')
 
-      puts "=== Pulling remote '#{args.remote}' database into latest.dump"
+      puts "=== Pulling remote '#{args.remote}' #{args.database} database into #{args.filename}"
 
       # Create a backup on heroku
       unless system("heroku pg:backups:capture --remote #{args.remote}")
@@ -19,41 +40,41 @@ namespace :pg do
       end
 
       # Download it to local
-      unless system("curl -o latest.dump `heroku pg:backups:public-url --remote #{args.remote}`")
+      unless system("curl -o #{args.filename} `heroku pg:backups:public-url --remote #{args.remote}`")
         abort("Error downloading database")
       end
 
       # Load it
-      Rake::Task['pg:load'].invoke
+      Rake::Task['pg:load'].invoke(*args)
       exit
     end
 
     # Hatchbox mode
-    if (ENV['HATCHBOX_IP'] || args[:remote]).count('.') == 3
+    if (ENV['HATCHBOX_IP'] || args[:remote]).to_s.count('.') == 3
       args.with_defaults(
         remote: ENV.fetch('HATCHBOX_IP'),
         app: ENV['HATCHBOX_APP'] || `pwd`.split('/').last.chomp,
         user: ENV['HATCHBOX_USER'] || 'deploy'
       )
 
-      puts "=== Pulling hatchbox '#{args.remote}' #{args.app} database into latest.dump"
+      puts "=== Pulling hatchbox '#{args.remote}' #{args.app} #{args.database} database into #{args.filename}"
 
       # SSH into hatchbox and call rake pg:save there to create latest.dump
-      unless(result = `ssh #{args.user}@#{args.remote} << EOF
+      unless(result = `ssh -T #{args.user}@#{args.remote} << EOF
         cd ~/#{args.app}/current/
-        bundle exec rake pg:save[latest.dump]
+        bundle exec rake pg:save database=#{args.database} filename=#{args.filename}
       `).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)
       end
 
       # SCP to copy the hatchkbox latest.dump to local
-      unless system("scp #{args.user}@#{args.remote}:~/#{args.app}/current/latest.dump ./")
+      unless system("scp #{args.user}@#{args.remote}:~/#{args.app}/current/#{args.filename} ./")
         abort("Error downloading database")
       end
 
       # Load it
-      Rake::Task['pg:load'].invoke
+      Rake::Task['pg:load'].invoke(*args)
       exit
     end
 
@@ -66,25 +87,48 @@ namespace :pg do
   #
   # bundle exec rake pg:load => Will replace the current database with latest.dump
   # bundle exec rake pg:load[something.dump] => Will replace the current database with something.dump
+  # bundle exec rake pg:load filename=latest.dump database=example
+  # DATABASE=example bundle exec rake pg:load
   desc 'Loads a postgresql .dump file into the development database (latest.dump by default)'
-  task :load, [:file_name] => :environment do |t, args|
-    args.with_defaults(:file_name => 'latest.dump')
+  task :load, [:filename] => :environment do |t, args|
+    defaults = { database: nil, filename: (ENV['DATABASE'] || 'latest') + '.dump' }
+    env_keys = { database: ENV['DATABASE'], filename: ENV['FILENAME'] }
+    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 filename
+    unless File.exists?(Rails.root + args.filename)
+      puts "#{args.filename || none} does not exist"; exit
+    end
 
+    # Validate Config
     config = ActiveRecord::Base.configurations[Rails.env]
-    db = { username: (config['username'] || `whoami`), password: config['password'], host: config['host'], port: (config['port'] || 5432), database: config['database'] }
-    db.transform_values! { |v| v.respond_to?(:chomp) ? v.chomp : v }
+    configs = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env)
+
+    if configs.length > 1 && args.database.blank?
+      puts "Multiple database configs exist for #{Rails.env} environment."
+      puts "Please run bundle exec rake pg:load database=x"
+      puts "Where x is one of: #{configs.map { |config| config.name }.to_sentence}"
+      exit
+    end
 
-    puts "=== Loading #{args.file_name} into local '#{db[:database]}' database"
+    if configs.length > 1 && args.database.present?
+      config = configs.find { |config| config.name == args.database }
+    end
 
-    # bin/rails db:environment:set RAILS_ENV=development
-    if Rails.env != 'production'
-      ENV['DISABLE_DATABASE_ENVIRONMENT_CHECK'] = '1'
+    if config.blank?
+      puts "Unable to find Rails database config for #{Rails.env}. Exiting."; exit
     end
 
-    Rake::Task['db:drop'].invoke
-    Rake::Task['db:create'].invoke
+    config = config.configuration_hash if config.respond_to?(:configuration_hash)
+    config = config.stringify_keys
 
-    if system("export PGPASSWORD=#{db[:password]}; pg_restore --no-acl --no-owner --clean --if-exists -h #{db[:host]} -U #{db[:username]} -d #{db[:database]} #{args.file_name}")
+    db = { username: (config['username'] || `whoami`), password: config['password'], host: config['host'], port: (config['port'] || 5432), database: config['database'] }
+    db.transform_values! { |v| v.respond_to?(:chomp) ? v.chomp : v }
+
+    puts "=== Loading #{args.filename} into local '#{db[:database]}' database"
+
+    if system("export PGPASSWORD=#{db[:password]}; pg_restore --no-acl --no-owner --clean --if-exists -h #{db[:host]} -U #{db[:username]} -d #{db[:database]} #{args.filename}")
       puts "Loading database completed"
     else
       abort "Error loading database"
@@ -94,8 +138,11 @@ namespace :pg do
   # bundle exec rake pg:save => Will dump the database to latest.dump
   # bundle exec rake pg:save[something.dump] => Will dump the database to something.dump
   desc 'Saves the development database to a postgresql .dump file (latest.dump by default)'
-  task :save, [:file_name] => :environment do |t, args|
-    args.with_defaults(:file_name => 'latest.dump')
+  task :save, [:filename] => :environment do |t, args|
+    defaults = { database: nil, filename: (ENV['DATABASE'] || 'latest') + '.dump' }
+    env_keys = { database: ENV['DATABASE'], filename: ENV['FILENAME'] }
+    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))
 
     db = if ENV['DATABASE_URL'].to_s.length > 0
       uri = URI.parse(ENV['DATABASE_URL']) rescue nil
@@ -103,15 +150,36 @@ 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)
+
+      if configs.length > 1 && args.database.blank?
+        puts "Multiple database configs exist for #{Rails.env} environment."
+        puts "Please run bundle exec rake pg:save database=x"
+        puts "Where x is one of: #{configs.map { |config| config.name }.to_sentence}"
+        exit
+      end
+
+      if configs.length > 1 && args.database.present?
+        config = configs.find { |config| config.name == args.database }
+      end
+
+      if config.blank?
+        puts "Unable to find Rails database config for #{Rails.env}. Exiting."; exit
+      end
+
+      config = config.configuration_hash if config.respond_to?(:configuration_hash)
+      config = config.stringify_keys
+
       { username: (config['username'] || `whoami`.chomp), password: config['password'], host: config['host'], port: (config['port'] || 5432), database: config['database'] }
     end
 
     db.transform_values! { |v| v.respond_to?(:chomp) ? v.chomp : v }
 
-    puts "=== Saving local '#{db[:database]}' database to #{args.file_name}"
+    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.file_name}")
+    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}")
       puts "Saving database completed"
     else
       abort "Error saving database"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,9 +48,11 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/models/effective/annotator.rb
 - app/models/effective/code_writer.rb
 - app/models/effective/csv_importer.rb
 - app/models/effective/live_generator.rb
+- app/models/effective/profiler.rb
 - config/effective_developer.rb
 - lib/effective_developer.rb
 - lib/effective_developer/engine.rb
@@ -94,6 +96,7 @@ files:
 - lib/scaffolds/importers/csv_importer.rb
 - lib/scaffolds/models/model.rb
 - lib/scaffolds/views/_resource.html.haml
+- lib/tasks/annotate.rake
 - lib/tasks/effective_csv_importer.rake
 - lib/tasks/pg_pull.rake
 - lib/tasks/rename_class.rake