marty 2.5.5 → 2.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54ce27167526784919b7d2b32987037dfe16632ecc4bfa087b2f2a8626121a33
-  data.tar.gz: d54097a4c0ba9b458d1ca5d190e51bee5f5c447fa3495f4810268dfb4ac5e87c
+  metadata.gz: 89ed116d83e4c492715b16521b670d8cb76b7e26c24c50ae80e7feb15c0647f0
+  data.tar.gz: 966828b387e0fde5e25d089955c24d17455803ccf374fe281de4d8267851456e
 SHA512:
-  metadata.gz: b2f560626abcc7bfb6e10f1a56e510805c7ba2aadfb19a74df0849caf362ccc5e118f3b1064490ce4ec69c07b41882e918b1f9d03ac90304c77f6ebc73262e01
-  data.tar.gz: 82837012e7e1b8a85e411e60cac752c23d9013e111a38f6d735ac7be1e51f769fec97573cc6b9bd0e57d8a8a4a76379d3ea94338be946c27b56e212d1b2e15a9
+  metadata.gz: 422d57c6920da447203117add2a24298b754aa8bc4d08deb4476e5610a5b76be20ab324752966a5144f0221a8d14c036e43c7e6d39ab33841f6c03332b908f8f
+  data.tar.gz: 6891166c6703a0149ba2c548da687ff041c1ad1ef472d2c47a778b3fa46040b7c9eed1cbee7a3ad1186e18585b20bd22246282e49be9d55f2264ab70b54025b9

data/.gitlab-ci.yml

@@ -1,30 +1,33 @@
-image: thepry/docker-ruby-ci:2.4.2-latest
+image: 415596832415.dkr.ecr.us-west-2.amazonaws.com/cm_tech/docker-ruby-ci-image:2.4.2-20190129
 
 services:
   - "clkao/postgres-plv8:9.6-2.0"
 
 before_script:
-  - bundle install --jobs $(nproc) --path vendor "${FLAGS[@]}"
+  - time bundle install --jobs $(nproc) --path vendor "${FLAGS[@]}"
   - cp ./spec/dummy/config/database.ci.yml ./spec/dummy/config/database.yml
   - RAILS_ENV=test bundle exec rails db:create db:migrate
 
-rubocop:
+.base-test:
   stage: test
+  # Use only the following CI runners
+  tags:
+    - cf-gitlabci-runner-eks-shared-dev
+
+rubocop:
+  extends: .base-test
   script:
     - bundle exec rubocop
 
 rspec-without-features:
-  stage: test
+  extends: .base-test
   script:
     - bundle exec rspec --exclude-pattern "spec/features/**/*_spec.rb"
 
 rspec-features:
-  stage: test
+  extends: .base-test
   script:
-    - |
-      cd spec/dummy/public && \
-      git clone --single-branch --branch version_6_5_3 https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.pnmac.com/cm_tech/extjs.git  && \
-      cd -
+    - ln -s /opt/support/extjs /cm_tech/marty/spec/dummy/public/extjs
     # - bundle exec rspec --pattern "spec/features/**/*_spec.rb"
     # FIXME: rule_spec is excluded, because chrome doesn't work with big window size in docker
     # And test fails with 1400/1400 resolution
@@ -45,4 +48,6 @@ variables:
   PGTZ: "America/Los_Angeles"
   HEADLESS: "true"
   HEADLESS_WINDOW_SIZE: "1400,1400"
+  REPOSITORY_URL: '415596832415.dkr.ecr.us-west-2.amazonaws.com/cm_tech/docker-ruby-ci-image'
+  DOCKER_AUTH_CONFIG: '{ "credsStore": "ecr-login" }'
 

data/Gemfile

@@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.4'
 gem 'sqlite3'
 
 group :development, :test do
-  gem 'capybara'
+  gem 'capybara', '~> 2.18.0'
   gem 'chromedriver-helper'
   gem 'connection_pool'
   gem 'database_cleaner'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (2.5.5)
+    marty (2.5.6)
       aws-sigv4 (~> 1.0, >= 1.0.2)
       axlsx (= 3.0.0pre)
       coderay
@@ -69,14 +69,13 @@ GEM
       nokogiri (~> 1.8, >= 1.8.2)
       rubyzip (~> 1.2, >= 1.2.1)
     builder (3.2.3)
-    capybara (3.13.2)
+    capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
-      rack (>= 1.6.0)
-      rack-test (>= 0.6.3)
-      regexp_parser (~> 1.2)
-      xpath (~> 3.2)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (>= 2.0, < 4.0)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     chromedriver-helper (2.1.0)
@@ -188,7 +187,6 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
     rake (12.3.2)
-    regexp_parser (1.3.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -255,7 +253,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara
+  capybara (~> 2.18.0)
   chromedriver-helper
   connection_pool
   daemons

data/app/components/marty/main_auth_app.rb

@@ -293,33 +293,33 @@ class Marty::MainAuthApp < Marty::AuthApp
 
   ######################################################################
 
-  def bg_command(param)
+  def bg_command(subcmd)
+    params = Marty::Config['DELAYED_JOB_PARAMS'] || ''
     e, root, p = ENV['RAILS_ENV'], Rails.root, Marty::Config['RUBY_PATH']
     dj_path = Marty::Config['DELAYED_JOB_PATH'] || 'bin/delayed_job'
     cmd = "export RAILS_ENV=#{e};"
     # FIXME: Environment looks to be setup incorrectly - this is a hack
     cmd += "export PATH=#{p}:$PATH;" if p
     # 2>&1 redirects STDERR to STDOUT since backticks only captures STDOUT
-    cmd += "#{root}/#{dj_path} #{param} 2>&1"
+    cmd += "#{root}/#{dj_path} #{subcmd} #{params} 2>&1"
     cmd
   end
 
-  endpoint :bg_status do |params|
+  endpoint :bg_status do |_|
     cmd = bg_command('status')
     res = `#{cmd}`
     client.show_detail res.html_safe.gsub("\n", '<br/>'), 'Delayed Job Status'
   end
 
-  endpoint :bg_stop do |params|
+  endpoint :bg_stop do |_|
     cmd = bg_command('stop')
     res = `#{cmd}`
     res = 'delayed_job: no instances running. Nothing to stop.' if res.empty?
     client.show_detail res.html_safe.gsub("\n", '<br/>'), 'Delayed Job Stop'
   end
 
-  endpoint :bg_restart do |params|
-    params = Marty::Config['DELAYED_JOB_PARAMS'] || ''
-    cmd = bg_command("restart #{params}")
+  endpoint :bg_restart do |_|
+    cmd = bg_command('restart')
     res = `#{cmd}`
     client.show_detail res.html_safe.gsub("\n", '<br/>'), 'Delayed Job Restart'
   end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '2.5.5'
+  VERSION = '2.5.6'
 end

data/spec/dummy/bin/delayed_job

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
+require 'delayed/command'
+
+Delayed::Command.new(ARGV).daemonize

data/spec/models/data_grid_spec.rb

@@ -558,10 +558,7 @@ describe 'lookups for infinity' do
       to eq 'Marty::DataGrid'
     g1 = Marty::DataGrid.lookup('infinity', 'G1')
 
-    res = lookup_grid_helper('infinity',
-                             'G8',
-                             'ltv' => 80,
-                            )
+    res = lookup_grid_helper('infinity', 'G8', 'ltv' => 80)
     expect(res).to eq [g1, 'G8']
   end
 
@@ -578,44 +575,31 @@ describe 'lookups for infinity' do
     g1_res = lookup_grid_helper('infinity', 'G1', h)
     expect(g1_res).to eq [11, 'G1']
 
-    res = lookup_grid_helper('infinity',
-                             'G8',
-                             h, true
-                           )
+    res = lookup_grid_helper('infinity', 'G8', h, true)
+
     expect(g1_res).to eq res
   end
 
   it 'should handle DataGrid typed data grids' do
     g1 = Marty::DataGrid.find_by(obsoleted_dt: 'infinity', name: 'G1')
 
-    res = lookup_grid_helper('infinity',
-                             'Ga',
-                             'dg' => g1,
-                            )
+    res = lookup_grid_helper('infinity', 'Ga', 'dg' => g1)
     expect(res).to eq [7, 'Ga']
 
     # should be able to lookup bu name as well
-    res = lookup_grid_helper('infinity',
-                             'Ga',
-                             'dg' => 'G2',
-                            )
+    res = lookup_grid_helper('infinity', 'Ga', 'dg' => 'G2')
+
     expect(res).to eq [7, 'Ga']
   end
 
   it 'should handle DataGrid typed data grids -- non mcfly' do
     ca = Gemini::State.find_by_name('CA')
 
-    res = lookup_grid_helper('infinity',
-                             'Gb',
-                             'property_state' => ca,
-                            )
+    res = lookup_grid_helper('infinity', 'Gb', 'property_state' => ca)
     expect(res).to eq [70, 'Gb']
 
     # should be able to lookup bu name as well
-    res = lookup_grid_helper('infinity',
-                             'Gb',
-                             'property_state' => 'CA',
-                            )
+    res = lookup_grid_helper('infinity', 'Gb', 'property_state' => 'CA')
     expect(res).to eq [70, 'Gb']
   end
 
@@ -748,18 +732,16 @@ describe 'updates' do
 
     dgch = dgc.attributes.
            slice('id', 'group_id', 'created_dt',  'metadata', 'data_type')
-    res = Marty::DataGrid.lookup_grid_distinct_entry_h('2/2/2014',
-                                                       { 'property_state' => 'CA' }, dgch)
+    res = Marty::DataGrid.lookup_grid_distinct_entry_h(
+      '2/2/2014', { 'property_state' => 'CA' }, dgch)
     expect(res['result']).to eq(70)
 
-    res = Marty::DataGrid.lookup_grid_distinct_entry_h('2/2/2015',
-                                                       { 'property_state' => 'CA' }, dgch)
-
+    res = Marty::DataGrid.lookup_grid_distinct_entry_h(
+      '2/2/2015', { 'property_state' => 'CA' }, dgch)
     expect(res['result']).to eq(333)
 
-    res = Marty::DataGrid.lookup_grid_distinct_entry_h('2/2/2016',
-                                                       { 'property_state' => 'CA' }, dgch)
-
+    res = Marty::DataGrid.lookup_grid_distinct_entry_h(
+      '2/2/2016', { 'property_state' => 'CA' }, dgch)
     expect(res['result']).to eq(444)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.5.5
+  version: 2.5.6
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -483,6 +483,7 @@ files:
 - spec/dummy/app/models/gemini/xyz_rule.rb
 - spec/dummy/app/models/gemini/xyz_rule_type.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/bin/delayed_job
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb