da_funk 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b480b5631767e85d7cb2ccbbd975c1be1855810
-  data.tar.gz: 7dc71b04d56979458cd23e44a27698028df6b890
+  metadata.gz: 431f3a163440020ee762a35bed3017636e4ecfe9
+  data.tar.gz: 8a950596de6fa69f4dc1ffb9ba927d9f353d3334
 SHA512:
-  metadata.gz: 76c5eba2efcb502d26c7661dd90f8318005bce47d060a4dca15c8a84c46e83e476f1d259866cb512379a7e8a049798bd6d2a194398d88024235fe51300d45a58
-  data.tar.gz: 37dc24ed9e61482dabd643ec97261d9f258682bdd53ab79f4e179dc8dabbb392d3870afe078cdda3814c71981d0c5a69b62d6b4a90de50508970d3e5d6aa9a62
+  metadata.gz: 5854ea72eaf73de652e1dc4c2b00e56a264ed8d6c01ff500b3aceeadc50bc45df6a5e88a978e361f08f078579ee4676ffc371ac46bf42d9896ef7240bf599473
+  data.tar.gz: efb79c4bbe6d47de7bb29d8e751e26f5540bec7069187883d2378f638cfa516caf95a609db66a9dbaaa6d45ed03206fd74ac81a839ac3bb2fc3c2c1cf547e979

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    da_funk (0.5.1)
+    da_funk (0.5.3)
       bundler (~> 1.7)
       cloudwalk_handshake (~> 0.4)
       rake (~> 10.4)
@@ -16,7 +16,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    cloudwalk_handshake (0.4.12)
+    cloudwalk_handshake (0.5.0)
     rake (10.4.2)
     yard (0.8.7.6)
 

data/RELEASE_NOTES.md

@@ -1,5 +1,15 @@
 # DaFunk
 
+### 0.5.3 - 2016-01-06 - Update cloudwalk_handshake
+- Update cloudwlak_handshake to version 0.5.0.
+- Support to execute an application as file.
+
+### 0.5.2 - 2016-01-05 - Update cloudwalk_handshake
+- FileDb dot not check key value after sanitize to avoid problem on hash creation.
+- Add sim_pim, sim_slot, sim_dual, phone, modem_speed, touchscreen, attach_gprs_timeout, attach_tries, tcp_recv_timeout, iso8583_send_tries, crypto_dukpt_slot and ctls to Setting.
+- Add method model and versions to Device::System.
+- Add support to brand, model and versions to DaFunk tests API.
+
 ### 0.5.1 - 2015-12-16 - Update cloudwalk_handshake
 - Update cloudwlak_handshake to version 0.4.12.
 

data/lib/da_funk/test.rb

@@ -23,7 +23,8 @@ module DaFunk
 
   class Test
     class << self
-      attr_accessor :root_path, :libs, :tests, :logical_number, :serial, :name
+      attr_accessor :root_path, :libs, :tests, :logical_number, :serial, :name,
+        :brand, :model, :battery
       include DaFunk::MRuby
     end
 
@@ -44,6 +45,9 @@ module DaFunk
       @serial         ||= "1111111111"
       @logical_number ||= "00001"
       @name           ||= "main"
+      @brand          ||= "test"
+      @model          ||= "test"
+      @battery        ||= "100"
       if self.cruby?
         @libs      ||= FileList[File.join(root_path, 'lib/**/*.rb')]
         @tests     ||= FileList[File.join(root_path, 'test/**/*test.rb')]

data/lib/device/network.rb

@@ -77,6 +77,10 @@ class Device
       adapter.disconnect
     end
 
+    def self.sim_id
+      adapter.sim_id
+    end
+
     # Check signal value
     #
     # @return [Fixnum] Signal value between 0 and 5.

data/lib/device/runtime.rb

@@ -12,10 +12,12 @@ class Device
     # @param json [String] Parameters to confifure new aplication.
     # @return [Object] From the new runtime instance.
     def self.execute(app, json = nil)
-      zip = "./#{app}.zip"
-      Device::Display.clear
-      raise File::FileError, zip unless File.exists?(zip)
-      raise "Problem to unzip #{zip}" unless Zip.uncompress(zip, app)
+      unless app.include?(".")
+        zip = "./#{app}.zip"
+        Device::Display.clear
+        raise File::FileError, zip unless File.exists?(zip)
+        raise "Problem to unzip #{zip}" unless Zip.uncompress(zip, app)
+      end
       return mrb_eval "Context.start('#{app}', '#{Device.adapter}', '#{json}')"
     end
   end

data/lib/device/setting.rb

@@ -14,6 +14,9 @@ class Device
       "user"                        => "",
       "password"                    => "", #WIFI
       "apn"                         => "",
+      "sim_pim"                     => "",
+      "sim_slot"                    => "0",
+      "sim_dual"                    => "0",
       "authentication"              => "", #WIFI
       "essid"                       => "", #WIFI
       "bssid"                       => "", #WIFI
@@ -26,17 +29,25 @@ class Device
       "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"             => "",
-      "uclreceivetimeout"           => "0",
+      "tcp_recv_timeout"            => "0",
       "iso8583_recv_tries"          => "0",
+      "iso8583_send_tries"          => "0",
+      "crypto_dukpt_slot"           => "",
+      "ctls"                        => "",
       "company_name"                => ""
     }
 

data/lib/device/system.rb

@@ -61,6 +61,14 @@ class Device
     def self.model
       adapter.model
     end
+
+    def self.brand
+      adapter.brand
+    end
+
+    def self.versions
+      adapter.versions
+    end
   end
 end
 

data/lib/device/version.rb

@@ -1,6 +1,6 @@
 
 class Device
-  API_VERSION="0.5.1"
+  API_VERSION="0.5.3"
 
   def self.api_version
     Device::API_VERSION

data/lib/file_db.rb

@@ -21,8 +21,8 @@ class FileDb
     text.split("\n").compact.each do |line|
       key_value = line.split("=")
       key, value = sanitize(key_value[0]), sanitize(key_value[1])
-      if key_value[1] && (@hash[key].nil? || @hash[key].empty?)
-        @hash[key] = value
+      if @hash[key].nil? || @hash[key].empty?
+        @hash[key] = value.to_s
       end
     end
   end
@@ -36,8 +36,10 @@ class FileDb
   end
 
   def []=(key, value)
+    value = value.to_s
+    old = @hash[key]
     ret = @hash[key] = value
-    save
+    save if old != value
     ret
   end
 

data/lib/zip.rb

@@ -13,13 +13,12 @@ module Zip
     # TODO Refactor file check
     if Dir.exist?(dir)
       files = Dir.entries(dir)
-      if (files.size > 2)
-        files[2..-1].each do |file|
-          if File.file?("#{dir}/#{file}")
-            File.delete("#{dir}/#{file}")
-          else
-            Dir.delete("#{dir}/#{file}")
-          end
+      files.each do |file|
+        next if (file == ".." || file == ".")
+        if File.file?("#{dir}/#{file}")
+          File.delete("#{dir}/#{file}")
+        else
+          Dir.delete("#{dir}/#{file}")
         end
       end
       Dir.delete(dir)

data/test/unit/device/notification_test.rb

@@ -5,17 +5,17 @@ class NotificationTest < DaFunk::Test.case
   end
 
   def test_interval_last_check_blank
-    assert @notification.valid_interval?
+    assert @notification.valid_check_interval?
   end
 
   def test_interval_expired
     @notification.instance_eval { @last_check = (Time.now - 11) }
-    assert @notification.valid_interval?
+    assert @notification.valid_check_interval?
   end
 
   def test_interval_not_expired
     @notification.instance_eval { @last_check = Time.now }
-    assert_equal false, @notification.valid_interval?
+    assert_equal false, @notification.valid_check_interval?
   end
 end
 

data/utils/command_line_platform.rb

@@ -8,9 +8,7 @@ class CommandLinePlatform
   IO = ::IO
 
   def self.setup
-    Device::System.klass               = DaFunk::Test.name
-    Device::Setting.logical_number     = DaFunk::Test.logical_number
-    CommandLinePlatform::System.serial = DaFunk::Test.serial
+    set_system_values
     CommandLinePlatform::Display.standard_output = STDOUT
     Screen.setup(21, 20)
     begin
@@ -21,6 +19,15 @@ class CommandLinePlatform
     end
   end
 
+  def self.set_system_values
+    Device::System.klass                = DaFunk::Test.name
+    Device::Setting.logical_number      = DaFunk::Test.logical_number
+    CommandLinePlatform::System.serial  = DaFunk::Test.serial
+    CommandLinePlatform::System.brand   = DaFunk::Test.brand
+    CommandLinePlatform::System.model   = DaFunk::Test.model
+    CommandLinePlatform::System.battery = DaFunk::Test.battery
+  end
+
   class IO
     def self.get_string(min, max, option = nil)
       str = ""
@@ -67,16 +74,33 @@ class CommandLinePlatform
     def self.connected?
       1
     end
+
+    def self.signal
+      "0"
+    end
+
+    def self.sim_id
+      ""
+    end
   end
 
   class System
     class << self
-      attr_accessor :serial
+      attr_accessor :serial, :brand, :model, :battery, :battery
     end
 
     def self.restart
       puts "Restart terminal!"
     end
+
+    def self.versions
+      {
+        "OS"     => Device.version,
+        "SDK"    => Device.api_version,
+        "EMV"    => "0.0.1",
+        "Pinpad" => "0.0.1"
+      }
+    end
   end
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake