supply 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 029fc80fc088a11de8e2f81af99fa093f09226ab
-  data.tar.gz: 2cb65207742a207031154ce342961d7ccbe75455
+  metadata.gz: 4f83fc4e36d718344106107075628c0ec7d2132e
+  data.tar.gz: 2c2be0e69074bf70feabbef9088e19cbdb0bbd13
 SHA512:
-  metadata.gz: 365022aa3a2c6b8142c26ea217d88c8a5aaa3ad7f19aa6d8fd2537db6e31a9677617f67c061377e8cc3ecf50bfd75aef4dffaef93b33eae86cb8f4d65e2b5f46
-  data.tar.gz: b607b543b3be473199120fdb4b293161ca49b34480c74f2a026d43083fd0089af4b35c321b5f8da9d6663f0911f80b332f848702c3f294139d9dcc227c07d5e5
+  metadata.gz: 00b5fb9d566f858423e3a82e2f257f85a1cb3bb1436f8f4f6e94a1c9dd54315f15d658ed8e3358e24684756c826d968bee7668e1c61b4ac995c9170b5f797cc7
+  data.tar.gz: 88439d20a9115470efac14d99bb5da5cbcfadc7a2cebc66f20f847972cc290c9c71156752f8467fecc9e6a7dfc0abf4113f4ae3b9b4afe31adc1c5cd56fe6c9b

data/README.md

@@ -9,7 +9,7 @@
   <a href="https://github.com/fastlane/deliver">deliver</a> &bull; 
   <a href="https://github.com/fastlane/snapshot">snapshot</a> &bull; 
   <a href="https://github.com/fastlane/frameit">frameit</a> &bull; 
-  <a href="https://github.com/fastlane/PEM">PEM</a> &bull; 
+  <a href="https://github.com/fastlane/pem">pem</a> &bull; 
   <a href="https://github.com/fastlane/sigh">sigh</a> &bull; 
   <a href="https://github.com/fastlane/produce">produce</a> &bull;
   <a href="https://github.com/fastlane/cert">cert</a> &bull;
@@ -17,7 +17,8 @@
   <a href="https://github.com/fastlane/pilot">pilot</a> &bull;
   <a href="https://github.com/fastlane/boarding">boarding</a> &bull;
   <a href="https://github.com/fastlane/gym">gym</a> &bull;
-  <a href="https://github.com/fastlane/scan">scan</a>
+  <a href="https://github.com/fastlane/scan">scan</a> &bull;
+  <a href="https://github.com/fastlane/match">match</a>
 </p>
 -------
 
@@ -68,17 +69,19 @@ Install the gem
 
     sudo gem install supply
 
-## Setup
+## Setup a Google Developers Service Account
 
 - Open the [Google Play Console](https://play.google.com/apps/publish/)
-- Open _Settings => API-Access_
-- Create a new Service Account - follow the link of the dialog
-- Create new Client ID
-- Select _Service Account_
-- Click _Generate new P12 key_ and store the downloaded file
-- Make a note of the _Email address_ underneath _Service account_ - this is the issuer which you will need later
-- Back on the Google Play developer console, click on _Grant Access_ for the newly added service account
-- Choose _Release Manager_ from the dropdown and confirm
+- 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**
+- Select **P12** as the Key type and click **Create**
+- Make a note of the file name of the P12 file downloaded to your computer, and close the dialog
+- Make a note of the **Email address** under **Service accounts** - this is the issuer 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
 
 ## Quick Start
 
@@ -128,9 +131,27 @@ And you can supply screenshots by creating directories with the following names,
 - `sevenInchScreenshots/` (7-inch tablets)
 - `tenInchScreenshots/` (10-inch tablets)
 - `tvScreenshots/`
+- `wearScreenshots/`
 
 Note that these will replace the current images and screenshots on the play store listing, not add to them.
 
+## Changelogs (What's new)
+
+You can add changelog files under the `changelogs/` directory for each locale. The filename should exactly match the version code of the APK that it represents. `supply init` will populate changelog files from existing data on Google Play if no `metadata/` directory exists when it is run.
+
+```
+└── fastlane
+    └── metadata
+        └── android 
+            ├── en-US
+            │   └── changelogs
+            │       ├── 100000.txt
+            │       └── 100100.txt
+            └── fr-FR
+                └── changelogs
+                    └── 100100.txt
+```
+
 ## Tips
 
 ### [`fastlane`](https://fastlane.tools) Toolchain
@@ -139,7 +160,7 @@ Note that these will replace the current images and screenshots on the play stor
 - [`deliver`](https://github.com/fastlane/deliver): Upload screenshots, metadata and your app to the App Store
 - [`snapshot`](https://github.com/fastlane/snapshot): Automate taking localized screenshots of your iOS app on every device
 - [`frameit`](https://github.com/fastlane/frameit): Quickly put your screenshots into the right device frames
-- [`PEM`](https://github.com/fastlane/PEM): Automatically generate and renew your push notification profiles
+- [`pem`](https://github.com/fastlane/pem): Automatically generate and renew your push notification profiles
 - [`sigh`](https://github.com/fastlane/sigh): Because you would rather spend your time building stuff than fighting provisioning
 - [`produce`](https://github.com/fastlane/produce): Create new iOS apps on iTunes Connect and Dev Portal using the command line
 - [`cert`](https://github.com/fastlane/cert): Automatically create and maintain iOS code signing certificates
@@ -148,6 +169,7 @@ Note that these will replace the current images and screenshots on the play stor
 - [`pilot`](https://github.com/fastlane/pilot): The best way to manage your TestFlight testers and builds from your terminal
 - [`boarding`](https://github.com/fastlane/boarding): The easiest way to invite your TestFlight beta testers 
 - [`gym`](https://github.com/fastlane/gym): Building your iOS apps has never been easier
+- [`match`](https://github.com/fastlane/match): Easily sync your certificates and profiles across your team using git
 
 ##### [Like this tool? Be the first to know about updates and new fastlane tools](https://tinyletter.com/krausefx)
 

data/lib/supply.rb

@@ -3,6 +3,7 @@ require 'supply/version'
 require 'supply/options'
 require 'supply/client'
 require 'supply/listing'
+require 'supply/apk_listing'
 require 'supply/uploader'
 
 require 'fastlane_core'
@@ -20,5 +21,8 @@ module Supply
   IMAGES_FOLDER_NAME = "images"
   IMAGE_FILE_EXTENSIONS = "{png,jpg,jpeg}"
 
+  CHANGELOGS_FOLDER_NAME = "changelogs"
+
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
+  UI = FastlaneCore::UI
 end

data/lib/supply/apk_listing.rb

@@ -0,0 +1,14 @@
+module Supply
+  class ApkListing
+    attr_accessor :recent_changes
+    attr_accessor :language
+    attr_accessor :apk_version_code
+
+    # Initializes the apk listing with the current listing if available
+    def initialize(recent_changes, language, apk_version_code)
+      self.recent_changes = recent_changes
+      self.language = language
+      self.apk_version_code = apk_version_code
+    end
+  end
+end

data/lib/supply/client.rb

@@ -161,6 +161,45 @@ module Supply
       end
     end
 
+    # Get a list of all apks verion codes - returns the list of version codes
+    def apks_version_codes
+      ensure_active_edit!
+
+      result = api_client.execute(
+        api_method: android_publisher.edits.apks.list,
+        parameters: {
+          'editId' => current_edit.data.id,
+          'packageName' => current_package_name
+        },
+        authorization: auth_client
+      )
+
+      raise result.error_message.red if result.error? && result.status != 404
+
+      return result.data.apks.collect(&:versionCode)
+    end
+
+    # Get a list of all apk listings (changelogs) - returns the list
+    def apk_listings(apk_version_code)
+      ensure_active_edit!
+
+      result = api_client.execute(
+        api_method: android_publisher.edits.apklistings.list,
+        parameters: {
+          'apkVersionCode' => apk_version_code,
+          'editId' => current_edit.data.id,
+          'packageName' => current_package_name
+        },
+        authorization: auth_client
+      )
+
+      raise result.error_message.red if result.error? && result.status != 404
+
+      return result.data.listings.collect do |row|
+        ApkListing.new(row.recentChanges, row.language, apk_version_code)
+      end
+    end
+
     #####################################################
     # @!group Modifying data
     #####################################################
@@ -190,11 +229,7 @@ module Supply
       raise result.error_message.red if result.error?
     end
 
-    def upload_apk_to_track(path_to_apk, track)
-      upload_apk_to_track_with_rollout(path_to_apk, track, 1.0)
-    end
-
-    def upload_apk_to_track_with_rollout(path_to_apk, track, rollout)
+    def upload_apk(path_to_apk)
       ensure_active_edit!
 
       apk = Google::APIClient::UploadIO.new(File.expand_path(path_to_apk), 'application/vnd.android.package-archive')
@@ -211,10 +246,16 @@ module Supply
 
       raise result_upload.error_message.red if result_upload.error?
 
+      return result_upload.data.versionCode
+    end
+
+    def update_track(track, rollout, apk_version_code)
+      ensure_active_edit!
+
       track_body = {
         'track' => track,
         'userFraction' => rollout,
-        'versionCodes' => [result_upload.data.versionCode]
+        'versionCodes' => [apk_version_code]
       }
 
       result_update = api_client.execute(
@@ -231,6 +272,28 @@ module Supply
       raise result_update.error_message.red if result_update.error?
     end
 
+    def update_apk_listing_for_language(apk_listing)
+      ensure_active_edit!
+
+      body_object = {
+        'language' => apk_listing.language,
+        'recentChanges' => apk_listing.recent_changes
+      }
+
+      result = api_client.execute(
+        api_method: android_publisher.edits.apklistings.update,
+        parameters: {
+          'apkVersionCode' => apk_listing.apk_version_code,
+          'editId' => current_edit.data.id,
+          'packageName' => current_package_name,
+          'language' => apk_listing.language
+        },
+        body_object: body_object,
+        authorization: auth_client
+      )
+      raise result.error_message.red if result.error?
+    end
+
     #####################################################
     # @!group Screenshots
     #####################################################

data/lib/supply/options.rb

@@ -58,7 +58,31 @@ module Supply
                                      verify_block: proc do |value|
                                        raise "Could not find apk file at path '#{value}'".red unless File.exist?(value)
                                        raise "apk file is not an apk".red unless value.end_with?(value)
-                                     end)
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :skip_upload_apk,
+                                     env_name: "SUPPLY_SKIP_UPLOAD_APK",
+                                     optional: true,
+                                     description: "Whether to skip uploading APK",
+                                     is_string: false,
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :skip_upload_metadata,
+                                     env_name: "SUPPLY_SKIP_UPLOAD_METADATA",
+                                     optional: true,
+                                     description: "Whether to skip uploading metadata",
+                                     is_string: false,
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :skip_upload_images,
+                                     env_name: "SUPPLY_SKIP_UPLOAD_IMAGES",
+                                     optional: true,
+                                     description: "Whether to skip uploading images, screenshots not included",
+                                     is_string: false,
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :skip_upload_screenshots,
+                                     env_name: "SUPPLY_SKIP_UPLOAD_SCREENSHOTS",
+                                     optional: true,
+                                     description: "Whether to skip uploading SCREENSHOTS",
+                                     is_string: false,
+                                     default_value: false)
       ]
     end
   end

data/lib/supply/setup.rb

@@ -14,6 +14,12 @@ module Supply
         download_images(listing)
       end
 
+      client.apks_version_codes.each do |apk_version_code|
+        client.apk_listings(apk_version_code).each do |apk_listing|
+          store_apk_listing(apk_listing)
+        end
+      end
+
       client.abort_current_edit
 
       Helper.log.info "Successfully stored metadata in '#{metadata_path}'".green
@@ -64,6 +70,17 @@ module Supply
       Helper.log.info "Due to the limit of the Google Play API `supply` can't download your existing screenshots..."
     end
 
+    def store_apk_listing(apk_listing)
+      containing = File.join(metadata_path, apk_listing.language, CHANGELOGS_FOLDER_NAME)
+      unless File.exist?(containing)
+        FileUtils.mkdir_p(containing)
+      end
+
+      path = File.join(containing, "#{apk_listing.apk_version_code}.txt")
+      Helper.log.info "Writing to #{path}..."
+      File.write(path, apk_listing.recent_changes)
+    end
+
     private
 
     def metadata_path

data/lib/supply/uploader.rb

@@ -1,7 +1,7 @@
 module Supply
   class Uploader
     def perform_upload
-      FastlaneCore::PrintTable.print_values(config: Supply.config, hide_keys: [:issuer], title: "Summary for sigh #{Supply::VERSION}")
+      FastlaneCore::PrintTable.print_values(config: Supply.config, hide_keys: [:issuer], title: "Summary for supply #{Supply::VERSION}")
 
       client.begin_edit(package_name: Supply.config[:package_name])
 
@@ -13,13 +13,13 @@ module Supply
 
           listing = client.listing_for_language(language)
 
-          upload_metadata(language, listing)
-          upload_images(language)
-          upload_screenshots(language)
+          upload_metadata(language, listing) unless Supply.config[:skip_upload_metadata]
+          upload_images(language) unless Supply.config[:skip_upload_images]
+          upload_screenshots(language) unless Supply.config[:skip_upload_screenshots]
         end
       end
 
-      upload_binary
+      upload_binary unless Supply.config[:skip_upload_apk]
 
       Helper.log.info "Uploading all changes to Google Play..."
       client.commit_current_edit!
@@ -69,11 +69,28 @@ module Supply
     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])
+
+        Helper.log.info "Updating track '#{Supply.config[:track]}'..."
         if Supply.config[:track].eql? "rollout"
-          client.upload_apk_to_track_with_rollout(Supply.config[:apk], Supply.config[:track], Supply.config[:rollout])
+          client.update_track(Supply.config[:track], Supply.config[:rollout], apk_version_code)
         else
-          client.upload_apk_to_track(Supply.config[:apk], Supply.config[:track])
+          client.update_track(Supply.config[:track], 1.0, apk_version_code)
+        end
+
+        if metadata_path
+          Dir.foreach(metadata_path) do |language|
+            next if language.start_with?('.') # e.g. . or .. or hidden folders
+
+            path = File.join(metadata_path, language, Supply::CHANGELOGS_FOLDER_NAME, "#{apk_version_code}.txt")
+            if File.exist?(path)
+              Helper.log.info "Updating changelog for code version '#{apk_version_code}' and language '#{language}'..."
+              apk_listing = ApkListing.new(File.read(path), language, apk_version_code)
+              client.update_apk_listing_for_language(apk_listing)
+            end
+          end
         end
+
       else
         Helper.log.info "No apk file found, you can pass the path to your apk using the `apk` option"
       end

data/lib/supply/version.rb

@@ -1,4 +1,4 @@
 module Supply
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
   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.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.30.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.30.0
 - !ruby/object:Gem::Dependency
   name: credentials_manager
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +191,7 @@ files:
 - README.md
 - bin/supply
 - lib/supply.rb
+- lib/supply/apk_listing.rb
 - lib/supply/client.rb
 - lib/supply/commands_generator.rb
 - lib/supply/listing.rb
@@ -218,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Command line tool for updating Android apps and their metadata on the Google