da_funk 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1c080f65d9fe67fccf2c7c7b2690158bd55debd
-  data.tar.gz: 870137e97051a0aa9622048a71a2d8f5fd32a903
+  metadata.gz: 48d7fbe5090df611791b473f79fdc69e88c71f1b
+  data.tar.gz: 9d5fc132303b0d48eeac689a45b3f7fb2321fae7
 SHA512:
-  metadata.gz: f7f6cba4cdc56a392ce06e88ff34351133f07855027d4244a7ab1d5e6366afdc03465c6ce809cdb2ed12982a42304775c5a12257e61c6c74b069ae69d7d75664
-  data.tar.gz: 1d0899ee151cd2d5457ea09e46753b1e71e3a223744228b31751068ded558a7f6afeafdcc14c884496cfb7116c6a69aefaa9d497b349bf0ac5f69b5d1b413335
+  metadata.gz: 647931fa3532bbb650dc3f5c6d97e0b98b939c277bc0beddf3bf2b163d78f3fbca07166034c350e89f80cad6cc01fc00f604ff1368237e5edb90c387c152c6f0
+  data.tar.gz: '094fcb787698b253651e808292bd09af426092f4aca09b0221b58f336dfa8dddb54bbb08c8f7b98c41f34d066a8e9e018041305392818d5cbfece24a46b68763'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (0.15.0)
+    da_funk (0.16.0)
       archive-zip (~> 0.5)
       bundler (~> 1.7)
       cloudwalk_handshake (~> 0.6)
@@ -20,7 +20,7 @@ GEM
     funky-simplehttp (0.4.4)
     funky-tlv (0.2.3)
     io-like (0.3.0)
-    posxml_parser (0.22.0)
+    posxml_parser (0.23.0)
       funky-emv (~> 0.3)
     rake (10.5.0)
     yard (0.9.9)

data/RELEASE_NOTES.md

@@ -1,5 +1,9 @@
 # DaFunk
 
+### 0.16.0 - 2017-09-04
+
+- Implement custom print at attach helper.
+
 ### 0.15.0 - 2017-08-30
 
 - Add task to setup(initialize) Network based in the current configuration.

data/lib/da_funk/helper.rb

@@ -14,25 +14,36 @@ module DaFunk
       string
     end
 
-    def attach
+    # {
+    #   :bmps => {
+    #     :attach_connecting => "<path>",
+    #     :attach_connected => "<path>",
+    #     :attach_fail => "<path>",
+    #     :attach_loop => ["<path1>", "<path2>", "<path3>", "<path4>"],
+    #   }
+    # }
+    #
+    # {:print_last => true} || nil
+
+    def attach(options = {:print_last => true})
       if Device::Network.configured?
-        print_last(I18n.t(:attach_connecting))
+        print_attach(:attach_connecting, options)
         unless Device::Network.connected?
-          if Device::Network.attach == Device::Network::SUCCESS
+          if Device::Network.attach(options) == Device::Network::SUCCESS
             Device::Setting.network_configured = 1
-            print_last(I18n.t(:attach_connected))
+            print_attach(:attach_connected, options)
           else
             Device::Setting.network_configured = 0 if Device::ParamsDat.file["connection_management"] != "1"
-            print_last(I18n.t(:attach_fail, :args => [Device::Network.code.to_s]))
+            print_attach(:attach_fail, options.merge(:args => [Device::Network.code.to_s]))
             getc(4000)
             return false
           end
         else
-          print_last(I18n.t(:attach_already_connected))
+          print_attach(:attach_already_connected, options)
         end
         true
       else
-        print_last(I18n.t(:attach_device_not_configured))
+        print_attach(:attach_device_not_configured, options)
         getc(2000)
         false
       end
@@ -90,10 +101,16 @@ module DaFunk
     end
 
     # must send nonblock proc
-    def try_user(timeout = Device::IO.timeout, &block)
+    def try_user(timeout = Device::IO.timeout, options = nil, &block)
       time = timeout != 0 ? Time.now + timeout / 1000 : Time.now
       processing = Hash.new(keep: true)
+      interation = 0
       while(processing[:keep] && processing[:key] != Device::IO::CANCEL) do
+        if options && options[:bmps] && files = options[:bmps][:attach_loop]
+          Device::Display.print_bitmap(files[interation])
+          max = files.size - 1
+          interation = (max >= interation) ? 0 : interation + 1
+        end
         if processing[:keep] = block.call(processing)
           processing[:key] = getc(300)
         end
@@ -293,6 +310,18 @@ module DaFunk
         puts("#{string}")
       end
     end
+
+    def print_attach(id, options = nil)
+      if options
+        if bmps = options[:bmps]
+          Device::Display.print_bitmap(bmps[id]) if bmps[id]
+        else
+          print_last(I18n.t(id, options)) if options[:print_last]
+        end
+      else
+        print_last(I18n.t(id))
+      end
+    end
   end
 end
 

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="0.15.0"
+  VERSION="0.16.0"
 end
 

data/lib/device/network.rb

@@ -144,14 +144,14 @@ class Device
       ret
     end
 
-    def self.attach
+    def self.attach(options = nil)
       Device::Network.connected?
       if self.code != SUCCESS
         self.code = Device::Network.init(*self.config)
         self.code = Device::Network.connect
         Device::Network.connected? if self.code != SUCCESS
 
-        hash = try_user do |process|
+        hash = try_user(Device::IO.timeout, options) do |process|
           Device::Network.connected?
           process[:ret] = self.code
           process[:ret] == PROCESSING # if true keep trying

metadata

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