Merge branch 'staging' into sanitize_tags

FarmBot · Mar 5, 2019 · 7ec07c7 · 7ec07c7
2 parents f091ad8 + c99e2dd
commit 7ec07c7
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 41 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,5 @@
 source "https://rubygems.org"
-ruby "~> 2.6.0"
+ruby "~> 2.6.1"
 
 gem "active_model_serializers"
 gem "bunny"
@@ -24,7 +24,6 @@ gem "request_store"
 gem "rollbar"
 gem "scenic"
 gem "secure_headers"
-gem "appsignal"
 gem "skylight"
 gem "tzinfo" # For validation of user selected timezone names
 gem "valid_url"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -30,7 +30,7 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_model_serializers (0.10.8)
+    active_model_serializers (0.10.9)
       actionpack (>= 4.1, < 6)
       activemodel (>= 4.1, < 6)
       case_transform (>= 0.2)
@@ -53,15 +53,13 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     amq-protocol (2.3.0)
-    appsignal (2.8.1)
-      rack
     arel (9.0.0)
     bcrypt (3.1.12)
     builder (3.2.3)
-    bunny (2.13.0)
+    bunny (2.14.1)
       amq-protocol (~> 2.3, >= 2.3.0)
     case_transform (0.2)
       activesupport
@@ -76,7 +74,7 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.1.4)
     crass (1.0.4)
-    daemons (1.2.6)
+    daemons (1.3.1)
     database_cleaner (1.7.0)
     declarative (0.0.10)
     declarative-option (0.1.0)
@@ -85,7 +83,7 @@ GEM
     delayed_job_active_record (4.1.3)
       activerecord (>= 3.0, < 5.3)
       delayed_job (>= 3.0, < 5)
-    devise (4.5.0)
+    devise (4.6.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0, < 6.0)
@@ -98,28 +96,28 @@ GEM
     erubi (1.8.0)
     eventmachine (1.2.7)
     excon (0.62.0)
-    factory_bot (4.11.1)
-      activesupport (>= 3.0.0)
-    factory_bot_rails (4.11.1)
-      factory_bot (~> 4.11.1)
-      railties (>= 3.0.0)
-    faker (1.9.1)
+    factory_bot (5.0.2)
+      activesupport (>= 4.2.0)
+    factory_bot_rails (5.0.1)
+      factory_bot (~> 5.0.0)
+      railties (>= 4.2.0)
+    faker (1.9.3)
       i18n (>= 0.7)
     faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.9.25)
+    ffi (1.10.0)
     figaro (1.1.1)
       thor (~> 0.14)
     fog-core (2.1.0)
       builder
       excon (~> 0.58)
       formatador (~> 0.2)
       mime-types
-    fog-google (1.8.1)
+    fog-google (1.8.2)
       fog-core (<= 2.1.0)
-      fog-json (~> 1.2.0)
+      fog-json (~> 1.2)
       fog-xml (~> 0.1.0)
       google-api-client (~> 0.23.0)
     fog-json (1.2.0)
@@ -133,7 +131,7 @@ GEM
     foreman (0.85.0)
       thor (~> 0.19.1)
     formatador (0.2.5)
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     google-api-client (0.23.9)
       addressable (~> 2.5, >= 2.5.1)
@@ -153,9 +151,9 @@ GEM
     hashdiff (0.3.8)
     hashie (3.6.0)
     httpclient (2.8.3)
-    i18n (1.5.3)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
+    json (2.2.0)
     jsonapi-renderer (0.2.0)
     jwt (2.1.0)
     launchy (2.4.3)
@@ -187,7 +185,7 @@ GEM
     mutations (0.9.0)
       activesupport
     nio4r (2.3.1)
-    nokogiri (1.9.1)
+    nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
     orm_adapter (0.5.0)
     os (1.0.0)
@@ -197,7 +195,7 @@ GEM
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
-    passenger (6.0.1)
+    passenger (6.0.2)
       rack
       rake (>= 0.8.1)
     pg (1.1.4)
