da_funk 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ec3525c8b86df99abedcdc53570b5566932e225
-  data.tar.gz: e9a9f6add66d948a31ccf63353a8b104a3b5f508
+  metadata.gz: e011410f7d6c3f3c8b9577722564f315c70c8fc7
+  data.tar.gz: 6d35d3fd04134b622af6d0bfe6a4b53fd2dca217
 SHA512:
-  metadata.gz: dd7f60bf1c62851bc4ce07cb0fcf7f8b1d2e7ee9657a5184e686a9593a58a41629e870371393c6bb776e2d945898385663cfcdcaba462bbf2f9f793f77a18a72
-  data.tar.gz: 053fbb6613d76a2d8125b012597e49ba61d7b5ba100cc7eb1f26b74f5971e1a892da9b5d369c4c371a43c77a57ade4db9e16a540efe2ba5a953d2ee7d9c366e3
+  metadata.gz: a1f83fd2f73f612efcc05b3fc9c81d3035e8c0e24dbc183e2ee15a37d439d9d7a1110a41754447c166d8d080f3a6109e031fcbb709811458348b3456099d5138
+  data.tar.gz: 6ffdc543b460d457ed686544b596f32432b833ac2f304d4e2a7be7fa3d9441c25aa9cb82db5cb548daa829360e4a0cf2dde11ec9754bdc00225ca78ed0e9c5f4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (0.7.0)
+    da_funk (0.7.1)
       bundler (~> 1.7)
       cloudwalk_handshake (~> 0.5)
       posxml_parser (~> 0.6)
@@ -13,7 +13,7 @@ GEM
   specs:
     cloudwalk_handshake (0.5.4)
     funky-simplehttp (0.4.4)
-    posxml_parser (0.7.7)
+    posxml_parser (0.7.10)
     rake (10.5.0)
     yard (0.8.7.6)
 

data/RELEASE_NOTES.md

@@ -1,5 +1,12 @@
 # DaFunk
 
+### 0.7.1 - 2016-03-30 - Small changes
+
+- Refactoring Application to calculate crc on the end of download to check integrity.
+- During attaching process define network_configured = 1 if attached successfully.
+- Fix crc generation on download file if crc didn’t come.
+- Update posxml_parser to version 0.7.10.
+
 ### 0.7.0 - 2016-03-10 - EventListener and EventHandler
 
 - Implemented method each for FileDb.

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="0.7.0"
+  VERSION="0.7.1"
 end
 

data/lib/device/application.rb

@@ -37,7 +37,12 @@ class Device
       else
         ret = Device::Transaction::Download::FILE_NOT_CHANGE
       end
-      @crc_local = @crc if ret == Device::Transaction::Download::SUCCESS
+      if ret == Device::Transaction::Download::SUCCESS
+        @crc_local = calculate_crc
+        if @crc_local != @crc
+          return Device::Transaction::Download::COMMUNICATION_ERROR
+        end
+      end
       ret
     rescue => e
       puts "ERROR #{e.message}"
@@ -61,15 +66,10 @@ class Device
 
     def outdated?
       return true unless File.exists?(file)
-      unless @crc_local
-        handle = File.open(file)
-        @crc_local = Device::Crypto.crc16_hex(handle.read)
-      end
+      @crc_local = calculate_crc unless @crc_local
       @crc_local != @crc
     rescue
       true
-    ensure
-      handle.close if handle
     end
 
     def execute(json = "")
@@ -90,6 +90,15 @@ class Device
 
     private
 
+    def calculate_crc
+      if exists?
+        handle = File.open(file)
+        Device::Crypto.crc16_hex(handle.read)
+      end
+    ensure
+      handle.close if handle
+    end
+
     def check_path(path)
       if posxml?
         "./shared/#{path}"

data/lib/device/network.rb

@@ -144,10 +144,12 @@ class Device
         while(ret == PROCESSING)
           ret = Device::Network.connected?
         end
-        if ret == SUCCESS && (wifi? || ethernet?)
-          Device::Network.dhcp_client(20000)
+        if ret == SUCCESS
+          Device::Network.dhcp_client(20000) if (wifi? || ethernet?)
+          Device::Setting.network_configured = 1
+        else
+          Device::Setting.network_configured = 0
         end
-        Device::Setting.network_configured = 0 if ret != SUCCESS 
       end
       ret
     end

data/lib/device/transaction/download.rb

@@ -20,7 +20,7 @@ class Device
       MAPREDUCE_RESPONSE_ERROR = -2
       IO_ERROR                 = -3
 
-      def self.request_file(remote_path, local_path, crc = "")
+      def self.request_file(remote_path, local_path, crc = nil)
         download = Device::Transaction::Download.new(Device::System.serial, "", DaFunk::VERSION)
         download.perform(Device::Network.socket,
                          Device::Setting.company_name,
@@ -77,7 +77,7 @@ class Device
         ei_encode_binary(@serial)        # elemento binario serialterminal
         ei_encode_binary(@version)       # elemento binario versao walk
         ei_encode_binary(remote_path)      # elemento binario nomeaplicativo
-        ei_encode_binary(crc)            # elemento binario crc aplicativo
+        ei_encode_binary(@crc)            # elemento binario crc aplicativo
         ei_encode_binary("")             # elemento binario buffer do posxml
         ei_encode_binary(logical_number) # elemento binario numero do terminal
         ei_encode_binary(current_app)    # elemento binario nome do aplicativo que esta sendo executado

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake