da_funk 0.4.19 → 0.4.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 581959a05ca363df037b218fb049a1337a05458e
-  data.tar.gz: bc09d913c2a3d7d25607ff173951d267c319f6f5
+  metadata.gz: 62c2f815b4a2aac3e8a15cf969b0f9d7ce842140
+  data.tar.gz: 0d585d8bf8eec09129472b764119775a91ad290a
 SHA512:
-  metadata.gz: 3b7ca6e71008e7dd5962e83d59179246381ada0c227c56334cab6ea449226c8f4adb8784d9d7035a7dd4a470781d7785529207dbe0230d47e446b375b3d72b84
-  data.tar.gz: daea05521a99d66a8a3143941f1be5e7707447999003c4fe5d576bbd7cb9a2ee2db3e9883973481499c4976800ccc5ba3343d060e0afd6bcd13e676ccf2e0ccf
+  metadata.gz: 1ed08db806c6b47c2845c9dbca87c021b3a3256b00b0dd81261e2ad06437d594840a44299d8860b600a63ebfb51d2f428bb4a21ac33b6ba51d9e7723e562b978
+  data.tar.gz: 1ec0cd499e3221a80d0537949c77939294ac2bdbb68dde23364e1adfa42d55337ca2539a8364316f0349cb9758b74c26478155d516ce104849cbdf3ce9bec5cc

data/Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 PATH
   remote: .
   specs:
-    da_funk (0.4.19)
+    da_funk (0.4.20)
       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.7)
+    cloudwalk_handshake (0.4.11)
     rake (10.4.2)
     yard (0.8.7.6)
 

data/RELEASE_NOTES.md

@@ -1,5 +1,20 @@
 # DaFunk
 
+### 0.4.20 - 2015-12-10 - Refactoring Notification
+- Implement try method on helper to be use on by communication tries.
+- Serfx#auth now receives the authentication key as a parameter too, so that could be called externally in a determined moment, example TOTP authentication on the right moment (after socket open, avoiding authentication problems).
+- Treat authentication error clearing cw_pos_timezone to perform entire handshake on next time.
+- Make Device::Display.print call STDOUT.print if row and column are not sent.
+- On Device::Display#clear call STDOUT.fresh to change the Screen state to 0(x and y).
+- Refactor download of file on ParamsDat to implement method try, adopted initially 3 times.
+- On Screen.setup define STDOUT on Object, instead of Kernel.
+- Update cloudwalk_handshake to version 0.4.11.
+- Fix Screen jump line to not jump before print if size is less than max_x.
+- Support to keep alive Notifications restarting in intervals.
+- On Notification Callback to display message use `getc(0)` (wait a key to be pressed forever) instead of getc(nil) (wait a key to be pressed in default time.
+- Implement String#chars extension.
+- Support to execute a unique file test, example: `rake test test/unit/file_test.rb`.
+
 ### 0.4.19 - 2015-12-04 - Refactoring Device::Setting.to_production!/.to_staging!
 - Implement FileDb#update_attributes to update more than one key in a unique save.
 - Refactoring Device::Setting.to_production!/.to_staging! to clean company_name if the last environment is different.

data/Rakefile

@@ -56,7 +56,6 @@ FILES = FileList[
 
 DaFunk::RakeTask.new do |t|
   t.main_out  = "./out/da_funk.mrb"
-  t.mruby = "mruby -b"
   t.libs = FILES
 end
 

data/lib/da_funk/helper.rb

@@ -62,6 +62,15 @@ module DaFunk
       value
     end
 
+    def try(tries, &block)
+      tried = 0
+      ret = false
+      while (tried < tries && ! ret)
+        ret = block.call(tried)
+        tried += 1
+      end
+      ret
+    end
 
     # Create a form menu.
     #

data/lib/da_funk/rake_task.rb

@@ -129,7 +129,11 @@ module DaFunk
 
         desc "Run all test on mruby"
         task :all => "test:setup" do
-          execute_tests(tests)
+          if ARGV[1]
+            execute_tests(FileList[ARGV[1]])
+          else
+            execute_tests(tests)
+          end
         end
       end
 

data/lib/da_funk/screen.rb

@@ -5,10 +5,10 @@ class Screen
 
   attr_accessor :x, :y, :max_x, :max_y
 
-  def self.setup(max_x, max_y)
+  def self.setup(max_x = SCREEN_X_SIZE, max_y = SCREEN_Y_SIZE)
     $stdout.close
-    Kernel.const_set(:STDOUT, self.new(max_x, max_y))
-    $stdout = Kernel::STDOUT
+    Object.const_set(:STDOUT, self.new(max_x, max_y))
+    $stdout = Object::STDOUT
   end
 
   def initialize(max_x = SCREEN_X_SIZE, max_y = SCREEN_Y_SIZE)
@@ -17,7 +17,7 @@ class Screen
     self.fresh
   end
 
-  def fresh(value_y = nil, value_x = nil)
+  def fresh(value_y = 0, value_x = 0)
     @x = value_x || 0
     @y = value_y || 0
   end
@@ -53,16 +53,18 @@ class Screen
   private
   def loop_split_strings(*args)
     str, value_y, value_x = *args
+    @y = value_y if value_y
+    @x = value_x if value_x
 
-    str.lines.each_with_index do |string, index|
-      jump_line if string[-1] == "\n"
-      string = string.chomp
-      if (@x + string.size) < @max_x
-        Device::IO.print_line(string, @y, @x)
-        @x += string.size
+    str.to_s.lines.each_with_index do |string, index|
+      buf = string.chomp
+      if (@x + buf.size) < @max_x
+        Device::Display.print(buf, @y, @x)
+        @x += buf.size
+        jump_line if string[-1] == "\n"
       else
         space = @max_x - @x
-        Device::IO.print_line("#{string[0..(space - 1)]}", @y, @x)
+        Device::Display.print("#{string[0..(space - 1)]}", @y, @x)
         jump_line
         loop_split_strings("#{string[(space)..-1]}")
       end

data/lib/device/display.rb

@@ -12,7 +12,7 @@ class Device
     # @return [NilClass] nil.
     def self.print(buf, row = nil, column = nil)
       if row.nil? && column.nil?
-        adapter.print(buf)
+        STDOUT.print(buf)
       else
         adapter.print_in_line(buf, row, column)
       end
@@ -38,6 +38,7 @@ class Device
     # @param line [Fixnum] Line to clear
     def self.clear(line = nil)
       if line.nil?
+        STDOUT.fresh
         adapter.clear
       else
         adapter.clear_line line

data/lib/device/notification.rb

@@ -1,14 +1,17 @@
+
 class Device
   class Notification
-    DEFAULT_TIMEOUT        = 15
-    DEFAULT_INTERVAL       = 10
-    DEFAULT_STREAM_TIMEOUT = 0
+    DEFAULT_TIMEOUT           = 20
+    DEFAULT_INTERVAL          = 10
+    DEFAULT_STREAM_TIMEOUT    = 0
+    DEFAULT_CREATION_INTERVAL = 3600
 
     class << self
-      attr_accessor :callbacks, :current
+      attr_accessor :callbacks, :current, :last_creation, :creation_interval
     end
 
     self.callbacks = Hash.new
+    self.creation_interval = DEFAULT_CREATION_INTERVAL
 
     attr_reader :fiber, :timeout, :interval, :last_check, :stream_timeout
 
@@ -30,6 +33,7 @@ class Device
     end
 
     def self.config
+      self.creation_interval      = Device::Setting.notification_socket_timeout.empty? ? DEFAULT_CREATION_INTERVAL : Device::Setting.notification_socket_timeout.to_i
       notification_timeout        = Device::Setting.notification_timeout.empty? ? DEFAULT_TIMEOUT : Device::Setting.notification_timeout.to_i
       notification_interval       = Device::Setting.notification_interval.empty? ? DEFAULT_INTERVAL : Device::Setting.notification_interval.to_i
       notification_stream_timeout = Device::Setting.notification_stream_timeout.empty? ? DEFAULT_STREAM_TIMEOUT : Device::Setting.notification_stream_timeout.to_i
@@ -37,7 +41,7 @@ class Device
     end
 
     def self.start
-      unless Device::Setting.logical_number.empty? || Device::Setting.company_name.empty? || (! Device::Network.connected?)
+      if create_fiber? && Device::Network.connected?
         unless Device::Notification.current && Device::Notification.current.closed?
           self.new(*self.config)
         end
@@ -57,10 +61,22 @@ class Device
         date = datetime.sub(" ", "-").split("-")
         Device::Display.print_line("#{date[1]}/#{date[0]}/#{date[2]} #{date[3]}", 0)
         Device::Display.print_line("#{message}", 2)
-        getc nil
+        getc(0)
       }
     end
 
+    def self.create_fiber?
+      (! Device::Setting.company_name.empty?) && (! Device::Setting.logical_number.empty?) && self.valid_creation_interval?
+    end
+
+    def self.valid_creation_interval?
+      if @last_creation
+        (@last_creation + self.creation_interval) < Time.now
+      else
+        true
+      end
+    end
+
     def initialize(timeout = DEFAULT_TIMEOUT, interval = DEFAULT_INTERVAL, stream_timeout = DEFAULT_STREAM_TIMEOUT)
       @timeout        = timeout
       @stream_timeout = stream_timeout
@@ -71,24 +87,34 @@ class Device
 
     # Check if there is any notification
     def check
-      if @fiber.alive? && valid_interval? && Device::Network.connected?
-        if (notification = @fiber.resume)
-          Notification.execute(NotificationEvent.new(notification))
+      if valid_check_interval? && Device::Network.connected?
+        if @fiber.alive?
+          if (notification = @fiber.resume)
+            Notification.execute(NotificationEvent.new(notification))
+          end
+          @last_check = Time.now
+          if Device::Notification.create_fiber?
+            self.close
+            @fiber = create_fiber
+          end
         end
-        @last_check = Time.now
       end
     end
 
     # Close socket and finish Fiber execution
     def close
-      @fiber.resume "close"
+      if closed?
+        true
+      else
+        ! @fiber.resume "close"
+      end
     end
 
     def closed?
       ! @fiber.alive?
     end
 
-    def valid_interval?
+    def valid_check_interval?
       if @last_check
         (@last_check + self.interval) < Time.now
       else
@@ -107,16 +133,27 @@ class Device
       end
     end
 
+    def check_errors(exception)
+      case exception.message
+      when "Invalid authentication token"
+        Device::Setting.cw_pos_timezone = "" # Clear timezone if authentication error
+      when "Socket closed"
+      else
+      end
+      false
+    end
+
     def create_fiber
       Fiber.new do
         begin
-          auth = CloudwalkTOTP.at
-          Serfx.connect(authkey: auth, socket_block: Device::Network.socket, timeout: timeout, stream_timeout: stream_timeout) do |conn|
+          Serfx.connect(socket_block: Device::Network.socket, timeout: timeout, stream_timeout: stream_timeout) do |conn|
+            conn.auth(CloudwalkTOTP.at)
+            Device::Notification.last_creation = Time.now
             conn.stream(subscription) { |ev| reply(conn, ev) }
           end
           true
-        rescue => RPCError
-          false
+        rescue Serfx::RPCError => exception
+          check_errors(exception)
         end
       end
     end

data/lib/device/params_dat.rb

@@ -46,13 +46,14 @@ class Device
 
     def self.download
       if attach
-        Device::Display.clear
-        puts "Downloading Params"
-        ret = Device::Transaction::Download.request_param_file(FILE_NAME)
-        if value = check_download_error(ret)
-          puts "Downloaded Successfully"
-          parse_apps
+        value = try(3) do |tried|
+          Device::Display.clear
+          puts "Downloading (#{tried})"
+          puts "Parameters"
+          ret = Device::Transaction::Download.request_param_file(FILE_NAME)
+          check_download_error(ret)
         end
+        parse_apps if value
         value
       end
     end
@@ -79,12 +80,15 @@ class Device
 
     def self.update_app(application)
       if attach && application
-        Device::Display.clear
-        puts "Downloading #{application.file}..."
-        ret = Device::Transaction::Download.request_file(application.file, application.zip)
-
-        unless check_download_error ret
-          sleep 2
+        try(3) do |tried|
+          Device::Display.clear
+          puts "Downloading (#{tried})"
+          puts "#{application.file}..."
+          ret = Device::Transaction::Download.request_file(application.file, application.zip)
+
+          ret = check_download_error(ret)
+          sleep(1)
+          ret
         end
       end
     end

data/lib/device/setting.rb

@@ -29,9 +29,10 @@ class Device
       "logical_number"              => "",
       "network_configured"          => "",
       "environment"                 => "",
-      "notification_timeout"        => "",
-      "notification_interval"       => "",
-      "notification_stream_timeout" => "",
+      "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",

data/lib/device/version.rb

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

data/lib/ext/string.rb

@@ -5,5 +5,9 @@ class String
     str = mask_string.chars.map{|s| s.match(/[0-9A-Za-z]/) ? "%s" : s }.join
     str % self.ljust(mask_clean.size, " ").chars
   end
+
+  def chars
+    self.split("")
+  end
 end
 

data/lib/serfx/commands.rb

@@ -15,8 +15,8 @@ module Serfx
     # `auth` has to be second command, immediately after `handshake`.
     #
     # @return  [Response]
-    def auth
-      tcp_send(:auth, 'AuthKey' => @authkey)
+    def auth(key = @authkey)
+      tcp_send(:auth, 'AuthKey' => key)
       read_response(:auth)
     end
     # fires an user event

data/lib/serfx/connection.rb

@@ -65,6 +65,7 @@ module Serfx
     def read_data(read_timeout = self.timeout)
       buf = read_buffer(read_timeout)
       return if buf.nil?
+      return {'Error' => "Socket closed"} if buf.empty?
       parse_package(buf)
     end
 
@@ -83,6 +84,7 @@ module Serfx
       loop do
         bytes = socket.bytes_available
         return socket.read(bytes) if bytes > 0
+        return socket.recv_nonblock(bytes) if bytes > 0
         break unless time_timeout > Time.now
         sleep 1
       end
@@ -103,10 +105,12 @@ module Serfx
         'Command' => command.to_s.gsub('_', '-'),
         'Seq' => seq
       }
