marty 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dc054b69b36c3f88865983281fb580a69870469
-  data.tar.gz: e09a7b2ec29e732f516d803fc9c3acec66db98c9
+  metadata.gz: 29ee1195170625cc6eb50d12a612fe502dc1b7b4
+  data.tar.gz: 7bbf0adc969bc474a90144deb4f5626b426e7ce2
 SHA512:
-  metadata.gz: 647481fb469e7dc0a979c792eff8dcfab5367bd44e8df5f28cefde2e781c61e16730e8a29262c2cda1f36f04ee82ea18d87000014705df8126b3d4c26dd04512
-  data.tar.gz: dd873fbce7126aa5ae3c947bc091edece040a8854be98be0991c03cdb32dedd4523c2978d8ea7c6c44d25c4f897bece30fe35b9cdcb79ffafb99cdcab1ecc1d0
+  metadata.gz: c387e23e8dee53fd1952560d8e51924876900b4eb5cdf7ce5bd910fa1980e574bb1b50f0df9a31ed7ea630fa4cdb01881cba2bc3ac646edd6cc036ae2dfe8210
+  data.tar.gz: 72759b95a84417cd0fb33e673548ca5fb83e064db20ce723aafa4a748f06acecb5241c12b37a13d22d7617d2c7fab16eb5a9300d1191c2900fb10b3e11aafac8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (2.3.0)
+    marty (2.3.1)
       aws-sigv4 (~> 1.0, >= 1.0.2)
       axlsx (= 3.0.0pre)
       coderay

data/app/components/marty/import_view.rb

@@ -4,7 +4,7 @@ class Marty::ImportView < Marty::Form
   action :apply do |a|
     a.text    = I18n.t("data_import_view.import")
     a.tooltip = I18n.t("data_import_view.import")
-    a.icon    = :database_go
+    a.icon_cls = 'fa fa-database glyph'
   end
 
   def parent_model; end

data/app/models/marty/pg_enum.rb

@@ -7,11 +7,11 @@ module Marty::PgEnum
     raise "no such #{self.name}: '#{index}'" unless
       self::VALUES.include?(index)
 
-    StringEnum.new(index)
+    index
   end
 
   def get_all(pt=nil)
-    self::VALUES.map { |v| StringEnum.new(v) }
+    self::VALUES.map(&:to_s)
   end
 
   def self.extended(base)

data/lib/marty/monkey.rb

@@ -154,37 +154,6 @@ module Netzke::Basepack::DataAdapters
   end
 end
 
-class StringEnum < String
-  include Delorean::Model
-  def name
-    self.to_s
-  end
-  def id
-    self
-  end
-  delorean_instance_method :name
-  delorean_instance_method :id
-
-  def to_yaml(opts = {})
-    YAML::quick_emit(nil, opts) do |out|
-      out.scalar('stringEnum', self.to_s, :plain)
-    end
-  end
-
-  def _dump _
-    self.to_s
-  end
-
-  def self._load(v)
-    new(v)
-  end
-end
-
-YAML::add_domain_type("pennymac.com,2017-06-02", "stringEnum") do
-  |type, val|
-  StringEnum.new(val)
-end
-
 ######################################################################
 
 # Add pg_enum migration support -- FIXME: this doesn't belong here
@@ -201,15 +170,6 @@ module ActiveRecord
           column(name, enum || name.to_s.pluralize, options) }
       end
     end
-    module PostgreSQL
-      module OID
-        class Enum < Type::Value
-          def cast(value)
-            value && StringEnum.new(value)
-          end
-        end
-      end
-    end
   end
 end
 

data/lib/marty/rule_script_set.rb

@@ -103,15 +103,13 @@ class Marty::RuleScriptSet < Delorean::AbstractContainer
     result_c = result_code(ruleh)
     guard_c = guard_code(ruleh)
 
-    code = self.class.body_start + self.class.indent(grid_i +
-                                                     guard_c +
-                                                     grid_c +
-                                                     result_c)
-    #puts '='*40
-    #puts ruleh["name"]
-    #puts '-'
-    #puts code
-    #puts '-'*10
+    code = self.class.body_start +
+           self.class.indent(grid_i + guard_c + grid_c + result_c)
+    # puts '='*40
+    # puts ruleh["name"]
+    # puts '-'
+    # puts code
+    # puts '-'*10
 
     code
   end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end

data/other/marty/diagnostic/base.rb

@@ -18,7 +18,9 @@ module Marty::Diagnostic; class Base < Request
     end
     class << self
       define_method :generate do
-        pack{yield}
+        pack do
+          yield
+        end
       end
     end
   end

data/other/marty/diagnostic/database.rb

@@ -25,4 +25,21 @@ module Marty::Diagnostic::Database
       ActiveRecord::Migrator.needs_migration?
     current.to_s
   end
+
+  def self.get_postgres_connections
+    conn = ActiveRecord::Base.connection.execute('SELECT datname,'\
+                                                 'application_name,'\
+                                                 'state,'\
+                                                 'pid,'\
+                                                 'client_addr '\
+                                                 'FROM pg_stat_activity')
+    conn.each_with_object({}) do |conn, h|
+      h[conn['datname']] ||= []
+      h[conn['datname']] << conn.except('datname')
+    end
+  end
+
+  def self.current_connections
+    get_postgres_connections[db_name]
+  end
 end

data/other/marty/diagnostic/delayed_job_worker_total_count.rb

@@ -0,0 +1,10 @@
+module Marty::Diagnostic; class DelayedJobWorkerTotalCount < Base
+  diagnostic_fn(aggregatable: false) do
+    count = Database.current_connections.map do |c|
+      [c['application_name'], c['client_addr'] || '127.0.0.1'] if
+        c['application_name'].include?('delayed')
+    end.compact.uniq.count
+    {'Delayed Workers' => count.zero? ? error(count) : count}
+  end
+end
+end

data/other/marty/diagnostic/delayed_job_workers.rb

@@ -1,14 +1,12 @@
 module Marty::Diagnostic; class DelayedJobWorkers < Base
   diagnostic_fn do
     my_ip = Node.my_ip
-    conns = Node.get_postgres_connections[Database.db_name]
-    workers = conns.map do |c|
+    workers = Database.current_connections.map do |c|
       ip   = c['client_addr'] || '127.0.0.1'
       name = c['application_name']
       name if name.include?('delayed') && (ip == my_ip || ip == '127.0.0.1')
     end.compact.uniq.count
-
-    workers.zero? ? error(workers) : workers
+    {'Delayed Workers / Node' => workers.zero? ? error(workers) : workers}
   end
 end
 end

data/other/marty/diagnostic/node.rb

@@ -7,21 +7,10 @@ module Marty::Diagnostic::Node
     end
   end
 
-  def self.get_postgres_connections
-    conn = ActiveRecord::Base.connection.execute('SELECT datname,'\
-                                                 'application_name,'\
-                                                 'state,'\
-                                                 'pid,'\
-                                                 'client_addr '\
-                                                 'FROM pg_stat_activity')
-    conn.each_with_object({}) do |conn, h|
-      h[conn['datname']] ||= []
-      h[conn['datname']] << conn.except('datname')
-    end
-  end
+
 
   def self.get_target_connections target
-    get_postgres_connections[Marty::Diagnostic::Database.db_name].select{|conn|
+    Marty::Diagnostic::Database.current_connections.select{|conn|
       conn['application_name'].include?(target)
     }.map{|conn|
       conn['client_addr'] == '127.0.0.1' ? my_ip :

data/other/marty/diagnostic/reporter.rb

@@ -1,9 +1,9 @@
 module Marty::Diagnostic; class Reporter < Request
   class_attribute :reports, :diagnostics, :namespaces
 
-  self.reports = {}
+  self.reports     = {}
   self.diagnostics = []
-  self.namespaces = ['Marty']
+  self.namespaces  = ['Marty']
 
   def self.run request
     self.request = request

data/spec/features/jobs_dashboard_spec.rb

@@ -27,6 +27,9 @@ describe 'Jobs Dashboard', type: :feature, js: true, capybara: true do
     find(ext_menuitem_id('Jobs Dashboard')).click
     page_title = I18n.t("jobs.promise_view")
     expect(page).to have_content(page_title)
+
+    sleep 1
+
     expect(tree_row_count(page_title)).to eq(2)
 
     fill_in "live_search_text", with: 'marty'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -525,6 +525,7 @@ files:
 - other/marty/diagnostic/connections.rb
 - other/marty/diagnostic/database.rb
 - other/marty/diagnostic/delayed_job_version.rb
+- other/marty/diagnostic/delayed_job_worker_total_count.rb
 - other/marty/diagnostic/delayed_job_workers.rb
 - other/marty/diagnostic/environment_variables.rb
 - other/marty/diagnostic/fatal.rb