supply 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9697a1089d5497d72524a149bed1fef5891cea92
-  data.tar.gz: 21e4ebade53c3955817f1bc7c96181d3a68aa7c9
+  metadata.gz: c35292abbffd6e72b05753b44d20421d64277a77
+  data.tar.gz: 3d01830e5a7b445fbf3fa6048faa1140400e1b87
 SHA512:
-  metadata.gz: 885050ae365c1dba5af3570cbeb641cf4836a8faa2404453be88b6c5cbdb5058a4181b9a5262c689ce1d6b8fd28c22f7618bba833b84fa8f371372813dfbd2b2
-  data.tar.gz: 558ce0fbcf00b10e29fbfa210ac8ce0e61b563931f234109b03deb913a2f5aa23f18dc941a5b668898d22799f255f4bd2a9d85e4aa04bc7de2af9865ce613e05
+  metadata.gz: 45213fa053b29bbcd62b51e1148017596e9111c4f4b7b774aab7579fba3c762f432e1b58be579f5d8373c81ec17bfd16d28fc2784c38137cc54c252d4145af47
+  data.tar.gz: 041a7d12da918735ea8873c1a8f1222b6e4371302f3de33fb6d871017a50e8d88a8ad7d1be8881c06231da0ede07b928c00073b1e1757873c216874e4e918e6c

data/README.md

@@ -128,6 +128,11 @@ To gradually roll out a new build use
 supply --apk path/app.apk --track rollout --rollout 0.5
 ```
 
+Expansion files (obbs) found under the same directory as your APK will also be uploaded together with your APK as long as:
+
+- they are identified as type 'main' or 'patch' (by containing 'main' or 'patch' in their file name)
+- you have at most one of each type
+
 ## Images and Screenshots
 
 After running `supply init`, you will have a metadata directory. This directory contains one or more locale directories (e.g. en-US, en-GB, etc.), and inside this directory are text files such as `title.txt` and `short_description.txt`.

data/lib/supply/client.rb

@@ -22,6 +22,10 @@ module Supply
 
     # instanciate a client given the supplied configuration
     def self.make_from_config
+      unless Supply.config[:json_key] || (Supply.config[:key] && Supply.config[:issuer])
+        UI.user_error! "Missing auth credentials: You must specify either 'json_key' or 'key' and 'issuer'"
+      end
+
       return Client.new(path_to_key: Supply.config[:key],
                         issuer: Supply.config[:issuer],
                         path_to_service_account_json: Supply.config[:json_key])
@@ -253,6 +257,19 @@ module Supply
         image_type)
     end
 
+    def upload_obb(obb_file_path: nil, apk_version_code: nil, expansion_file_type: nil)
+      ensure_active_edit!
+
+      android_publisher.upload_expansion_file(
+        current_package_name,
+        current_edit.id,
+        apk_version_code,
+        expansion_file_type,
+        upload_source: obb_file_path,
+        content_type: 'application/octet-stream'
+      )
+    end
+
     private
 
     def ensure_active_edit!

data/lib/supply/uploader.rb

@@ -85,9 +85,11 @@ module Supply
     end
 
     def upload_binary
-      if Supply.config[:apk]
-        Helper.log.info "Preparing apk at path '#{Supply.config[:apk]}' for upload..."
-        apk_version_code = client.upload_apk(Supply.config[:apk])
+      apk_path = Supply.config[:apk]
+
+      if apk_path
+        Helper.log.info "Preparing apk at path '#{apk_path}' for upload..."
+        apk_version_code = client.upload_apk(apk_path)
 
         Helper.log.info "Updating track '#{Supply.config[:track]}'..."
         if Supply.config[:track].eql? "rollout"
@@ -96,6 +98,8 @@ module Supply
           client.update_track(Supply.config[:track], 1.0, apk_version_code)
         end
 
+        upload_obbs(apk_path, apk_version_code)
+
         if metadata_path
           Dir.foreach(metadata_path) do |language|
             next if language.start_with?('.') # e.g. . or .. or hidden folders
@@ -117,5 +121,54 @@ module Supply
     def metadata_path
       Supply.config[:metadata_path]
     end
+
+    # searches for obbs in the directory where the apk is located and
+    # upload at most one main and one patch file. Do nothing if it finds
+    # more than one of either of them.
+    def upload_obbs(apk_path, apk_version_code)
+      expansion_paths = find_obbs(apk_path)
+      ['main', 'patch'].each do |type|
+        if expansion_paths[type]
+          upload_obb(expansion_paths[type], type, apk_version_code)
+        end
+      end
+    end
+
+    # @return a map of the obb paths for that apk
+    # keyed by their detected expansion file type
+    # E.g.
+    # { 'main' => 'path/to/main.obb', 'patch' => 'path/to/patch.obb' }
+    def find_obbs(apk_path)
+      search = File.join(File.dirname(apk_path), '*.obb')
+      paths = Dir.glob(search, File::FNM_CASEFOLD)
+      expansion_paths = {}
+      paths.each do |path|
+        type = obb_expansion_file_type(path)
+        next unless type
+        if expansion_paths[type]
+          Helper.log.warn("Can only upload one '#{type}' apk expansion. Skipping obb upload entirely.")
+          Helper.log.warn("If you'd like this to work differently, please submit an issue.")
+          return {}
+        end
+        expansion_paths[type] = path
+      end
+      expansion_paths
+    end
+
+    def upload_obb(obb_path, expansion_file_type, apk_version_code)
+      Helper.log.info "Uploading obb file #{obb_path}..."
+      client.upload_obb(obb_file_path: obb_path,
+                        apk_version_code: apk_version_code,
+                        expansion_file_type: expansion_file_type)
+    end
+
+    def obb_expansion_file_type(obb_file_path)
+      filename = File.basename(obb_file_path, ".obb")
+      if filename.include?('main')
+        'main'
+      elsif filename.include?('patch')
+        'patch'
+      end
+    end
   end
 end

data/lib/supply/version.rb

@@ -1,4 +1,4 @@
 module Supply
-  VERSION = "0.4.0".freeze
+  VERSION = "0.5.0".freeze
   DESCRIPTION = "Command line tool for updating Android apps and their metadata on the Google Play Store"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: supply
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client