+
       buff = MessagePack::Packer.new
       buff.write(header)
       buff.write(body) unless body.nil?
-      res = socket.write(buff.to_str)
+
+      res = socket.write(buff.to_str) unless buff.to_str.empty?
       @requests[seq] = { header: header, ack?: false }
       seq
     end

data/test/test_helper.rb

@@ -7,8 +7,8 @@ require 'da_funk'
 
 DaFunk::Test.configure do |t|
   t.root_path      = ROOT_PATH
-  t.serial         = "0000011700025246"
-  t.logical_number = "002"
+  t.serial         = "0000000001"
+  t.logical_number = "001"
   t.name           = APP_NAME
 end
 

data/test/unit/device/display_test.rb

@@ -51,13 +51,27 @@ class DisplayTest < DaFunk::Test.case
     assert_equal 3, $stdout.y
   end
 
+  def test_kernel_print_small
+    $stdout.fresh
+    assert_equal nil, print("1234")
+    assert_equal 4, $stdout.x
+    assert_equal 0, $stdout.y
+  end
+
+  def test_kernel_puts_small
+    $stdout.fresh
+    assert_equal nil, puts("1234")
+    assert_equal 0, $stdout.x
+    assert_equal 1, $stdout.y
+  end
+
   def test_kernel_puts_string_20_plus_1
     $stdout.fresh
