apiotics 0.1.36 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec59851725501c613a71d7f571d6e9bc066b7651
-  data.tar.gz: b79092af7968395a9046f413bf26a0145f6f281e
+  metadata.gz: 7d3f9c7b4169da3b3e7774bb0310cdb56f9b6307
+  data.tar.gz: af686841990496ddfc778cc0f15ba8f99f721566
 SHA512:
-  metadata.gz: 9ef6e28662d7e3c0d9681af6122474d32473c66b0f64a0e0f5318b3ecb2035309ebf4f8ea960e464380a0fa3eb590bde44c2ecbc89c4b39e8e0bd3fea856d573
-  data.tar.gz: 28e5f4e640d6ef9056e727701ad8389c6e690b4bb20a319d69888adef4ba8428f09dd3811eb65e1cf0a6d97a649eacc6ec0e068fb67fa2d5cb09d8954dd446b2
+  metadata.gz: c01ebd06d73be068c04fae9c1f33c1058ba37973eaf278e72e90260d0440d950d171de085044d1be3475aed2dfd25141b314bb33a12c0c17654da923d3eaacba
+  data.tar.gz: d6e8d04870e1d44b76d2fd8ca710e05510780b020c195b776f27cc3e12a8803f5470fcb4d046d2e1d9a976606fefcc2e49f83dda7fb6f67904106e0661ae6536

data/lib/apiotics/hardware.rb

@@ -56,7 +56,7 @@ module Apiotics
       msg = system(string)
     end
     
-    def self.openocd(worker_name)
+    def self.openocd(worker_name, name)
       download_directory = Rails.root.join('lib', 'openocd')
       Dir.mkdir download_directory unless Dir.exist?(download_directory)
       download_directory = Rails.root.join('lib', 'openocd', 'downloads')
@@ -65,17 +65,22 @@ module Apiotics
       config = Apiotics::Portal.openocd_worker_config(worker_name)
       config = JSON.parse(config)
       unless config["openocd_config_file_name"] == nil || config["openocd_config_file_name"] == ""
-        path = Rails.root.join('lib', 'openocd', 'downloads', config["openocd_config_file_name"])
+        path = Rails.root.join('lib', 'openocd', 'downloads', config["firmware_file_name"])
         if File.exist?(path)
-          file = File.open(path) 
-          firmware_data = file.read
-          file.close
         else
           firmware_data = Apiotics::Portal.download_firmware(worker_name)
           file = File.new(path, 'w')
           file.write firmware_data.force_encoding(Encoding::UTF_8)
           file.close
         end
+        if name != nil
+          data = File.open(path, 'r+')
+          version_offset = 2048
+          offset = version_offset + 4 + 68 + 68 + 68
+          name = name + "\0"
+          IO.write(data, name, offset)
+          data.close
+        end
         msg = self.install_firmware(config["openocd_config_file_name"], path, config["openocd_start_address"])
       end
       return msg

data/lib/apiotics/portal.rb

@@ -91,19 +91,20 @@ module Apiotics
       instance_hash = JSON.parse(HTTParty.post("#{Apiotics.configuration.portal}api/workers", :query => {:public_key => Apiotics.configuration.public_key, :private_key => Apiotics.configuration.private_key}).body)      
       klass = (worker_name.to_s + "::" + worker_name.to_s).constantize rescue nil
       unless klass == nil
-        instance_ids = Array.new
-        instance_hash[worker_name].each do |instance_id,status|
-          if status == "Active"
-            instance_ids << instance_id
+        instance_ids = Hash.new
+        instance_hash[worker_name].each do |instance_id,status_hash|
+          if status_hash["status"] == "Active"
+            instance_ids[instance_id] = status_hash
           end
         end
         stale_instances = klass.where.not(apiotics_instance: instance_ids)
         stale_instances.destroy_all
-        instance_ids.each do |instance_id|
+        instance_ids.each do |instance_id, status_hash|
           i = klass.find_by(apiotics_instance: instance_id)
           if i == nil
             i = klass.new
             i.apiotics_instance = instance_id
+            i.name = status_hash["name"]
             i.save(:validate => false)
             Apiotics.configuration.targets[worker_name].keys.each do |key|
               subklass = (worker_name + "::" + key).constantize rescue nil

data/lib/apiotics/version.rb

@@ -1,3 +1,3 @@
 module Apiotics
-  VERSION = '0.1.36'
+  VERSION = '0.1.37'
 end

data/lib/generators/apiotics/create_model/templates/create_module_model_table.rb.erb

@@ -2,6 +2,7 @@ class Create<%= plural_module_name %> < ActiveRecord::Migration[5.1]
   def change
     create_table :<%= plural_table_name %> do |t|
       t.string :apiotics_instance
+      t.sting :name
       t.timestamps
     end
   end

data/lib/generators/apiotics/script/templates/install_firmware.rake

@@ -1,6 +1,10 @@
 namespace :firmware do
-  desc "Install firmware on devices"
-  task :install, [:worker] => [:environment] do |task, args|
-    Apiotics::Hardware.openocd(args[:worker])
+  desc "Install firmware on devices.  Use rake firmware:install {worker_name} to install firmware on a device.  Use rake firmware:install {worker_name} {instance_name} to install firmware and set a name for the device."
+  task :install, [:worker, :name] => [:environment] do |task, args|
+    if args[:name] == nil
+      Apiotics::Hardware.openocd(args[:worker], nil)
+    else
+      Apiotics::Hardware.openocd(args[:worker] args[:name])
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apiotics
 version: !ruby/object:Gem::Version
-  version: 0.1.36
+  version: 0.1.37
 platform: ruby
 authors:
 - MicroArx Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: IoT For Everybody.