sony-ci-api 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78ddca4a90c4040cd7dd9061255f8093be1f6ad0
-  data.tar.gz: 7dc66ce63747e28bba420c2002a8ee521559060c
+  metadata.gz: c344e4f79a93bc0fab03b439d9279c3a49a4710d
+  data.tar.gz: 8071312023cf6bb2652931f383c431888a11401e
 SHA512:
-  metadata.gz: cb0604d3a6b3b1dabafc68c8ea32637b5855fcc9bd747e1eb2d4ef5c02c826100160c983432f09df973aa7533d183173483fe6cf7779f7318046dbefaf39fd49
-  data.tar.gz: d037bef8500d5b8f45f6e9f363306ee4871ce295a9e38e260a132861352368040183a4a4e7395a4bfbd30b825d86487f9e75b9cf56a90b437487c1e2da3c4bb6
+  metadata.gz: bc671a8b8b8c98a98d06b32cd15715e687cf97b6c3210d02fae851f27d722f2812fb4831cc94769ab8fdf971c65cc71707945ebc02facd6577c33e1881d165f8
+  data.tar.gz: 626375b4070d753c6a3239f09905d5d185f871234159304e2d7ca83d3af1d3e171b8728949e26361dc5ea6f0408239a2192aaacd34665e9edcf232411c6cf5f2

data/bin/sony-ci-api

@@ -10,7 +10,7 @@ end
 
 ci = SonyCiAdmin.new(
   # verbose: true,
-  credentials_path: 'ci.yml')
+  credentials_path: 'config/ci.yml')
 
 begin
   case args.keys.sort

data/lib/sony-ci-api.rb

@@ -1,2 +1,4 @@
-require_relative 'sony-ci-api/sony_ci_basic'
 require_relative 'sony-ci-api/sony_ci_admin'
+# Nothing else: The outside world doesn't need to worry 
+# about the particular classes which are required, and 
+# sony_ci_admin.rb loads its own dependencies.

data/lib/sony-ci-api/sony_ci_admin.rb

@@ -38,48 +38,34 @@ class SonyCiAdmin < SonyCiBasic
     Detailer.new(self).detail(asset_id)
   end
 
-  class CiClient #:nodoc:
-    # This class hierarchy might be excessive, but it gives us:
-    # - a single place for the `perform` method
-    # - and an isolated container for related private methods
-
-    def perform(curl, mime=nil)
-      # TODO: Is this actually working?
-      # curl.on_missing { |data| puts "4xx: #{data}" }
-      # curl.on_failure { |data| puts "5xx: #{data}" }
-      curl.verbose = @ci.verbose
-      curl.headers['Authorization'] = "Bearer #{@ci.access_token}"
-      curl.headers['Content-Type'] = mime if mime
-      curl.perform
-    end
-  end
-
-  class Detailer < CiClient #:nodoc:
+  class Detailer < SonyCiClient #:nodoc:
     def initialize(ci)
       @ci = ci
     end
 
     def detail(asset_id)
       curl = Curl::Easy.http_get('https:'"//api.cimediacloud.com/assets/#{asset_id}") do |c|
-        perform(c)
+        add_headers(c)
       end
+      handle_errors(curl)
       JSON.parse(curl.body_str)
     end
   end
 
-  class Deleter < CiClient #:nodoc:
+  class Deleter < SonyCiClient #:nodoc:
     def initialize(ci)
       @ci = ci
     end
 
     def delete(asset_id)
-      Curl::Easy.http_delete('https:'"//api.cimediacloud.com/assets/#{asset_id}") do |c|
-        perform(c)
+      curl = Curl::Easy.http_delete('https:'"//api.cimediacloud.com/assets/#{asset_id}") do |c|
+        add_headers(c)
       end
+      handle_errors(curl)
     end
   end
 
-  class Lister < CiClient #:nodoc:
+  class Lister < SonyCiClient #:nodoc:
     include Enumerable
 
     def initialize(ci)
@@ -89,8 +75,9 @@ class SonyCiAdmin < SonyCiBasic
     def list(limit, offset)
       curl = Curl::Easy.http_get('https:''//api.cimediacloud.com/workspaces/' \
                                  "#{@ci.workspace_id}/contents?limit=#{limit}&offset=#{offset}") do |c|
-        perform(c)
+        add_headers(c)
       end
+      handle_errors(curl)
       JSON.parse(curl.body_str)['items']
     end
 
@@ -106,7 +93,7 @@ class SonyCiAdmin < SonyCiBasic
     end
   end
 
-  class Uploader < CiClient #:nodoc:
+  class Uploader < SonyCiClient #:nodoc:
     def initialize(ci, path, log_path)
       @ci = ci
       @path = path
@@ -115,9 +102,12 @@ class SonyCiAdmin < SonyCiBasic
 
     def upload
       file = File.new(@path)
-      if file.size > 5 * 1024 * 1024
+      if file.size >= 5 * 1024 * 1024
         initiate_multipart_upload(file)
-        do_multipart_upload_part(file)
+        part = 0
+        while part do
+          part = do_multipart_upload_part(file, part) 
+        end
         complete_multipart_upload
       else
         singlepart_upload(file)
@@ -137,22 +127,16 @@ class SonyCiAdmin < SonyCiBasic
     MULTIPART_URI = 'https://io.cimediacloud.com/upload/multipart'
 
     def singlepart_upload(file)
-      curl = "curl -s -XPOST '#{SINGLEPART_URI}'" \
-             " -H 'Authorization: Bearer #{@ci.access_token}'" \
-             " -F filename='@#{file.path}'" \
-             " -F metadata=\"{'workspaceId': '#{@ci.workspace_id}'}\""
-      body_str = `#{curl}`
-      @asset_id = JSON.parse(body_str)['assetId']
-      fail "Upload failed: #{body_str}" unless @asset_id
-      # TODO: This shouldn't be hard, but it just hasn't worked for me.
-#      params = {
-#        File.basename(file) => file.read,
-#        'metadata' => JSON.generate({})
-#      }.map { |k,v| Curl::PostField.content(k,v) }
-#      curl = Curl::Easy.http_post(SINGLEPART_URI, params) do |c|
-#        c.multipart_form_post = true
-#        perform(c)
-#      end
+      params = [
+        Curl::PostField.file('filename', file.path, File.basename(file.path)),
+        Curl::PostField.content('metadata', JSON.generate('workspaceId' => @ci.workspace_id))
+      ]
+      curl = Curl::Easy.http_post(SINGLEPART_URI, params) do |c|
+        c.multipart_form_post = true
+        add_headers(c)
+      end
+      handle_errors(curl)
+      @asset_id = JSON.parse(curl.body_str)['assetId']
     end
 
     def initiate_multipart_upload(file)
@@ -160,21 +144,29 @@ class SonyCiAdmin < SonyCiBasic
                              'size' => file.size,
                              'workspaceId' => @ci.workspace_id)
       curl = Curl::Easy.http_post(MULTIPART_URI, params) do |c|
-        perform(c, 'application/json')
+        add_headers(c, 'application/json')
       end
+      handle_errors(curl)
       @asset_id = JSON.parse(curl.body_str)['assetId']
     end
 
-    def do_multipart_upload_part(file)
-      Curl::Easy.http_put("#{MULTIPART_URI}/#{@asset_id}/1", file.read) do |c|
-        perform(c, 'application/octet-stream')
+    CHUNK_SIZE = 10 * 1024 * 1024
+    
+    def do_multipart_upload_part(file, part)
+      fragment = file.read(CHUNK_SIZE)
+      return unless fragment
+      curl = Curl::Easy.http_put("#{MULTIPART_URI}/#{@asset_id}/#{part + 1}", fragment) do |c|
+        add_headers(c, 'application/octet-stream')
       end
+      handle_errors(curl)
+      return part + 1
     end
 
     def complete_multipart_upload
-      Curl::Easy.http_post("#{MULTIPART_URI}/#{@asset_id}/complete") do |c|
-        perform(c)
+      curl = Curl::Easy.http_post("#{MULTIPART_URI}/#{@asset_id}/complete") do |c|
+        add_headers(c)
       end
+      handle_errors(curl)
     end
   end
 end

data/lib/sony-ci-api/sony_ci_basic.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'curb'
 require 'json'
+require_relative 'sony_ci_client'
 
 class SonyCiBasic
   attr_reader :access_token
@@ -36,7 +37,6 @@ class SonyCiBasic
       c.password = credentials['password']
       # c.on_missing { |curl, data| puts "4xx: #{data}" }
       # c.on_failure { |curl, data| puts "5xx: #{data}" }
-      c.perform
     end
 
     @access_token = JSON.parse(curl.body_str)['access_token']
@@ -50,23 +50,7 @@ class SonyCiBasic
     Downloader.new(self).download(asset_id)
   end
 
-  class CiClient #:nodoc:
-    # This class hierarchy might be excessive, but it gives us:
-    # - a single place for the `perform` method
-    # - and an isolated container for related private methods
-
-    def perform(curl, mime=nil)
-      # TODO: Is this actually working?
-      # curl.on_missing { |data| puts "4xx: #{data}" }
-      # curl.on_failure { |data| puts "5xx: #{data}" }
-      curl.verbose = @ci.verbose
-      curl.headers['Authorization'] = "Bearer #{@ci.access_token}"
-      curl.headers['Content-Type'] = mime if mime
-      curl.perform
-    end
-  end
-
-  class Downloader < CiClient #:nodoc:
+  class Downloader < SonyCiClient #:nodoc:
     @@cache = {}
 
     def initialize(ci)
@@ -76,9 +60,11 @@ class SonyCiBasic
     def download(asset_id)
       hit = @@cache[asset_id]
       if !hit || hit[:expires] < Time.now
+        
         curl = Curl::Easy.http_get('https'"://api.cimediacloud.com/assets/#{asset_id}/download") do |c|
-          perform(c)
+          add_headers(c)
         end
+        handle_errors(curl)
         url = JSON.parse(curl.body_str)['location']
         @@cache[asset_id] = { url: url, expires: Time.now + 3 * 60 * 60 }
       end

data/lib/sony-ci-api/sony_ci_client.rb

@@ -0,0 +1,14 @@
+class SonyCiClient #:nodoc:
+  def add_headers(curl, mime=nil)
+    # on_missing and on_failure exist...
+    # but any exceptions are caught and turned into warnings:
+    # You need to check the response code at the end
+    # if you want the execution path to change.
+    curl.verbose = @ci.verbose
+    curl.headers['Authorization'] = "Bearer #{@ci.access_token}"
+    curl.headers['Content-Type'] = mime if mime
+  end
+  def handle_errors(curl)
+    raise "#{curl.status}: #{curl.url}" if curl.response_code.to_s !~ /^2../
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sony-ci-api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Chuck McCallum
@@ -21,6 +21,7 @@ files:
 - lib/sony-ci-api.rb
 - lib/sony-ci-api/sony_ci_admin.rb
 - lib/sony-ci-api/sony_ci_basic.rb
+- lib/sony-ci-api/sony_ci_client.rb
 homepage: https://github.com/WGBH/sony-ci-api
 licenses:
 - MIT