RubyGems - deliver - Versions diffs - 0.9.4 → 0.10.0 - Mend

deliver 0.9.4 → 0.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

checksums.yaml +4 -4
data/README.md +9 -9
data/bin/deliver +2 -1
data/lib/assets/DeliverfileExample +4 -4
data/lib/assets/summary.html.erb +203 -0
data/lib/deliver.rb +1 -3
data/lib/deliver/deliver_process.rb +5 -5
data/lib/deliver/html_generator.rb +21 -0
data/lib/deliver/version.rb +1 -1
metadata +6 -5
data/lib/deliver/pdf_generator.rb +0 -150

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78781d3546c4cd7b835bcabed42d5e01dbff9e8a
-  data.tar.gz: a1ddcc47275a59cb5053a801ab0c814848b87dc5
+  metadata.gz: 2a3a8eed44f8084c64b1f4947a3e5c6158fb0582
+  data.tar.gz: 0d6a5d848a43ccac5c447a8f0f5b627615a4953d
 SHA512:
-  metadata.gz: a1fbd7b9ed4c7d395df12956ebc2be46ae617b6edf313273b3bb01978714eb9cd44d1a133ce8c242c2502b6445b591ddfe42a0a93356867a52babb56ce406324
-  data.tar.gz: 2bf71d1abf252de7c91f956854b9d95b817e439e9bf6cc25df0a86fbe371d3e3083c216d4483a41d597e28be0428a66f07032214a8b606a334a5a333fa914f38
+  metadata.gz: 405185ddfcf48f78757938756dc8391dfa484a88b613629a4c4fa5d9035555583bcfe6deb7307c5907303378e8883a749c8a39e2a72e1d87808efad846fb9f78
+  data.tar.gz: 9b20f456befe9309d76efe6d88c884264c51f6cc58fbf957775f2dc4a298948d56268e3f2430016b7c83e432de18d0fda2d2c30ab06efc770c045dbfcf5b9150

data/README.md CHANGED Viewed

@@ -182,10 +182,10 @@ ipa do
     "./name.ipa"
 end
-changelog({
+changelog(
     "en-US" => "This update adds cool new features",
     "de-DE" => "Dieses Update ist super"
-})
+)
 ```
 If you wish to skip automated submission to review you can provide `--skip-deploy` option when calling `deliver`. This will upload the ipa file and app metadata, but will not submit the app for review.
@@ -199,8 +199,8 @@ In order to upload an `.ipa` file for Apple TestFlight you need to specify `beta
 ```ruby
 beta_ipa do
-    system("ipa build")
-    "./name.ipa"
+  system("ipa build")
+  "./name.ipa"
 end
 ```
@@ -228,10 +228,10 @@ end
 #### Read content from somewhere external (file, web service, ...)
 ```ruby
-description({
-    "en-US" => File.read("description-en.txt")
-    "de-DE" => open("http://example.com/app_description.txt").read
-})
+description(
+  "en-US" => File.read("description-en.txt")
+  "de-DE" => open("http://example.com/app_description.txt").read
+)
 ```
 #### Build and sign the app
@@ -278,7 +278,7 @@ app = Deliver::App.new(app_identifier: 'com.krausefx.app')
 app.get_app_status # => Waiting for Review
 app.create_new_version!("1.4")
-app.metadata.update_title({ "en-US" => "iPhone App Title" })
+app.metadata.update_title("en-US" => "iPhone App Title")
 app.metadata.set_all_screenshots_from_path("./screenshots")
 app.upload_metadata!
 app.itc.submit_for_review!(app)

data/bin/deliver CHANGED Viewed

@@ -16,7 +16,7 @@ class FastlaneApplication
     program :help, 'Author', 'Felix Krause <deliver@krausefx.com>'
     program :help, 'Website', 'https://fastlane.tools'
     program :help, 'GitHub', 'https://github.com/krausefx/deliver'
-    # program :help_formatter, :compact # https://github.com/commander-rb/commander/issues/12 # https://github.com/commander-rb/commander/issues/12
+    program :help_formatter, :compact
     global_option '-f', '--force', 'Runs a deployment without verifying any information (PDF file). This can be used for build servers.'
     global_option '--beta', 'Upload a beta build to iTunes Connect. This uses the `beta_ipa` block.'
@@ -101,6 +101,7 @@ end
 begin
   FastlaneCore::UpdateChecker.start_looking_for_update('deliver')
+  Deliver::DependencyChecker.check_dependencies
   FastlaneApplication.new.run
 ensure
   FastlaneCore::UpdateChecker.show_update_status('deliver', Deliver::VERSION)

data/lib/assets/DeliverfileExample CHANGED Viewed

@@ -1,12 +1,12 @@
 ###################### App Metadata ######################
 #
-# title({
+# title(
 #   "en-US" => "Your App Name"
-# })
+# )
 #
-# changelog({
+# changelog(
 #   "en-US" => "iPhone 6 (Plus) Support"
-# })
+# )
 # More options: https://github.com/KrauseFx/deliver/blob/master/Deliverfile.md
 ###################### Screenshots ######################

data/lib/assets/summary.html.erb ADDED Viewed

@@ -0,0 +1,203 @@
+<html>
+    <head>
+        <title>deliver - <%= @data['en-US'][:title][:value] rescue @data.values.first[:title][:value] %></title>
+        <meta http-equiv="content-type" content="text/html; charset=UTF-16">
+        <style>
+          #app-name {
+              font-size: 42px;
+              font-family: 'Helvetica Neue', HelveticaNeue, Helvetica Neue;
+              font-weight: 300;
+              margin-top: 22px;
+              margin-left: 25px;
+              margin-right: 25px;
+          }
+          #app-urls {
+              margin-left: 25px;
+              font-size: 14px;
+              margin-top: 4px;
+              margin-right: 25px;
+          }
+          body {
+              font-family: 'Helvetica Neue', HelveticaNeue;
+          }
+          hr {
+            margin-top: 40px;
+            margin-bottom: 40px;
+          }
+          .app-url-descr {
+              height:22px;
+              display: inline-block;
+              font-weight: 500;
+          }
+          .app-url {
+              color: #0056ba;
+              font-weight: 300;
+              margin-right: 10px;
+          }
+          #app-keyword {
+              margin-left: 25px;
+              margin-right: 25px;
+              margin-top: 22px;
+          }
+          .cat-headline {
+              font-weight: 700;
+              margin-bottom: 5px;
+          }
+          #app-description {
+              margin-left: 25px;
+              margin-right: 25px;
+              margin-top: 22px;
+          }
+          #app-description-text {
+              font-weight: 300;
+          }
+          #app-changelog {
+              margin-left: 25px;
+              margin-right: 25px;
+              margin-top: 22px;
+          }
+          #app-screenshots {
+              margin-left: 15px;
+              margin-right: 15px;
+              margin-top: 22px;
+          }
+          .app-keyword-list {
+              font-weight: 300;
+          }
+          .app-changelog-list {
+              list-style-type: square;
+              font-weight: 300;
+          }
+          ul {
+              margin-top: 6px;
+          }
+          .app-screenshot-row {
+              width: 100%;
+              margin-top: 10px;
+              margin-bottom: 10px;
+          }
+          .app-screenshot {
+              width: calc(20% - 30px);
+              margin-left: 10px;
+              margin-right: 10px;
+          }
+          #app-screenshots .cat-headline {
+              margin-left: 10px;
+              margin-right: 10px;
+          }
+          /*for highlighting a changed value*/
+          .modified {
+              color: #0056ba;
+          }
+        </style>
+    </head>
+    <%
+      def modified?(val)
+        "modified" if (val and val[:modified] == true)
+      end
+    %>
+    <body>
+      <% @data.each do |language, content| %>
+        <div id="app-name" class="<%= modified?(content[:title]) %>">
+          <%= language %>: <%= content[:title][:value] %>
+        </div>
+        <div id="app-urls">
+          <% all_keys = [:support_url, :privacy_url, :software_url] %>
+          <% all_keys.each do |key| %>
+            <% value = content[key][:value] rescue nil %>
+            <% if value %>
+              <div class="app-url-descr <%= modified?(content[key]) %>">
+                <%= key %>: <a target="_blank" class="app-url" href="<%= value %>"><%= value %></a>
+              </div>
+            <% end %>
+          <% end %>
+        </div>
+        <div id="app-keyword" class="<%= modified?(content[:keywords]) %>">
+            <div class="cat-headline">Keywords</div>
+            <ul class="app-keyword-list">
+              <% (content[:keywords][:value] rescue []).each do |keyword| %>
+                <li><%= keyword %></li>
+              <% end %>
+            </ul>
+        </div>
+        <div id="app-description" class="<%= modified?(content[:description]) %>">
+             <div class="cat-headline">Description</div>
+             <div id="app-description-text">
+                <%= content[:description][:value].gsub("\n", "<br />") rescue nil %>
+             </div>
+        </div>
+        <div id="app-changelog" class="<%= modified?(content[:version_whats_new]) %>">
+            <div class="cat-headline">Changelog</div>
+            <%= content[:version_whats_new][:value].gsub("\n", "<br />") rescue nil %>
+        </div>
+        <div id="app-screenshots">
+          <div class="cat-headline">Screenshots</div>
+          <% if (content[:screenshots] || []).count > 0 %>
+            <% last_size = nil %>
+            <% content[:screenshots].sort{|a, b| [a.screen_size, a.path] <=> [b.screen_size, b.path]}.each do |screenshot| %>
+              <% new_row = (last_size != screenshot.screen_size or last_size == nil) %>
+              <% if new_row and last_size != nil %>
+                </div>
+              <% end %>
+              <% if new_row %>
+                <h4><%= screenshot.screen_size %></h4>
+                <div class="app-screenshot-row">
+              <% end %>
+              <a href="<%= screenshot.path %>" target="_blank"><img class="app-screenshot" src="<%= screenshot.path %>"></a>
+              <% last_size = screenshot.screen_size %>
+            <% end %>
+          <% else %>
+            <!-- no screenshots -->
+            <div style="border: 3px solid red; padding: 0px 20px">
+              <h2 style="color: red">No Screenshots Found</h2>
+              <p>
+                deliver couldn't find any screenshots. Due to a bug in iTunes Transporter this will <b>remove</b> the existing screenshots on iTunes Connect.
+              </p>
+              <p>
+                Please make sure to store your screenshots in the screenshots folder. If you want to download your existing screenshots, run <i>deliver init</i> in a different directory.
+              </p>
+            </div>
+          <% end %>
+          </div>
+        </div>
+        <hr />
+      <% end # end data %>
+    </body>
+</html>

