deliver 0.3.7 → 0.4.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c381ff315b6f8ffd6f8bec88b530ef0b3e0bae1
-  data.tar.gz: 3406796c4b66bb14021562e09756f5ff04399192
+  metadata.gz: 37da57c3eb156d3988937f90351681ab5a21b7af
+  data.tar.gz: 99ca18165d2655ed9c71e807a704212b91787c91
 SHA512:
-  metadata.gz: 3bf1e5549b91493820f12e73d23aca9cc2ac613f089d0509006212f4a20b2da27a5f2968eff2e819c6d86b7b045120c6509af89bf5748de0ee34d03f03250b6f
-  data.tar.gz: 311fe5d0275a5c8e40e21da2c9af3dbd286f92b1760b80f6600ccc043fea49b7eb2670d9028cfd988844062afe4d1f769c2fc9034f3562178e4034240416af4d
+  metadata.gz: 3965c800ad0007c536e0acdc6f8a05c14cb1196c2b0a7ddc3b1da1ba8ffa9431f64e882b904b814cdae243bb47f802e8e70c761d28ab9cfd59f26a1f4598f593
+  data.tar.gz: 8f5d1f9748c7a945aa8ee736c9e17f851f4e06f9bfe1dfcae56a513dd7420aca52d36ba21a2b122352ec3ee15fd4b821cb817c6d8e39508d7bf4d2873068af8f

data/README.md

@@ -128,7 +128,17 @@ changelog({
     "de-DE" => "Dieses Update ist super"
 })
 ```
+If you wish to skip automated submission to review you can provide `--skip-deploy` option when calling `deliver`. 
 
+#### Upload a new ipa for TestFlight beta testers
+
+In order to upload beta `.ipa` you need to specify beta_ipa path in your `Deliverfile`
+
+```ruby
+beta_ipa "./latest.ipa"
+```
+
+and provide `--beta` option when calling `deliver`.
 
 #### Implement blocks to run unit tests
 ```ruby
@@ -169,8 +179,8 @@ keywords ["keyword1", "something", "else"]
 #### Read content from somewhere external (file, web service, ...)
 ```ruby
 description({
-    "en-US" => File.read("changelog-en.txt")
-    "de-DE" => open("http://example.com/latest-changelog.txt").read
+    "en-US" => File.read("description-en.txt")
+    "de-DE" => open("http://example.com/app_description.txt").read
 })
 ```
 
@@ -248,7 +258,7 @@ This is especially important if you have more than one iTunes Connect account in
     DELIVER_PASSWORD
     
 ## Implement your custom solution
-Take a look at [Using the exposed Ruby classes](use-the-exposed-ruby-classes).
+Take a look at [Using the exposed Ruby classes](#use-the-exposed-ruby-classes).
 
 # Can I trust *Deliver*? 
 ###How does this thing even work? Is magic involved? 🎩###
@@ -306,18 +316,9 @@ You should not deploy a new App Store update after every commit, since you still
 ## Editing the ```Deliverfile```
 Change syntax highlighting to *Ruby*.
 
-## In progress
-These are features, which are implemented, but not yet fully tested and production ready. You can try it on your own risk.
-
-#### Distribute an ipa file to your TestFlight beta testers
-```ruby
-beta_ipa "./latest.ipa"
-```
-This will upload the ipa file to iTunes Connect and mark the uploaded build as Beta build.
-
 # Need help?
 - If there is a technical problem with ```Deliver```, submit an issue. Run ```deliver --trace``` to get the stacktrace.
-- I'm available for contract work - drop me an email: deliver@felixkrause.at
+- I'm available for contract work - drop me an email: deliver@krausefx.com
 
 # License
 This project is licensed under the terms of the MIT license. See the LICENSE file.

data/lib/deliver/commands/run.rb

@@ -4,12 +4,15 @@ command :run do |c|
   c.syntax = 'deliver'
   c.description = 'Run a deploy process using the Deliverfile in the current folder'
   c.option '--force', 'Runs a deployment without verifying any information (PDF file). This can be used for build servers.'
+  c.option '--beta', 'Runs a deployment to beta build on iTunes Connect'
+  c.option '--skip-deploy', 'Skips deployment on iTunes Connect'
   c.action do |args, options|
     Deliver::DependencyChecker.check_dependencies
 
     if File.exists?(deliver_path)
       # Everything looks alright, use the given Deliverfile
-      Deliver::Deliverer.new(deliver_path, force: options.force)
+      options.default :beta => false, :skip_deploy => false
+      Deliver::Deliverer.new(deliver_path, force: options.force, is_beta_ipa: options.beta, skip_deploy: options.skip_deploy)
     else
       Deliver::Helper.log.warn("No Deliverfile found at path '#{deliver_path}'.")
       if agree("Do you want to create a new Deliverfile at the current directory? (y/n)", true)
@@ -17,4 +20,4 @@ command :run do |c|
       end
     end
   end
-end
+end

data/lib/deliver/deliver_process.rb

@@ -15,7 +15,10 @@ module Deliver
     # @return (Deliver::App) The App that is currently being edited.
     attr_accessor :app
 
-    # @return (Hash) All the updated/new information we got from the Deliverfile. 
+    # @return (Deliver::IpaUploader) The IPA uploader that is currently being used.
+    attr_accessor :ipa
+
+    # @return (Hash) All the updated/new information we got from the Deliverfile.
     #  is used to store the deploy information until the Deliverfile finished running.
     attr_accessor :deploy_information
 
@@ -28,7 +31,7 @@ module Deliver
       begin
         run_unit_tests
         fetch_information_from_ipa_file
-        
+
         Helper.log.info("Got all information needed to deploy a new update ('#{@app_version}') for app '#{@app_identifier}'")
 
         verify_ipa_file
@@ -38,7 +41,7 @@ module Deliver
         load_metadata_from_config_json_folder # the json file generated from the quick start
         set_app_metadata
         set_screenshots
-        
+
         verify_pdf_file
 
         trigger_metadata_upload
@@ -68,11 +71,23 @@ module Deliver
     def fetch_information_from_ipa_file
       @app_version = @deploy_information[Deliverer::ValKey::APP_VERSION]
       @app_identifier = @deploy_information[Deliverer::ValKey::APP_IDENTIFIER]
-      
-      used_ipa_file = @deploy_information[:ipa] || @deploy_information[:beta_ipa]
+
+      if is_release_build?
+        used_ipa_file = @deploy_information[:ipa]
+      elsif is_beta_build?
+        used_ipa_file = @deploy_information[:beta_ipa]
+      end
 
       if used_ipa_file
-        @ipa = Deliver::IpaUploader.new(Deliver::App.new, '/tmp/', used_ipa_file, is_beta_build?)
+        upload_strategy = Deliver::IPA_UPLOAD_STRATEGY_APP_STORE
+        if is_beta_build?
+          upload_strategy = Deliver::IPA_UPLOAD_STRATEGY_BETA_BUILD
+        end
+        if skip_deployment?
+          upload_strategy = Deliver::IPA_UPLOAD_STRATEGY_JUST_UPLOAD
+        end
+
+        @ipa = Deliver::IpaUploader.new(Deliver::App.new, '/tmp/', used_ipa_file, upload_strategy)
 
         # We are able to fetch some metadata directly from the ipa file
         # If they were also given in the Deliverfile, we will compare the values
@@ -84,9 +99,6 @@ module Deliver
     def verify_ipa_file
       raise Deliverfile::Deliverfile::DeliverfileDSLError.new(Deliverfile::Deliverfile::MISSING_APP_IDENTIFIER_MESSAGE.red) unless @app_identifier
       raise Deliverfile::Deliverfile::DeliverfileDSLError.new(Deliverfile::Deliverfile::MISSING_VERSION_NUMBER_MESSAGE.red) unless @app_version
-      if (@deploy_information[Deliverer::ValKey::IPA] and @deploy_information[Deliverer::ValKey::BETA_IPA])
-        raise Deliverfile::Deliverfile::DeliverfileDSLError.new("You can not set both ipa and beta_ipa in one file. Either it's a beta build or a release build".red) 
-      end
     end
 
     def create_app
@@ -95,7 +107,7 @@ module Deliver
     end
 
     def verify_app_on_itunesconnect
-      if @ipa and not is_beta_build?
+      if @ipa and is_release_build?
         # This is a real release, which should also upload the ipa file onto production
         @app.create_new_version!(@app_version) unless Helper.is_test?
         @app.metadata.verify_version(@app_version)
@@ -148,7 +160,7 @@ module Deliver
 
     def set_screenshots
       screens_path = @deploy_information[Deliverer::ValKey::SCREENSHOTS_PATH]
-      
+
       # Check if there is a Snapfile
       if File.exists?('./Snapfile') and not screens_path
 
@@ -258,8 +270,16 @@ module Deliver
         return app_version
       end
 
+      def skip_deployment?
+        @deploy_information[Deliverer::ValKey::SKIP_DEPLOY]
+      end
+
+      def is_release_build?
+        is_beta_build? == false
+      end
+
       def is_beta_build?
-        @deploy_information[Deliverer::ValKey::BETA_IPA] != nil
+          @deploy_information[Deliverer::ValKey::IS_BETA_IPA]
       end
   end
-end
+end

data/lib/deliver/deliverer.rb

@@ -1,7 +1,7 @@
 module Deliver
   # This class will collect the deploy data from different places
   # This will trigger:
-  # 
+  #
   # - Parsing the Deliverfile
   # - Temporary storing all the information got from the file, until the file finished executing
   # - Triggering the upload process itself using the DeliverProcess class
@@ -18,9 +18,11 @@ module Deliver
       APPLE_ID = :apple_id
       APP_VERSION = :version
       IPA = :ipa
-      BETA_IPA = :beta_ipa
       DESCRIPTION = :description
       TITLE = :title
+      BETA_IPA = :beta_ipa
+      IS_BETA_IPA = :is_beta_ipa
+      SKIP_DEPLOY = :skip_deploy
       CHANGELOG = :changelog
       SUPPORT_URL = :support_url
       PRIVACY_URL = :privacy_url
@@ -39,16 +41,18 @@ module Deliver
       ERROR = :error
     end
 
-    
+
     # Start a new deployment process based on the given Deliverfile
     # @param (String) path The path to the Deliverfile.
     # @param (Hash) hash You can pass a hash instead of a path to basically
     #  give all the information required (see {Deliverer::ValKey} for available options)
-    # @param (Bool) force Runs a deployment without verifying any information. This can be 
+    # @param (Bool) force Runs a deployment without verifying any information. This can be
     # used for build servers. If this is set to false a PDF summary will be generated and opened
-    def initialize(path = nil, hash: nil, force: false)
+    def initialize(path = nil, hash: nil, force: false, is_beta_ipa: false, skip_deploy: false)
       @deliver_process = DeliverProcess.new
       @deliver_process.deploy_information[ValKey::SKIP_PDF] = true if force
+      @deliver_process.deploy_information[ValKey::IS_BETA_IPA] = is_beta_ipa
+      @deliver_process.deploy_information[ValKey::SKIP_DEPLOY] = skip_deploy
 
       if hash
         hash.each do |key, value|
@@ -65,14 +69,14 @@ module Deliver
     end
 
     # This method is internally called from the Deliverfile DSL
-    # to set a value for a given key. This method will also verify if 
+    # to set a value for a given key. This method will also verify if
     # the key is valid.
     def set_new_value(key, value)
       unless self.class.all_available_keys_to_set.include?key
         raise "Invalid key '#{key}', must be contained in Deliverer::ValKey.".red
       end
 
-      if @deliver_process.deploy_information[key]      
+      if @deliver_process.deploy_information[key]
         Helper.log.warn("You already set a value for key '#{key}'. Overwriting value '#{value}' with new value.")
       end
 
@@ -85,7 +89,7 @@ module Deliver
     end
 
     # An array of all available options to be set a deployment_information.
-    # 
+    #
     # Is used to verify user inputs
     # @return (Hash) The array of symbols
     def self.all_available_keys_to_set
@@ -93,20 +97,20 @@ module Deliver
     end
 
     # An array of all available blocks to be set for a deployment
-    # 
+    #
     # Is used to verify user inputs
     # @return (Hash) The array of symbols
     def self.all_available_blocks_to_set
       Deliverer::AllBlocks.constants.collect { |a| Deliverer::AllBlocks.const_get(a) }
     end
 
-    # This method will take care of the actual deployment process, after we 
-    # received all information from the Deliverfile. 
-    # 
+    # This method will take care of the actual deployment process, after we
+    # received all information from the Deliverfile.
+    #
     # This method will be called from the {Deliver::Deliverfile} after
     # it is finished executing the Ruby script.
     def finished_executing_deliver_file
       deliver_process.run
     end
   end
-end
+end

data/lib/deliver/deliverfile/deliverfile.rb

@@ -32,4 +32,4 @@ module Deliver
       end
     end
   end
-end
+end

data/lib/deliver/deliverfile/dsl.rb

@@ -13,11 +13,11 @@ module Deliver
 
         class DeliverfileDSLError < StandardError
         end
-        
+
         # Setting all the metadata
         def method_missing(method_sym, *arguments, &block)
           allowed = Deliver::Deliverer.all_available_keys_to_set
-          not_translated = [:ipa, :beta_ipa, :app_identifier, :apple_id, :screenshots_path, :config_json_folder, :submit_further_information]
+          not_translated = [:ipa, :app_identifier, :apple_id, :screenshots_path, :config_json_folder, :submit_further_information]
 
           if allowed.include?(method_sym)
             value = arguments.first || block.call
@@ -25,7 +25,7 @@ module Deliver
             unless value
               Helper.log.error(caller)
               Helper.log.fatal("No value or block passed to method '#{method_sym}'")
-              raise DeliverfileDSLError.new(MISSING_VALUE_ERROR_MESSAGE.red) 
+              raise DeliverfileDSLError.new(MISSING_VALUE_ERROR_MESSAGE.red)
             end
 
             if (not value.kind_of?Hash) and (not not_translated.include?method_sym)
@@ -57,10 +57,10 @@ module Deliver
         # This method can be used to set a default language, which is used
         # when passing a string to metadata changes, instead of a hash
         # containing multiple languages.
-        # 
+        #
         # This is approach only is recommend for deployments where you are only
         # supporting one language.
-        # 
+        #
         # The language itself must be included in {Deliver::Languages::ALL_LANGUAGES}.
         # @example
         #  default_language 'en-US'
@@ -69,7 +69,7 @@ module Deliver
         def default_language(value = nil)
           # Verify, default_language is on the top of the file
           already_set = @deliver_data.deliver_process.deploy_information
-          minimum = (already_set[:skip_pdf] ? 2 : 1) # skip_pdf + blocks
+          minimum = (already_set[:skip_pdf] ? 4 : 3) # skip_pdf + blocks
           if already_set.count > minimum
             raise "'default_language' must be on the top of the Deliverfile.".red
           end
@@ -113,17 +113,17 @@ module Deliver
         end
 
         # Set the apps new version number.
-        # 
-        # If you do not set this, it will automatically being fetched from the 
+        #
+        # If you do not set this, it will automatically being fetched from the
         # IPA file.
         def version(value = nil)
           value ||= yield if block_given?
           raise DeliverfileDSLError.new(MISSING_VALUE_ERROR_MESSAGE.red) unless value
           raise DeliverfileDSLError.new("The app version should be a string".red) unless value.kind_of?(String)
-          
+
           @deliver_data.set_new_value(Deliverer::ValKey::APP_VERSION, value)
         end
-        
+
         private
           def validate_ipa(value)
             raise DeliverfileDSLError.new(INVALID_IPA_FILE_GIVEN.red) unless value
@@ -132,4 +132,4 @@ module Deliver
       end
     end
   end
-end
+end

data/lib/deliver/ipa_uploader.rb

@@ -2,22 +2,28 @@ require 'zip'
 require 'plist'
 
 module Deliver
-  class IpaUploaderError < StandardError 
+  class IpaUploaderError < StandardError
   end
 
+  IPA_UPLOAD_STRATEGY_APP_STORE = 1
+  IPA_UPLOAD_STRATEGY_BETA_BUILD = 2
+  IPA_UPLOAD_STRATEGY_JUST_UPLOAD = 3
+
   # This class takes care of preparing and uploading the given ipa file
   # Metadata + IPA file can not be handled in one file
   class IpaUploader < AppMetadata
     attr_accessor :app
+    attr_accessor :publish_strategy
 
     # Create a new uploader for one ipa file. This will only upload the ipa and no
     # other app metadata.
     # @param app (Deliver::App) The app for which the ipa should be uploaded for
     # @param dir (String) The path to where we can store (copy) the ipa file. Usually /tmp/
     # @param ipa_path (String) The path to the IPA file which should be uploaded
-    # @param is_beta_build (Bool) If it's a beta build, it will be released to the testers, otherwise into production
+    # @param publish_strategy (Int) If it's a beta build, it will be released to the testers.
+    # If it's a production build it will be released into production. Otherwise no action.
     # @raise (IpaUploaderError) Is thrown when the ipa file was not found or is not valid
-    def initialize(app, dir, ipa_path, is_beta_build)
+    def initialize(app, dir, ipa_path, publish_strategy)
       ipa_path.strip! # remove unused white spaces
       raise IpaUploaderError.new("IPA on path '#{ipa_path}' not found") unless File.exists?(ipa_path)
       raise IpaUploaderError.new("IPA on path '#{ipa_path}' is not a valid IPA file") unless ipa_path.include?".ipa"
@@ -25,7 +31,7 @@ module Deliver
       super(app, dir, false)
 
       @ipa_file = Deliver::MetadataItem.new(ipa_path)
-      @is_beta_build = is_beta_build
+      @publish_strategy = publish_strategy
     end
 
     # Fetches the app identifier (e.g. com.facebook.Facebook) from the given ipa file.
@@ -80,14 +86,14 @@ module Deliver
       return is_okay
     end
 
-    
+
 
     private
       # This method will trigger the iTunesConnect class to choose the latest build
       def publish_on_itunes_connect(submit_information = nil)
-        if not @is_beta_build
+        if @publish_strategy == IPA_UPLOAD_STRATEGY_APP_STORE
           return publish_production_build(submit_information)
-        else
+        elsif @publish_strategy == IPA_UPLOAD_STRATEGY_BETA_BUILD
           return publish_beta_build
         end
         return false
@@ -159,4 +165,4 @@ module Deliver
       end
 
   end
-end
+end

data/lib/deliver/itunes_connect.rb

@@ -417,12 +417,14 @@ module Deliver
           # Export Compliance #
           #####################
           if page.has_content?"Export"
+            
             if not perms[:export_compliance][:encryption_updated] and perms[:export_compliance][:cryptography_enabled]
               raise "encryption_updated must be enabled if cryptography_enabled is enabled!"
             end
 
             begin
-              first(:xpath, "#{basic}.exportCompliance.encryptionUpdated.value' and @radio-value='#{perms[:export_compliance][:encryption_updated]}']//input").trigger('click')
+              encryption_updated_control = all(:xpath, "#{basic}.exportCompliance.encryptionUpdated.value' and @radio-value='#{perms[:export_compliance][:encryption_updated]}']//input")
+              encryption_updated_control[0].trigger('click') if encryption_updated_control.count > 0
               first(:xpath, "#{basic}.exportCompliance.usesEncryption.value' and @radio-value='#{perms[:export_compliance][:cryptography_enabled]}']//input").trigger('click')
               first(:xpath, "#{basic}.exportCompliance.isExempt.value' and @radio-value='#{perms[:export_compliance][:is_exempt]}']//input").trigger('click')
             rescue

data/lib/deliver/version.rb

@@ -1,3 +1,3 @@
 module Deliver
-  VERSION = "0.3.7"
+  VERSION = "0.4.0.beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0.beta1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -297,7 +297,7 @@ description: "Using Deliver you can easily integrate a real continuous delivery
   once in a so called\n    Deliverfile and store it in git, to easily deploy from
   every machine, even your Continuos Integration server"
 email:
-- krausefx@gmail.com
+- deliver@krausefx.com
 executables:
 - deliver
 extensions: []
@@ -334,7 +334,7 @@ files:
 - lib/deliver/pdf_generator.rb
 - lib/deliver/update_checker.rb
 - lib/deliver/version.rb
-homepage: http://felixkrause.at
+homepage: http://krausefx.com
 licenses:
 - MIT
 metadata: {}
@@ -350,9 +350,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2