@@ -262,11 +260,11 @@ GEM
       uber (< 0.2.0)
     request_store (1.4.1)
       rack (>= 1.4)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
     retriable (3.1.2)
-    rollbar (2.18.2)
+    rollbar (2.19.2)
       multi_json
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -280,7 +278,7 @@ GEM
     rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-rails (3.8.1)
+    rspec-rails (3.8.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -291,10 +289,10 @@ GEM
     rspec-support (3.8.0)
     ruby-graphviz (1.2.4)
     rubyzip (1.2.2)
-    scenic (1.4.1)
+    scenic (1.5.1)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    secure_headers (6.0.0)
+    secure_headers (6.1.0)
     selenium-webdriver (3.141.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2, >= 1.2.2)
@@ -334,8 +332,8 @@ GEM
     valid_url (0.0.4)
       addressable
       rails
-    warden (1.2.7)
-      rack (>= 1.0)
+    warden (1.2.8)
+      rack (>= 2.0.6)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
@@ -347,7 +345,6 @@ PLATFORMS
 
 DEPENDENCIES
   active_model_serializers
-  appsignal
   bunny
   climate_control
   codecov

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -56,6 +56,10 @@ services:
     <<: *rails
     depends_on: ["parcel"]
     command: node_modules/typescript/bin/tsc -w --noEmit
+    deploy:
+      restart_policy:
+        condition: on-failure
+        delay: 3s
   parcel:     # ====================
     <<: *base_config
     <<: *rails

diff --git a/docker_configs/api.Dockerfile b/docker_configs/api.Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.6
+FROM ruby:2.6.1
 # WHY: We need Postgres 10, not the default (9)
 RUN wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add -
 RUN sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list'

diff --git a/spec/controllers/api/regimens/regimens_create_spec.rb b/spec/controllers/api/regimens/regimens_create_spec.rb
@@ -41,7 +41,7 @@
       sign_in user
       color = %w(blue green yellow orange purple pink gray red).sample
 
-      name = (1..3).map{ Faker::Pokemon.name }.join(" ")
+      name = (1..3).map{ Faker::Games::Pokemon.name }.join(" ")
       payload = {
           name: name,
           color: color ,

diff --git a/spec/factories/farmware_envs.rb b/spec/factories/farmware_envs.rb
@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :farmware_env do
     device
-    key   { Faker::Pokemon.move }
-    value { Faker::Pokemon.move }
+    key   { Faker::Games::Pokemon.move }
+    value { Faker::Games::Pokemon.move }
   end
 end
diff --git a/spec/factories/regimen.rb b/spec/factories/regimen.rb
@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :regimen, :class => 'Regimen' do
-    name { Faker::Pokemon.name + Faker::Pokemon.name }
+    name { Faker::Games::Pokemon.name + Faker::Games::Pokemon.name }
     device
   end
 end
diff --git a/spec/factories/tools.rb b/spec/factories/tools.rb
@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :tool do
     device
-    name { Faker::Pokemon.name + Faker::Pokemon.name  }
+    name { Faker::Games::Pokemon.name + Faker::Games::Pokemon.name  }
   end
 end
diff --git a/spec/models/farmware_envs_spec.rb b/spec/models/farmware_envs_spec.rb
@@ -4,7 +4,7 @@
   it 'has a length limit' do
     p = {
       device: FactoryBot.create(:device),
-      key: Faker::Pokemon.name,
+      key: Faker::Games::Pokemon.name,
       value:  "===" * 300
     }
     expect { FarmwareEnv.create!(p) }

diff --git a/spec/mutations/sequences/create_spec.rb b/spec/mutations/sequences/create_spec.rb
@@ -5,7 +5,7 @@
   let(:device) { user.device }
   let(:body) { sequence_body_for(user) }
 
-  name = Faker::Pokemon.name
+  name = Faker::Games::Pokemon.name
   let(:sequence_params) do
     { device: device,
       name: name,