deliver 0.13.5 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 810ea535d013e57d9e014c67b56e847ec941a09d
-  data.tar.gz: e2ab6c805f676bb095b85c9976bee86cafe9c1aa
+  metadata.gz: ed7a41394af9241c8a2ed2f2c9c54a5f49321a6f
+  data.tar.gz: 053f44c89fc589950c6c63fa5ca33756fc3e7834
 SHA512:
-  metadata.gz: c99a1b18fb35ade7c3e6a1ecb191540e079effb943d3e11f198133cc087554b61c1be0fba73b7665825c068bb6d9dfece632056043b61cdec2efd671a9b59a55
-  data.tar.gz: 8d7c1095fde3c646a924e1a1ae3846ad01b6e291210a7a2ade6af4327ecde2894010efe564b40e3bb62b0cdbe9f1dd18bf5fd5056b226a166798120eedfa40d1
+  metadata.gz: 4223c4244c5252bddef2302e897ec5f51cdf401a565aa71d0d0cdfbf9794cd5be450511e0e3a4826d46c0a52cc8e0072f2379a6b27a8a3351e3450cc3ea07ef3
+  data.tar.gz: d07d9abac75c63994e98d3f2741901760cd77e7c8c99109f0dcc817cabec19f1f418ae8a6a6f0336cc960115e0e3ea15e49087bdc3d29c3bd9ad4eaa28b76c55

data/README.md

@@ -43,7 +43,6 @@ Get in contact with the developer on Twitter: [@KrauseFx](https://twitter.com/Kr
 -------
 <p align="center">
     <a href="#features">Features</a> &bull; 
-    <a href="#testflight">TestFlight</a> &bull; 
     <a href="#installation">Installation</a> &bull; 
     <a href="#quick-start">Quick Start</a> &bull; 
     <a href="#usage">Usage</a> &bull; 
@@ -64,7 +63,6 @@ Get in contact with the developer on Twitter: [@KrauseFx](https://twitter.com/Kr
 - Store the configuration in git to easily deploy from **any** computer, including your Continuous Integration server (e.g. Jenkins)
 - Get a PDF preview of the fetched metadata before uploading the app metadata and screenshots to Apple: [Example Preview](https://github.com/krausefx/deliver/blob/master/assets/PDFExample.png?raw=1)
 - Automatically create new screenshots with [snapshot](https://github.com/KrauseFx/snapshot)
-- Upload new builds to the new Apple TestFlight
 
 ##### [Like this tool? Be the first to know about updates and new fastlane tools](https://tinyletter.com/krausefx)
 
@@ -80,233 +78,39 @@ Make sure, you have the latest version of the Xcode command line tools installed
 
 To create new screenshots automatically, check out my other open source project [snapshot](https://github.com/KrauseFx/snapshot).
 
-# TestFlight
-
-**New**: To upload builds to TestFlight, use the new [pilot](https://github.com/fastlane/pilot) tool.
-
-Upload a new build to Apple `TestFlight` use the following command:
-
-```
-deliver testflight
-```
-
-This will automatically look for an ipa file in the current directory.
-
-`deliver` currently supports **Internal Testers** only.
-
-Make sure to increase your build number before building and uploading your app.
-
-#### More options:
-
-Specify the `ipa` file, the Apple ID and app identifier to be used: 
-
-```
-deliver testflight ./my_app.ipa -u felix@krausefx.com -a 862582703
-```
-
-To build and upload the ipa in one step, you can use [shenzhen](https://github.com/nomad/shenzhen):
-
-```
-ipa build && deliver testflight
-```
-
-You can pass the "What to Test" value using the environment variable `DELIVER_WHAT_TO_TEST`:
-
-```
-DELIVER_WHAT_TO_TEST="Try the brand new project button" deliver testflight
-```
-
-Additional environment variables: `DELIVER_BETA_DESCRIPTION`, `DELIVER_BETA_FEEDBACK_EMAIL`.
+To upload builds to TestFlight check out [pilot](https://github.com/fastlane/pilot).
 
 # Quick Start
 
-
 The guide will create all the necessary files for you, using the existing app metadata from iTunes Connect.
 
 - ```cd [your_project_folder]```
 - ```deliver init```
-- When your app is already in the App Store: ```y```
- - Enter your iTunes Connect credentials
- - Enter your app identifier
- - Enjoy a good drink, while the computer does all the work for you
-- When it's a new app: ```n```
-
-From now on, you can run ```deliver``` to deploy a new update, or just upload new app metadata and screenshots.
-
-### Customize the ```Deliverfile```
-Open the ```Deliverfile``` using a text editor and customize it even further. Take a look at the following settings:
+- Enter your iTunes Connect credentials
+- Enter your app identifier
+- Enjoy a good drink, while the computer does all the work for you
 
-- ```ipa```: You can either pass a static path to an ipa file, or add your custom build script.
-- ```unit_tests```: Uncomment the code to run tests. (e.g. using [xctool](https://github.com/facebook/xctool)). It is recommended to use [fastlane](https://fastlane.tools) for running tests.
+From now on, you can run `deliver` to deploy a new update, or just upload new app metadata and screenshots.
 
 # Usage
 
-Why should you have to remember complicated commands and parameters?
-
-Store your configuration in a text file to easily deploy from any computer.
-
-Run ```deliver init``` to create a new ```Deliverfile```. You can either let the wizard generate a file based on the metadata from iTunes Connect or create one from a template.
-
-Once you created your configuration, just run ```deliver```.
-
-All available commands with a short description can be found in [Deliverfile.md](https://github.com/KrauseFx/deliver/blob/master/Deliverfile.md).
-
-Here are a few examples:
-#### Upload screenshots to iTunes Connect
-
-Remove the rest, and use just this format for your ```Deliverfile```.
-
-```ruby
-app_identifier "net.sunapps.1"
-version "1.1"
-
-screenshots_path "./screenshots"
-```
-The screenshots folder must include one subfolder per language (see [Available language codes](#available-language-codes)).
-
-The screenshots are ordered alphabetically. The best way to sort them is to prepend a number before the actual screenshot name. You can also put Watch screenshots into this folder.
-
-To let the computer create the screenshots for you, checkout [this section of the README](#automatically-create-screenshots).
-
-If you want to have the screenshots inside a device frame, with a background and a fancy label on top, you can use [Sketch to App Store](http://sketchtoappstore.com/).
-
-To download all existing screenshots, use `deliver download_screenshots`.
-
-#### Update App description, keywords and more
-
-If you used `deliver init`, take a look at the `./metadata/` folder, which contains your app description, keywords and app title. If you change the content of the files, it will get updated when you run `deliver`.
-
-#### Upload a new ipa file with a changelog to the App Store
-This will submit a new update to Apple
-```ruby
-ipa do 
-    system("ipa build")
-    "./name.ipa"
-end
-
-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.
-
-The changelog is only used for App Store submission, not for TestFlight builds.
-
-It is recommended to use `deliver` in combination with [fastlane](https://github.com/KrauseFx/fastlane) to build the app using `xcodebuild`.
-
-#### Upload a new ipa for TestFlight beta testers
-
-In order to upload an `.ipa` file for Apple TestFlight you need to specify `beta_ipa` path in your `Deliverfile`
-
-```ruby
-beta_ipa do 
-  system("ipa build")
-  "./name.ipa"
-end
-```
-
-and provide `--beta` option when calling `deliver`. When running `deliver` with the `--beta` flag enabled, it will **not** upload new app metadata.
-
-#### Implement blocks to run unit tests
-If you're using [fastlane](http://github.com/krausefx/fastlane), run tests and error blocks there.
-
-If you only use `deliver`, you can use the following blocks:
-
-```ruby
-unit_tests do
-    system("xctool test")
-end
-
-success do
-    system("Say 'success'")
-end
-
-error do |information|
-    # custom exception handling here
-    raise "Something went wrong: #{information['error']}"    
-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
-)
-```
-
-#### Build and sign the app
-I'm using [Shenzhen](https://github.com/nomad/shenzhen), but you can use any build tool or custom scripts.
-```ruby
-ipa do
-    # Add any code you want, like incrementing the build 
-    # number or changing the app identifier
-  
-    system("ipa build --verbose") # build your project using Shenzhen
-    "./AppName.ipa" # Tell 'deliver' where it can find the finished ipa file
-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_output
-```
-
-##### 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
-on a deployment. 
-
-All available commands with a short description can be found in [Deliverfile.md](https://github.com/KrauseFx/deliver/blob/master/Deliverfile.md).
-
-**Some examples:**
-
-- Run your own unit tests or integration tests before a deploy (recommended)
-- Ask the script user for a changelog
-- Deploy a new version just by starting a Jenkins job
-- Post the deployment status on Slack
-- Upload the latest screenshots to your server
-
-For further actions, check out [fastlane](https://github.com/KrauseFx/fastlane)
-    
-#### Use the exposed Ruby classes
-Some examples:
-```ruby
-require 'deliver'
-
-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.set_all_screenshots_from_path("./screenshots")
-app.upload_metadata!
-app.itc.submit_for_review!(app)
-
-FastlaneCore::ItunesSearchApi.fetch_by_identifier("net.sunapps.15") # => Fetches public metadata
-```
-This project is well documented, check it out on [RubyDoc](http://www.rubydoc.info/github/KrauseFx/deliver/frames).
-
+TODO
 
 # Credentials
 
 A detailed description about your credentials is available on a [separate repo](https://github.com/fastlane/CredentialsManager).
 
-
 # Can I trust `deliver`? 
 ###How does this thing even work? Is magic involved? 🎩###
 
 `deliver` is fully open source, you can take a look at its source files. It will only modify the content you want to modify using the ```Deliverfile```. Your password will be stored in the Mac OS X keychain, but can also be passed using environment variables. (More information available on [CredentialsManager](https://github.com/fastlane/CredentialsManager))
 
-Before actually uploading anything to iTunes, ```deliver``` will generate a [PDF summary](https://github.com/krausefx/deliver/blob/master/assets/PDFExample.png?raw=1) of the collected data. 
+Before actually uploading anything to iTunes, ```deliver``` will generate a [HTML summary](https://github.com/krausefx/deliver/blob/master/assets/PDFExample.png?raw=1) of the collected data. 
 
 ```deliver``` uses the following techniques under the hood:
 
-- The iTMSTransporter tool is used to fetch the latest app metadata from iTunes Connect and upload the updated app metadata back to Apple. It is also used to upload the ipa file. iTMSTransporter is a command line tool provided by Apple.
-- With the iTMSTransporter you cannot create new version on iTunes Connect or actually publish the newly uploaded ipa file. This is why there is some browser scripting involved, using [Capybara](https://github.com/jnicklas/capybara) and [Poltergeist](https://github.com/teampoltergeist/poltergeist).
-- The iTunes search API to find missing information about a certain app, like the *apple_id* when you only pass the *bundle_identifier*. 
+- The iTMSTransporter tool is used to upload the binary to iTunes Connect. iTMSTransporter is a command line tool provided by Apple.
+- For all metadata related actions `deliver` uses [spaceship](https://github.com/fastlane/spaceship)
 
 # Tips
 
@@ -332,9 +136,6 @@ Before actually uploading anything to iTunes, ```deliver``` will generate a [PDF
 "da", "de-DE", "el", "en-AU", "en-CA", "en-GB", "en-US", "es-ES", "es-MX", "fi", "fr-CA", "fr-FR", "id", "it", "ja", "ko", "ms", "nl", "no", "pt-BR", "pt-PT", "ru", "sv", "th", "tr", "vi", "zh-Hans", "zh-Hant"
 ```
 
-## Use a clean status bar
-You can use [SimulatorStatusMagic](https://github.com/shinydevelopment/SimulatorStatusMagic) to clean up the status bar.
-
 ## Automatically create screenshots
 
 If you want to integrate ```deliver``` with ```snapshot```, check out [fastlane](https://github.com/KrauseFx/fastlane)!

data/bin/deliver

@@ -2,4 +2,4 @@
 $:.push File.expand_path("../../lib", __FILE__)
 
 require 'deliver'
-Deliver::CommandsGenerator.start
+Deliver::CommandsGenerator.start

data/lib/assets/DeliverfileDefault

@@ -1,30 +1,10 @@
-###################### App Metadata ######################
-# Update the app description and metadata in the ./metadata folder
-
-###################### Screenshots ######################
-# Store all screenshots in the ./screenshots folder separated
-# by language. If you use snapshot, this happens automatically
-
-###################### IPA File ######################
-# This part is only relevant, if you want to submit a new binary
-# If you don't use fastlane (https://github.com/KrauseFx/fastlane)
-# you can set the path to your ipa file using:
-# ipa "./app.ipa"
-
-# to provide an ipa file for TestFlight distribution, use beta_ipa 
-# beta_ipa "./app.ipa"
-
-# The version of your app - remove this if you provide an ipa file
-version "[[APP_VERSION]]"
-
 ###################### More Options ######################
 # If you want to have even more control, check out the documentation
 # https://github.com/KrauseFx/deliver/blob/master/Deliverfile.md
 
 
 ###################### Automatically generated ######################
-# Feel free to remove the following lines if you use fastlane
+# Feel free to remove the following line if you use fastlane (which you should)
 
 app_identifier "[[APP_IDENTIFIER]]" # The bundle identifier of your app
-apple_id "[[APPLE_ID]]" # This is NOT your Apple login ID, but the App ID of your app
-email "[[EMAIL]]" # the login email address
+username "[[USERNAME]]" # your Apple ID user

data/lib/assets/summary.html.erb

@@ -1,6 +1,6 @@
 <html>
     <head>
-        <title>deliver - <%= @data['en-US'][:title][:value] rescue @data.values.first[:title][:value] %></title>
+        <title>deliver - <%= @options[:name]["en-US"] || @options[:name].values.first %></title>
         <meta http-equiv="content-type" content="text/html; charset=UTF-16">
         <style>
           #app-name {
@@ -106,65 +106,57 @@
               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] %>
+      <% @options[:description].keys.each do |language| %>
+        <div id="app-name">
+          <%= language %>: <%= @options[:name][language] %>
         </div>
 
         <div id="app-urls">
-          <% all_keys = [:support_url, :privacy_url, :software_url] %>
+          <% all_keys = [:support_url, :marketing_url] %>
           <% all_keys.each do |key| %>
-            <% value = content[key][:value] rescue nil %>
+            <% value = @options[key][language] %>
             <% if value %>
-              <div class="app-url-descr <%= modified?(content[key]) %>">
+              <div class="app-url-descr">
                 <%= 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>
+        <% if @options[:keywords] and @options[:keywords][language] %>
+          <div id="app-keyword">
+              <div class="cat-headline">Keywords</div>
+              <ul class="app-keyword-list">
+                <% @options[:keywords][language].split(" ").each do |keyword| %>
+                  <li><%= keyword %></li>
+                <% end %>
+              </ul>
+          </div>
+        <% end %>
         
-        <div id="app-description" class="<%= modified?(content[:description]) %>">
+        <div id="app-description">
              <div class="cat-headline">Description</div>
              <div id="app-description-text">
-                <%= content[:description][:value].gsub("\n", "<br />") rescue nil %>
+                <%= (@options[:description][language] || '').gsub("\n", "<br />") %>
              </div>
         </div>
         
-        <div id="app-changelog" class="<%= modified?(content[:version_whats_new]) %>">
+        <div id="app-changelog">
             <div class="cat-headline">Changelog</div>
-            <%= content[:version_whats_new][:value].gsub("\n", "<br />") rescue nil %>
+            <%= (@options[:release_notes][language] || '').gsub("\n", "<br />") %>
         </div>
         
         <div id="app-screenshots">
           <div class="cat-headline">Screenshots</div>
 
-          <% if (content[:screenshots] || []).count > 0 %>
+          <% if @screenshots.count > 0 %>
             <% last_size = nil %>
-            <% content[:screenshots].sort{|a, b| [a.screen_size, a.path] <=> [b.screen_size, b.path]}.each do |screenshot| %>
+            <% sc = @screenshots.find_all { |s| s.language == language } %>
+            <% sc.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) %>
 
@@ -173,7 +165,7 @@
               <% end %>
 
               <% if new_row %>
-                <h4><%= screenshot.screen_size %></h4>
+                <h4><%= screenshot.formatted_name %></h4>
                 <div class="app-screenshot-row">
               <% end %>
               
@@ -186,19 +178,15 @@
             <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>
+                deliver couldn't find any screenshots. This will <b>remove</b> existing screenshots, but will also not upload any.
               <p>
                 Please make sure to store your screenshots in the screenshots folder. If you want to download your existing screenshots, run <i>deliver download_screenshots</i>.
               </p>
             </div>
           <% end %>
           </div>
-          
-        </div>
+        
         <hr />
       <% end # end data %>
     </body>
 </html>
-
-

data/lib/deliver.rb

@@ -1,24 +1,26 @@
 require 'json'
 require 'deliver/version'
-require 'deliver/app'
-require 'deliver/app_metadata'
-require 'deliver/metadata_item'
+require 'deliver/options'
+require 'deliver/commands_generator'
+require 'deliver/detect_values'
+require 'deliver/runner'
+require 'deliver/upload_metadata'
+require 'deliver/upload_screenshots'
+require 'deliver/upload_price_tier'
+require 'deliver/upload_assets'
+require 'deliver/submit_for_review'
 require 'deliver/app_screenshot'
-require 'deliver/itunes_connect/itunes_connect'
-require 'deliver/itunes_transporter'
-require 'deliver/deliverfile/deliverfile'
-require 'deliver/deliverfile/deliverfile_creator'
-require 'deliver/deliverer'
-require 'deliver/ipa_uploader'
 require 'deliver/html_generator'
-require 'deliver/deliver_process'
-require 'deliver/dependency_checker'
-require 'deliver/ipa_file_analyser'
-require 'deliver/testflight'
-require 'deliver/commands_generator'
 
+require 'spaceship'
 require 'fastlane_core'
 
+# TODO
+require 'pry'
+
 module Deliver
+  class << self
+  end
+
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
 end