huebot 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5da1b1dcd0f32ce09e44155b39d7bc6ed92aa285944fc3a67801cf02642737c0
-  data.tar.gz: 9116d3a891e608276e64517f9252a42cddd615ca9952c55e816ca53196bdde15
+  metadata.gz: 587a390d34c338db6aa2cd4d94944b051cf25f6c77b2db25f86ae996cb76b44a
+  data.tar.gz: 1a0d4d34b73caa8123cf1336e61ebed393b104c9aad82b8245f65d3356bab890
 SHA512:
-  metadata.gz: fc1ae1f775c685e635fe36d85ef33548a50163f80378f42301f73e9bdf868343fecb4b9a9fa64490466771dc44b51f95745587bc32423e65cdc306dae0e01fa9
-  data.tar.gz: b5721fb115fc0f8c38e9389063a9012a51d7aa2fa0cf2f1b7a2d93812d916b2ffb1f27508358483a9656b4bdb09d7f78fc7bd9e4f65ff599214c9cdd2f0e8a93
+  metadata.gz: 40d24c93bd23b68ccc914d0bd7834deee41d90faa96be78ce68d10f53ebcf55978b47f06beb569d5ef48d3d7cfb10501672df99a1312931e052a67fea9fb235b
+  data.tar.gz: 3c0e33394c515e02212192229df35bde7d79a36bd20590edb40d89f5f751bccaa3432921413c7ff0762638d3804a1e06aaca3a13c835d006d8aaa3f78c62dd6e

data/bin/huebot

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # Used for local testing
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib') if ENV["HUEBOT_DEV"] == "1"
 
 require 'huebot'
 

data/lib/huebot/cli/helpers.rb

@@ -60,8 +60,10 @@ module Huebot
           Program::Src.new(src, path, version)
         }
 
-        if options.read_stdin
+        if !$stdin.isatty or options.read_stdin
+          puts "Please enter your YAML Huebot program below, followed by Ctrl+d:" if options.read_stdin
           src = YAML.load($stdin.read)
+          puts "Executing..." if options.read_stdin
           version = (src.delete("version") || 1.0).to_f
           sources << Program::Src.new(src, "STDIN", version)
         end
@@ -141,10 +143,15 @@ module Huebot
       huebot ls
 
   Run program(s):
-      huebot run file1.yml [file2.yml [file3.yml ...]] [options]
+      huebot run prog1.yaml [prog2.yaml [prog3.yaml ...]] [options]
+
+  Run program from STDIN:
+      cat prog1.yaml | huebot run [options]
+      huebot run [options] < prog1.yaml
+      huebot run -i [options]
 
   Validate programs and inputs:
-      huebot check file1.yml [file2.yml [file3.yml ...]] [options]
+      huebot check prog1.yaml [prog2.yaml [prog3.yaml ...]] [options]
 
   Print the current state of the given lights and/or groups:
       huebot get-state [options]

data/lib/huebot/compiler/api_v1.rb

@@ -13,6 +13,10 @@ module Huebot
       TIMER_KEYS = ["timer"].freeze
       DEADLINE_KEYS = ["until"].freeze
       HHMM = /\A[0-9]{2}:[0-9]{2}\Z/.freeze
+      PERCENT_CAPTURE = /\A([0-9]+)%\Z/.freeze
+      MIN_KELVIN = 2000
+      MAX_KELVIN = 6530
+      MAX_BRI = 254
 
       def initialize(api_version)
         @api_version = api_version
@@ -105,12 +109,27 @@ module Huebot
 
         ctk = state.delete "ctk"
         case ctk
-        when 2000..6530
+        when MIN_KELVIN..MAX_KELVIN
           state["ct"] = (1_000_000 / ctk).round # https://en.wikipedia.org/wiki/Mired
         when nil
           # pass
         else
-          errors << "'transition.state.ctk' must be an integer between 2700 and 6530"
+          errors << "'transition.state.ctk' must be an integer between #{MIN_KELVIN} and #{MAX_KELVIN}"
+        end
+
+        case state["bri"]
+        when Integer, nil
+          # pass
+        when PERCENT_CAPTURE
+          n = $1.to_i
+          if n >= 0 and n <= 100
+            percent = n * 0.01
+            state["bri"] = (MAX_BRI * percent).round
+          else
+            errors << "'transition.state.bri' must be an integer or a percent between 0% and 100%"
+          end
+        else
+          errors << "'transition.state.bri' must be an integer or a percent between 0% and 100%"
         end
 
         state

data/lib/huebot/version.rb

@@ -1,4 +1,4 @@
 module Huebot
   # Gem version
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: huebot
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-18 00:00:00.000000000 Z
+date: 2023-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest