da_funk 3.8.3 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '017963ffdd6d81e37fa359cb6fb4733c11143e36'
-  data.tar.gz: 1e796162f351d4f88b71e8a391c6fa957e9a315c
+  metadata.gz: 6c320eb9211f0fc06dcb381ba75d7fcdaba89d7e
+  data.tar.gz: ff34f839f0afc322b862906febd45e129794eaee
 SHA512:
-  metadata.gz: 874bb8bd1b0c3c263ba12b03929750d5c0082f9161c6d59fbf11485bc72e49aaf1dd3b12440d24d759bf91641bdc381098d7c8879ec060b3ca71533b7048f6d7
-  data.tar.gz: ff935fcacbb0de1595c84f1fc368b4d7b15b33f7beaf06e4c76089fa232575d770490a21bcb37fab06707018efb1482c33f3f923959d5b62d078f369ce9441cf
+  metadata.gz: 6b1bc034f2987486057a0f8b0d6bcabe7c9edc19037b38d6cd8a62c120be151a971d1fed1539845c91258455b30a270b6f94e00920913a9569094c40b6390478
+  data.tar.gz: 537f48540589a3dd0f3a8d86a2af52def6fc603e6974a794e6403b4e4446f14d41abd9981e910c6b48313f268224ad3f35b4649edbd51b800a788b1655fd161f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (3.8.3)
+    da_funk (3.9.0)
       archive-zip (~> 0.5)
       bundler
       cloudwalk_handshake
@@ -20,7 +20,7 @@ GEM
       rake
     cloudwalk_handshake (1.4.2)
       funky-simplehttp (~> 0.6)
-    funky-emv (1.0.0)
+    funky-emv (1.1.0)
       funky-tlv (~> 0.2)
     funky-simplehttp (0.6.0)
     funky-tlv (0.2.3)

data/RELEASE_NOTES.md

@@ -1,5 +1,9 @@
 # DaFunk
 
+### 3.9.0 - 2019-06-18
+
+- Support to uncompress main application and reboot after it.
+
 ### 3.8.3 - 2019-06-18
 
 - Added emv_input_amount_idle parameter on config.dat.

data/lib/da_funk/application.rb

@@ -1,11 +1,3 @@
-# Scenario
-# 1. Load from scratch
-# - No file downloaded
-# - with file downloaded
-# 2. Second load
-# - No crc update
-# - With crc update
-
 module DaFunk
   class Application
     class ApplicationError < StandardError; end
@@ -66,7 +58,11 @@ module DaFunk
         zip = self.file
         message = "Problem to unzip #{zip}[#{name}]"
         raise FileNotFoundError.new(message) unless self.exists?
-        raise ApplicationError.new(message) unless Zip.uncompress(zip)
+        if main_application?
+          raise ApplicationError.new(message) unless Zip.uncompress(zip, './main', true, false)
+        else
+          raise ApplicationError.new(message) unless Zip.uncompress(zip)
+        end
       end
     end
 
@@ -95,6 +91,10 @@ module DaFunk
       true
     end
 
+    def main_application?
+      main == 'main'
+    end
+
     def execute(json = "")
       if posxml?
         PosxmlInterpreter.new(remote, nil, false).start

data/lib/da_funk/params_dat.rb

@@ -126,11 +126,13 @@ module DaFunk
 
     def self.update_apps(force_params = false, force_crc = false, force = false)
       self.download if force_params || ! self.valid
+      main_updated = nil
       if self.valid
         apps_to_update = self.outdated_apps(force_crc, force)
         size_apps = apps_to_update.size
         apps_to_update.each_with_index do |app, index|
-          self.update_app(app, index+1, size_apps, force_crc || force)
+          ret = self.update_app(app, index+1, size_apps, force_crc || force)
+          main_updated ||= (ret && app.main_application?)
         end
 
         files_to_update = self.outdated_files(force_crc, force)
@@ -139,6 +141,18 @@ module DaFunk
           self.update_file(file_, index+1, size_files, force_crc || force)
         end
       end
+    ensure
+      self.restart if main_updated
+    end
+
+    def self.restart
+      Device::Display.clear
+      I18n.pt(:admin_main_update_message)
+      3.times do |i|
+        Device::Display.print("REBOOTING IN #{3 - i}",3,3)
+        sleep(1)
+      end
+      Device::System.restart
     end
 
     def self.format!(keep_config_files = false, keep_files = [])

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="3.8.3"
+  VERSION="3.9.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 3.8.3
+  version: 3.9.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake