deliver 1.10.2 → 1.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6882be5a147bd9ff07a20994c06e85526ff9998c
-  data.tar.gz: 76e61ff854160c9a1f0880ee2fde93a385ac7d80
+  metadata.gz: f742e0172af5093251ba6cb860c304a0a8f010a3
+  data.tar.gz: f70c146c288830f8a0034199c2a6b9a687177c3f
 SHA512:
-  metadata.gz: 46c8abdf42198abc197e60c93f8694c45763a6fcc17516d71fd210b130bf54cd56f80cab631b4e3e3ec62976e89d19d9f8e73515ff9343187ce37676f1c9ab4c
-  data.tar.gz: 21baa62dc0269bf44414f487b41127f7d1a2dd573a6c4dbf76ef1d0a902d4b2200cefd2700f0c6abdc5bc12e0d66fb8de89d97cb6921da117e761fbb6aa43152
+  metadata.gz: bd96e4c87c94f82c5d2e71017f637c89092bbac3d9cd8fe62a4aebfedd498a93f2753bb815f77e70fbfa1f0c6435c25de9cc01c222fb05eb24c0a890f48e973d
+  data.tar.gz: bca1d1f32e7ec26854436c6a29ed46cd79699429cd1879eff5329d07079fd6544c3f9825ef5421aae7b04803b572bf0e11dbb425505ffa5ef9eb0f040df5fecf

data/lib/deliver/commands_generator.rb

@@ -65,7 +65,7 @@ module Deliver
         c.description = 'Create the initial `deliver` configuration based on an existing app'
         c.action do |args, options|
           if File.exist?("Deliverfile") or File.exist?("fastlane/Deliverfile")
-            Ui.important("You already got a running deliver setup in this directory")
+            UI.important("You already got a running deliver setup in this directory")
             return 0
           end
 
@@ -97,7 +97,8 @@ module Deliver
           options = FastlaneCore::Configuration.create(Deliver::Options.available_options, options.__hash__)
           options.load_configuration_file("Deliverfile")
           Deliver::Runner.new(options) # to login...
-          path = options[:screenshots_path] || (FastlaneCore::Helper.fastlane_enabled? ? './fastlane' : '.')
+          containing = FastlaneCore::Helper.fastlane_enabled? ? './fastlane' : '.'
+          path = options[:screenshots_path] || File.join(containing, 'screenshots')
           Deliver::DownloadScreenshots.run(options, path)
         end
       end
@@ -110,9 +111,10 @@ module Deliver
           options = FastlaneCore::Configuration.create(Deliver::Options.available_options, options.__hash__)
           options.load_configuration_file("Deliverfile")
           Deliver::Runner.new(options) # to login...
-          path = options[:metadata_path] || (FastlaneCore::Helper.fastlane_enabled? ? './fastlane' : '.')
+          containing = FastlaneCore::Helper.fastlane_enabled? ? './fastlane' : '.'
+          path = options[:metadata_path] || File.join(containing, 'metadata')
           res = ENV["DELIVER_FORCE_OVERWRITE"]
-          res ||= UI.confirm("Do you want to overwrite existing metadata on path '#{File.expand_path(path)}/metadata'?")
+          res ||= UI.confirm("Do you want to overwrite existing metadata on path '#{File.expand_path(path)}'?")
           if res
             require 'deliver/setup'
             v = options[:app].latest_version

data/lib/deliver/download_screenshots.rb

@@ -23,9 +23,9 @@ module Deliver
           # If the screen shot is for an appleTV we need to store it in a way that we'll know it's an appleTV
           # screen shot later as the screen size is the same as an iPhone 6 Plus in landscape.
           if screenshot.device_type == "appleTV"
-            containing_folder = File.join(folder_path, "screenshots", "appleTV", screenshot.language)
+            containing_folder = File.join(folder_path, "appleTV", screenshot.language)
           else
-            containing_folder = File.join(folder_path, "screenshots", screenshot.language)
+            containing_folder = File.join(folder_path, screenshot.language)
           end
 
           begin

data/lib/deliver/runner.rb

@@ -79,7 +79,8 @@ module Deliver
       end
 
       transporter = FastlaneCore::ItunesTransporter.new(options[:username])
-      transporter.upload(options[:app].apple_id, package_path)
+      result = transporter.upload(options[:app].apple_id, package_path)
+      UI.user_error!("Could not upload binary to iTunes Connect. Check out the error above") unless result
     end
 
     def submit_for_review

data/lib/deliver/setup.rb

@@ -23,7 +23,7 @@ module Deliver
     # and screenshots folders
     def generate_deliver_file(deliver_path, options)
       v = options[:app].latest_version
-      generate_metadata_files(v, deliver_path)
+      generate_metadata_files(v, File.join(deliver_path, 'metadata'))
 
       # Generate the final Deliverfile here
       gem_path = Helper.gem_path('deliver')
@@ -33,9 +33,8 @@ module Deliver
       return deliver
     end
 
-    def generate_metadata_files(v, deliver_path)
+    def generate_metadata_files(v, path)
       app_details = v.application.details
-      containing = File.join(deliver_path, 'metadata')
 
       # All the localised metadata
       (UploadMetadata::LOCALISED_VERSION_VALUES + UploadMetadata::LOCALISED_APP_VALUES).each do |key|
@@ -46,7 +45,7 @@ module Deliver
             content = app_details.send(key)[language]
           end
 
-          resulting_path = File.join(containing, language, "#{key}.txt")
+          resulting_path = File.join(path, language, "#{key}.txt")
           FileUtils.mkdir_p(File.expand_path('..', resulting_path))
           File.write(resulting_path, content)
           UI.message("Writing to '#{resulting_path}'")
@@ -61,7 +60,7 @@ module Deliver
           content = app_details.send(key)
         end
 
-        resulting_path = File.join(containing, "#{key}.txt")
+        resulting_path = File.join(path, "#{key}.txt")
         File.write(resulting_path, content)
         UI.message("Writing to '#{resulting_path}'")
       end
@@ -70,8 +69,9 @@ module Deliver
     end
 
     def download_screenshots(deliver_path, options)
-      FileUtils.mkdir_p(File.join(deliver_path, 'screenshots'))
-      Deliver::DownloadScreenshots.run(options, deliver_path)
+      path = File.join(deliver_path, 'screenshots')
+      FileUtils.mkdir_p(path)
+      Deliver::DownloadScreenshots.run(options, path)
     end
   end
 end

data/lib/deliver/version.rb

@@ -1,4 +1,4 @@
 module Deliver
-  VERSION = "1.10.2"
+  VERSION = "1.10.3"
   DESCRIPTION = 'Upload screenshots, metadata and your app to the App Store using a single command'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.3
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: Upload screenshots, metadata and your app to the App Store using a single