.github/workflows/ci.yml

@@ -20,15 +20,16 @@ jobs:
         stable: [true]
         crystal:
           - latest
+          - 1.14.1
         include:
           - stable: false
             crystal: nightly
     # Service containers to run with `container-job`
     services:
       sshtest:
-        image: tutum/ubuntu:trusty
+        image: testcontainers/sshd:1.2.0
         env:
-          ROOT_PASS: somepassword
+          PASSWORD: somepassword
       # Label used to access the service container
       redis:
         # Docker Hub image
@@ -45,7 +46,7 @@ jobs:
         run: apk add --no-cache libssh2-static iputils
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: shards install --ignore-crystal-version
+        run: shards install --ignore-crystal-version --skip-postinstall --skip-executables
       - name: Run tests
         run: crystal spec -v --error-trace
         env:

.github/workflows/docs.yml

@@ -0,0 +1,24 @@
+name: Deploy docs
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - uses: crystal-lang/install-crystal@v1
+        with:
+          crystal: latest
+      - name: "Install shards"
+        run: shards install
+      - name: "Generate docs"
+        run: crystal docs
+      - name: Deploy to GitHub Pages
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./docs

shard.yml

@@ -1,6 +1,5 @@
 name: placeos-driver
-version: 6.8.6
-crystal: ">= 1.0.0"
+version: 7.4.1
 
 dependencies:
   action-controller:
@@ -17,8 +16,10 @@ dependencies:
   debug:
     github: Sija/debug.cr
 
-  hound-dog:
-    github: place-labs/hound-dog
+  # clustering service discovery
+  redis_service_manager:
+    github: place-labs/redis_service_manager
+    version: ">= 3.0.0"
 
   ipaddress:
     github: Sija/ipaddress.cr

spec/driver_proxy_spec.cr

@@ -114,7 +114,7 @@ describe PlaceOS::Driver::Proxy::Driver do
       req_out.reply.should eq("reply_id")
       req_out.id.should eq("mod-1234")
 
-      sleep 0.5
+      sleep 500.milliseconds
 
       # reply to the execute request
       req_out.cmd = :result
@@ -170,7 +170,7 @@ describe PlaceOS::Driver::Proxy::Driver do
 
     # Subscription should not exist yet - i.e. no lookup
     subscription.module_id.should eq("mod-1234")
-    sleep 0.05
+    sleep 50.milliseconds
 
     # Update the status
     mod_store["power"] = true

spec/helper.cr

@@ -47,7 +47,7 @@ class Helper
     input.write_bytes json.bytesize
     input.write json.to_slice
 
-    sleep 0.01
+    sleep 10.milliseconds
 
     raw_data = Bytes.new(4096)
     bytes_read = output.read(raw_data)

spec/logger_spec.cr

@@ -24,13 +24,13 @@ describe PlaceOS::Driver::Log do
     # However we still don't want them being logged to our regular logs
     (std_out.size > 0).should eq(false)
 
-    # Warning and above logs should go to both
-    logger.warn { "hello-logs" }
+    # Error and above logs should go to both
+    logger.error { "hello-logs" }
 
     bytes_read = output.read(raw_data)
     req_out = PlaceOS::Driver::Protocol::Request.from_json(String.new(raw_data[2, bytes_read - 4]))
     req_out.id.should eq("mod-123")
-    req_out.payload.should eq(%{[4,"hello-logs"]})
+    req_out.payload.should eq(%{[5,"hello-logs"]})
 
     (std_out.size > 10).should eq(true)
   end
@@ -68,12 +68,12 @@ describe PlaceOS::Driver::Log do
     (std_out.size > 0).should eq(false)
 
     # Warning and above logs should go to both
-    logger.warn { "hello-logs" }
+    logger.error { "hello-logs" }
 
     bytes_read = output.read(raw_data)
     req_out = PlaceOS::Driver::Protocol::Request.from_json(String.new(raw_data[2, bytes_read - 4]))
     req_out.id.should eq("mod-123")
-    req_out.payload.should eq(%{[4,"hello-logs"]})
+    req_out.payload.should eq(%{[5,"hello-logs"]})
 
     (std_out.size > 10).should eq(true)
   end

spec/process_manager_spec.cr

@@ -27,7 +27,7 @@ describe PlaceOS::Driver::ProcessManager do
     input.write_bytes json.bytesize
     input.write json.to_slice
 
-    sleep 0.01
+    sleep 100.milliseconds
     raw_data = Bytes.new(4096)
     bytes_read = output.read(raw_data)
 
@@ -49,7 +49,7 @@ describe PlaceOS::Driver::ProcessManager do
     input.write_bytes json.bytesize
     input.write json.to_slice
 
-    sleep 0.01
+    sleep 100.milliseconds
     raw_data = Bytes.new(4096)
     bytes_read = output.read(raw_data)
 
@@ -68,7 +68,7 @@ describe PlaceOS::Driver::ProcessManager do
     input.write json.to_slice
 
     process.loaded[driver_id].logger.debugging.should eq(false)
-    sleep 0.01
+    sleep 100.milliseconds
     process.loaded[driver_id].logger.debugging.should eq(true)
 
     # Disable debugging
@@ -80,7 +80,7 @@ describe PlaceOS::Driver::ProcessManager do
     input.write json.to_slice
 
     process.loaded["mod_1234"].logger.debugging.should eq(true)
-    sleep 0.01
+    sleep 100.milliseconds
     process.loaded["mod_1234"].logger.debugging.should eq(false)
 
     # Update settings
@@ -101,7 +101,7 @@ describe PlaceOS::Driver::ProcessManager do
     input.write json.to_slice
 
     process.loaded[driver_id].settings.json["test"]["number"].as_i.should eq(123)
-    sleep 0.01
+    sleep 100.milliseconds
     process.loaded[driver_id].settings.json["test"]["number"].as_i.should eq(1234)
 
     # Update settings where the IP address has changed
@@ -122,7 +122,7 @@ describe PlaceOS::Driver::ProcessManager do
     input.write json.to_slice
 
     process.loaded[driver_id].settings.json["test"]["number"].as_i.should eq(1234)
-    sleep 0.01
+    sleep 100.milliseconds
     process.loaded[driver_id].settings.json["test"]["number"].as_i.should eq(12345)
 
     # Check what's running on this node:
@@ -149,7 +149,7 @@ describe PlaceOS::Driver::ProcessManager do
     input.write json.to_slice
 
     process.loaded.size.should eq 1
-    sleep 0.01
+    sleep 100.milliseconds
     process.loaded.size.should eq 0
 
     # Ensure it terminates properly
@@ -185,7 +185,7 @@ describe PlaceOS::Driver::ProcessManager do
     input.write_bytes json.bytesize
     input.write json.to_slice
 
-    sleep 0.01
+    sleep 10.milliseconds
     raw_data = Bytes.new(4096)
     bytes_read = output.read(raw_data)
 
@@ -214,7 +214,7 @@ describe PlaceOS::Driver::ProcessManager do
     input.write_bytes json.bytesize
     input.write json.to_slice
 
-    sleep 0.01
+    sleep 10.milliseconds
     raw_data = Bytes.new(4096)
     bytes_read = output.read(raw_data)
 

spec/protocol_management_spec.cr

@@ -67,7 +67,7 @@ describe PlaceOS::Driver::Protocol::Management do
     manager.info.should eq(["mod-management-test"])
 
     manager.stop("mod-management-test")
-    sleep 0.2
+    sleep 200.milliseconds
     manager.running?.should eq(false)
     manager.terminated?.should eq(false)
     redis_callback.should eq 0
@@ -115,7 +115,7 @@ describe PlaceOS::Driver::Protocol::Management do
     }))
     manager.running?.should eq(true)
 
-    sleep 0.5
+    sleep 500.milliseconds
 
     # Clears the module state
     redis_clear.should eq 1
@@ -162,7 +162,7 @@ describe PlaceOS::Driver::Protocol::Management do
     manager.info.should eq(["mod-management-test"])
 
     manager.stop("mod-management-test")
-    sleep 0.2
+    sleep 200.milliseconds
     manager.running?.should eq(false)
     manager.terminated?.should eq(false)
   end

spec/protocol_spec.cr

@@ -16,7 +16,7 @@ describe PlaceOS::Driver::Protocol do
     input.write json.to_slice
 
     while id.nil?
-      sleep 0.001
+      sleep 10.milliseconds
     end
 
     id.should eq("mod_1234")
@@ -53,7 +53,7 @@ describe PlaceOS::Driver::Protocol do
     IO.copy(io, input)
 
     while results.size < 2
-      sleep 0.001
+      sleep 10.milliseconds
     end
 
     input.close

spec/subscription_proxy_spec.cr

@@ -16,7 +16,7 @@ module PlaceOS::Driver::Proxy
         channel.close
       end
 
-      sleep 0.005
+      sleep 50.milliseconds
 
       RedisStorage.with_redis &.publish("placeos/test", "whatwhat")
 