-    assert_equal nil, puts("12345678901234567890")
+    assert_equal nil, print("12345678901234567890")
     assert_equal 20, $stdout.x
-    assert_equal 1, $stdout.y
+    assert_equal 0, $stdout.y
     assert_equal nil, puts("1")
-    assert_equal 1, $stdout.x
+    assert_equal 0, $stdout.x
     assert_equal 2, $stdout.y
   end
 
@@ -71,15 +85,29 @@ class DisplayTest < DaFunk::Test.case
   def test_kernel_puts_string_43
     $stdout.fresh
     assert_equal nil, puts("1234567890123456789012345678901234567890123")
-    assert_equal 1, $stdout.x
+    assert_equal 0, $stdout.x
     assert_equal 3, $stdout.y
   end
 
+  def test_kernel_print_string_43
+    $stdout.fresh
+    assert_equal nil, print("1234567890123456789012345678901234567890123")
+    assert_equal 1, $stdout.x
+    assert_equal 2, $stdout.y
+  end
+
   def test_kernel_puts_string_22
     $stdout.fresh
     assert_equal nil, puts("1234567890123456789012")
-    assert_equal 1, $stdout.x
+    assert_equal 0, $stdout.x
     assert_equal 2, $stdout.y
   end
+
+  def test_kernel_print_string_22
+    $stdout.fresh
+    assert_equal nil, print("1234567890123456789012")
+    assert_equal 1, $stdout.x
+    assert_equal 1, $stdout.y
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 0.4.19
+  version: 0.4.20
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake