apiotics 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41dcd2f44d625cc322694b01aaa300b5b836a4f0
-  data.tar.gz: 3eed758660cd07bc6075f678e87428ebd9e6c459
+  metadata.gz: c8c1c641a4fd78cbf146dce87fd547de4eccd727
+  data.tar.gz: 1d71b5ea8c9ee2d4dc6f68aaa58b8691a8267e67
 SHA512:
-  metadata.gz: 4d7da40f950e9960145b8eefac79e35154a9da724c363c9535b3e1a6c4755a56a0ec0a57fef043bd323f26cc8a2077e5ca60b47865b3f05c61bdbca34243fb35
-  data.tar.gz: 161a54125eaf1b04b8014b672f826b634a1b26e2e2aec15ee4c867418604ecdc429b3a2afb8a416d9657b0da0809aaf6632fda8370d87a96a968cbd4a0e936bf
+  metadata.gz: e44139a7721d61e90c44f75facf5dd165554f6a9e5bc45c58ab72bff87e09835741f22036f89bd87a5c2a2af7c2447b91aa28691a99cabd4a0d66387e8ebedf6
+  data.tar.gz: c7e1d205d7dfbfc416cd4cce47cea1c87f8d15c84c4d9fd7c9976772d05cd5e0550188b64cc6f695fbe958fb0ca887a9eeeffe4ce0fa14e35e0b09f0ea1f2414

data/lib/apiotics/hardware.rb

@@ -320,7 +320,9 @@ module Apiotics
         end
         if downloaded == false
           scripts = Apiotics::Portal.sd_scripts(system)
-          File.write("#{download_directory}/sd_scripts.tgz")
+          file = File.open("#{download_directory}/sd_scripts.tgz", 'wb')
+          file.write(scripts)
+          file.close
           `tar xvzf #{download_directory}/sd_scripts.tgz -C #{download_directory}`
           `rm #{download_directory}/sd_scripts.tgz`
         end
@@ -350,7 +352,7 @@ module Apiotics
     end
     
     def self.sd_config_file(worker_name, name, download_directory)
-      worker_directory = download_directory + "/#{worker_name.downcase}"
+      worker_directory = download_directory.to_s + "/#{worker_name.downcase}"
       Dir.mkdir worker_directory unless Dir.exist?(worker_directory)
       config_file_path = "#{worker_directory}/#{worker_name.downcase}.json"
       if File.exist?(config_file_path)
@@ -380,14 +382,19 @@ module Apiotics
     
     def self.brand_sd_image(download_directory, image_path, wifi_settings, config_file_path)
       status = false
-      branding_script_path == nil
+      branding_script_path = nil
       if Hardware.mac == true
         branding_script_path = "#{download_directory}/brand_image.mac.sh"
       elsif Hardware.linux == true
         branding_script_path = "#{download_directory}/brand_image.sh"
       end
       if branding_script_path != nil
-        `#{branding_script_path} #{image_path} #{wifi_settings["ssid"]} #{wifi_settings["password"]} #{config_file_path} dhcp`
+        #puts "Please wait..."
+        IO.popen("#{branding_script_path} #{image_path} #{wifi_settings["ssid"]} #{wifi_settings["password"]} #{config_file_path} dhcp") do |io|
+          while (line = io.gets) do
+            puts line
+          end
+        end
         status = true
       else
         puts "Unrecognized system architecture, exiting."
@@ -423,23 +430,30 @@ module Apiotics
     end
     
     def self.burn_sd_image(download_directory, image_path, disk)
+      img_path = image_path.chomp(".img.gz") + "_branded.img.gz"
       puts "Burning #{image_path} to #{disk}..."
       if Hardware.mac == true
-        execute_path = download_directory + "/burn_image_to_disk.mac.sh"
+        execute_path = download_directory.to_s + "/burn_image_to_disk.mac.sh"
       elsif Hardware.linux == true
-        execute_path = download_directory + "/burn_image_to_disk.sh"
+        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
-        `#{execute_path} #{image_path} #{disk}`
+        puts "Running sudo #{execute_path} #{image_path} #{disk}"
+        #pwd = STDIN.getpass("Password:")
+        IO.popen("sudo -S #{execute_path} #{img_path} #{disk}") do |io|
+          while (line = io.gets) do
+            puts line
+          end
+        end
       end
     end
     
     def self.sd_card(worker_name, name, config)
-      download_directory = self.check_sd_card_scripts
+      download_directory = Hardware.check_sd_card_scripts
       if download_directory != nil
         image_path = Hardware.get_sd_image(download_directory, worker_name)
         wifi_settings = Hardware.fetch_wifi
@@ -520,6 +534,7 @@ module Apiotics
           encrypted_settings = File.read(path)
           return_hash = encrypted_settings.apiotics_decrypt(pwd)
         end
+        return_hash = JSON.parse(return_hash)
       end
       return_hash
     end

data/lib/apiotics/portal.rb

@@ -266,16 +266,34 @@ module Apiotics
       }
     end
     
+    ##
+    
     def self.get_sd_image(download_directory, worker_name)
       filename = "#{download_directory}/#{worker_name}.img.gz"
-      File.open(filename, "w") do |file|
-        puts "Downloading image.."
-        response = HTTParty.post("#{Apiotics.configuration.portal}api/download", :query => {:public_key => Apiotics.configuration.public_key, :private_key => Apiotics.configuration.private_key, :worker => worker_name}, stream_body: true) do |fragment|
-          print "."
+      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"]
+      size = response["size"].to_i
+      #puts url
+      total_downloaded = 0
+      chunk = size / 50
+      back = "\b" * 52
+      todo = " " * 50
+      File.open(filename, "wb") do |file|
+        puts "Downloading image..\n"
+        print "[#{todo}]"
+         HTTParty.get(url, stream_body: true) do |fragment|
+          total_downloaded = total_downloaded + fragment.length
+          done = "#" * (total_downloaded / chunk)
+          todo = " " * (50 - total_downloaded / chunk)
+          print "#{back}"
+          print "[#{done}#{todo}]"  
           file.write(fragment)
         end
       end
-      File.unlink(filename)
+      fin = "#" * 50
+      print "#{back}"
+      print "[#{fin}]\n"
     end
     
     def self.register_client

data/lib/apiotics/version.rb

@@ -1,3 +1,3 @@
 module Apiotics
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
 end

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

@@ -8,6 +8,8 @@ namespace :firmware do
       else
         Apiotics::Hardware.wifi(args[:ssid], args[:password], args[:security_mode])
       end
+    else
+      Apiotics::Hardware.wifi(args[:ssid], args[:password], nil)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apiotics
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - MicroArx Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -267,7 +267,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.