da_funk 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 304644f5bc16cc540923f89bc9dd7f1d8a090270
-  data.tar.gz: a5411ee364ae02046de4cbd86d261f6011f9182b
+  metadata.gz: 1baf960081a5ad4843e1cb22d37e2e29be5c3692
+  data.tar.gz: 34371b4fe6401c9af40308b7f5365cd32bcbebce
 SHA512:
-  metadata.gz: 1cce1204ac44af751958a89a654975bc49cb20bc2eac8cf1dd52549564454eca988a77e6e4c397a02a3c8669cbec6f74b9d8fe5b1bd3912c0c37e7c557e1e24a
-  data.tar.gz: 3ab98b4965d982db7592742bb4a8ca66039b65c9ccd9b780ce57ac21e0d76a12d39d0155fb471d08371770f2d7e94c9475145deb0bc231d01e7266597b0e6446
+  metadata.gz: '09bfb378797fca4d535f598436c1660b777b7bbd07166c3afbedfac07ea0562a754419f81c04328c598103ad98bf78056dfc7fb6da5c66a3c388b4ae70871b15'
+  data.tar.gz: 9d73299b5cd8e60670f4a3bfab10c15ef9e9e8834e62f8a5fc3e1a00dcbc692c56d2c12699ddade2454ab051ac447a75d17d4679dcab6de06e37f23419df1260

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (1.12.0)
+    da_funk (1.13.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -15,33 +15,35 @@ GEM
     archive-zip (0.11.0)
       io-like (~> 0.3.0)
     ast (2.4.0)
-    cloudwalk (1.9.1)
+    cloudwalk (1.10.0)
       bundler
       rake
-    cloudwalk_handshake (0.12.0)
+    cloudwalk_handshake (0.13.0)
     funky-emv (0.17.2)
       funky-tlv (~> 0.2)
     funky-simplehttp (0.5.0)
     funky-tlv (0.2.3)
     io-like (0.3.0)
+    jaro_winkler (1.5.1)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.1.2)
       ast (~> 2.4.0)
-    posxml_parser (2.6.0)
+    posxml_parser (2.7.0)
       funky-emv (~> 0.3)
-    powerpack (0.1.1)
+    powerpack (0.1.2)
     rainbow (3.0.0)
     rake (12.3.1)
-    rubocop (0.56.0)
+    rubocop (0.58.2)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
+      parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
-    unicode-display_width (1.3.2)
-    yard (0.9.12)
+    ruby-progressbar (1.10.0)
+    unicode-display_width (1.4.0)
+    yard (0.9.16)
 
 PLATFORMS
   ruby

data/RELEASE_NOTES.md

@@ -1,5 +1,11 @@
 # DaFunk
 
+### 1.13.0 - 2018-08-17
+
+- Add DaFunk::ParamsDat::parameters_load copy of ready?.
+- ScrenFlow.confirm returns boolean.
+- Support schedule events in file if using hours parameters.
+
 ### 1.12.0 - 2018-08-09
 
 - Do not raise exception when bitmap to be display doesn’t exists.

data/lib/da_funk/event_handler.rb

@@ -7,36 +7,56 @@ module DaFunk
       @type          = type
       @option        = option
       @perform_block = block
-      self.register
+      register
     end
 
     def register
-      self.schedule_timer
+      schedule_timer
       EventListener.add_handler(self)
     end
 
     def perform(*parameter)
-      if self.execute?
-        self.schedule_timer
+      if execute?
+        schedule_timer
         @perform_block.call(*parameter)
       end
     end
 
     def schedule_timer
-      if self.option.is_a?(Hash)
-        if self.option.include?(:minutes)
-          self.timer = Time.now + (self.option[:minutes].to_i * 60)
-        elsif self.option.include?(:seconds)
-          self.timer = Time.now + self.option[:seconds]
+      if option.is_a?(Hash)
+        if option.include?(:hours) && option.include?(:slot)
+          self.timer = Time.at(seconds_from_file)
+        elsif option.include?(:minutes)
+          self.timer = Time.now + (option[:minutes].to_i * 60)
+        elsif option.include?(:seconds)
+          self.timer = Time.now + option[:seconds]
         end
       end
     end
 
+    def seconds_from_file
+      unless option[:slot] && option[:hours]
+        raise "slot or hours missing on EventHandler creation"
+      end
+
+      db    = FileDb.new("main/schedule.dat")
+      value = db[option[:slot]]
+
+      if value.to_s.empty? || value.to_i <= Time.now.to_i
+        hours = 60 * 60 * option[:hours].to_i
+        hours = 99_999 if hours == 0
+        value = (Time.now.to_i + hours)
+        db[option[:slot]] = value
+      end
+      value.to_i
+    end
+
     def execute?
+      schedule_timer unless self.timer
       if self.timer
         self.timer < Time.now
       else
-        true
+        ! self.timer
       end
     end
   end

data/lib/da_funk/params_dat.rb

@@ -27,13 +27,17 @@ module DaFunk
       File.exists?(FILE_NAME)
     end
 
-    def self.ready?
+    def self.parameters_load
       return unless exists?
       apps.each {|app| return false if app.outdated? } if apps.size > 0
       files.each {|f| return false if f.outdated? } if files.size > 0
       true
     end
 
+    def self.ready?
+      self.parameters_load
+    end
+
     def self.outdated_apps(force_crc = false, force = false)
       self.apps.select{|app| app.outdated?(force_crc) || force }
     end

data/lib/da_funk/screen_flow.rb

@@ -32,7 +32,7 @@ module DaFunk
 
     def confirm(text)
       puts text.chomp
-      getc(0)
+      getc(0) == Device::IO::ENTER
     end
   end
 end

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="1.12.0"
+  VERSION="1.13.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2018-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake