loader.rb in roku_builder-3.4.2

- old
+ new
@@ -9,95 +9,84 @@
       @root_dir = root_dir
     end
 
     # Sideload an app onto a roku device
     # @param root_dir [String] Path to the root directory of the roku app
-    # @param stage [Hash] stage to use for sideloading.
-    # @param update_manifest [Boolean] Flag to update the manifest file before sideloading. Default: false
     # @param folders [Array<String>] Array of folders to be sideloaded. Pass nil to send all folders. Default: nil
     # @param files [Array<String>] Array of files to be sideloaded. Pass nil to send all files. Default: nil
     # @return [String] Build version on success, nil otherwise
-    def sideload(stage:, update_manifest: false, folders: nil, files: nil)
+    def sideload(update_manifest: false, folders: nil, files: nil)
       result = nil
-      stager = Stager.new(**stage)
-      if stager.stage
-        # Update manifest
-        build_version = ""
-        if update_manifest
-          build_version = ManifestManager.update_build(root_dir: @root_dir)
-        else
-          build_version = ManifestManager.build_version(root_dir: @root_dir)
-        end
-        outfile = build(stage: stage, build_version: build_version, folders: folders, files: files)
-        path = "/plugin_install"
-        # Connect to roku and upload file
-        conn = multipart_connection
-        payload =  {
-          mysubmit: "Replace",
-          archive: Faraday::UploadIO.new(outfile, 'application/zip')
-        }
-        response = conn.post path, payload
-        # Cleanup
-        File.delete(outfile)
-        result = build_version if response.status==200 and response.body=~/Install Success/
+      # Update manifest
+      build_version = ""
+      if update_manifest
+        build_version = ManifestManager.update_build(root_dir: @root_dir)
+      else
+        build_version = ManifestManager.build_version(root_dir: @root_dir)
       end
-      stager.unstage
-      result
+      outfile = build(build_version: build_version, folders: folders, files: files)
+      path = "/plugin_install"
+      # Connect to roku and upload file
+      conn = multipart_connection
+      payload =  {
+        mysubmit: "Replace",
+        archive: Faraday::UploadIO.new(outfile, 'application/zip')
+      }
+      response = conn.post path, payload
+      # Cleanup
+      File.delete(outfile)
+      result = build_version if response.status==200 and response.body=~/Install Success/
+        result
     end
 
 
     # Build an app to sideload later
     # @param root_dir [String] Path to the root directory of the roku app
-    # @param stage [Hash] stage to use for sideloading.
     # @param build_version [String] Version to assigne to the build. If nil will pull the build version form the manifest. Default: nil
     # @param outfile [String] Path for the output file. If nil will create a file in /tmp. Default: nil
     # @param folders [Array<String>] Array of folders to be sideloaded. Pass nil to send all folders. Default: nil
     # @param files [Array<String>] Array of files to be sideloaded. Pass nil to send all files. Default: nil
     # @return [String] Path of the build
-    def build(stage:, build_version: nil, outfile: nil, folders: nil, files: nil)
-      stager = Stager.new(**stage)
-      if stager.stage
-        build_version = ManifestManager.build_version(root_dir: @root_dir, logger: @logger) unless build_version
-        unless folders
-          folders = Dir.entries(@root_dir).select {|entry| File.directory? File.join(@root_dir, entry) and !(entry =='.' || entry == '..') }
-        end
-        unless files
-          files = Dir.entries(@root_dir).select {|entry| File.file? File.join(@root_dir, entry)}
-        end
-        outfile = "/tmp/build_#{build_version}.zip" unless outfile
-        File.delete(outfile) if File.exist?(outfile)
-        io = Zip::File.open(outfile, Zip::File::CREATE)
-        # Add folders to zip
-        folders.each do |folder|
-          base_folder = File.join(@root_dir, folder)
-          entries = Dir.entries(base_folder)
-          entries.delete(".")
-          entries.delete("..")
-          writeEntries(@root_dir, entries, folder, io)
-        end
-        # Add file to zip
-        writeEntries(@root_dir, files, "", io)
-        io.close()
+    def build(build_version: nil, outfile: nil, folders: nil, files: nil)
+      build_version = ManifestManager.build_version(root_dir: @root_dir) unless build_version
+      unless folders
+        folders = Dir.entries(@root_dir).select {|entry| File.directory? File.join(@root_dir, entry) and !(entry =='.' || entry == '..') }
       end
-      stager.unstage
+      unless files
+        files = Dir.entries(@root_dir).select {|entry| File.file? File.join(@root_dir, entry)}
+      end
+      outfile = "/tmp/build_#{build_version}.zip" unless outfile
+      File.delete(outfile) if File.exist?(outfile)
+      io = Zip::File.open(outfile, Zip::File::CREATE)
+      # Add folders to zip
+      folders.each do |folder|
+        base_folder = File.join(@root_dir, folder)
+        entries = Dir.entries(base_folder)
+        entries.delete(".")
+        entries.delete("..")
+        writeEntries(@root_dir, entries, folder, io)
+      end
+      # Add file to zip
+      writeEntries(@root_dir, files, "", io)
+      io.close()
       outfile
     end
 
     # Remove the currently sideloaded app
     def unload()
-        path = "/plugin_install"
+      path = "/plugin_install"
 
-        # Connect to roku and upload file
-        conn = multipart_connection
-        payload =  {
-          mysubmit: "Delete",
-          archive: ""
-        }
-        response = conn.post path, payload
-        if response.status == 200 and response.body =~ /Install Success/
-          return true
-        end
-        return false
+      # Connect to roku and upload file
+      conn = multipart_connection
+      payload =  {
+        mysubmit: "Delete",
+        archive: ""
+      }
+      response = conn.post path, payload
+      if response.status == 200 and response.body =~ /Install Success/
+        return true
+      end
+      return false
     end
 
     private
 
     # Recursively write directory contents to a zip archive