deliver 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9074ee087705d2000cc56a2baa077e9361bb0506
-  data.tar.gz: 7fa2d77af3c9db33724d3c359fbe6a409dc54e05
+  metadata.gz: 730cbb7ddcff1c957d5f345f8487448ef7258c30
+  data.tar.gz: 1f8c6bed0405116fa8e0224ea9ea80cf21313411
 SHA512:
-  metadata.gz: d45c8ae078611d98ec7549f7fe11765cd74572877203812f5e462fff4877658d2460bd0f2d474ed5542b2dc5fa5c25c3a33c5ca6c934a7207349abcc77d4a6d9
-  data.tar.gz: 0ecdabdc955d80a69a0f7bc1f2e3430a3cf09de1281189e78a8513d98e39466fc26200d27f1e19690499330f8438fc7ab003186eab6b6d11bed5dfe427be1fef
+  metadata.gz: 716d790846a95f3eb33ccd1f9233a66e92a3cd47054907b62622a86094e4d6bb0d1ada51141ed2b12cf2db0e138179ef41926039da2fb1cd7cd74b8c9f818941
+  data.tar.gz: 4be310b04a8de4efec25a81c9f0c18adb4f32c741a644a13e79dede102da51d64e6ba5504bf5f9b60f17ac122f5a4c3f3e2c415b41915f412054d8d1f21df8b6

data/README.md

@@ -180,6 +180,12 @@ ipa do
 end
 ```
 
+#### Hide the iTunes Transporter log
+By default, the transporter log is shown, to be fully transparent. If you prefer to hide it, you can use the following option in your ```Deliverfile``` to disable it for both the upload and the download of metadata:
+```ruby
+hide_transporter_log
+```
+
 ##### What is the ```Deliverfile```?
 As you can see, the ```Deliverfile``` is a normal Ruby file, which is executed when
 running a deployment. Therefore it's possible to fully customise the behaviour

data/lib/assets/DeliverfileDefault

@@ -2,6 +2,8 @@
 # Everything next to a # is a comment and will be ignored
 
 email '[[EMAIL]]'
+# hide_transporter_output # remove the '#' in the beginning of the line, to hide the output while uploading
+
 
 ########################################
 # App Metadata

data/lib/assets/DeliverfileExample

@@ -8,6 +8,7 @@
 # Everything next to a # is a comment and will be ignored
 
 email "yourappleid@company.com"
+# hide_transporter_output # remove the '#' in the beginning of the line, to hide the output while uploading
 
 ########################################
 # App Metadata

data/lib/deliver/app_metadata.rb

@@ -53,7 +53,7 @@ module Deliver
         if redownload_package
           # Delete the one that may exists already
           unless Helper.is_test?
-            `rm -fr #{dir}/*.itmsp`
+            `rm -rf #{dir}/*.itmsp`
           end
 
           # we want to update the metadata, so first we have to download the existing one

data/lib/deliver/deliver_process.rb

@@ -150,12 +150,12 @@ module Deliver
       screens_path = @deploy_information[Deliverer::ValKey::SCREENSHOTS_PATH]
       
       # Check if there is a Snapfile
-      if File.exists?('./Snapfile')
+      if File.exists?('./Snapfile') and not screens_path
 
         Helper.log.info("Found a Snapfile, using it to create new screenshots.".green)
         begin
           Snapshot::Runner.new.work
-          @app.metadata.set_all_screenshots_from_path(screens_path) if screens_path
+          Helper.log.info("Looking for screenshots in './screenshots'.".yellow)
           @app.metadata.set_all_screenshots_from_path('./screenshots')
         rescue Exception => ex
           # There were some UI Automation errors
@@ -163,6 +163,9 @@ module Deliver
         end
 
       elsif screens_path
+        if File.exists?('./Snapfile')
+          Helper.log.info("Found a Snapfile. Ignoring it. If you want 'deliver' to automatically take new screenshots for you, remove 'screenshots_path' from your 'Deliverfile'.".yellow)
+        end
         # Not using Snapfile. Not a good user.
         if not @app.metadata.set_all_screenshots_from_path(screens_path)
           # This path does not contain folders for each language

data/lib/deliver/deliverfile/dsl.rb

@@ -107,6 +107,11 @@ module Deliver
           PasswordManager.shared_manager(value)
         end
 
+        # This will hide the output of the iTunes Connect transporter while uploading/downloading
+        def hide_transporter_log
+          ItunesTransporter.hide_transporter_output
+        end
+
         # Set the apps new version number.
         # 
         # If you do not set this, it will automatically being fetched from the 

data/lib/deliver/ipa_uploader.rb

@@ -71,6 +71,8 @@ module Deliver
 
       if is_okay
         unless Helper.is_test?
+          `rm -rf ./#{@app.apple_id}.itmsp` # we don't need that any more
+
           return publish_on_itunes_connect(submit_information)
         end
       end

data/lib/deliver/itunes_connect.rb

@@ -90,9 +90,16 @@ module Deliver
         fill_in "accountpassword", with: password
 
         begin
-          wait_for_elements(".enabled").first.click
-          wait_for_elements('.ng-scope.managedWidth')
-        rescue
+          (wait_for_elements(".enabled").first.click rescue nil) # Login Button
+          wait_for_elements('.homepageWrapper.ng-scope')
+          
+          if page.has_content?"My Apps"
+            # Everything looks good
+          else
+            raise ItunesConnectLoginError.new("Looks like your login data was correct, but you do not have access to the apps.")
+          end
+        rescue Exception => ex
+          Helper.log.debug(ex)
           raise ItunesConnectLoginError.new("Error logging in user #{user} with the given password. Make sure you entered them correctly.")
         end
 

data/lib/deliver/itunes_transporter.rb

@@ -1,5 +1,5 @@
 require 'pty'
-
+require 'shellwords'
 require 'deliver/password_manager'
 
 
@@ -18,6 +18,11 @@ module Deliver
     OUTPUT_REGEX = />\s+(.+)/
 
     private_constant :ERROR_REGEX, :WARNING_REGEX, :OUTPUT_REGEX
+
+    # This will be called from the Deliverfile, and disables the logging of the transpoter output
+    def self.hide_transporter_output
+      @@hide_transporter_output = true
+    end
     
     # Returns a new instance of the iTunesTranspoter.
     # If no username or password given, it will be taken from
@@ -43,8 +48,10 @@ module Deliver
 
       result = execute_transporter(command)
 
-      if result
+      if result and File.directory?"/tmp/#{app.apple_id}.itmsp"
         Helper.log.info "Successfully downloaded the latest package from iTunesConnect.".green
+      else
+        Helper.log.fatal "Could not download metadata from iTunes Connect. Do you have special characters in your password (Like ' or \")?"
       end
 
       result
@@ -80,6 +87,13 @@ module Deliver
         @errors = []
         @warnings = []
 
+        if defined?@@hide_transporter_output
+          # Show a one time message instead
+          Helper.log.info "Waiting for iTunes Connect transpoter to be finished.".green
+          Helper.log.info "If you want upload/download logs to be enabled, remove 'hide_transporter_log' from your Deliverfile."
+          Helper.log.info "In progress...".green
+        end
+
         begin
           PTY.spawn(command) do |stdin, stdout, pid|
             stdin.each do |line|
@@ -119,7 +133,7 @@ module Deliver
           @warnings << $1
         end
 
-        if line =~ OUTPUT_REGEX
+        if not defined?@@hide_transporter_output and line =~ OUTPUT_REGEX
           # General logging for debug purposes
           Helper.log.debug "[Transpoter Output]: #{$1}"
         end
@@ -147,7 +161,7 @@ module Deliver
       end
 
       def escaped_password(password)
-        password.gsub('$', '\\$')
+        Shellwords.escape(password)
       end
 
   end

data/lib/deliver/pdf_generator.rb

@@ -8,10 +8,23 @@ module Deliver
     # @param export_path (String) The path to a folder where the resulting PDF file should be stored. 
     def render(deliverer, export_path = nil)
       export_path ||= '/tmp'
+      fontdir = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'fonts'))
       
       resulting_path = "#{export_path}/#{Time.now.to_i}.pdf"
       Prawn::Document.generate(resulting_path) do
 
+  
+        # Adding Mona to handle Japanese. The Prawn docs say not to use the included Kai font so we're
+        # using this 3rd-party font instead.
+        
+        font_families["Mona"] = {
+          :normal => { :file => "#{fontdir}/mona.ttf", :font => "Mona" }
+        }
+        
+        pdf_fallback_fonts = [ "Mona" ]
+
+        font "Helvetica" # Set main document font
+
         counter = 0
         deliverer.app.metadata.information.each do |language, content|
           title = content[:title][:value] rescue ''
@@ -19,7 +32,7 @@ module Deliver
           Helper.log.info("[PDF] Exporting locale '#{language}' for app with title '#{title}'")
 
           font_size 20
-          text "#{language}: #{title}"
+          text "#{language}: #{title}", :fallback_fonts => pdf_fallback_fonts
           stroke_horizontal_rule
           font_size 14
 
@@ -33,15 +46,15 @@ module Deliver
           # Description on right side
           bounding_box([col1, cursor], width: 340.0) do
             if content[:description] and content[:description][:value]
-              text content[:description][:value], size: 6, color: (content[:description][:modified] ? modified_color : standard_color)
+              text content[:description][:value], size: 6, color: (content[:description][:modified] ? modified_color : standard_color), :fallback_fonts => pdf_fallback_fonts
             end
             move_down 10
             stroke_horizontal_rule
             move_down 10
-            text "Changelog:", size: 8
+            text "Changelog:", size: 8, :fallback_fonts => pdf_fallback_fonts
             move_down 5
             if content[:version_whats_new] and content[:version_whats_new][:value]
-              text content[:version_whats_new][:value], size: 6, color: (content[:version_whats_new][:modified] ? modified_color : standard_color)
+              text content[:version_whats_new][:value], size: 6, color: (content[:version_whats_new][:modified] ? modified_color : standard_color), :fallback_fonts => pdf_fallback_fonts
             end
           end
           title_bottom = cursor.to_f
@@ -63,20 +76,20 @@ module Deliver
 
               if value.kind_of?Array
                 # Keywords only
-                text "#{key}:", color: color, width: width, size: size
+                text "#{key}:", color: color, width: width, size: size, :fallback_fonts => pdf_fallback_fonts
                 move_down 2
 
                 keywords_padding_left = 5
                 bounding_box([keywords_padding_left, cursor], width: (col1 - keywords_padding_left)) do
                   value.each do |item|
-                    text "- #{item}", color: color, width: width, size: (size - 2)
+                    text "- #{item}", color: color, width: width, size: (size - 2), :fallback_fonts => pdf_fallback_fonts
                   end
                 end
               else
                 # Everything else
                 next if value == nil or value.length == 0
                 
-                text "#{key}: #{value}", color: color, width: width, size: size
+                text "#{key}: #{value}", color: color, width: width, size: size, :fallback_fonts => pdf_fallback_fonts
               end
             end
           end
@@ -90,26 +103,29 @@ module Deliver
           move_cursor_to top
           
           if (content[:screenshots] || []).count > 0
-            content[:screenshots].sort_by { |a| [:screen_size, :path] }.each do |screenshot|
+            content[:screenshots].sort{ |a, b| [a.screen_size, a.path] <=> [b.screen_size, b.path] }.each do |screenshot|
               
               if last_size and last_size != screenshot.screen_size
                 # Next row (other simulator size)
                 top -= (previous_image_height + padding)
                 move_cursor_to top
                 
-                if top < previous_image_height
-                  start_new_page
-                  top = cursor
-                end
-                
                 index = 0
               end
 
+              # Compute the image height to know how far to move down
+              original_size = FastImage.size(screenshot.path)
+              previous_image_height = (image_width.to_f / original_size[0].to_f) * original_size[1].to_f
+
+              # If there isn't enough room for this image then start a new page
+              if top < previous_image_height
+                start_new_page
+                top = cursor
+              end
+
               image screenshot.path, width: image_width, 
                                         at: [(index * (image_width + padding)), top]
 
-              original_size = FastImage.size(screenshot.path)
-              previous_image_height = (image_width.to_f / original_size[0].to_f) * original_size[1].to_f
 
               last_size = screenshot.screen_size
               index += 1

data/lib/deliver/version.rb

@@ -1,3 +1,3 @@
 module Deliver
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -309,6 +309,7 @@ files:
 - lib/assets/DeliverfileDefault
 - lib/assets/DeliverfileExample
 - lib/assets/ScreenshotsHelp
+- lib/assets/fonts/mona.ttf
 - lib/deliver.rb
 - lib/deliver/app.rb
 - lib/deliver/app_metadata.rb