da_funk 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b08890583ad6d10c592b5ef42e9f87586fcb5eb2
-  data.tar.gz: 73027d348b22d8a5b1799b5a631f2703ededa91a
+  metadata.gz: 3cd50e3c9d31b56bc424f584b99605fcb0acf4e2
+  data.tar.gz: 9d61b820511b5dece845625d6d6d0cea6a1d7532
 SHA512:
-  metadata.gz: c02ca455f484d9b6f2a89552c17b2a530305e04b86cc7b4ccc1ba65bce0a00c219a6fc3d136e07c396f689b6b053c3d2fc8c37a097094f761188804f3446bb33
-  data.tar.gz: 55ec01977d0b7f49d0557ddb0cdf0655bd924156f38469864bbc674b46f80d3eaceb58b37d49b6cddc79c0223a84e9805cc97edcce98424275b134286cbde262
+  metadata.gz: b33561a86c106e832f62e6bcf771363de5a32a84fdb1edac18cf40e1eb11e905fea56ec6ee5006844fa0942f71e68b54aec1cfef533e1e5746351f242accc7ca
+  data.tar.gz: beb9cf06c69dcc62bce21178d4b22335defe5996b8b1834ee2d72c8e6ce06deffeb2b01bcbaed2ff3d2abeda8894ebab2ee961ab245c7c89436dcc9e28d60fc5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (0.6.4)
+    da_funk (0.6.5)
       bundler (~> 1.7)
       cloudwalk_handshake (~> 0.5)
       posxml_parser (~> 0.6)
@@ -11,7 +11,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    cloudwalk_handshake (0.5.3)
+    cloudwalk_handshake (0.5.4)
     funky-simplehttp (0.4.4)
     posxml_parser (0.7.2)
     rake (10.5.0)

data/RELEASE_NOTES.md

@@ -1,5 +1,11 @@
 # DaFunk
 
+### 0.6.5 - 2016-02-18 - Implement keys map on input functions
+
+- Update cloudwalk_handshake to version 0.5.4.
+- Implement Device::IO.setup_keyboard to map keys on input functions.
+- On Device::Transaction::Download rescue SocketError returning COMMUNICATION_ERROR.
+
 ### 0.6.4 - 2016-02-16 - Update cloudwalk_handshake
 
 - Update cloudwalk_handshake to version 0.5.3.

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="0.6.4"
+  VERSION="0.6.5"
 end
 

data/lib/device/io.rb

@@ -1,5 +1,7 @@
 class Device
   class IO < ::IO
+    include Device::Helper
+
     F1               = "\001"
     F2               = "\002"
     F3               = "\003"
@@ -31,17 +33,6 @@ class Device
 
     NUMBERS = %w(1 2 3 4 5 6 7 8 9 0)
 
-    ONE_LETTERS   = "qzQZ _,."
-    TWO_LETTERS   = "abcABC"
-    THREE_LETTERS = "defDEF"
-    FOUR_LETTERS  = "ghiGHI"
-    FIVE_LETTERS  = "jklJKL"
-    SIX_LETTERS   = "mnoMNO"
-    SEVEN_LETTERS = "prsPRS"
-    EIGHT_LETTERS = "tuvTUV"
-    NINE_LETTERS  = "wxyWXY"
-    ZERO_LETTERS  = "spSP"
-
     ONE_NUMBER    = "1"
     TWO_NUMBER    = "2"
     THREE_NUMBER  = "3"
@@ -53,29 +44,55 @@ class Device
     NINE_NUMBER   = "9"
     ZERO_NUMBER   = "0"
 
-    ONE_ALPHA     = ONE_NUMBER   + ONE_LETTERS
-    TWO_ALPHA     = TWO_NUMBER   + TWO_LETTERS
-    THREE_ALPHA   = THREE_NUMBER + THREE_LETTERS
-    FOUR_ALPHA    = FOUR_NUMBER  + FOUR_LETTERS
-    FIVE_ALPHA    = FIVE_NUMBER  + FIVE_LETTERS
-    SIX_ALPHA     = SIX_NUMBER   + SIX_LETTERS
-    SEVEN_ALPHA   = SEVEN_NUMBER + SEVEN_LETTERS
-    EIGHT_ALPHA   = EIGHT_NUMBER + EIGHT_LETTERS
-    NINE_ALPHA    = NINE_NUMBER  + NINE_LETTERS
-    ZERO_ALPHA    = ZERO_NUMBER  + ZERO_LETTERS
-
-    RANGE_ALPHA   = [ONE_ALPHA, TWO_ALPHA, THREE_ALPHA, FOUR_ALPHA, FIVE_ALPHA, SIX_ALPHA, SEVEN_ALPHA, EIGHT_ALPHA, NINE_ALPHA, ZERO_ALPHA]
-    RANGE_NUMBER  = [ONE_NUMBER, TWO_NUMBER, THREE_NUMBER, FOUR_NUMBER, FIVE_NUMBER, SIX_NUMBER, SEVEN_NUMBER, EIGHT_NUMBER, NINE_NUMBER, ZERO_NUMBER]
-    RANGE_LETTERS = [ONE_LETTERS, TWO_LETTERS, THREE_LETTERS, FOUR_LETTERS, FIVE_LETTERS, SIX_LETTERS, SEVEN_LETTERS, EIGHT_LETTERS, NINE_LETTERS, ZERO_LETTERS]
-
-    KEYS_RANGE    = {MASK_ALPHA => RANGE_ALPHA, MASK_LETTERS => RANGE_LETTERS, MASK_NUMBERS => RANGE_NUMBER}
-
-    include Device::Helper
-
     class << self
-      attr_accessor :timeout
+      attr_accessor :timeout, :keys_range
+    end
+
+    # Setup Keyboard Map
+    #
+    # @param key_map [Array] contains the key map from 1 to 0 (0..9)
+    # @return [NilClass] nil.
+    #
+    # @example
+    #   one_letters   = "qzQZ _,."
+    #   two_letters   = "abcABC"
+    #   three_letters = "defDEF"
+    #   four_letters  = "ghiGHI"
+    #   five_letters  = "jklJKL"
+    #   six_letters   = "mnoMNO"
+    #   seven_letters = "prsPRS"
+    #   eight_letters = "tuvTUV"
+    #   nine_letters  = "wxyWXY"
+    #   zero_letters  = "spSP"
+    #   map = [one_letters, two_letters, three_letters, four_letters, five_letters,
+    #   six_letters, seven_letters, eight_letters, nine_letters, zero_letters]
+    #   Device::IO.setup_keyboard(map)
+    #
+    def self.setup_keyboard(map)
+      one_letters, two_letters, three_letters, four_letters, five_letters,
+        six_letters, seven_letters, eight_letters, nine_letters, zero_letters =
+        map
+
+      range_number  = [
+        ONE_NUMBER , TWO_NUMBER   , THREE_NUMBER , FOUR_NUMBER , FIVE_NUMBER ,
+        SIX_NUMBER , SEVEN_NUMBER , EIGHT_NUMBER , NINE_NUMBER , ZERO_NUMBER
+      ]
+      range_letters = [
+        one_letters, two_letters, three_letters, four_letters, five_letters,
+        six_letters, seven_letters, eight_letters, nine_letters, zero_letters
+      ]
+      range_alpha = [
+        ONE_NUMBER   + one_letters, TWO_NUMBER     + two_letters,
+        THREE_NUMBER + three_letters, FOUR_NUMBER  + four_letters,
+        FIVE_NUMBER  + five_letters, SIX_NUMBER    + six_letters,
+        SEVEN_NUMBER + seven_letters, EIGHT_NUMBER + eight_letters,
+        NINE_NUMBER  + nine_letters, ZERO_NUMBER   + zero_letters
+      ]
+      @keys_range = {MASK_ALPHA => range_alpha, MASK_LETTERS => range_letters, MASK_NUMBERS => range_number}
     end
 
+    self.setup_keyboard(["qzQZ _,.", "abcABC", "defDEF", "ghiGHI", "jklJKL",
+                        "mnoMNO", "prsPRS", "tuvTUV", "wxyWXY", "spSP"])
     self.timeout = DEFAULT_TIMEOUT
 
     # Restricted to terminals, get strings and numbers.
@@ -156,7 +173,7 @@ class Device
 
     def self.change_next(text, mask_type = Device::IO::MASK_ALPHA)
       char = text[-1]
-      if char && (range = KEYS_RANGE[mask_type].detect { |range| range.include?(char) })
+      if char && (range = self.keys_range[mask_type].detect { |range| range.include?(char) })
         index = range.index(char)
         new_value = range[index+1]
         if new_value

data/lib/device/transaction/download.rb

@@ -116,6 +116,8 @@ class Device
         end
 
         return_code
+      rescue SocketError
+        return COMMUNICATION_ERROR
       end
 
       def generate_crc(local_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake