apiotics 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db6cd04319d0626204bec257c2996307ea450b80
-  data.tar.gz: 5b7aab3cfba5c14cb824f04b2f3d78c4947a9373
+  metadata.gz: cf59743178c67ba8fc5651aae6497cd2142dc4f2
+  data.tar.gz: 51ea2c76b6b5c304680703b300b4121b029a2298
 SHA512:
-  metadata.gz: 7b33c0097709e5bfd1551e8fc1c838d4c23383c92a7f5fe07b3be35a1735960796f0792e68e9a26c21ba3ad81ab751fa7057087718d48b15158addce4d4e035f
-  data.tar.gz: 8b30fde35f8a3b9b0e2c0c9082711414c66a147d89642d66b1f49f659fd655bbb62e2e12b4d66698a9044d63223d539cacc53ea437fcea1ffdfe6732fd294b2e
+  metadata.gz: 75f585a1105d7d12f2761f9b52c2fa7a4cfd6720c55664dab61372d34bbec1c57cc53cf089a103e83c359e2548708f92410708adc74216937c77b94cc97a4380
+  data.tar.gz: 81306f49643f01775a86e47390b98e76f9f9a48c5d4d12d011ed35a8f8006b7e2607149ac8e07acf88f17918f2caa1df080f37164d48bd8b07680b03245d094d

data/lib/apiotics/hardware.rb

@@ -310,11 +310,11 @@ module Apiotics
       downloaded = false
       unless system == nil
         if system == "mac"
-          if File.exist?("#{download_directory}/brand_image.mac.sh")
+          if File.exist?("#{download_directory}/brand_and_burn.mac.sh")
             downloaded = true
           end
         elsif system == "linux"
-          if File.exist?("#{download_directory}/brand_image.sh")
+          if File.exist?("#{download_directory}/brand_and_burn.sh")
             downloaded = true
           end
         end
@@ -327,11 +327,11 @@ module Apiotics
           `rm #{download_directory}/sd_scripts.tgz`
         end
         if system == "mac"
-          if File.exist?("#{download_directory}/brand_image.mac.sh")
+          if File.exist?("#{download_directory}/brand_and_burn.mac.sh")
             status = download_directory
           end
         elsif system == "linux"
-          if File.exist?("#{download_directory}/brand_image.sh")
+          if File.exist?("#{download_directory}/brand_and_burn.sh")
             status = download_directory
           end
         end
@@ -339,11 +339,16 @@ module Apiotics
       return status
     end
     
-    def self.get_sd_image(download_directory, worker_name)
+    def self.get_sd_image(download_directory, worker_name, config)
       Dir.chdir download_directory
-      image_path = "#{download_directory}/#{worker_name}.img.gz"
+      worker_directory = download_directory.to_s + "/#{worker_name.downcase}"
+      Dir.mkdir worker_directory unless Dir.exist?(worker_directory)
+      image_name = "#{worker_name.downcase}-#{config['device_name'].underscore}-#{config['device_version']}"
+      image_name = image_name.gsub(" ", "_")
+      image_path = "#{worker_directory}/#{image_name}.img.gz"
       unless File.exist?(image_path)
-        Apiotics::Portal.get_sd_image(download_directory, worker_name)
+        `rm #{worker_directory}/*`
+        Apiotics::Portal.get_sd_image(worker_directory, worker_name, image_name)
         #zip_path = "#{download_directory}/#{worker_name}.img.gz"
         #`gunzip -c #{zip_path} > #{image_path}`
         #`rm #{zip_path}`
@@ -380,96 +385,63 @@ module Apiotics
       config_file_path
     end
     
-    def self.brand_sd_image(download_directory, image_path, wifi_settings, config_file_path)
+    def self.brand_and_burn_sd_image(download_directory, image_path, wifi_settings, config_file_path)
       status = false
       Dir.chdir download_directory
-      branding_script_path = nil
+      script_path = nil
       if Hardware.mac == true
-        branding_script_path = "#{download_directory}/brand_image.mac.sh"
+        script_path = "#{download_directory}/brand_and_burn.mac.sh"
       elsif Hardware.linux == true
-        branding_script_path = "#{download_directory}/brand_image.sh"
+        script_path = "#{download_directory}/brand_and_burn.sh"
       end
-      if branding_script_path != nil
+      if script_path != nil
         #puts "Please wait..."
-        puts "Running #{branding_script_path} #{image_path} #{wifi_settings["ssid"]} #{wifi_settings["password"]} #{config_file_path} dhcp"
-        IO.popen("#{branding_script_path} #{image_path} #{wifi_settings["ssid"]} #{wifi_settings["password"]} #{config_file_path} dhcp") do |io|
+        puts "Running sudo -S #{script_path} brand_and_burn #{image_path} no_disk #{wifi_settings["ssid"]} #{wifi_settings["password"]} #{wifi_settings["security_mode"]} #{config_file_path} 0 dhcp"
+        IO.popen("sudo -S #{script_path} brand_and_burn #{image_path} no_disk #{wifi_settings["ssid"]} #{wifi_settings["password"]} #{wifi_settings["security_mode"]} #{config_file_path} 0 dhcp") do |io|
           while (line = io.gets) do
             puts line
           end
         end
         status = true
       else
-        puts "Unrecognized system architecture, exiting."
+        puts "Unrecognized operating system, exiting."
       end
       status
     end
     
-    def self.find_smallest_disk
-      small_disk_size = 99999999999999999999
-      small_disk = "no_disk"
-      disks = {}
-      output = `df -k`
-      lines = output.split("\n")
-      i = 0
-      lines.each do |line|
-        lines[i] = line.split(" ")
-        i += 1
-      end
-      gigabyte_scaling = 1024 * 1024
-      lines.each do |line|
-        length = line.count
-        unless line[length - 1] == "/"
-          disks[line[0]] = line[1].to_i / gigabyte_scaling
-        end
-      end
-      disks.each do |disk, size|
-        if size < small_disk_size && size > 4 && disk[0..3] == "/dev"
-          small_disk_size = size
-          small_disk = disk
-        end
-      end
-      return small_disk
-    end
-    
-    def self.burn_sd_image(download_directory, image_path, disk)
-      Dir.chdir download_directory
-      img_path = image_path.chomp(".img.gz") + "_branded.img.gz"
-      puts "Burning #{image_path}..."
-      if Hardware.mac == true
-        execute_path = download_directory.to_s + "/burn_image_to_disk.mac.sh"
-      elsif Hardware.linux == true
-        execute_path = download_directory.to_s + "/burn_image_to_disk.sh"
-      else
-        execute_path = nil
-      end
-      if execute_path == nil
-        puts "This computer is not running a recognized OS.  Exiting."
-      else
-        puts "Running sudo #{execute_path} #{image_path}"
-        #pwd = STDIN.getpass("Password:")
-        IO.popen("sudo -S #{execute_path} #{img_path}") do |io|
-          while (line = io.gets) do
-            puts line
-          end
-        end
-      end
-    end
+    #def self.burn_sd_image(download_directory, image_path)
+    #  Dir.chdir download_directory
+    #  img_path = image_path.chomp(".img.gz") + "_branded.img.gz"
+    #  puts "Burning #{image_path}..."
+    #  if Hardware.mac == true
+    #    execute_path = download_directory.to_s + "/burn_image_to_disk.mac.sh"
+    #  elsif Hardware.linux == true
+    #    execute_path = download_directory.to_s + "/burn_image_to_disk.sh"
+    #  else
+    #    execute_path = nil
+    #  end
+    #  if execute_path == nil
+    #    puts "This computer is not running a recognized OS.  Exiting."
+    #  else
+    #    puts "Running sudo #{execute_path} #{image_path}"
+    #    #pwd = STDIN.getpass("Password:")
+    #    IO.popen("sudo -S #{execute_path} #{img_path}") do |io|
+    #      while (line = io.gets) do
+    #        puts line
+    #      end
+    #    end
+    #  end
+    #end
     
     def self.sd_card(worker_name, name, config)
+      #puts "Grab a coffee, this may take a few minutes..."
       download_directory = Apiotics::Hardware.check_sd_card_scripts
       if download_directory != nil
-        image_path = Apiotics::Hardware.get_sd_image(download_directory, worker_name)
+        image_path = Apiotics::Hardware.get_sd_image(download_directory, worker_name, config)
         wifi_settings = Apiotics::Hardware.fetch_wifi
         if wifi_settings != nil
           config_file_path = Apiotics::Hardware.sd_config_file(worker_name, name, download_directory)
-          if Apiotics::Hardware.brand_sd_image(download_directory, image_path, wifi_settings, config_file_path)
-            disk = Apiotics::Hardware.find_smallest_disk
-            if disk != "no_disk"
-              Apiotics::Hardware.burn_sd_image(download_directory, image_path, disk)
-            else
-              puts "No plausible SD card disk found.  Please insert an SD card into your computer. Exiting."
-            end
-          end
+          Apiotics::Hardware.brand_and_burn_sd_image(download_directory, image_path, wifi_settings, config_file_path)
         else
           puts "No WiFi settings found.  Please run rake firmware:wifi[ssid,password,security_mode] to set your default wifi settings"
         end
@@ -500,7 +472,7 @@ module Apiotics
       }
       args.keys.each do |key|
         if args[key] == nil
-          args[key] = ""
+          args[key] = "NONE"
         end
       end
       

data/lib/apiotics/portal.rb

@@ -268,8 +268,8 @@ module Apiotics
     
     ##
     
-    def self.get_sd_image(download_directory, worker_name)
-      filename = "#{download_directory}/#{worker_name}.img.gz"
+    def self.get_sd_image(download_directory, worker_name, image_name)
+      filename = "#{download_directory}/#{image_name}.img.gz"
       response = HTTParty.post("#{Apiotics.configuration.portal}api/download", :query => {:public_key => Apiotics.configuration.public_key, :private_key => Apiotics.configuration.private_key, :worker => worker_name}).body
       response = JSON.parse(response)
       url = response["url"]

data/lib/apiotics/version.rb

@@ -1,3 +1,3 @@
 module Apiotics
-  VERSION = '0.2.11'
+  VERSION = '0.2.12'
 end

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

@@ -1,15 +1,18 @@
 namespace :firmware do
   desc "Set Wifi details for a device (if applicable).  Use rake firmware:wifi[ssid, password, security_mode] to set the wifi details for a device."
   task :wifi, [:ssid, :password, :security_mode] => [:environment] do |task, args|
-    security_modes = ["WEP", "WPA", "WPA2"]
+    security_modes = ["WEP", "WPA", "WPA2", "NONE"]
+    password = args[:password] || 'NONE'
     if args[:security_mode] != nil
       unless security_modes.include?(args[:security_mode])
         puts "#{args[:security_mode]} is not a supported WiFi security mode.  The supported security modes are: #{security_modes.to_s}"
       else
-        Apiotics::Hardware.wifi(args[:ssid], args[:password], args[:security_mode])
+        Apiotics::Hardware.wifi(args[:ssid], password, args[:security_mode])
       end
     else
-      Apiotics::Hardware.wifi(args[:ssid], args[:password], nil)
+      Apiotics::Hardware.wifi(args[:ssid], password, "NONE")
     end
   end
-end
+end
+
+#

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apiotics
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - MicroArx Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails