supply 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2962e8c36a67b8e1fc920269e1052c3f3392de08
-  data.tar.gz: 5313215b362d0c842128f7f6d49614a10cbb6948
+  metadata.gz: eff55accd696bce7ea7f682dbe1f1201abaab960
+  data.tar.gz: 6904059222901364058d75845490675f9a001df2
 SHA512:
-  metadata.gz: 9430225bf759727b2d9c3a72dcd434c11bc5883ec2e52e53e8a580b6cad19607c0387f8d00323a014b2dd0c799e0dff279e39b88afe046e8373a8cb1d664c9b6
-  data.tar.gz: 89fd60fe08bb2b6bba279ee7eeb2f88432ea1602aa4bc25d22296c201b1d57d26c045d556a102c24288d7e87b36960c9e1b56e3f9af12589f8e5e53885265c3d
+  metadata.gz: 8443859f5876dd6dd7bc1015f91ab49a96cc0c96a28045e5ff4402be07b6fb3d77e4385b94551df679b8506994760274331c52a80aa3b208a99c5ca64dee35e1
+  data.tar.gz: 9d879c1ae4f98e4a119970306277f807d5d3cf38a7312f8e1401ab8ac09353da6b52967299031d4f3afad94af87e483865c434be9cde9ee36e002c3805d087e2

data/README.md

@@ -1,24 +1,24 @@
 <h3 align="center">
-  <a href="https://github.com/fastlane/fastlane">
-    <img src="assets/fastlane.png" width="150" />
+  <a href="https://github.com/fastlane/fastlane/tree/master/fastlane">
+    <img src="../fastlane/assets/fastlane.png" width="150" />
     <br />
     fastlane
   </a>
 </h3>
 <p align="center">
-  <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/sigh">sigh</a> &bull; 
-  <a href="https://github.com/fastlane/produce">produce</a> &bull;
-  <a href="https://github.com/fastlane/cert">cert</a> &bull;
-  <a href="https://github.com/fastlane/spaceship">spaceship</a> &bull;
-  <a href="https://github.com/fastlane/pilot">pilot</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/deliver">deliver</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/snapshot">snapshot</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/frameit">frameit</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/pem">pem</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/sigh">sigh</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/produce">produce</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/cert">cert</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/spaceship">spaceship</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/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> &bull;
-  <a href="https://github.com/fastlane/match">match</a>
+  <a href="https://github.com/fastlane/fastlane/tree/master/gym">gym</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/scan">scan</a> &bull;
+  <a href="https://github.com/fastlane/fastlane/tree/master/match">match</a>
 </p>
 -------
 
@@ -30,9 +30,9 @@ supply
 ============
 
 [![Twitter: @FastlaneTools](https://img.shields.io/badge/contact-@FastlaneTools-blue.svg?style=flat)](https://twitter.com/FastlaneTools)
-[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/fastlane/supply/blob/master/LICENSE)
+[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/fastlane/fastlane/blob/master/supply/LICENSE)
 [![Gem](https://img.shields.io/gem/v/supply.svg?style=flat)](http://rubygems.org/gems/supply)
-[![Build Status](https://img.shields.io/travis/fastlane/supply/master.svg?style=flat)](https://travis-ci.org/KrauseFx/supply)
+[![Build Status](https://img.shields.io/circleci/project/fastlane/fastlane/master.svg?style=flat)](https://circleci.com/gh/fastlane/fastlane)
 
 ###### Command line tool for updating Android apps and their metadata on the Google Play Store
 
@@ -41,12 +41,12 @@ Get in contact with the developer on Twitter: [@FastlaneTools](https://twitter.c
 
 -------
 <p align="center">
-    <a href="#features">Features</a> &bull; 
-    <a href="#installation">Installation</a> &bull; 
-    <a href="#setup">Setup</a> &bull; 
-    <a href="#quick-start">Quick Start</a> &bull; 
-    <a href="#available-commands">Commands</a> &bull; 
-    <a href="#uploading-an-apk">Uploading an APK</a> &bull; 
+    <a href="#features">Features</a> &bull;
+    <a href="#installation">Installation</a> &bull;
+    <a href="#setup">Setup</a> &bull;
+    <a href="#quick-start">Quick Start</a> &bull;
+    <a href="#available-commands">Commands</a> &bull;
+    <a href="#uploading-an-apk">Uploading an APK</a> &bull;
     <a href="#images-and-screenshots">Images</a>
 </p>
 
@@ -161,7 +161,7 @@ You can add changelog files under the `changelogs/` directory for each locale. T
 ```
 └── fastlane
     └── metadata
-        └── android 
+        └── android
             ├── en-US
             │   └── changelogs
             │       ├── 100000.txt
@@ -176,19 +176,18 @@ You can add changelog files under the `changelogs/` directory for each locale. T
 ### [`fastlane`](https://fastlane.tools) Toolchain
 
 - [`fastlane`](https://fastlane.tools): Connect all deployment tools into one streamlined workflow
-- [`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
-- [`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
-- [`codes`](https://github.com/fastlane/codes): Create promo codes for iOS Apps using the command line
-- [`spaceship`](https://github.com/fastlane/spaceship): Ruby library to access the Apple Dev Center and iTunes Connect
-- [`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
+- [`deliver`](https://github.com/fastlane/fastlane/tree/master/deliver): Upload screenshots, metadata and your app to the App Store
+- [`snapshot`](https://github.com/fastlane/fastlane/tree/master/snapshot): Automate taking localized screenshots of your iOS app on every device
+- [`frameit`](https://github.com/fastlane/fastlane/tree/master/frameit): Quickly put your screenshots into the right device frames
+- [`pem`](https://github.com/fastlane/fastlane/tree/master/pem): Automatically generate and renew your push notification profiles
+- [`sigh`](https://github.com/fastlane/fastlane/tree/master/sigh): Because you would rather spend your time building stuff than fighting provisioning
+- [`produce`](https://github.com/fastlane/fastlane/tree/master/produce): Create new iOS apps on iTunes Connect and Dev Portal using the command line
+- [`cert`](https://github.com/fastlane/fastlane/tree/master/cert): Automatically create and maintain iOS code signing certificates
+- [`spaceship`](https://github.com/fastlane/fastlane/tree/master/spaceship): Ruby library to access the Apple Dev Center and iTunes Connect
+- [`pilot`](https://github.com/fastlane/fastlane/tree/master/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/fastlane/tree/master/gym): Building your iOS apps has never been easier
+- [`match`](https://github.com/fastlane/fastlane/tree/master/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)
 
@@ -196,7 +195,7 @@ You can add changelog files under the `changelogs/` directory for each locale. T
 Please submit an issue on GitHub and provide information about your setup
 
 # Code of Conduct
-Help us keep `supply` open and inclusive. Please read and follow our [Code of Conduct](https://github.com/fastlane/code-of-conduct).
+Help us keep `supply` open and inclusive. Please read and follow our [Code of Conduct](https://github.com/fastlane/fastlane/blob/master/CODE_OF_CONDUCT.md).
 
 ## License
 

data/lib/supply/client.rb

@@ -52,7 +52,7 @@ module Supply
 
       auth_client = Google::Auth::ServiceAccountCredentials.make_creds(json_key_io: key_io, scope: scope)
 
-      Helper.log.debug "Fetching a new access token from Google..."
+      UI.verbose("Fetching a new access token from Google...")
 
       auth_client.fetch_access_token!
 
@@ -76,7 +76,7 @@ module Supply
 
     # Begin modifying a certain package
     def begin_edit(package_name: nil)
-      raise "You currently have an active edit" if @current_edit
+      UI.user_error!("You currently have an active edit") if @current_edit
 
       self.current_edit = android_publisher.insert_edit(package_name)
 
@@ -280,7 +280,7 @@ module Supply
     private
 
     def ensure_active_edit!
-      raise "You need to have an active edit, make sure to call `begin_edit`" unless @current_edit
+      UI.user_error!("You need to have an active edit, make sure to call `begin_edit`") unless @current_edit
     end
   end
 end

data/lib/supply/commands_generator.rb

@@ -22,7 +22,7 @@ module Supply
       program :description, Supply::DESCRIPTION
       program :help, 'Author', 'Felix Krause <supply@krausefx.com>'
       program :help, 'Website', 'https://fastlane.tools'
-      program :help, 'GitHub', 'https://github.com/fastlane/supply'
+      program :help, 'GitHub', 'https://github.com/fastlane/fastlane/tree/master/supply'
       program :help_formatter, :compact
 
       always_trace!

data/lib/supply/options.rb

@@ -37,18 +37,17 @@ module Supply
                                      env_name: "SUPPLY_KEY",
                                      short_option: "-k",
                                      conflicting_options: [:json_key],
-                                     optional: true, # deprecated
+                                     deprecated: 'Use --json_key instead',
                                      description: "The p12 File used to authenticate with Google",
                                      default_value: Dir["*.p12"].first || CredentialsManager::AppfileConfig.try_fetch_value(:keyfile),
                                      verify_block: proc do |value|
-                                       UI.important("DEPRECATED --key OPTION. Use --json_key instead")
                                        UI.user_error! "Could not find p12 file at path '#{File.expand_path(value)}'" unless File.exist?(File.expand_path(value))
                                      end),
         FastlaneCore::ConfigItem.new(key: :issuer,
                                      env_name: "SUPPLY_ISSUER",
                                      short_option: "-i",
                                      conflicting_options: [:json_key],
-                                     optional: true, # deprecated
+                                     deprecated: 'Use --json_key instead',
                                      description: "The issuer of the p12 file (email address of the service account)",
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:issuer),
                                      verify_block: proc do |value|

data/lib/supply/setup.rb

@@ -2,7 +2,7 @@ module Supply
   class Setup
     def perform_download
       if File.exist?(metadata_path)
-        Helper.log.info "Metadata already exists at path '#{metadata_path}'".yellow
+        UI.important("Metadata already exists at path '#{metadata_path}'")
         return
       end
 
@@ -22,7 +22,7 @@ module Supply
 
       client.abort_current_edit
 
-      Helper.log.info "Successfully stored metadata in '#{metadata_path}'".green
+      UI.success("Successfully stored metadata in '#{metadata_path}'")
     end
 
     def store_metadata(listing)
@@ -31,8 +31,8 @@ module Supply
 
       Supply::AVAILABLE_METADATA_FIELDS.each do |key|
         path = File.join(containing, "#{key}.txt")
-        Helper.log.info "Writing to #{path}..."
-        File.write(path, listing.send(key))
+        UI.message("Writing to #{path}...")
+        File.open(path, 'w:UTF-8') { |file| file.write(listing.send(key)) }
       end
     end
 
@@ -44,12 +44,12 @@ module Supply
       IMAGES_TYPES.each do |image_type|
         if ['featureGraphic'].include?(image_type)
           # we don't get all files in full resolution :(
-          Helper.log.info "Due to the limit of the Google Play API `supply` can't download your existing feature graphics..."
+          UI.message("Due to the limit of the Google Play API `supply` can't download your existing feature graphics...")
           next
         end
 
         begin
-          Helper.log.info "Downloading #{image_type} for #{listing.language}..."
+          UI.message("Downloading #{image_type} for #{listing.language}...")
 
           url = client.fetch_images(image_type: image_type, language: listing.language).last
           next unless url
@@ -57,8 +57,8 @@ module Supply
           path = File.join(metadata_path, listing.language, IMAGES_FOLDER_NAME, "#{image_type}.png")
           File.write(path, Net::HTTP.get(URI.parse(url)))
         rescue => ex
-          Helper.log.error ex.to_s
-          Helper.log.error "Error downloading '#{image_type}' for #{listing.language}...".red
+          UI.error(ex.to_s)
+          UI.error("Error downloading '#{image_type}' for #{listing.language}...")
         end
       end
     end
@@ -71,7 +71,7 @@ module Supply
         FileUtils.mkdir_p(File.join(containing, IMAGES_FOLDER_NAME, screenshot_type))
       end
 
-      Helper.log.info "Due to the limit of the Google Play API `supply` can't download your existing screenshots..."
+      UI.message("Due to the limit of the Google Play API `supply` can't download your existing screenshots...")
     end
 
     def store_apk_listing(apk_listing)
@@ -81,7 +81,7 @@ module Supply
       end
 
       path = File.join(containing, "#{apk_listing.apk_version_code}.txt")
-      Helper.log.info "Writing to #{path}..."
+      UI.message("Writing to #{path}...")
       File.write(path, apk_listing.recent_changes)
     end
 

data/lib/supply/uploader.rb

@@ -5,14 +5,14 @@ module Supply
 
       client.begin_edit(package_name: Supply.config[:package_name])
 
-      raise "No local metadata found, make sure to run `supply init` to setup supply".red 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]
 
       if metadata_path
         UI.user_error!("Could not find folder #{metadata_path}") unless File.directory? metadata_path
 
         all_languages.each do |language|
           next if language.start_with?('.') # e.g. . or .. or hidden folders
-          Helper.log.info "Preparing to upload for language '#{language}'..."
+          UI.message("Preparing to upload for language '#{language}'...")
 
           listing = client.listing_for_language(language)
 
@@ -25,9 +25,9 @@ module Supply
 
       upload_binary unless Supply.config[:skip_upload_apk]
 
-      Helper.log.info "Uploading all changes to Google Play..."
+      UI.message("Uploading all changes to Google Play...")
       client.commit_current_edit!
-      Helper.log.info "Successfully finished the upload to Google Play".green
+      UI.success("Successfully finished the upload to Google Play")
     end
 
     def upload_changelogs(language)
@@ -39,7 +39,7 @@ module Supply
     def upload_changelog(language, apk_version_code)
       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}'..."
+        UI.message("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
@@ -50,7 +50,12 @@ module Supply
         path = File.join(metadata_path, language, "#{key}.txt")
         listing.send("#{key}=".to_sym, File.read(path)) if File.exist?(path)
       end
-      listing.save
+      begin
+        listing.save
+      rescue Encoding::InvalidByteSequenceError => ex
+        message = (ex.message || '').capitalize
+        UI.user_error!("Metadata must be UTF-8 encoded. #{message}")
+      end
     end
 
     def upload_images(language)
@@ -59,7 +64,7 @@ module Supply
         path = Dir.glob(search, File::FNM_CASEFOLD).last
         next unless path
 
-        Helper.log.info "Uploading image file #{path}..."
+        UI.message("Uploading image file #{path}...")
         client.upload_image(image_path: File.expand_path(path),
                             image_type: image_type,
                               language: language)
@@ -75,7 +80,7 @@ module Supply
         client.clear_screenshots(image_type: screenshot_type, language: language)
 
         paths.sort.each do |path|
-          Helper.log.info "Uploading screenshot #{path}..."
+          UI.message("Uploading screenshot #{path}...")
           client.upload_image(image_path: File.expand_path(path),
                               image_type: screenshot_type,
                                 language: language)
@@ -87,10 +92,10 @@ module Supply
       apk_path = Supply.config[:apk]
 
       if apk_path
-        Helper.log.info "Preparing apk at path '#{apk_path}' for upload..."
+        UI.message("Preparing apk at path '#{apk_path}' for upload...")
         apk_version_code = client.upload_apk(apk_path)
 
-        Helper.log.info "Updating track '#{Supply.config[:track]}'..."
+        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
@@ -107,7 +112,7 @@ module Supply
         end
 
       else
-        Helper.log.info "No apk file found, you can pass the path to your apk using the `apk` option"
+        UI.message("No apk file found, you can pass the path to your apk using the `apk` option")
       end
     end
 
@@ -149,8 +154,8 @@ module Supply
         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.")
+          UI.important("Can only upload one '#{type}' apk expansion. Skipping obb upload entirely.")
+          UI.important("If you'd like this to work differently, please submit an issue.")
           return {}
         end
         expansion_paths[type] = path
@@ -159,7 +164,7 @@ module Supply
     end
 
     def upload_obb(obb_path, expansion_file_type, apk_version_code)
-      Helper.log.info "Uploading obb file #{obb_path}..."
+      UI.message("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)

data/lib/supply/version.rb

@@ -1,4 +1,4 @@
 module Supply
-  VERSION = "0.5.2".freeze
+  VERSION = "0.5.3".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.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-29 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.35.0
+        version: 0.40.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: credentials_manager
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.38.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.38.0
 description: Command line tool for updating Android apps and their metadata on the
   Google Play Store
 email: