da_funk 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f6796aa8b171f133b5b3a6b0170b61a83651b63
-  data.tar.gz: f428c3c98ebc985b7ccad5753ef547910bb72e6a
+  metadata.gz: 3ffa40cacb07a44394edc805f71b8be32438bfc9
+  data.tar.gz: b2f646de25afc556455cf85aea448804f1d95af1
 SHA512:
-  metadata.gz: 0701508221650303c1817bdf30f8c833ee1513f3bc4e60e5a3331f664521abd3cd4982c48da6f8183dba4436dd7c3dc88388e27d979b1e3e1453b2582ecfbe0b
-  data.tar.gz: 2c8ddae58a9c941dcec255840c6d76f7957be7148fdc1113d91125e54afd42ef4f256c502c2cee93475da928fad28d348e4aa08e84641614eee729afd28acc78
+  metadata.gz: d158b9803baae2030ee1baeedaa0e41e178bfbd4b6b7550937d22d0755ba729da963def38dec968470d46b5b0259b401cd880561650bf7b0103f22751abd4a4e
+  data.tar.gz: 7886ea442d36228ad0299f99069177c9583f3be60ebe20c78a70e45d2aa7f57f4f7e68a098e1f036cec6b0c85509303d2479ca52ba08ac9c655863313e46f4ba

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    da_funk (0.9.1)
+    da_funk (0.9.2)
       bundler (~> 1.7)
       cloudwalk_handshake (~> 0.6)
       funky-emv (~> 0.3)
@@ -12,11 +12,11 @@ GEM
   remote: https://rubygems.org/
   specs:
     cloudwalk_handshake (0.8.0)
-    funky-emv (0.5.8)
+    funky-emv (0.6.0)
       funky-tlv (~> 0.2)
     funky-simplehttp (0.4.4)
-    funky-tlv (0.2.2)
-    posxml_parser (0.15.1)
+    funky-tlv (0.2.3)
+    posxml_parser (0.15.2)
       funky-emv (~> 0.3)
     rake (10.5.0)
     yard (0.9.9)

data/RELEASE_NOTES.md

@@ -1,5 +1,10 @@
 # DaFunk
 
+### 0.9.2 - 2017-07-25
+
+- Refactoring Network.configured? fixing the return which must be a bool.
+- Create Device::Setting.wifi_password and Device::Setting.apn_password.
+
 ### 0.9.1 - 2017-07-12
 
 - Fix file deletable check and extra parameters for additional files at ParamsDat.format!.

data/lib/da_funk/helper.rb

@@ -18,11 +18,13 @@ module DaFunk
       Device::Display.clear
       if Device::Network.configured?
         I18n.pt(:attach_connecting)
-        if Device::Network.connected? < 0
-          if (ret = Device::Network.attach) == 0
+        unless Device::Network.connected?
+          if Device::Network.attach == Device::Network::SUCCESS
+            Device::Setting.network_configured = 1
             I18n.pt(:attach_connected)
           else
-            I18n.pt(:attach_fail, :args => [ret.to_s])
+            Device::Setting.network_configured = 0
+            I18n.pt(:attach_fail, :args => [Device::Network.code.to_s])
             getc(4000)
             return false
           end

data/lib/da_funk/version.rb

@@ -1,4 +1,4 @@
 module DaFunk
-  VERSION="0.9.1"
+  VERSION="0.9.2"
 end
 

data/lib/device/network.rb

@@ -40,9 +40,10 @@ class Device
     #AUTH_WPA_WPA2_EAP   = "wpa_wpa2_eap"
 
     class << self
-      attr_accessor :type, :apn, :user, :password, :socket
+      attr_accessor :type, :apn, :user, :password, :socket, :code
     end
 
+    self.code = NO_CONNECTION
     self.socket = Proc.new do |avoid_handshake|
       sock = TCPSocket.new Device::Setting.host, Device::Setting.host_port
       sock.connect(avoid_handshake)
@@ -69,9 +70,12 @@ class Device
       if self.adapter.started? ||
         (self.configured? && Device::Network.init(*self.config) == SUCCESS)
 
-        return adapter.connected?
+        self.code = adapter.connected?
+
+        return self.code == Device::Network::SUCCESS
       end
-      NO_CONNECTION
+      self.code = NO_CONNECTION
+      false
     end
 
     def self.configured?
@@ -96,7 +100,7 @@ class Device
     #
     # @return [Fixnum] Signal value between 0 and 5.
     def self.signal
-      if self.connected? == 0
+      if self.connected?
         adapter.signal
       end
     end
@@ -114,8 +118,8 @@ class Device
     #   end
     #   selected = menu("Select SSID:", selection)
     #
-    #   Device::Setting.password       = form("Password",
-    #     :min => 0, :max => 127, :default => Device::Setting.password)
+    #   Device::Setting.wifi_password  = form("Password",
+    #     :min => 0, :max => 127, :default => Device::Setting.wifi_password)
     #   Device::Setting.authentication = selected[:authentication]
     #   Device::Setting.essid          = selected[:essid]
     #   Device::Setting.channel        = selected[:channel]
@@ -144,28 +148,27 @@ class Device
     end
 
     def self.attach
-      ret = Device::Network.connected?
-      if ret != SUCCESS
-        ret = Device::Network.init(*self.config)
-        ret = Device::Network.connect
-        ret = Device::Network.connected? if ret != SUCCESS
+      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|
-          process[:ret] = Device::Network.connected?
+          Device::Network.connected?
+          process[:ret] = self.code
           process[:ret] == PROCESSING # if true keep trying
         end
-        ret = hash[:ret]
+        self.code = hash[:ret]
 
-        if ret == SUCCESS
-          ret = Device::Network.dhcp_client(20000) if (wifi? || ethernet?)
-          Device::Setting.network_configured = 1
+        if self.code == SUCCESS
+          self.code = Device::Network.dhcp_client(20000) if (wifi? || ethernet?)
         else
-          ret = ERR_USER_CANCEL if hash[:key] == Device::IO::CANCEL
-          Device::Setting.network_configured = 0
+          self.code = ERR_USER_CANCEL if hash[:key] == Device::IO::CANCEL
           Device::Network.disconnect
         end
       end
-      ret
+      self.code
     end
 
     def self.config
@@ -179,19 +182,19 @@ class Device
         {
           apn:      Device::Setting.apn,
           user:     Device::Setting.user,
-          password: Device::Setting.password
+          password: Device::Setting.apn_password
         }
       elsif wifi?
         {
           authentication: Device::Setting.authentication,
-          password:       Device::Setting.password,
+          password:       Device::Setting.wifi_password,
           essid:          Device::Setting.essid,
           channel:        Device::Setting.channel,
           cipher:         Device::Setting.cipher,
           mode:           Device::Setting.mode
         }
       elsif ethernet?
-        Hash.new
+        Hash.new # TODO
       end
     end
 

data/lib/device/notification.rb

@@ -41,7 +41,7 @@ class Device
     end
 
     def self.start
-      if create_fiber? && Device::Network.connected? == Device::Network::SUCCESS
+      if create_fiber? && Device::Network.connected?
         unless Device::Notification.current && Device::Notification.current.closed?
           self.new(*self.config)
         end
@@ -74,7 +74,7 @@ class Device
     # Check if there is any notification
     def check
       # TODO check if should execute this(because of connection exception)
-      if valid_check_interval? && Device::Network.connected? == Device::Network::SUCCESS
+      if valid_check_interval? && Device::Network.connected?
         if @fiber.alive?
           if (notification = @fiber.resume)
             Notification.execute(NotificationEvent.new(notification))

data/lib/device/setting.rb

@@ -10,48 +10,50 @@ class Device
     DEFAULT     = {
       "host"                        => HOST_PRODUCTION,
       "host_port"                   => PORT_TCP_SSL,
-      "ssl"                         => "1",
-      "user"                        => "",
-      "password"                    => "", #WIFI
-      "apn"                         => "",
-      "sim_pin"                     => "",
-      "sim_slot"                    => "0",
-      "sim_dual"                    => "0",
+      "ssl"                         => "1", #COMM
+      "media_primary"               => "", #COMM
+      "user"                        => "", #GPRS
+      "apn_password"                => "", #GPRS
+      "apn"                         => "", #GPRS
+      "sim_pin"                     => "", #GPRS
+      "sim_slot"                    => "0", #GPRS
+      "sim_dual"                    => "0", #GPRS
+      "wifi_password"                    => "", #WIFI
       "authentication"              => "", #WIFI
       "essid"                       => "", #WIFI
       "bssid"                       => "", #WIFI
       "cipher"                      => "", #WIFI
       "mode"                        => "", #WIFI
       "channel"                     => "", #WIFI
-      "media"                       => "",
-      "ip"                          => "",
-      "gateway"                     => "",
-      "dns1"                        => "",
-      "dns2"                        => "",
-      "subnet"                      => "",
-      "phone"                       => "",
-      "modem_speed"                 => "",
-      "logical_number"              => "",
-      "network_configured"          => "",
-      "touchscreen"                 => "",
-      "environment"                 => "",
-      "attach_gprs_timeout"         => "",
-      "attach_tries"                => "",
-      "notification_socket_timeout" => "", # Period to create fiber
-      "notification_timeout"        => "", # Time to wait message to read
-      "notification_interval"       => "", # Check interval
-      "notification_stream_timeout" => "", # Time to wait stream message to read
-      "cw_switch_version"           => "",
-      "cw_pos_timezone"             => "",
-      "tcp_recv_timeout"            => "14",
-      "iso8583_recv_tries"          => "0",
-      "iso8583_send_tries"          => "0",
-      "crypto_dukpt_slot"           => "",
-      "ctls"                        => "",
-      "locale"                      => "en",
-      "heartbeat"                   => "",
-      "boot"                        => "1",
-      "company_name"                => ""
+      "media"                       => "", #COMM
+      "ip"                          => "", #COMM
+      "gateway"                     => "", #COMM
+      "dns1"                        => "", #COMM
+      "dns2"                        => "", #COMM
+      "subnet"                      => "", #COMM
+      "phone"                       => "", #PPOE
+      "modem_speed"                 => "", #PPOE
+      "logical_number"              => "", #SYS
+      "network_configured"          => "", #SYS
+      "touchscreen"                 => "", #SYS
+      "environment"                 => "", #SYS
+      "attach_gprs_timeout"         => "", #COMM
+      "attach_tries"                => "", #COMM
+      "notification_socket_timeout" => "", #SYS Period to create fiber
+      "notification_timeout"        => "", #SYS Time to wait message to read
+      "notification_interval"       => "", #SYS Check interval
+      "notification_stream_timeout" => "", #SYS Time to wait stream message to read
+      "cw_switch_version"           => "", #SYS
+      "cw_pos_timezone"             => "", #SYS
+      "tcp_recv_timeout"            => "14", #COMM
+      "iso8583_recv_tries"          => "0", #COMM
+      "iso8583_send_tries"          => "0", #COMM
+      "crypto_dukpt_slot"           => "", #SYS
+      "ctls"                        => "", #SYS
+      "locale"                      => "en", #SYS
+      "heartbeat"                   => "", #SYS
+      "boot"                        => "1", #SYS
+      "company_name"                => "" #SYS
     }
 
     def self.setup

data/utils/command_line_platform.rb

@@ -69,7 +69,11 @@ class CommandLinePlatform
     end
 
     def self.connected?
-      1
+      true
+    end
+
+    def self.code
+      Device::Network::SUCCESS
     end
 
     def self.signal

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: cloudwalk_handshake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: funky-simplehttp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: posxml_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: funky-emv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
 description: DaFunk is a Embedded System Framework optimized for programmer happiness
@@ -117,8 +117,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .yardopts
+- ".gitignore"
+- ".yardopts"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -231,17 +231,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: MRuby Embedded System Framework