deliver 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 534a6b8ed220433bd502dfa2f7c788104f99da4a
-  data.tar.gz: fa7864e238b1924e3cfc4e114404b88302e2ad2d
+  metadata.gz: 52e8b70dfa6c0a3bcb2392bb73968de6761b070f
+  data.tar.gz: 2e89716623be26e9086410b6b5c1ec635a1dd7ef
 SHA512:
-  metadata.gz: 9611bb1d5a25ac9dd2db52685e48148dbb8437fef80eb8000cf89b920214272c7ba536938950264db6cea703900776a65dffa494e05c7bf7ca1827758b1c7095
-  data.tar.gz: a4d905e853d4134dbca1a41fa3ad30f24974eb692d425103ca829880d6cd58c92740e614ec24b7f6b9e956237648b3bf92e09c903d760103b72525df6128e21f
+  metadata.gz: ccc2a8bebf9154313bcd5408f004d1478924b33b8a50938a73e30c955b6ddf83e406067e75bdef176c16535e1a1d344d5a55fb220e40ea3995cbf3f8190a90dd
+  data.tar.gz: b30db3e33eace1b85660bf6c2155f0cf0f19fc82675b48d09778b7d1e092c22f795ab4a89f9219357091d26a305e859550c45285091e25ce8a36dd47d5e37f72

data/README.md

@@ -128,11 +128,11 @@ 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`. 
+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.
 
 #### Upload a new ipa for TestFlight beta testers
 
-In order to upload beta `.ipa` you need to specify beta_ipa path in your `Deliverfile`
+In order to upload an `.ipa` file for Apple TestFlight you need to specify `beta_ipa` path in your `Deliverfile`
 
 ```ruby
 beta_ipa "./latest.ipa"

data/bin/deliver

@@ -12,8 +12,8 @@ HighLine.track_eof = false
 # Commander
 program :version, Deliver::VERSION
 program :description, 'CLI for \'Deliver\' - Automate uploading of app metadata, screenshots and app updates to Apple'
-program :help, 'Author', 'Felix Krause <krausefx@gmail.com>'
-program :help, 'Website', 'http://felixkrause.at'
+program :help, 'Author', 'Felix Krause <deliver@krausefx.com>'
+program :help, 'Website', 'http://krausefx.com'
 program :help, 'GitHub', 'https://github.com/krausefx/deliver'
 program :help_formatter, :compact
 

data/lib/assets/DeliverfileDefault

@@ -44,10 +44,12 @@ end
 
 # ipa "./latest.ipa" # this can be used, if you prefer manually building the ipa file
 
+# beta_ipa "./ad_hoc_build.ipa" # upload ipa file using `deliver --beta`
+
 # unit_tests do
 #   system("xctool test")
 # end
 
 success do
   system("say 'Successfully deployed a new version.'")
-end
+end

data/lib/deliver/deliver_process.rb

@@ -78,10 +78,17 @@ module Deliver
       elsif is_beta_build?
         used_ipa_file = @deploy_information[:beta_ipa]
       end
+
+      if used_ipa_file.kind_of?Proc
+        # The user provided a block. We only want to execute the block now, since it might be a long build step
+        used_ipa_file = used_ipa_file.call
+
+        Deliverfile::Deliverfile::DSL.validate_ipa!(used_ipa_file)
+      end
       
       if (used_ipa_file || '').length == 0 and is_beta_build?
         # Beta Release but no ipa given
-        raise "Could not find an ipa file for 'beta' mode. Provide one using `beta_ipa do ... end`.".red
+        raise "Could not find an ipa file for 'beta' mode. Provide one using `beta_ipa do ... end` in your Deliverfile.".red
       end
 
       if used_ipa_file

data/lib/deliver/deliverfile/dsl.rb

@@ -84,21 +84,19 @@ module Deliver
         # Pass the path to the ipa file which should be uploaded
         # @raise (DeliverfileDSLError) occurs when you pass an invalid path to the
         #  IPA file.
-        def ipa(value = nil)
-          value ||= yield if block_given?
-          validate_ipa(value)
+        def ipa(value = nil, &block)
+          validate_ipa!(value) if value # to catch errors early
 
-          @deliver_data.set_new_value(Deliverer::ValKey::IPA, value)
+          @deliver_data.set_new_value(Deliverer::ValKey::IPA, (value || block))
         end
 
         # Pass the path to the ipa file (beta version) which should be uploaded
         # @raise (DeliverfileDSLError) occurs when you pass an invalid path to the
         #  IPA file.
-        def beta_ipa(value = nil)
-          value ||= yield if block_given?
-          validate_ipa(value)
+        def beta_ipa(value = nil, &block)
+          validate_ipa!(value) if value # to catch errors early
 
-          @deliver_data.set_new_value(Deliverer::ValKey::BETA_IPA, value)
+          @deliver_data.set_new_value(Deliverer::ValKey::BETA_IPA, (value || block))
         end
 
         # This will set the email address of the Apple ID to be used
@@ -124,11 +122,13 @@ module Deliver
           @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
-            raise DeliverfileDSLError.new(INVALID_IPA_FILE_GIVEN.red) unless value.include?".ipa"
-          end
+        # Only verifies the file type of the ipa path and if the file can be found. Is also called from deliver_process
+        # This will raise a DeliverfileDSLError if something goes wrong
+        def self.validate_ipa!(value)
+          raise DeliverfileDSLError.new(INVALID_IPA_FILE_GIVEN.red) unless value
+          raise DeliverfileDSLError.new(INVALID_IPA_FILE_GIVEN.red) unless value.kind_of?String
+          raise DeliverfileDSLError.new(INVALID_IPA_FILE_GIVEN.red) unless value.include?".ipa"
+        end
       end
     end
   end

data/lib/deliver/ipa_uploader.rb

@@ -72,6 +72,7 @@ module Deliver
       begin
         transporter.upload(@app, @metadata_dir)
       rescue Exception => ex
+        Helper.log.debug ex
         is_okay = ex.to_s.include?"ready exists a binary upload with build" # this just means, the ipa is already online
       end
 

data/lib/deliver/version.rb

@@ -1,3 +1,3 @@
 module Deliver
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json