deliver 0.9.0.pre → 0.9.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6e5f3897f71270754b2dd165acad1d32d5f5788
-  data.tar.gz: 1411d0ca22a4f1b27670ae4e8483306b8b6e0a3b
+  metadata.gz: cbb3cf4785750f0e7da41a6e530de252562c5ebb
+  data.tar.gz: 0c9586db31a2f63b1b747c705f2d041ae443ea5f
 SHA512:
-  metadata.gz: e2f787905aeb6501555f8bf4a8e3b8f54cc48bb2c0e5e09b08090b36ce070e4ba33faa5136d42dd510b54a172d80d81a2428292194bc2e35897b9f1e9208d767
-  data.tar.gz: 4488184db0658cf289a600cb8eb578caba39803041f5f90ba984f81d1bfea0c5820294fb3576f7d839109e251ec026715256432ffb11a914b6505f5d15d944ba
+  metadata.gz: 9f9fe6e20a9951fd3e4a1485d7fac7472b4bbba87da747deb7a812c1bb522bdda4a234ca74f99b232a34689b080c6abb0d56e25278952233208a5ce9280ca895
+  data.tar.gz: e9cdc4647a9eccea4b9e9f531315c7d069c5d156b094485c43d0ea7a0cfdf54d6be9b643f6eaeafd65133b36f77d5e088ba0c851fdaf664dda49189a7edaf973

data/README.md

@@ -168,6 +168,10 @@ To let the computer create the screenshots for you, checkout [this section of th
 
 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/).
 
+#### 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
@@ -185,6 +189,8 @@ If you wish to skip automated submission to review you can provide `--skip-deplo
 
 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`
@@ -218,24 +224,6 @@ error do |information|
 end
 ```
 
-
-#### Set a default language if you only maintain one language
-```ruby
-default_language "en-US"
-version "1.2"
-
-title "Only English Title"
-```
-If you do not pass an ipa file, you have to specify the app version you want to edit.
-
-#### Update the app's keywords
-```ruby
-default_language "de-DE"
-version "1.2"
-
-keywords ["keyword1", "something", "else"]
-```
-
 #### Read content from somewhere external (file, web service, ...)
 ```ruby
 description({
@@ -275,8 +263,9 @@ All available commands with a short description can be found in [Deliverfile.md]
 - 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 on your server
-- Many more things, be creative and let me know :)
+- 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:

data/bin/deliver

@@ -46,9 +46,12 @@ class FastlaneApplication
 
     command :init do |c|
       c.syntax = 'deliver init'
+      c.option '-u', '--username String', String, 'Your Apple ID'
       c.description = "Creates a new Deliverfile in the current directory"
 
       c.action do |args, options|
+        set_username(options.username)
+
         path = (Deliver::Helper.fastlane_enabled?? './fastlane' : '.')
         Deliver::DeliverfileCreator.create(path)
       end

data/lib/assets/DeliverfileDefault

@@ -1,65 +1,30 @@
-# For more information visit the GitHub documentation: https://github.com/krausefx/deliver
-# Everything next to a # is a comment and will be ignored
+###################### App Metadata ######################
+# Update the app description and metadata in the ./metadata folder
 
-# hide_transporter_output # remove the '#' in the beginning of the line, to hide the output while uploading
+###################### 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.ip'
 
-########################################
-# App Metadata
-########################################
+# to provide an ipa file for TestFlight distribution, use beta_ipa 
+# beta_ipa './app.ip'
 
+# The version of your app - remove this if you provide an ipa file
+version "[[APP_VERSION]]"
 
-# This folder has to include one folder for each language
-# More information about automatic screenshot upload: 
-# https://github.com/KrauseFx/deliver#upload-screenshots-to-itunes-connect
-screenshots_path "./screenshots/"
+###################### More Options ######################
+# If you want to have even more control, check out the documentation
+# https://github.com/KrauseFx/deliver/blob/master/Deliverfile.md
 
 
-# More information about all available options: https://github.com/KrauseFx/deliver/blob/master/Deliverfile.md
+###################### Automatically generated ######################
+# Feel free to remove the following lines if you use fastlane
 
-# Both lines are optional if you want to remove them:
-app_identifier "[[APP_IDENTIFIER]]"
+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
-
-# version "1.2" # you can pass this if you want to verify the version number with the ipa file
-
-# To update the app's description, changelog, etc. or to avoid updating it using deliver, edit the files in ./metadata/[language]
-
-########################################
-# Building and Testing
-########################################
-
-# For fastlane users:
-# you can remove all code below if you're using fastlane!
-
-# Remove the whole block if you do not want to upload an ipa file
-ipa do
-    # Add any code you want, like incrementing the build 
-    # number or changing the app identifier
-
-    # Attention: When you return a valid ipa file, this file will get uploaded and released
-    # If you only want to upload app metadata, remove the complete ipa block.
-
-    # system("ipa build --verbose") # build your project using Shenzhen
-    
-    "./[[APP_NAME]].ipa" # Tell 'Deliver' where it can find the finished ipa file
-end
-
-# ipa "./latest.ipa" # this can be used instead of the `do` block, if you prefer manually building the ipa file
-
-# beta_ipa do
-    # system("ipa build --verbose") # customize this to build beta version
-    # "./ad_hoc_build.ipa" # upload ipa file using `deliver --beta`
-# end
-
-# unit_tests do
-#   If you use fastlane (http://github.com/krausefx/fastlane), run the tests there
-#   system("xctool test")
-# end
-
-success do
-  # system("say 'Successfully deployed a new version.'")
-end
-
-# More information about all available options: https://github.com/KrauseFx/deliver/blob/master/Deliverfile.md
+email "[[EMAIL]]" # the login email address

data/lib/assets/DeliverfileExample

@@ -1,26 +1,4 @@
-# This is the example Deliverfile
-# For more information about each property, visit the GitHub documentation: https://github.com/krausefx/deliver
-# 
-# You can remove those parts you don't need
-# 
-# A list of available language codes can be found here: https://github.com/krausefx/deliver#available-language-codes
-# 
-# Everything next to a # is a comment and will be ignored
-
-# hide_transporter_output # remove the '#' in the beginning of the line, to hide the output while uploading
-
-########################################
-# App Metadata
-########################################
-
-
-# This folder has to include one folder for each language
-# More information about automatic screenshot upload: 
-# https://github.com/KrauseFx/deliver#upload-screenshots-to-itunes-connect
-screenshots_path "./screenshots"
-
-
-# version "1.2" # you can pass this if you want to verify the version number with the ipa file
+###################### App Metadata ######################
 # 
 # title({
 #   "en-US" => "Your App Name"
@@ -29,42 +7,32 @@ screenshots_path "./screenshots"
 # changelog({
 #   "en-US" => "iPhone 6 (Plus) Support" 
 # })
+# More options: https://github.com/KrauseFx/deliver/blob/master/Deliverfile.md
 
+###################### 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.ip'
 
-########################################
-# Building and Testing
-########################################
-
-# For fastlane users:
-# you can remove all code below if you're using fastlane!
-
-
-# Remove the whole block if you do not want to upload an ipa file
-ipa do
-    # Add any code you want, like incrementing the build 
-    # number or changing the app identifier
-
-    # Attention: When you return a valid ipa file, this file will get uploaded and released
-    # If you only want to upload app metadata, remove the complete ipa block.
-
-    # system("ipa build --verbose") # build your project using Shenzhen
+# to provide an ipa file for TestFlight distribution, use beta_ipa 
+# beta_ipa './app.ip'
 
-    "./[[APP_NAME]].ipa" # Tell 'Deliver' where it can find the finished ipa file
-end
+# The version of your app - remove this if you provide an ipa file
+version "[[APP_VERSION]]"
 
-# ipa "./latest.ipa" # this can be used instead of the `do` block, if you prefer manually building the ipa file
+###################### More Options ######################
+# If you want to have even more control, check out the documentation
+# https://github.com/KrauseFx/deliver/blob/master/Deliverfile.md
 
-# beta_ipa do
-    # system("ipa build --verbose") # customize this to build beta version
-    # "./ad_hoc_build.ipa" # upload ipa file using `deliver --beta`
-# end
 
-# unit_tests do
-#   If you use fastlane (http://github.com/krausefx/fastlane), run the tests there
-#   system("xctool test")
-# end
+###################### Automatically generated ######################
+# Feel free to remove the following lines if you use fastlane
 
-success do
-  # system("say 'Successfully deployed a new version.'")
-end
+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

data/lib/deliver/deliver_process.rb

@@ -219,6 +219,8 @@ module Deliver
         Helper.log.warn "Overwriting screenshots path from config (#{screens_path}) with (#{ENV["DELIVER_SCREENSHOTS_PATH"]})".yellow
         screens_path = ENV["DELIVER_SCREENSHOTS_PATH"]
       end
+
+      screens_path ||= "./screenshots/" # default value
       
       if screens_path
         # Not using Snapfile. Not a good user.

data/lib/deliver/deliverfile/deliverfile_creator.rb

@@ -57,9 +57,11 @@ module Deliver
       app = Deliver::App.new(app_identifier: identifier)
       app.set_metadata_directory("/tmp") # we don't want to pollute the current folder
       app.metadata # this will download the latest app metadata
+
+      version_number = app.metadata.fetch_value("//x:version").first["string"] # fetch the latest app version
       
       file_path = File.join(deliver_path, Deliver::Deliverfile::Deliverfile::FILE_NAME)
-      json = generate_deliver_file(app, deliver_path, project_name)
+      json = generate_deliver_file(app, deliver_path, project_name, version_number)
       File.write(file_path, json)
 
       FileUtils.mkdir_p File.join(deliver_path, 'screenshots')
@@ -81,7 +83,7 @@ module Deliver
     private
       # This method takes care of creating a new 'deliver' folder, containg the app metadata 
       # and screenshots folders
-      def self.generate_deliver_file(app, path, project_name)
+      def self.generate_deliver_file(app, path, project_name, version_number)
         FileUtils.mkdir_p path rescue nil # never mind if it's already there
 
         json = create_json_based_on_xml(app, path)
@@ -107,6 +109,7 @@ module Deliver
         deliver.gsub!("[[APP_NAME]]", project_name)
         deliver.gsub!("[[APPLE_ID]]", app.apple_id.to_s)
         deliver.gsub!("[[EMAIL]]", CredentialsManager::PasswordManager.shared_manager.username)
+        deliver.gsub!("[[APP_VERSION]]", version_number)
 
         return deliver
       end

data/lib/deliver/version.rb

@@ -1,3 +1,3 @@
 module Deliver
-  VERSION = "0.9.0.pre"
+  VERSION = "0.9.0.pre2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre
+  version: 0.9.0.pre2
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core