@@ -82,7 +82,7 @@ module PlaceOS::Driver::Proxy
       sys_lookup[lookup_key] = "mod-1234"
       RedisStorage.with_redis &.publish("lookup-change", "sys-123")
 
-      sleep 0.05
+      sleep 50.milliseconds
 
       # Update the status
       storage["power"] = true

spec/subscription_spec.cr

@@ -18,7 +18,7 @@ module PlaceOS
           channel.close
         end
 
-        sleep 0.005
+        sleep 50.milliseconds
 
         Subscriptions.new_redis.publish("placeos/test", "whatwhat")
 
@@ -86,7 +86,7 @@ module PlaceOS
         sys_lookup[lookup_key] = "mod-1234"
         redis.publish "lookup-change", "sys-123"
 
-        sleep 0.05
+        sleep 50.milliseconds
 
         # Update the status
         storage["power"] = true
@@ -143,11 +143,11 @@ module PlaceOS
         # Create the lookup and signal the change
         sys_lookup[lookup_key] = "mod-12345"
 
-        sleep 0.005
+        sleep 50.milliseconds
 
         redis.publish "lookup-change", "sys-12345"
 
-        sleep 0.005
+        sleep 50.milliseconds
 
         # Update the status
         storage["power"] = true
@@ -163,7 +163,7 @@ module PlaceOS
 
         # Give the loop a moment to start up again
         while !subs.running
-          sleep 0.1
+          sleep 100.milliseconds
         end
 
         in_callback = false

spec/system_proxy_spec.cr

@@ -97,7 +97,7 @@ describe PlaceOS::Driver::Proxy::System do
 
     # Subscription should not exist yet - i.e. no lookup
     subscription.module_id.should eq("mod-5678")
-    sleep 0.05
+    sleep 50.milliseconds
 
     # Update the status
     mod_store["power"] = true

spec/test_build.cr

@@ -41,8 +41,8 @@ class Helper
     @username : String = ""
     @password : String = ""
 
-    accessor thing : Thing, implementing: IncludedAble
-    accessor main_lcd : Display_1, implementing: Powerable
+    accessor thing : Array(Thing), implementing: IncludedAble
+    accessor main_lcd : Display_1
     accessor switcher : Switcher
     accessor camera : Array(Camera), implementing: [Powerable, Moveable]
     accessor blinds : Array(Blind)?
@@ -128,7 +128,7 @@ class Helper
     end
 
     def future_add(a : Int32, b : Int32 = 200)
-      Promise.defer { sleep 0.01; a + b }
+      Promise.defer { sleep 10.milliseconds; a + b }
     end
 
     def future_error

spec/transport_http_spec.cr

@@ -2,8 +2,11 @@ require "./helper"
 
 describe PlaceOS::Driver::TransportHTTP do
   it "should perform a secure request" do
+    responses = 0
     queue = Helper.queue
-    transport = PlaceOS::Driver::TransportHTTP.new(queue, "https://www.google.com.au/", ::PlaceOS::Driver::Settings.new(%({"disable_cookies": true})))
+    transport = PlaceOS::Driver::TransportHTTP.new(queue, "https://www.google.com.au/", ::PlaceOS::Driver::Settings.new(%({"disable_cookies": true}))) do
+      responses += 1
+    end
     transport.before_request do |request|
       request.hostname.should eq "www.google.com.au"
     end
@@ -14,16 +17,19 @@ describe PlaceOS::Driver::TransportHTTP do
     response = transport.http(:get, "/")
     response.status_code.should eq(200)
     transport.cookies.size.should eq 0
+    responses.should eq 1
 
     # Close the connection
     transport.terminate
   end
 
   it "should perform an insecure request" do
     queue = Helper.queue
-
+    responses = 0
     # Selected from: https://whynohttps.com/
-    transport = PlaceOS::Driver::TransportHTTP.new(queue, "http://blog.jp/", ::PlaceOS::Driver::Settings.new("{}"))
+    transport = PlaceOS::Driver::TransportHTTP.new(queue, "http://blog.jp/", ::PlaceOS::Driver::Settings.new("{}")) do
+      responses += 1
+    end
     transport.before_request do |request|
       request.hostname.should eq "blog.jp"
     end
@@ -34,6 +40,7 @@ describe PlaceOS::Driver::TransportHTTP do
     response = transport.http(:get, "/")
     response.status_code.should eq(200)
     (transport.cookies.size > 0).should be_true
+    responses.should eq 1
 
     # Close the connection
     transport.terminate