Merge pull request #931 from RickCarlino/predeploy

Predeploy

.gitignore

@@ -2,27 +2,26 @@
 .vscode/
 *.log
 *.pem
+*scratchpad*
 /tmp
-# For self hosted users...
 api_docs.md
 config/application.yml
 config/database.yml
 config/secrets.yml
 coverage
-erd.pdf
 erd_diagram.png
+erd.pdf
 latest_corpus.ts
 log/*.log
-mqtt/rabbitmq.config
 mqtt/rabbitmq.conf
+mqtt/rabbitmq.config
 node_modules
 node_modules/
 package-lock.json
+public/direct_upload/temp/*.jpg
 public/dist
 public/system
 public/webpack
 public/webpack/*
-tmp
-public/direct_upload/temp/*.jpg
 scratchpad.rb
-*scratchpad*
+tmp

Procfile.api_only

@@ -0,0 +1,5 @@
+# Run Rails & Webpack concurrently
+rails:            rails s -e development -p ${API_PORT:-3000} -b 0.0.0.0
+log_service:      rails r lib/log_service_runner.rb
+resource_service: rails r lib/resource_service_runner.rb
+worker:           rake jobs:work

app/models/transport.rb

@@ -3,7 +3,7 @@ require "bunny"
 # A wrapper around AMQP to stay DRY. Will make life easier if we ever need to
 # change protocols
 class Transport
-  OPTS     = { read_timeout: 10, heartbeat: 10, log_level: 'info' }
+  OPTS = { read_timeout: 10, heartbeat: 10, log_level: "info" }
 
   def self.amqp_url
     @amqp_url ||= ENV['CLOUDAMQP_URL'] ||

config/database.example.yml

@@ -1,7 +1,6 @@
 default: &default
   adapter: postgresql
   encoding: unicode
-  database: farmbot_development
   pool: 5
 
 development:
@@ -15,4 +14,3 @@ test:
 production:
   database: farmbot_prod
   <<: *default
-  

lib/tasks/api.rake

@@ -12,9 +12,15 @@ namespace :api do
     sh "PORT=3000 bundle exec foreman start --procfile=Procfile.dev"
   end
 
+  desc "Run Rails _ONLY_. No Webpack."
+  task only: :environment do
+    sh "PORT=3000 bundle exec foreman start --procfile=Procfile.api_only"
+  end
+
   desc "Pull the latest Farmbot API version"
   task(update: :environment) { same_thing }
 
   desc "Pull the latest Farmbot API version"
   task(upgrade: :environment) { same_thing }
+
 end

package.json

@@ -51,7 +51,7 @@
     "css-loader": "0.28.11",
     "enzyme": "^3.1.0",
     "enzyme-adapter-react-16": "^1.1.0",
-    "farmbot": "^6.3.0-rc1",
+    "farmbot": "6.3.0-rc3",
     "farmbot-toastr": "^1.0.3",
     "fastclick": "^1.0.6",
     "file-loader": "1.1.11",

spec/lib/transport_mgmt_spec.rb

@@ -1,10 +1,10 @@
 require "spec_helper"
 
 describe Transport::Mgmt do
+
   it "generates credentials" do
     the_list = [:foo, :bar]
     dbl      = double("Fake API", list_connections: the_list)
-
     expect(Transport::Mgmt.username).to eq("admin")
     expect(Transport::Mgmt.password).to eq(ENV.fetch("ADMIN_PASSWORD"))
     expect(Transport::Mgmt.client).to be_kind_of(RabbitMQ::HTTP::Client)

yarn.lock

@@ -2377,9 +2377,9 @@ farmbot-toastr@^1.0.0, farmbot-toastr@^1.0.3:
     farmbot-toastr "^1.0.0"
     typescript "^2.3.4"
 
-farmbot@^6.3.0-rc1:
-  version "6.3.0-rc1"
-  resolved "https://registry.yarnpkg.com/farmbot/-/farmbot-6.3.0-rc1.tgz#6f29559edf25d27bb55f213144c7b147d1610a67"
+farmbot@6.3.0-rc3:
+  version "6.3.0-rc3"
+  resolved "https://registry.yarnpkg.com/farmbot/-/farmbot-6.3.0-rc3.tgz#0fca105608e0635876a940a5a4f87b4271cc8e7b"
   dependencies:
     mqtt "2.15.0"