mochizuki 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e8d9cbce9004854c3a808ac1ac24e60190933b6b3b60130d10ea3cfabf2babd
-  data.tar.gz: 1ea2feed70b54549c218b5bba77ba36d75d7920c64a9603dc945e00b933b8492
+  metadata.gz: 45a1c70f5392c04f591f9867ce4fcd119bef28702e90ffe66d5eea1de5cdfa37
+  data.tar.gz: e6681852d0a5b1ab7f72991403728fdcd36b5afee94d3f657e39d6ef5b3ad002
 SHA512:
-  metadata.gz: c2b00aa3c1b336f349da73d9dea769aed8741691ac6bd49508c4181da0be8855ee5a4cd8df104ffb2111949655da62e749f59c68d7df20a63bdb931cac313b80
-  data.tar.gz: 1535e88b1c499b77a92966beb6da3813c881ad78f07ef4097ac512a4536895953e8fea49c931d7c26ca29fa2a55a3c13bbe3516af77abb6cafb3ebf971b160fe
+  metadata.gz: a9b75c553d835b499be5936fa9b3d065713b33bfc5d080486aebc8e0ca61d0f9ab55b1489f097a4f41df6ff0f1729477fa596b7a68fba6a4535bb65d1267658f
+  data.tar.gz: 3fbad4d706c73818f05c354c96828ad368916fe49002c3c5d5f61d84226c42957f47e940238f97f1b3dc620f59a4a66e9059bf789a7a5d98abc3c52e87366b2e

data/README.md

@@ -19,7 +19,16 @@ gem install mochizuki
 
 **Recommended**
 
-See [mochizuki-docker](https://github.com/DarkKowalski/mochizuki-docker)
+```bash
+docker pull darkkowalski/mochizuki
+```
+
+```bash
+docker run --name mochizuki \
+           --restart=always \
+           -v /path/to/mochizuki.conf:/app/mochizuki.conf \
+           -d -it darkkowalski/mochizuki
+```
 
 ## Configuration
 

data/bin/mochizuki

@@ -1,7 +1,7 @@
 #!/bin/ruby
 # frozen_string_literal: true
 
-require'mochizuki'
+require 'mochizuki'
 
 load('mochizuki.conf')
 Mochizuki::Bot.new.start

data/lib/mochizuki/auto_query.rb

@@ -16,9 +16,10 @@ module Mochizuki
       scheduler.every @config.query_interval.to_s do
         power = Mochizuki::Fetcher.new.fetch
         @logger.info "Auto query, #{power} kWh remaining"
-        if Mochizuki.status.auto_alarm_enabled?
+        if Mochizuki.status.auto_alarm_triggered?
           yield(power)
           Mochizuki.status.alarmed_before = true
+          @logger.info 'Auto alarm is suppressed for now'
         end
       end
     end

data/lib/mochizuki/fetcher.rb

@@ -31,6 +31,7 @@ module Mochizuki
     end
 
     def fetch
+      @logger.info 'Try to query'
       fetch_viewstate
       fetch_cookie
       power = fetch_power

data/lib/mochizuki/status.rb

@@ -18,14 +18,14 @@ module Mochizuki
       def update_status(power)
         last = Mochizuki.status.below_threshold
         current = power.to_f < @config.alarm_threshold.to_f
-        @logger.info "Status, @below_threshold, last: #{last}, current: #{current}"
+        @logger.info "Update status, @below_threshold, last: #{last}, current: #{current}"
 
         Mochizuki.status.below_threshold = current
 
         return unless !current && last # re-enabled auto alarm
 
         Mochizuki.status.alarmed_before = false
-        @logger.info "Status, @alarmed_before, #{@alarmed_before}, auto alarm enabled"
+        @logger.info 'Auto alarm enabled'
       end
     end
 
@@ -38,7 +38,7 @@ module Mochizuki
         @alarmed_before = false
       end
 
-      def auto_alarm_enabled?
+      def auto_alarm_triggered?
         if @below_threshold.nil?
           @logger.error "Unable to check status, @below_threshold can't be nil"
           raise Mochizuki::Error, 'Invalid @below_threshold'

data/lib/mochizuki/telegram_bot.rb

@@ -14,17 +14,18 @@ module Mochizuki
         Mochizuki::AutoQuery.new.alarm do |power|
           bot.api.send_message(chat_id: @config.channel,
                                text: "Dorm: #{@config.dorm}: #{power} kWh, " \
-                               "lower than threshold #{@config.alarm_threshold}")
+                               "lower than threshold #{@config.alarm_threshold} kWh")
         end
         @logger.info 'Auto query enabled'
 
         bot.listen do |msg|
+          @logger.info "ID: #{msg.chat.id} uses #{msg}"
           case msg.text
           when '/start'
+            send_msg = 'I am a telegram bot written in ruby, '\
+                       'details at https://github.com/DarkKowalski/mochizuki'
             bot.api.send_message(chat_id: msg.chat.id,
-                                 text: 'I am a telegram bot written in ruby, '\
-                                       'details at https://github.com/DarkKowalski/mochizuki-bot')
-            @logger.info "ID: #{msg.chat.id} uses /start"
+                                 text: send_msg)
           when '/query'
             dorm = @config.dorm
             begin
@@ -34,9 +35,12 @@ module Mochizuki
               send_msg = 'Failed to query.'
             end
             bot.api.send_message(chat_id: msg.chat.id, text: send_msg)
+          when '/status'
+            send_msg = "Bot status: auto alarm is suppressed -> #{Mochizuki.status.alarmed_before}"
+            bot.api.send_message(chat_id: msg.chat.id, text: send_msg)
           else
+            @logger.warn "Unknown command #{msg}"
             bot.api.send_message(chat_id: msg.chat.id, text: "Use '/query' to get remaining power")
-            @logger.warn "ID: #{msg.chat.id} uses #{msg.text}"
           end
         end
       end

data/lib/mochizuki/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mochizuki
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mochizuki
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kowalski Dark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday