da_funk 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf134b79b1735c0d37ddef7f421f9034226724c1
-  data.tar.gz: ce1d6d88bbb118646f4c2c32c900327f16fb25d6
+  metadata.gz: f38c6bd31e1923473ee9fb7e8a2586c580c84ad9
+  data.tar.gz: 3cb20a51106207f50205378c1a7190cf9ac6ee34
 SHA512:
-  metadata.gz: 3e3b13310c7cca732d6dd6c0bb4bf9c9dc3a51b6cce89a711ff94d9ef55b233b4f2241dd8c2bf1d82a47a10e5bd7b6b846ba406d172e332b3dc020522b573413
-  data.tar.gz: 0191d292cd7a94c4a062f46ebbbc3bf1422702176ac995d6dffbd604ea13adad3b5d10215a850cb28ca4d0e2aa6465fb9614bcf21995f83c49be9068b1a89a00
+  metadata.gz: 3c789324ce787dd86505a0317ff57d84b115e814347e992fea088d842c139329485638655c1a1eb78c83b058dcb03654f25a4468f7f645799a09feed4b0d439d
+  data.tar.gz: facc5c84e2a207eb4897d0fe89aa7223d86e1f026efc7465334b2ce0b467a88570b1f9eea5868341c7a2a4e59fb43e3aba7578046a99ff63fe606bde436c6910

data/Gemfile.lock

@@ -1,22 +1,22 @@
 GIT
   remote: https://github.com/scalone/walk-simplehttp-poc.git
-  revision: 9dad485f7a7c4e783651805b3e75a4779629b0cb
+  revision: 5b1e7813e9b5653d3005f799a1a4bd3871596dd9
   specs:
-    simplehttp (0.4.0)
+    simplehttp (0.4.1)
 
 PATH
   remote: .
   specs:
-    da_funk (0.4.9)
+    da_funk (0.4.10)
       bundler (~> 1.7)
-      cloudwalk_handshake (~> 0.3)
+      cloudwalk_handshake (~> 0.4)
       rake (~> 10.4)
       yard (~> 0.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    cloudwalk_handshake (0.3.0)
+    cloudwalk_handshake (0.4.1)
     rake (10.4.2)
     yard (0.8.7.6)
 

data/RELEASE_NOTES.md

@@ -1,5 +1,10 @@
 # DaFunk
 
+### 0.4.10 - 2015-08-14 - Check CRC during App Update
+- Update CloudwalkHandshake version.
+- Support to check CRC during app update, avoiding unnecessary download.
+- Fix Helper class Documentation.
+
 ### 0.4.9 - 2015-08-04 - CloudwalkHandshake loading fix
 - Fixes problem to load CloudwalkHandshake.
 

data/da_funk.gemspec

@@ -17,8 +17,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "http://github.com/cloudwalkio/da_funk"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.extensions = ["ext/da_funk/extconf.rb"]
+  spec.files         = `git ls-files -z`.split("\x0") << "out/da_funk.mrb"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
@@ -28,5 +27,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.3"
+  spec.add_dependency "cloudwalk_handshake", "~> 0.4"
 end

data/lib/device/application.rb

@@ -22,6 +22,14 @@ class Device
       @zip ||= "#{file_no_ext}.zip"
     end
 
+    def outdated?
+      return false unless File.exists?(@file_path)
+      file = File.open(@file_path)
+      Device::Crypto.crc16_hex(file.read) == @crc
+    ensure
+      file.close if file
+    end
+
     def execute(json = "")
       Device::Runtime.execute(file_no_ext, json)
     end

data/lib/device/helper.rb

@@ -62,12 +62,13 @@ class Device
       value
     end
 
-    # {
-    #   :default => {:detail => 10}, # default value to return if enter
-    #   :number => true, # Add number to label or not
-    #   "option X" => {:detail => 10},
-    #   "option Y" => {:detail => 11}
-    # }
+    # @example
+    #   {
+    #     :default => {:detail => 10}, # default value to return if enter
+    #     :number => true, # Add number to label or not
+    #     "option X" => {:detail => 10},
+    #     "option Y" => {:detail => 11}
+    #   }
     def menu(title, selection, options = {})
       options[:number] = true if options[:number].nil?
 

data/lib/device/notification.rb

@@ -52,9 +52,12 @@ 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|
+      NotificationCallback.new "SHOW_MESSAGE", :on => Proc.new { |message, datetime|
         Device::Display.clear
-        Device::Display.print_line(message, 3)
+        date = datetime.sub(" ", "-").split("-")
+        Device::Display.print_line("#{date[1]}/#{date[0]}/#{date[2]} #{date[3]}", 0)
+        Device::Display.print_line("#{message}", 2)
+        getc(0)
       }
     end
 

data/lib/device/params_dat.rb

@@ -78,7 +78,7 @@ class Device
     end
 
     def self.update_app(application)
-      if attach && application
+      if attach && application && application.outdated?
         Device::Display.clear
         puts "Downloading #{application.file}..."
         ret = Device::Transaction::Download.request_file(application.file, application.zip)

data/lib/device/print.rb

@@ -34,12 +34,11 @@ class Device
     # @param multicode_height [Fixnum] The height control of multiple code font
     #  The value ranges from 12 to 64.
     #
-    # @retval RET_OK Success.
-    # @retval ERR_FONT_NOT_EXIST Font does not exist.
-    # @retval ERR_INVALID_PARAM Invalid parameter.
-    # @retval ERR_DEV_BUSY Device is busy.
-    #
     # @return [Fixnum] Return number.
+    # @return [Fixnum] RET_OK Success.
+    # @return [Fixnum] ERR_FONT_NOT_EXIST Font does not exist.
+    # @return [Fixnum] ERR_INVALID_PARAM Invalid parameter.
+    # @return [Fixnum] ERR_DEV_BUSY Device is busy.
     def self.start(singlecode_width=DEFAULT_SINGLE_WIDTH,
                    singlecode_height=DEFAULT_SINGLE_HEIGHT,
                    multicode_width=DEFAULT_MULTI_WIDTH,
@@ -49,12 +48,11 @@ class Device
 
     # Check printer status, useful for paper check.
     #
-    # @retval RET_OK Success.
-    # @retval ERR_FONT_NOT_EXIST Font does not exist.
-    # @retval ERR_INVALID_PARAM Invalid parameter.
-    # @retval ERR_DEV_BUSY Device is busy.
-    #
     # @return [Fixnum] Return number.
+    # @return [Fixnum] RET_OK Success.
+    # @return [Fixnum] ERR_FONT_NOT_EXIST Font does not exist.
+    # @return [Fixnum] ERR_INVALID_PARAM Invalid parameter.
+    # @return [Fixnum] ERR_DEV_BUSY Device is busy.
     def self.open
       self.adapter.open
     end
@@ -75,11 +73,11 @@ class Device
 
     # Selects print font.
     #
-    # @param filename [String] Font filename.
+    # @param path [String] Font path.
     #
-    # @retval RET_OK Success.
-    # @retval ERR_FONT_NOT_EXIST Font does not exist.
-    # @retval ERR_INVALID_PARAM Invalid parameter.
+    # @return [Fixnum] RET_OK Success.
+    # @return [Fixnum] ERR_FONT_NOT_EXIST Font does not exist.
+    # @return [Fixnum] ERR_INVALID_PARAM Invalid parameter.
     def self.font=(path)
       self.adapter.font = path
     end
@@ -163,12 +161,12 @@ class Device
 
     # Check printer status, useful for paper check.
     #
-    # @retval RET_OK Success.
-    # @retval ERR_FONT_NOT_EXIST Font does not exist.
-    # @retval ERR_INVALID_PARAM Invalid parameter.
-    # @retval ERR_PRN_BUSY Printer is busy.
-    # @retval ERR_PRN_PAPEROUT Out of paper.
-    # @retval ERR_PRN_OVERHEAT Printer overheating.
+    # @return [Fixnum] RET_OK Success.
+    # @return [Fixnum] ERR_FONT_NOT_EXIST Font does not exist.
+    # @return [Fixnum] ERR_INVALID_PARAM Invalid parameter.
+    # @return [Fixnum] ERR_PRN_BUSY Printer is busy.
+    # @return [Fixnum] ERR_PRN_PAPEROUT Out of paper.
+    # @return [Fixnum] ERR_PRN_OVERHEAT Printer overheating.
     def self.check
       self._check
     end

data/lib/device/version.rb

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

data/test/unit/device/application_test.rb

@@ -0,0 +1,31 @@
+
+class ApplicationTest < DaFunk::Test.case
+  def setup
+    @file_path = "./ttt"
+    @string = "12345678901234567890"
+    @file = File.open("./ttt", "w+")
+    @file.write(@string)
+    @file.close
+    @crc = Device::Crypto.crc16_hex(@string)
+
+  end
+
+  def test_check_crc_true
+    application = Device::Application.new("TTT", @file_path, "ruby", @crc)
+    assert_equal true, application.outdated?
+  end
+
+  def test_check_crc_false
+    application = Device::Application.new("TTT", @file_path, "ruby", "1111")
+    assert_equal false, application.outdated?
+  end
+
+  def test_check_crc_non_file
+    application = Device::Application.new("TTT", "./non_exists", "ruby", "1111")
+    assert_equal false, application.outdated?
+  end
+
+  def teardown
+    File.delete(@file_path)
+  end
+end

data/utils/command_line_platform.rb

@@ -11,7 +11,8 @@ class CommandLinePlatform
     begin
       require 'cloudwalk_handshake'
       CloudwalkHandshake.configure!
-    rescue
+    rescue LoadError
+    rescue NameError
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: da_funk
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,22 +58,21 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 description: DaFunk is a Embedded System Framework optimized for programmer happiness
   and sustainable productivity. It encourages beautiful code by favoring convention
   over configuration.
 email:
 - thiago@cloudwalk.io
 executables: []
-extensions:
-- ext/da_funk/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -85,8 +84,6 @@ files:
 - RELEASE_NOTES.md
 - Rakefile
 - da_funk.gemspec
-- ext/da_funk/Makefile
-- ext/da_funk/extconf.rb
 - guides/sample_input_output.rb
 - guides/sample_message_iso8583.rb
 - guides/sample_network_gprs.rb
@@ -139,11 +136,13 @@ files:
 - lib/serfx/exceptions.rb
 - lib/serfx/response.rb
 - lib/zip.rb
+- out/da_funk.mrb
 - test/integration/getc_test.rb
 - test/integration/mrb_eval_test.rb
 - test/integration/notification_test.rb
 - test/integration/params_dat_test.rb
 - test/test_helper.rb
+- test/unit/device/application_test.rb
 - test/unit/device/display_test.rb
 - test/unit/device/helper_test.rb
 - test/unit/device/notification_callback_test.rb
@@ -184,6 +183,7 @@ test_files:
 - test/integration/notification_test.rb
 - test/integration/params_dat_test.rb
 - test/test_helper.rb
+- test/unit/device/application_test.rb
 - test/unit/device/display_test.rb
 - test/unit/device/helper_test.rb
 - test/unit/device/notification_callback_test.rb

data/ext/da_funk/Makefile

@@ -1,5 +0,0 @@
-all:
-	    true
-
-install:
-	    true

data/ext/da_funk/extconf.rb

@@ -1,8 +0,0 @@
-require 'rake'
-require 'mkmf'
-
-rakefile = File.join(File.dirname(File.expand_path(__FILE__)), "..", "..", "Rakefile")
-
-if sh "bundle exec rake -f #{rakefile}"
-  $makefile_created = true
-end