da_funk 0.4.18 → 0.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a5fab758ef2648e1788ea84950b7bf6cf831b14
-  data.tar.gz: 832c818da5391f1ba9be48227d43cac80866bae9
+  metadata.gz: 581959a05ca363df037b218fb049a1337a05458e
+  data.tar.gz: bc09d913c2a3d7d25607ff173951d267c319f6f5
 SHA512:
-  metadata.gz: 20827c1f82448753380b6cefe12ebf9485bc67a53cc1f00067ba4f16beba581725772bd302a25109f740a803a8aec286102dc3e7fa20c09ff815f83910ead73a
-  data.tar.gz: 1bdeeff9b3c250cc6ec7aa7875fb7b5873cf75652a9016c2e01dcc1b6df091ea0e4c32dcf3697b50d1b8e8cb2e3ca000df6d6e956ac4ea107dbdbd7cf081dc9e
+  metadata.gz: 3b7ca6e71008e7dd5962e83d59179246381ada0c227c56334cab6ea449226c8f4adb8784d9d7035a7dd4a470781d7785529207dbe0230d47e446b375b3d72b84
+  data.tar.gz: daea05521a99d66a8a3143941f1be5e7707447999003c4fe5d576bbd7cb9a2ee2db3e9883973481499c4976800ccc5ba3343d060e0afd6bcd13e676ccf2e0ccf

data/Gemfile.lock

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

data/RELEASE_NOTES.md

@@ -1,5 +1,11 @@
 # DaFunk
 
+### 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.
+- Update cloudwalk_handshake version to 0.4.7.
+- Fix debug flag setup to check if is_a? FalseClass class to define true/false.
+
 ### 0.4.18 - 2015-12-03 - Automatically configure Application running
 - Automatically configure Application running.
 

data/lib/da_funk/rake_task.rb

@@ -15,7 +15,7 @@ module DaFunk
     def initialize
       yield self if block_given?
 
-      @debug             ||= true
+      @debug               = @debug.is_a?(FalseClass) ? false : true
       @libs              ||= FileList['lib/**/*.rb']
       @tests             ||= FileList['test/**/*test.rb']
       @tests_integration ||= FileList['test/integration/**/*test.rb']

data/lib/device/notification.rb

@@ -109,11 +109,15 @@ class Device
 
     def create_fiber
       Fiber.new do
-        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) }
+        begin
+          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
+        rescue => RPCError
+          false
         end
-        true
       end
     end
 
@@ -124,20 +128,6 @@ class Device
     def event_name
       "#{Device::Setting.company_name};#{Device::Setting.logical_number}"
     end
-
-    def socket_callback
-      Proc.new do
-        socket_tcp = Device::Network.create_socket
-        socket_tcp.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
-
-        if Device::Setting.ssl == "1"
-          socket = Device::Network.handshake_ssl(socket_tcp)
-        else
-          socket = socket_tcp
-        end
-        [socket, socket_tcp]
-      end
-    end
   end
 end
 

data/lib/device/setting.rb

@@ -61,12 +61,20 @@ class Device
       self.environment == "staging"
     end
 
-    def self.to_production!
-      self.host = HOST_PRODUCTION
+   def self.to_production!
+      if self.environment != "production"
+        @file.update_attributes("company_name" => "", "environment" => "production", "host" => HOST_PRODUCTION)
+        return true
+      end
+      false
     end
 
     def self.to_staging!
-      self.host = HOST_STAGING
+      if self.environment != "staging"
+        @file.update_attributes("company_name" => "", "environment" => "staging", "host" => HOST_STAGING)
+        return true
+      end
+      false
     end
 
     def self.method_missing(method, *args, &block)

data/lib/device/version.rb

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

data/lib/file_db.rb

@@ -45,6 +45,13 @@ class FileDb
     @hash[key]
   end
 
+  def update_attributes(values = Hash.new)
+    values.each do |key, value|
+      @hash[key] = value
+    end
+    save
+  end
+
   private
   def sanitize(string)
     new_string = string.to_s.strip

data/lib/serfx/connection.rb

@@ -65,13 +65,16 @@ module Serfx
     def read_data(read_timeout = self.timeout)
       buf = read_buffer(read_timeout)
       return if buf.nil?
+      parse_package(buf)
+    end
 
-      # TODO Check first and second(header and body) packet size
-      first_packet, second_packet = buf[0..12], buf[13..-1]
-      if second_packet.nil? || second_packet.empty?
-        [MessagePack.unpack(first_packet), nil]
+    def parse_package(buf)
+      object = MessagePack.unpack(buf)
+      check = MessagePack.pack(object)
+      if check.size == buf.size
+        [object, nil]
       else
-        [MessagePack.unpack(first_packet), MessagePack.unpack(second_packet)]
+        [object, MessagePack.unpack(buf[check.size..-1])]
       end
     end
 

data/test/test_helper.rb

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

metadata

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