data/lib/deliver.rb CHANGED Viewed

@@ -10,7 +10,7 @@ require 'deliver/deliverfile/deliverfile'
 require 'deliver/deliverfile/deliverfile_creator'
 require 'deliver/deliverer'
 require 'deliver/ipa_uploader'
-require 'deliver/pdf_generator'
+require 'deliver/html_generator'
 require 'deliver/deliver_process'
 require 'deliver/dependency_checker'
 require 'deliver/ipa_file_analyser'
@@ -20,6 +20,4 @@ require 'fastlane_core'
 module Deliver
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
-  Deliver::DependencyChecker.check_dependencies
 end

data/lib/deliver/deliver_process.rb CHANGED Viewed

@@ -251,21 +251,21 @@ module Deliver
       else
         # Everything is prepared for the upload
         # We may have to ask the user if that's okay
-        pdf_path = PdfGenerator.new.render(self)
+        html_path = HtmlGenerator.new.render(self)
         unless Helper.is_test?
           puts "----------------------------------------------------------------------------"
-          puts "Verifying the upload via the PDF file can be disabled by either adding"
+          puts "Verifying the upload via the HTML file can be disabled by either adding"
           puts "'skip_pdf true' to your Deliverfile or using the flag --force."
           puts "----------------------------------------------------------------------------"
-          system("open '#{pdf_path}'")
-          okay = agree("Does the PDF on path '#{pdf_path}' look okay for you? (blue = updated) (y/n)", true)
+          system("open '#{html_path}'")
+          okay = agree("Does the Preview on path '#{html_path}' look okay for you? (blue = updated) (y/n)", true)
           unless okay
             dir ||= app.get_metadata_directory
             dir += "/#{app.apple_id}.itmsp"
             FileUtils.rm_rf(dir) unless Helper.is_test?
-            raise "Did not upload the metadata, because the PDF file was rejected by the user".yellow
+            raise "Did not upload the metadata, because the HTML file was rejected by the user".yellow
           end
         end
       end

data/lib/deliver/html_generator.rb ADDED Viewed

@@ -0,0 +1,21 @@
+module Deliver
+  class HtmlGenerator
+    # Renders all data available in the Deliverer to quickly see if everything was correctly generated.
+    # @param deliverer [Deliver::Deliverer] The deliver process on which based the HTML file should be generated
+    # @param export_path (String) The path to a folder where the resulting HTML file should be stored.
+    def render(deliverer, export_path = nil)
+      lib_path = Helper.gem_path('deliver')
+      @data = deliverer.app.metadata.information
+      html_path = File.join(lib_path, "lib/assets/summary.html.erb")
+      html = ERB.new(File.read(html_path)).result(binding) # http://www.rrn.dk/rubys-erb-templating-system
+      export_path ||= ENV["DELIVER_HTML_EXPORT_PATH"] || '.' # DELIVER_HTML_EXPORT_PATH used in tests to use /tmp
+      export_path = File.join(export_path, "Preview.html")
+      File.write(export_path, html)
+      return export_path
+    end
+  end
+end

data/lib/deliver/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Deliver
-  VERSION = "0.9.4"
+  VERSION = "0.10.0"
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-03 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: credentials_manager
   requirement: !ruby/object:Gem::Requirement
@@ -237,6 +237,7 @@ files:
 - lib/assets/DeliverfileExample
 - lib/assets/ScreenshotsHelp
 - lib/assets/fonts/mona.ttf
+- lib/assets/summary.html.erb
 - lib/deliver.rb
 - lib/deliver/app.rb
 - lib/deliver/app_metadata.rb
@@ -249,6 +250,7 @@ files:
 - lib/deliver/deliverfile/deliverfile_creator.rb
 - lib/deliver/deliverfile/dsl.rb
 - lib/deliver/dependency_checker.rb
+- lib/deliver/html_generator.rb
 - lib/deliver/ipa_file_analyser.rb
 - lib/deliver/ipa_uploader.rb
 - lib/deliver/itunes_connect/itunes_connect.rb
@@ -262,7 +264,6 @@ files:
 - lib/deliver/itunes_connect/itunes_connect_submission.rb
 - lib/deliver/itunes_transporter.rb
 - lib/deliver/metadata_item.rb
-- lib/deliver/pdf_generator.rb
 - lib/deliver/testflight.rb
 - lib/deliver/version.rb
 homepage: https://fastlane.tools

data/lib/deliver/pdf_generator.rb DELETED Viewed

@@ -1,150 +0,0 @@
-require 'prawn'
-module Deliver
-  class PdfGenerator
-    # Renders all data available in the Deliverer to quickly see if everything was correctly generated.
-    # @param deliverer [Deliver::Deliverer] The deliver process on which based the PDF file should be generated
-    # @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__), '..', 'assets', '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|
-          modified_color = '0000AA'
-          standard_color = '000000'
-          title = content[:title][:value] rescue ''
-          Helper.log.info("[PDF] Exporting locale '#{language}' for app with title '#{title}'")
-          font_size 20
-          color = (content[:title][:modified] ? modified_color : standard_color rescue standard_color)
-          text "#{language}: #{title}", :fallback_fonts => pdf_fallback_fonts, color: color
-          stroke_horizontal_rule
-          font_size 14
-          move_down 30
-          col1 = 200
-          prev_cursor = cursor.to_f
-          # 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), :fallback_fonts => pdf_fallback_fonts
-            end
-            move_down 10
-            stroke_horizontal_rule
-            move_down 10
-            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), :fallback_fonts => pdf_fallback_fonts
-            end
-          end
-          title_bottom = cursor.to_f
-          move_cursor_to prev_cursor
-          all_keys = [:support_url, :privacy_url, :software_url, :keywords]
-          all_keys.each_with_index do |key, index|
-            value = content[key][:value] rescue nil
-            color = (content[key][:modified] ? modified_color : standard_color rescue standard_color)
-            bounding_box([0, cursor], width: col1) do
-              key = key.to_s.gsub('_', ' ').capitalize
-              width = 200
-              size = 10
-              if value.kind_of?Array
-                # Keywords only
-                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), :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, :fallback_fonts => pdf_fallback_fonts
-              end
-            end
-          end
-          image_width = bounds.width / 6 # wide enough for 5 portrait screenshots to fit
-          padding = 10
-          last_size = nil
-          top = [cursor, title_bottom].min - padding
-          index = 0
-          previous_image_height = 0
-          move_cursor_to top
-          if (content[:screenshots] || []).count > 0
-            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
-                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]
-              last_size = screenshot.screen_size
-              index += 1
-            end
-          else
-            move_cursor_to top
-            text "No screenshots passed. Is this correct? They will get removed from iTunesConnect."
-          end
-          counter += 1
-          if counter < deliverer.app.metadata.information.count
-            start_new_page
-          end
-        end
-      end
-      return resulting_path
-    end
-  end
-end