apiotics 0.2.20 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38f50f5b590201d5810e6421de980ff6ba4deaab
-  data.tar.gz: 72421edc96d5b78fa93135b810f47546e96c881a
+  metadata.gz: a6739f4800b9a3cc9495c5dabbd0d7a7dee83aee
+  data.tar.gz: 83883b8338894312e846f2e0ead3498c4db42be6
 SHA512:
-  metadata.gz: 50d993904889dfa805002f8d0a470417d432dcd697480178f559bb4719d26d0bdb6d48ce1289b8665baef49da2d8caae4107d05a737a97de0335b5886bb89e26
-  data.tar.gz: b1dda11fcbc8b14e5da9d9c5e4190aa3fb444db57506bf7fe53b5fa6fec7efa3f8cfd77c496ce4eed8a389523997b5c2016b9441341ceef6d6f5a69b8aa777de
+  metadata.gz: d4a3af056017df304504f1fdabbad96a5a64b35db88a4fd2a5e986c5b80e3db51e659152ca600824db652d17e1fd82346a1a9a7a16e658fb7412b7e84d395dec
+  data.tar.gz: bf14e1e6de3402d513f5ac5f000809440ebcda4ff3fcb7b8a6aa0899c3dd9fa7e5a1da1624eca60deed8ceeea341bd60f114f0902d5abb67a41767803918bb6b

data/lib/apiotics/hardware.rb

@@ -455,35 +455,49 @@ module Apiotics
       download_directory = Apiotics::Hardware.check_sd_card_scripts
       if download_directory != nil
         image_path = Apiotics::Hardware.get_sd_image(download_directory, worker_name, config)
-        wifi_settings = Apiotics::Hardware.fetch_wifi
-        if wifi_settings != nil
+        image_size = Apiotics::Portal.get_image_size(worker_name)
+        if File.size(image_path) == image_size.to_i
+          wifi_settings = Apiotics::Hardware.fetch_wifi
+          if wifi_settings == nil
+            wifi_settings = {
+              "ssid" => "NONE",
+              "password" => "NONE",
+              "security_mode" => "NONE"
+            }
+          end     
           config_file_path = Apiotics::Hardware.sd_config_file(worker_name, name, download_directory)
           cellular = ApioticsSetting.find_by(key: "cellular")
           if cellular == nil
             cellular = 0
           else
             cellular = cellular.value
-          end
+          end  
           Apiotics::Hardware.brand_and_burn_sd_image(download_directory, image_path, wifi_settings, cellular, config_file_path)
         else
-          puts "No WiFi settings found.  Please run rake firmware:wifi[ssid,password,security_mode] to set your default wifi settings.  If you do not intend to use WiFi, set all arguments to NONE."
+          puts "Error in download, file downloaded does not match file size on server.  Please try running this command again."
+          File.delete(image_path)
         end
       else
         puts "SD card installation scripts not available. Exiting."
       end
+        
     end
     
     def self.install(worker_name, name)
-      config = Apiotics::Portal.openocd_worker_config(worker_name)
-      config = JSON.parse(config)
-      if config["installer"] == "Open OCD 0.10"
-        Hardware.openocd(worker_name, name, config)
-      elsif config["installer"] == "Uniflash 4.3.0"
-        Hardware.uniflash(worker_name, name, config)
-      elsif config["installer"] == "SD Card"
-        Hardware.sd_card(worker_name, name, config)
+      if ActiveRecord::Base.connection.table_exists? 'apiotics_settings'
+        config = Apiotics::Portal.openocd_worker_config(worker_name)
+        config = JSON.parse(config)
+        if config["installer"] == "Open OCD 0.10"
+          Hardware.openocd(worker_name, name, config)
+        elsif config["installer"] == "Uniflash 4.3.0"
+          Hardware.uniflash(worker_name, name, config)
+        elsif config["installer"] == "SD Card"
+          Hardware.sd_card(worker_name, name, config)
+        else
+          puts "Unknown installer for #{worker_name}.  Please check the installer settings for the #{worker_name} device on the Apiotics portal.\n"
+        end
       else
-        puts "Unknown installer for #{worker_name}.  Please check the installer settings for the #{worker_name} device on the Apiotics portal.\n"
+        puts "Please run rails g apiotics:install before running this command."
       end
     end
     

data/lib/apiotics/portal.rb

@@ -296,6 +296,16 @@ module Apiotics
       print "[#{fin}]\n"
     end
     
+    def self.get_image_size(worker_name)
+      response = HTTParty.post("#{Apiotics.configuration.portal}api/image_size", :query => {:public_key => Apiotics.configuration.public_key, :private_key => Apiotics.configuration.private_key, :worker => worker_name}).body
+      response = JSON.parse(response)
+      if response["size"] != nil
+        response["size"]
+      else
+        nil
+      end
+    end
+    
     def self.register_client
       response = HTTParty.post("#{Apiotics.configuration.portal}api/register_client", :query => {:public_key => Apiotics.configuration.public_key, :private_key => Apiotics.configuration.private_key}).body
       hash = JSON.parse(response)

data/lib/apiotics/version.rb

@@ -1,3 +1,3 @@
 module Apiotics
-  VERSION = '0.2.20'
+  VERSION = '0.2.21'
 end

data/lib/generators/apiotics/initializer/initializer_generator.rb

@@ -11,8 +11,11 @@ module Apiotics
         template "apiotics_parents.rb.erb", "config/initializers/apiotics_parents.rb"
       else
         template "apiotics.rb.erb", "config/initializers/apiotics.rb"
-        template "apiotics_settings.rb.erb", "db/migrate/#{date_string}_create_apiotics_settings.rb"
         template "setting.rb.erb", "app/models/apiotics_setting.rb"
+        unless ActiveRecord::Base.connection.table_exists? 'apiotics_settings'
+          template "apiotics_settings.rb.erb", "db/migrate/#{date_string}_create_apiotics_settings.rb"
+          rake 'db:migrate'
+        end
         #template "apiotics_module.rb.erb", "app/models/apiotics.rb"    
       end
     end

metadata

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