da_funk 0.4.5 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec1d9846f46aa2dac82e6aa65bcda41838400d2b
-  data.tar.gz: 81335482ebcc090564b03cfeec21434f29fc6be2
+  metadata.gz: b1446cb5bdb03736d85f243da9e8a9bd46e6f8de
+  data.tar.gz: c4b5cde8b5971c7df4aec2f22fa7031d51149769
 SHA512:
-  metadata.gz: cf63404ca741cae273ba0c59ab2c88ba9c46b3b211d82faaa41a18f25bec532f8458fc7d4e6db258189a071be125f91e640d240e1ab6242620a9b0c5ea908b44
-  data.tar.gz: e9d59a6978b202957fb58e522d1c76835c8649d7dc86545cd9a50ce3f28a502affa7da2b2c39856209a34b41ae4ac89f2a78ebf6b6bc78ef57a9cd1d1b5f6d25
+  metadata.gz: 340d76d27f72033a38bd09af0e566f36f17f5a536fc4787724d982a8837660c7a7fbad209568157e229d43e90a9b70ad87a95bd22db7476c360e8bb0b3675196
+  data.tar.gz: 9a8412f650cd4c0b40885a2d5b2da3f22ee689330b000420c94410820c37147aeb18df16e08cb56b04f65de9960ecf98eec134777eec7b5960f23f76ce7ce8a5

data/Gemfile

@@ -1,5 +1,8 @@
 source "https://rubygems.org"
 
+gem 'cloudwalk_handshake'
+gem 'simplehttp', :git => 'https://github.com/scalone/walk-simplehttp-poc.git'
+
 group :development do
   gem 'yard'
 end

data/Gemfile.lock

@@ -1,14 +1,22 @@
+GIT
+  remote: https://github.com/scalone/walk-simplehttp-poc.git
+  revision: 9dad485f7a7c4e783651805b3e75a4779629b0cb
+  specs:
+    simplehttp (0.4.0)
+
 PATH
   remote: .
   specs:
-    da_funk (0.4.4)
+    da_funk (0.4.8)
       bundler (~> 1.7)
+      cloudwalk_handshake (~> 0.2.0)
       rake (~> 10.4)
       yard (~> 0.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    cloudwalk_handshake (0.2.0)
     rake (10.4.2)
     yard (0.8.7.6)
 
@@ -17,5 +25,7 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
+  cloudwalk_handshake
   da_funk!
+  simplehttp!
   yard

data/RELEASE_NOTES.md

@@ -1,5 +1,20 @@
 # DaFunk
 
+### 0.4.8 - 2015-07-29 - CloudwalkHandshake as dependency
+- Add CloudwalkHandshake as dependency.
+
+### 0.4.7 - 2015-06-09 - New Notication Spec
+- Fix gem out moving on mrb compilation.
+- Abstract CloudWalk Handshake to other gem.
+- Support new CloudWalk Notifcation spec.
+- Support Notification timezone update.
+- Support Notification show message.
+- Changed Notification event check timeout for 5 seconds.
+
+### 0.4.6 - 2015-06-12 - Timezone Setting
+- Support cw_pos_timezone.
+- Support cw_pos_version.
+
 ### 0.4.5 - 2015-06-09 - ISO8583, environment and abstraction classes
 - Implementing support to change host environment configuration with Setting.to_production! and Setting.to_staging!.
 - Fix da_funk.mrb out path getting the app name to output da_funk.mrb.

data/Rakefile

@@ -9,6 +9,7 @@ DA_FUNK_ROOT = File.dirname(File.expand_path(__FILE__))
 FileUtils.cd DA_FUNK_ROOT
 
 FILES = FileList[
+  "lib/device/version.rb",
   "lib/da_funk.rb",
   "lib/da_funk/test.rb",
   "lib/device.rb",
@@ -26,8 +27,6 @@ FILES = FileList[
   "lib/device/system.rb",
   "lib/device/transaction/download.rb",
   "lib/device/transaction/emv.rb",
-  "lib/device/version.rb",
-  "lib/device/walk.rb",
   "lib/file_db.rb",
   "lib/iso8583/bitmap.rb",
   "lib/iso8583/codec.rb",
@@ -37,7 +36,6 @@ FILES = FileList[
   "lib/iso8583/message.rb",
   "lib/iso8583/util.rb",
   "lib/iso8583/version.rb",
-  "lib/version.rb",
   "lib/device/transaction/iso.rb",
   "lib/serfx.rb",
   "lib/serfx/commands.rb",

data/da_funk.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 tasks = File.expand_path('../tasks', __FILE__)
 $LOAD_PATH.unshift(tasks) unless $LOAD_PATH.include?(tasks)
 
-require 'version.rb'
+require 'device/version.rb'
 
 Gem::Specification.new do |spec|
   spec.name          = "da_funk"
@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rake", "~> 10.4"
   spec.add_dependency "bundler", "~> 1.7"
   spec.add_dependency "yard", "~> 0.8"
+  spec.add_dependency "cloudwalk_handshake", "~> 0.2.0"
 end

data/lib/da_funk.rb

@@ -10,7 +10,6 @@ unless Object.const_defined?(:MTest)
   require file_path + "/device/setting.rb"
   require file_path + "/device/system.rb"
   require file_path + "/device/version.rb"
-  require file_path + "/device/walk.rb"
   require file_path + "/device/params_dat.rb"
   require file_path + "/device.rb"
   require file_path + "/file_db.rb"
@@ -22,7 +21,6 @@ unless Object.const_defined?(:MTest)
   require file_path + "/iso8583/message.rb"
   require file_path + "/iso8583/util.rb"
   require file_path + "/iso8583/version.rb"
-  require file_path + "/version.rb"
   require file_path + "/device/transaction/download.rb"
   require file_path + "/device/transaction/emv.rb"
   require file_path + "/device/transaction/iso.rb"

data/lib/da_funk/rake_task.rb

@@ -70,7 +70,7 @@ module DaFunk
     end
 
     def check_gem_out(gem)
-      if File.exists?(path = File.join(gem.full_gem_path, "out", gem.name)) && File.file?(path)
+      if File.exists?(path = File.join(gem.full_gem_path, "out", "#{gem.name}.mrb")) && File.file?(path)
       elsif File.exists?(path = File.join(gem.full_gem_path, "out", gem.name, "main.mrb")) && File.file?(path)
       elsif File.exists?(path = File.join(gem.full_gem_path, "out", gem.name, "#{gem.name}.mrb")) && File.file?(path)
       else
@@ -89,26 +89,21 @@ module DaFunk
         resources.each_with_index do |file,dest_i|
           FileUtils.cp(file, resources_out[dest_i]) if File.file?(file)
         end
-      end
-
-      desc "Compile app to mrb and process resources"
-      task :build => :resources do
-        FileUtils.mkdir_p out_path
 
         Bundler.load.specs.each do |gem|
           path = check_gem_out(gem)
           FileUtils.cp(path, File.join(out_path, "#{gem.name}.mrb")) if path
         end
+      end
 
+      desc "Compile app to mrb and process resources"
+      task :build => :resources do
         sh "#{mrbc} -g -o #{main_out} #{libs} "
       end
 
       namespace :test do
         task :setup => :resources do
           ENV["RUBY_PLATFORM"] = "mruby"
-          Bundler.load.specs.each do |gem|
-            sh "cp #{File.join(gem.full_gem_path, "out", gem.name)}.mrb #{out_path}/#{gem.name}.mrb" if File.exists? "#{File.join(gem.full_gem_path, "out", gem.name)}.mrb"
-          end
         end
 
         desc "Run unit test on mruby"

data/lib/device.rb

@@ -1,3 +1,4 @@
+
 class Device
   class << self
     attr_accessor :adapter

data/lib/device/network.rb

@@ -1,4 +1,6 @@
 
+require 'cloudwalk_handshake'
+
 class Device
   class Network
 
@@ -35,7 +37,13 @@ class Device
     #AUTH_WPA_WPA2_EAP   = "wpa_wpa2_eap"
 
     class << self
-      attr_accessor :type, :apn, :user, :password, :socket, :socket_tcp, :socket_ssl, :ssl
+      attr_accessor :type, :apn, :user, :password, :socket
+    end
+
+    self.socket = Proc.new do |avoid_walk|
+      sock = CloudwalkSocket.new
+      sock.connect(avoid_walk)
+      sock
     end
 
     def self.adapter
@@ -84,65 +92,6 @@ class Device
       ret
     end
 
-    def self.handshake_ssl!
-      @socket_ssl = self.handshake_ssl(@socket_tcp)
-      @ssl = true
-      @socket = @socket_ssl
-    end
-
-    def self.handshake_ssl(tcp)
-      return if tcp.closed?
-      entropy = PolarSSL::Entropy.new
-      ctr_drbg = PolarSSL::CtrDrbg.new entropy
-      s_ssl = PolarSSL::SSL.new
-      s_ssl.set_endpoint PolarSSL::SSL::SSL_IS_CLIENT
-      s_ssl.set_rng ctr_drbg
-      s_ssl.set_socket tcp
-      s_ssl.handshake
-      s_ssl
-    end
-
-    def self.handshake!
-      handshake = "#{Device::System.serial};#{Device::System.app};#{Device::Setting.logical_number};#{Device.version}"
-      socket.write("#{handshake.size.chr}#{handshake}")
-
-      company_name = socket_tcp.closed? ? nil : socket.read(3)
-      return false if company_name == "err" || company_name.nil?
-
-      Device::Setting.company_name = company_name
-      true
-    end
-
-    # Create Socket in Walk Switch
-    def self.walk_socket
-      if @socket
-        @socket
-      else
-        @socket_tcp = create_socket
-        if Device::Setting.ssl == "1"
-          handshake_ssl!
-        else
-          @socket = @socket_tcp
-        end
-        handshake!
-        @socket
-      end
-    end
-
-    def self.create_socket
-      TCPSocket.new(Device::Setting.host, Device::Setting.host_port)
-    end
-
-    def self.close_socket
-      @socket.close
-      if @socket != @socket_tcp
-        @socket_tcp.close
-      end
-      @socket     = nil
-      @socket_tcp = nil
-      @socket_ssl = nil
-    end
-
     def self.attach
       Device::Network.init(*self.config)
       ret = Device::Network.connect

data/lib/device/notification.rb

@@ -51,6 +51,11 @@ class Device
 
       NotificationCallback.new "SYSTEM_UPDATE", :on => Proc.new { |file| }
       NotificationCallback.new "CANCEL_SYSTEM_UPDATE", :on => Proc.new { }
+      NotificationCallback.new "TIMEZONE_UPDATE", :on => Proc.new { Device::Setting.cw_pos_timezone = "" }
+      NotificationCallback.new "SHOW_MESSAGE", :on => Proc.new { |message,datetime|
+        Device::Display.clear
+        Device::Display.print_line(message, 3)
+      }
     end
 
     def initialize(timeout = DEFAULT_TIMEOUT, interval = DEFAULT_INTERVAL, stream_timeout = DEFAULT_STREAM_TIMEOUT)
@@ -89,15 +94,34 @@ class Device
     end
 
     private
+    def reply(conn, ev)
+      if ev.is_a?(Hash)
+        if ev["Event"] == "user" && ev["Payload"] && ev["Payload"].include?("Id")
+          index = ev["Payload"].index("\"Id")
+          id = ev["Payload"][(index+7)..(index+38)]
+          conn.event(event_name, "{\"Id\"=>\"#{id}\"}", false)
+        end
+      end
+    end
+
     def create_fiber
       Fiber.new do
-        Serfx.connect(socket_block: socket_callback, timeout: timeout, stream_timeout: stream_timeout) do |conn|
-          conn.stream("user:#{Device::Setting.company_name};#{Device::Setting.logical_number}")
+        auth = CloudwalkTOTP.at
+        Serfx.connect(authkey: auth, socket_block: Device::Network.socket, timeout: timeout, stream_timeout: stream_timeout) do |conn|
+          conn.stream(subscription) { |ev| reply(conn, ev) }
         end
         true
       end
     end
 
+    def subscription
+      "user:#{event_name}"
+    end
+
+    def event_name
+      "#{Device::Setting.company_name};#{Device::Setting.logical_number}"
+    end
+
     def socket_callback
       Proc.new do
         socket_tcp = Device::Network.create_socket

data/lib/device/notification_event.rb

@@ -19,11 +19,21 @@ class Device
       @name     = values["Name"]
       @event    = values["Event"]
 
-      @message  = payload.gsub('=>', ' : ')
-      @value    = JSON.parse(message)
-      @body     = value["Body"]
+      @message  = payload.to_s.gsub("=>", " : ")
+      @value    = JSON.parse(@message) unless @message.empty?
+      @body     = extract_body(value)
 
       @callback, *@parameters = @body.to_s.split("|")
     end
+
+    def extract_body(value)
+      unless value.nil?
+        return value["Body"] if value["Body"]
+        # TODO: For some reason the JSON parse has a problem
+        # and extract "B" from "Body"
+        return value["ody"] if value["ody"]
+      end
+    end
   end
 end
+

data/lib/device/params_dat.rb

@@ -51,9 +51,6 @@ class Device
         ret = Device::Transaction::Download.request_param_file(FILE_NAME)
         if value = check_download_error(ret)
           puts "Downloaded Successfully"
-          Device::Network.close_socket
-          # TODO
-          #Device::Network.walk_socket.close unless Device::Network.walk_socket.closed?
           parse_apps
         end
         value
@@ -85,9 +82,6 @@ class Device
         Device::Display.clear
         puts "Downloading #{application.file}..."
         ret = Device::Transaction::Download.request_file(application.file, application.zip)
-        Device::Network.close_socket
-        # TODO
-        #Device::Network.walk_socket.close unless Device::Network.walk_socket.closed?
 
         unless check_download_error ret
           sleep 2

data/lib/device/setting.rb

@@ -32,6 +32,8 @@ class Device
       "notification_timeout"        => "",
       "notification_interval"       => "",
       "notification_stream_timeout" => "",
+      "cw_switch_version"           => "",
+      "cw_pos_timezone"             => "",
       "company_name"                => ""
     }
 

data/lib/device/transaction/download.rb

@@ -22,7 +22,7 @@ class Device
 
       def self.request_file(remote_path, local_path)
         download = Device::Transaction::Download.new(Device::System.serial, "", Device.version)
-        download.perform(Device::Network.walk_socket,
+        download.perform(Device::Network.socket,
                          Device::Setting.company_name,
                          remote_path, local_path, Device::System.app,
                          Device::Setting.logical_number)
@@ -44,8 +44,8 @@ class Device
       # -1: Commnucation error
       # -2: Mapreduce response error
       # -3: IO Error
-      def perform(socket, company_name, remote_path, filepath, current_app, logical_number, file_crc = nil)
-        @socket, @buffer, @request, @first_packet = socket, "", "", ""
+      def perform(socket_proc, company_name, remote_path, filepath, current_app, logical_number, file_crc = nil)
+        @socket, @buffer, @request, @first_packet = socket_proc.call, "", "", ""
         @crc = file_crc ? file_crc : generate_crc(filepath)
         key = "#{company_name}_#{remote_path}"
 
@@ -107,6 +107,7 @@ class Device
 
         # receive 6A
         @socket.read(1) if response_size > 1024
+        @socket.close unless @socket.closed?
 
         return_code
       end

data/lib/device/version.rb

@@ -1,5 +1,7 @@
 
 class Device
+  API_VERSION="0.4.8"
+
   def self.api_version
     Device::API_VERSION
   end

data/lib/serfx/commands.rb

@@ -7,7 +7,7 @@ module Serfx
     #
     # @return  [Response]
     def handshake
-      tcp_send(:handshake, 'Version' => 1)
+      tcp_send(:handshake, 'Version' => 1, 'SerialNumber' => Device::System.serial)
       read_response(:handshake)
     end
 
@@ -97,6 +97,7 @@ module Serfx
       loop do
         header, ev = read_data(self.stream_timeout)
         check_rpc_error!(header)
+        block.call(ev) if block_given?
         break unless fiber_yield!(ev)
       end
       res
@@ -136,6 +137,7 @@ module Serfx
       loop do
         header, ev = read_data
         check_rpc_error!(header)
+        block.call(ev) if block_given?
         break unless fiber_yield!(ev)
       end
       res

data/lib/serfx/connection.rb

@@ -4,7 +4,7 @@ module Serfx
   # implement the actual RPC commands available via [Commands]
   class Connection
     MAX_MESSAGE_SIZE = 1024
-    DEFAULT_TIMEOUT  = 15
+    DEFAULT_TIMEOUT  = 5
     COMMANDS = {
       handshake:        [:header],
       auth:             [:header],
@@ -29,29 +29,26 @@ module Serfx
 
     include Serfx::Commands
 
-    attr_reader :host, :port, :seq, :socket, :socket_tcp, :socket_block, :timeout, :stream_timeout
+    attr_reader :host, :port, :seq, :socket, :socket_block, :timeout, :stream_timeout
 
     def close
-      @socket_tcp.close
       @socket.close
     end
 
     def closed?
-      @socket_tcp.closed?
+      @socket.closed?
     end
 
     # @param  opts [Hash] Specify the RPC connection details
-    # @option opts [TCPSocket] :socket_tcp Socket
     # @option opts [SSL] :socket Socket SSL or normal tcp socket
     # @option opts [Fixnum] :timeout Timeout in seconds to wait for a event and return Fiber
     # @option opts [Symbol] :authkey encryption key for RPC communication
-    # @option opts [Block] :socket_block Callback to create socket if socket was closed, should return [socket, socket_tcp]
+    # @option opts [Block] :socket_block Callback to create socket if socket was closed, should return [socket]
     def initialize(opts = {})
       if @socket_block = opts[:socket_block]
-        @socket, @socket_tcp = @socket_block.call
+        @socket = @socket_block.call(true)
       else
         @socket = opts[:socket]
-        @socket_tcp = opts[:socket_tcp]
       end
       @timeout = opts[:timeout] || DEFAULT_TIMEOUT
       @stream_timeout = opts[:stream_timeout] || DEFAULT_TIMEOUT
@@ -70,11 +67,11 @@ module Serfx
       return if buf.nil?
 
       # TODO Check first and second(header and body) packet size
-      first_packet, second_packet = buf.split("\x85")
-      if second_packet.nil?
+      first_packet, second_packet = buf[0..12], buf[13..-1]
+      if second_packet.nil? || second_packet.empty?
         [MessagePack.unpack(first_packet), nil]
       else
-        [MessagePack.unpack(first_packet), MessagePack.unpack("\x85" + second_packet)]
+        [MessagePack.unpack(first_packet), MessagePack.unpack(second_packet)]
       end
     end
 

data/test/integration/mrb_eval_test.rb

@@ -10,7 +10,7 @@ class MrbEvalTest < DaFunk::Test.case
     Device::Notification.check
 
     http = SimpleHttp.new('http', 'http://google.com', 443)
-    http.socket = Device::Network.walk_socket
+    http.socket = Device::Network.socket.call
     assert_equal 302, http.get('/').code
 
     command =<<EOF
@@ -24,7 +24,7 @@ class MrbEvalTest < DaFunk::Test.case
 
     Device::Network.socket = nil
     http = SimpleHttp.new('http', 'http://google.com', 80)
-    http.socket = Device::Network.walk_socket
+    http.socket = Device::Network.socket.call
     response = http.get('/')
     Device::Network.socket = nil
     response.code

data/test/integration/notification_test.rb

@@ -1,9 +1,12 @@
 
 class NotificationTest < DaFunk::Test.case
   def test_notification
+    Device::Setting.to_staging!
     Device::Setting.company_name = "pc1"
     Device::Setting.logical_number = "0101"
+    Device::Notification.setup
     notification = Device::Notification.new
+
     assert_equal nil, notification.check
     notification.check
     notification.check
@@ -16,5 +19,29 @@ class NotificationTest < DaFunk::Test.case
     notification.close
     assert notification.closed?
   end
+
+  def test_notification_SHOW_MESSAGE
+    $status = nil
+    Device::Setting.to_staging!
+    Device::Setting.company_name = "pc1"
+    Device::Setting.logical_number = "0101"
+    Device::Notification.setup
+    NotificationCallback.new "SHOW_MESSAGE", :on => Proc.new { |message,datetime|
+      $status = message
+    }
+
+    notification = Device::Notification.new
+
+    puts "Must create message AAAA"
+    time = Time.now + 60
+    while(time > Time.now && $status.nil?) do
+      notification.check
+      sleep 2
+    end
+    assert_equal "AAAA", $status
+
+    notification.close
+    assert notification.closed?
+  end
 end
 

data/utils/command_line_platform.rb

@@ -11,7 +11,7 @@ class CommandLinePlatform
     def self.get_string(min, max, option = nil)
       str = ""
       while
-        str << gets.chomp
+        str << STDIN.gets.chomp
         return str if str.size >= min
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.8
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: cloudwalk_handshake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: DaFunk is a Embedded System Framework optimized for programmer happiness
   and sustainable productivity. It encourages beautiful code by favoring convention
   over configuration.
@@ -109,7 +123,6 @@ files:
 - lib/device/transaction/emv.rb
 - lib/device/transaction/iso.rb
 - lib/device/version.rb
-- lib/device/walk.rb
 - lib/ext/kernel.rb
 - lib/file_db.rb
 - lib/iso8583/bitmap.rb
@@ -125,7 +138,6 @@ files:
 - lib/serfx/connection.rb
 - lib/serfx/exceptions.rb
 - lib/serfx/response.rb
-- lib/version.rb
 - lib/zip.rb
 - test/integration/getc_test.rb
 - test/integration/mrb_eval_test.rb

data/lib/device/walk.rb

@@ -1,8 +0,0 @@
-
-class Device
-  class Walk
-    def self.execute(file)
-      load file
-    end
-  end
-end

data/lib/version.rb

@@ -1,5 +0,0 @@
-
-class Device
-  API_VERSION="0.4.5"
-end
-