supply 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eff55accd696bce7ea7f682dbe1f1201abaab960
-  data.tar.gz: 6904059222901364058d75845490675f9a001df2
+  metadata.gz: dfce9589c181ae3e7fee0c3424ab0f3edcec5a79
+  data.tar.gz: 227bf608c6cf1d5971e2848de19718ee718496a0
 SHA512:
-  metadata.gz: 8443859f5876dd6dd7bc1015f91ab49a96cc0c96a28045e5ff4402be07b6fb3d77e4385b94551df679b8506994760274331c52a80aa3b208a99c5ca64dee35e1
-  data.tar.gz: 9d879c1ae4f98e4a119970306277f807d5d3cf38a7312f8e1401ab8ac09353da6b52967299031d4f3afad94af87e483865c434be9cde9ee36e002c3805d087e2
+  metadata.gz: 8ea1590b53f11f6eceb347ffa3ebe45f0828d255b4dc94bece5e9392dd5b326160feffb4bdcc62f50302a265a67b221eabd98205b809c1b6553ddfa4889fd52f
+  data.tar.gz: 55f81de2d3654faf784bbe9ffa835753fb4576a0cdc0a058909596a4b916c84a33f2eabf595ab715e5b14884495928c570d9dc00693b71a05618f0c5f5436011

data/README.md

@@ -76,13 +76,11 @@ Setup consists of setting up your Google Developers Service Account
 - Open the [Google Play Console](https://play.google.com/apps/publish/)
 - Select **Settings** tab, followed by the **API access** tab
 - Click the **Create Service Account** button and follow the **Google Developers Console** link in the dialog
-- Click **Add credentials** and select **Service account**
+- Click **Create credentials** and select **Service account**
 - Select **JSON** as the Key type and click **Create**
 - Make a note of the file name of the JSON file downloaded to your computer, and close the dialog
-- Make a note of the **Email address** under **Service accounts** - this is the user which you will need later
 - Back on the Google Play developer console, click **Done** to close the dialog
 - Click on **Grant Access** for the newly added service account
-- In the **Invite a New User** dialog, paste the service account email address you noted earlier into the **Email address** field
 - Choose **Release Manager** from the **Role** dropdown and click **Send Invitation** to close the dialog
 
 ### Migrating Google credential format (from .p12 key file to .json)

data/lib/supply/client.rb

@@ -193,13 +193,16 @@ module Supply
       return result_upload.version_code
     end
 
+    # Updates the track for the provided version code(s)
     def update_track(track, rollout, apk_version_code)
       ensure_active_edit!
 
+      track_version_codes = apk_version_code.kind_of?(Array) ? apk_version_code : [apk_version_code]
+
       track_body = Androidpublisher::Track.new({
         track: track,
         user_fraction: rollout,
-        version_codes: [apk_version_code]
+        version_codes: track_version_codes
       })
 
       android_publisher.update_track(

data/lib/supply/options.rb

@@ -67,11 +67,26 @@ module Supply
                                      env_name: "SUPPLY_APK",
                                      description: "Path to the APK file to upload",
                                      short_option: "-b",
+                                     conflicting_options: [:apk_paths],
                                      default_value: Dir["*.apk"].last || Dir[File.join("app", "build", "outputs", "apk", "app-Release.apk")].last,
                                      optional: true,
                                      verify_block: proc do |value|
                                        UI.user_error! "Could not find apk file at path '#{value}'" unless File.exist?(value)
-                                       UI.user_error! "apk file is not an apk" unless value.end_with?(value)
+                                       UI.user_error! "apk file is not an apk" unless value.end_with?('.apk')
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :apk_paths,
+                                     env_name: "SUPPLY_APK_PATHS",
+                                     conflicting_options: [:apk],
+                                     optional: true,
+                                     type: Array,
+                                     description: "An array of paths to APK files to upload",
+                                     short_option: "-u",
+                                     verify_block: proc do |value|
+                                       UI.user_error!("Could not evaluate array from '#{value}'") unless value.kind_of?(Array)
+                                       value.each do |path|
+                                         UI.user_error! "Could not find apk file at path '#{path}'" unless File.exist?(path)
+                                         UI.user_error! "file at path '#{path}' is not an apk" unless path.end_with?('.apk')
+                                       end
                                      end),
         FastlaneCore::ConfigItem.new(key: :skip_upload_apk,
                                      env_name: "SUPPLY_SKIP_UPLOAD_APK",

data/lib/supply/uploader.rb

@@ -5,7 +5,7 @@ module Supply
 
       client.begin_edit(package_name: Supply.config[:package_name])
 
-      UI.user_error!("No local metadata found, make sure to run `supply init` to setup supply") unless metadata_path || Supply.config[:apk]
+      UI.user_error!("No local metadata found, make sure to run `supply init` to setup supply") unless metadata_path || Supply.config[:apk] || Supply.config[:apk_paths]
 
       if metadata_path
         UI.user_error!("Could not find folder #{metadata_path}") unless File.directory? metadata_path
@@ -23,7 +23,7 @@ module Supply
         end
       end
 
-      upload_binary unless Supply.config[:skip_upload_apk]
+      upload_binaries unless Supply.config[:skip_upload_apk]
 
       UI.message("Uploading all changes to Google Play...")
       client.commit_current_edit!
@@ -88,19 +88,33 @@ module Supply
       end
     end
 
-    def upload_binary
-      apk_path = Supply.config[:apk]
+    def upload_binaries
+      apk_paths = [Supply.config[:apk]] unless (apk_paths = Supply.config[:apk_paths])
 
+      apk_version_codes = []
+
+      apk_paths.each do |apk_path|
+        apk_version_codes.push(upload_binary_data(apk_path))
+      end
+
+      update_track(apk_version_codes)
+    end
+
+    private
+
+    ##
+    # Upload binary apk and obb and corresponding change logs with client
+    #
+    # @param [String] apk_path
+    #    Path of the apk file to upload.
+    #
+    # @return [Integer] The apk version code returned after uploading, or nil if there was a problem
+    def upload_binary_data(apk_path)
+      apk_version_code = nil
       if apk_path
         UI.message("Preparing apk at path '#{apk_path}' for upload...")
         apk_version_code = client.upload_apk(apk_path)
-
-        UI.message("Updating track '#{Supply.config[:track]}'...")
-        if Supply.config[:track].eql? "rollout"
-          client.update_track(Supply.config[:track], Supply.config[:rollout], apk_version_code)
-        else
-          client.update_track(Supply.config[:track], 1.0, apk_version_code)
-        end
+        UI.user_error!("Could not upload #{apk_path}") unless apk_version_code
 
         upload_obbs(apk_path, apk_version_code)
 
@@ -110,13 +124,20 @@ module Supply
             upload_changelog(language, apk_version_code)
           end
         end
-
       else
         UI.message("No apk file found, you can pass the path to your apk using the `apk` option")
       end
+      apk_version_code
     end
 
-    private
+    def update_track(apk_version_codes)
+      UI.message("Updating track '#{Supply.config[:track]}'...")
+      if Supply.config[:track].eql? "rollout"
+        client.update_track(Supply.config[:track], Supply.config[:rollout], apk_version_code)
+      else
+        client.update_track(Supply.config[:track], 1.0, apk_version_codes)
+      end
+    end
 
     def all_languages
       Dir.foreach(metadata_path).sort { |x, y| x <=> y }

data/lib/supply/version.rb

@@ -1,4 +1,4 @@
 module Supply
-  VERSION = "0.5.3".freeze
+  VERSION = "0.6.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.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client