appstage 0.0.9 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5d77157f887095e6f3c718cce8701323f0fd7a154df37cd9401d2ff6c797776
-  data.tar.gz: 86a8d2824bfaf18cacdb692833e64f60ae04f3741a5a67210192fe7b0383b9ec
+  metadata.gz: 899da4478e914b2b501efaceda1249b810530fd23e7711c441b9888d6559bae7
+  data.tar.gz: 86af51492b1a2453c05699db459ab0c0aa92285d49e6f384e75b29c36297f014
 SHA512:
-  metadata.gz: 72f17186550c9acc1d887a133758045be13117f2a640cda16f48b24d6bb6fa321990e98028fd2e4f49a42d5a727eff3db6caa4c3d1bf701fd42f8d3a56ab2f07
-  data.tar.gz: 506bae5149fdfbe490f456dc9651f5ba999ce5f99a941c410721c1fb224df18d8e2f463906d535074d143d41259d7ff54d85ecdf6935635984678f4df4ddf9d1
+  metadata.gz: 1e4353c2005fc439e7e7df645ea5d9a8575eee12b68668b723f2be2817941733da0208906e22c424ab9bf973fe5561e85ab3789c15054f06d2803252b9e24d5a
+  data.tar.gz: 619646d115c8df60ce69f22d28ee1c30ee4703480d79bf4421bb6f444fb9eaf0b2575b886cca908805e92300a0690e43ab30e436af691d643e1fe2ba42ddc853

data/lib/appstage.rb

@@ -1,11 +1,10 @@
-#Appstage cli for uploading live builds
 require 'optparse'
 require 'httparty'  #GEM
 require 'digest'
-require 'mimemagic'
 require 'list_files'
 require 'delete_files'
 require 'upload_file'
+require 'version'
 
 module AppStage
 
@@ -13,7 +12,7 @@ module AppStage
     options = {}
 
     option_parser = OptionParser.new do |parser|
-      parser.banner = "Appstage CLI V#{Gem::Specification::load("appstage.gemspec").version}\n" <<
+      parser.banner = "Appstage CLI V#{Appstage::VERSION}\n" <<
         "Usage: appstage <command> [options]"
 
       parser.separator " Commands:-"
@@ -36,14 +35,10 @@ module AppStage
 
       parser.separator " Options:-"
 
-      parser.on("-j", "--jwttoken JWT", "Your appstage.io account JWT token") do |v|
+      parser.on("-j", "--jwttoken JWT", "Your appstage.io project token") do |v|
         options[:jwt] = v
       end
 
-      parser.on("-p", "--project_id ID", "Your appstage.io project id") do |v|
-        options[:project_id] = v
-      end
-
       parser.on("-h", "--host HOSTURL", "The appstage host, optional, leave blank to use live server") do |v|
         options[:host] = v
       end

data/lib/delete_files.rb

@@ -17,21 +17,20 @@ module AppStage
           puts " deleting #{rf['name']}"
           delete_file(rf['id'])
         end
-
+        0
       rescue Exception => e
         puts "Delete failed - #{e.message}"
-        return 1
+        -1
       end
-      0
     end
 
   private
 
     def delete_file(file_id)
-      host = @options[:host] or "https://www.appstage.io"
+      host = @options[:host] || "https://www.appstage.io"
       token = @options[:jwt]
 
-      response = HTTParty.delete(host+"/api/live_builds/#{file_id}.json",
+      response = HTTParty.delete(host+"/api/live_builds/#{file_id}",
           :headers => { 'Content-Type' => 'application/json',
                         'Authorization' => "Bearer #{token}"}
       )

data/lib/list_files.rb

@@ -10,23 +10,24 @@ module AppStage
         getFileList.each do |rf|
           puts "#{rf['name']}"
         end
+        0
       rescue Exception => e
         puts "File listing failed - #{e.message}"
-        return 1
+        -1
       end
-      0
     end
 
     def getFileList
       host = @options[:host] || "https://www.appstage.io"
+      raise('Invalid project token') unless @options[:jwt]
       token = @options[:jwt]
       pattern = @options[:list].nil? ? ".*" : @options[:list]
 
-      response = HTTParty.get(host+"/api/live_builds.json",
+      response = HTTParty.get(host+"/api/live_builds",
           :headers => { 'Content-Type' => 'application/json',
                         'Authorization' => "Bearer #{token}"}
       )
-      raise "Server error #{response.code}" if response.code != 200
+      raise(JSON.parse(response.body)['error']) unless response.code == 200
       files = JSON.parse(response.body)['release_files'].select{|f| f['name'].match(/#{pattern}/)}
     end
   end

data/lib/upload_file.rb

@@ -8,59 +8,37 @@ module AppStage
     def execute
       begin
         host = @options[:host] || "https://www.appstage.io"
+
+        raise('No file specified') unless @options[:upload]
         file_path = File.expand_path(@options[:upload])
-        content_type = MimeMagic.by_path(file_path) || "application/octet-stream"
-        file_contents = File.open(file_path).read
         filename = File.basename(@options[:upload])
+
+        raise('Invalid project token') unless @options[:jwt]
         token = @options[:jwt]
 
         puts "Uploading #{filename} #{File.size(file_path)} bytes..."
 
-        json = {blob: {
-                  filename: filename,
-                  byte_size: File.size(file_path),
-                  content_type: content_type,
-                  checksum: Digest::MD5.base64digest(file_contents)
-               }}.to_json
-
-        response = HTTParty.post(host+'/api/direct_uploads',
-            :body => json,
-            :headers => { 'Content-Type' => 'application/json',
-                          'Authorization' => "Bearer #{token}"}
-          )
-
-        response_json = JSON.parse(response.body)
-
-        direct_url = response_json['direct_upload']['url']
-        headers = response_json['direct_upload']['headers']
-        headers['Connection'] = 'keep-alive'
-
-        response_json = HTTParty.put(direct_url,
-            multipart: true,
-            headers: headers,
-            body: file_contents
-        )
-        response_json = JSON.parse(response.body)
-
-        cloud_stored_file = response_json['signed_id']
-
         json = {
           release_file: {
-            cloud_stored_file: cloud_stored_file
+            cloud_stored_file: File.open(file_path)
           }
-        }.to_json
-
-        response = HTTParty.post(host+"/api/live_builds.json",
-            :body => json,
-            :headers => { 'Content-Type' => 'application/json',
-                          'Authorization' => "Bearer #{token}"}
-          )
+        }
+
+        response = HTTParty.post(host+"/api/live_builds",
+          :body => json,
+          :multipart => true,
+          :headers => {
+            'Authorization' => "Bearer #{token}"
+          },
+          :verify => false
+        )
+        raise(JSON.parse(response.body)['error']) unless response.code == 200
 
         puts "Upload complete"
-        response.code == 200 ? 0 : response.code
+        0
       rescue Exception => e
         puts "Upload failed - #{e}"
-        0
+        -1
       end
     end
   end

data/lib/version.rb

@@ -0,0 +1,3 @@
+module Appstage
+    VERSION = "1.0.12"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appstage
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 1.0.12
 platform: ruby
 authors:
 - P4 Innovation Ltd
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2024-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '0.21'
 - !ruby/object:Gem::Dependency
-  name: mimemagic
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
-  type: :runtime
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.23'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: '3.23'
 description: List, Upload and Delete live build content on appstage.io
 email:
 - hello@appstage.io
@@ -51,6 +65,7 @@ files:
 - lib/delete_files.rb
 - lib/list_files.rb
 - lib/upload_file.rb
+- lib/version.rb
 homepage: https://github.com/p4innovation/appstage-cli
 licenses:
 - MIT