deliver 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f073822a6cd5ae489648e54a348982bc98b71122
-  data.tar.gz: a7deac2ad9c35042803c15bb4aff5b3d5ad21b36
+  metadata.gz: 058d53f7f022fadeeb57b82e356342d9c8be41d8
+  data.tar.gz: 6fa0490789ee508fb13280919f7bd9bfe40340b9
 SHA512:
-  metadata.gz: d4c40f724deea58194fe74a1bbedb431f126a267ddbfa43ddf4427f5cadf6543d1ae4ad0183b5041946c94d32c3842476076ecab8fd9cf12693bdd29ebebf97f
-  data.tar.gz: e25d930ab3d631813f91bac218101961ad1ecce5ad04ad1acbb941c0768dec7bffd1aba26db5838a9e4bad325487400c59842e523070e673ca93db5f907b3646
+  metadata.gz: f464d750c0c6a40c8e9f7a5013c27a411ce67dea972a95ccec0dcda00b9959d08271653579c2c58a82961e28f915aabf4e03dfec5f58bb72c440fc8d532d2b44
+  data.tar.gz: 2a77467718336a69895e98ed452969bd4b293f94d4b88235861b4a36b3320d87f82ca60e06997db9e5ed788f18ea7e0bdd665b271e6f2ea2ecab8f40599633ab

data/README.md

@@ -36,7 +36,7 @@ deliver
 
 ###### Upload screenshots, metadata and your app to the App Store using a single command
 
-`deliver` can upload ipa files, app screenshots and more to iTunes Connect from the command line.
+`deliver` can upload ipa or pkg files, app screenshots and more to iTunes Connect from the command line.
 
 Get in contact with the developer on Twitter: [@FastlaneTools](https://twitter.com/FastlaneTools)
 
@@ -56,7 +56,7 @@ Get in contact with the developer on Twitter: [@FastlaneTools](https://twitter.c
 
 # Features
 - Upload hundreds of localised screenshots completely automatically
-- Upload a new ipa file to iTunes Connect without Xcode from any Mac
+- Upload a new ipa/pkg file to iTunes Connect without Xcode from any Mac
 - Maintain your app metadata locally and push changes back to iTunes Connect
 - Easily implement a real Continuous Deployment process using [fastlane](https://fastlane.tools)
 - Store the configuration in git to easily deploy from **any** Mac, including your Continuous Integration server
@@ -110,7 +110,13 @@ Provide the path to an `ipa` file to upload and submit your app for review:
 deliver --ipa "App.ipa" --submit_for_review
 ```
 
-If you use [fastlane](https://fastlane.tools) you don't have to manually specify the path to your `ipa` file. 
+or you can specify path to `pkg` file for Mac OS X apps:
+
+```
+deliver --pkg "MacApp.pkg"
+```
+
+If you use [fastlane](https://fastlane.tools) you don't have to manually specify the path to your `ipa`/`pkg` file.
 
 This is just a small sub-set of what you can do with `deliver`, check out the full documentation in [Deliverfile.md](https://github.com/fastlane/deliver/blob/master/Deliverfile.md)
 

data/lib/deliver/commands_generator.rb

@@ -36,7 +36,7 @@ module Deliver
         c.action do |args, options|
           options = FastlaneCore::Configuration.create(Deliver::Options.available_options, options.__hash__)
           loaded = options.load_configuration_file("Deliverfile")
-          loaded = true if options[:description] || options[:ipa] # do we have *anything* here?
+          loaded = true if options[:description] || options[:ipa] || options[:pkg] # do we have *anything* here?
           unless loaded
             if agree("No deliver configuration found in the current directory. Do you want to setup deliver? (y/n)".yellow, true)
               require 'deliver/setup'

data/lib/deliver/detect_values.rb

@@ -12,9 +12,11 @@ module Deliver
 
       if options[:ipa]
         identifier = FastlaneCore::IpaFileAnalyser.fetch_app_identifier(options[:ipa])
-        options[:app_identifier] = identifier if identifier.to_s.length > 0
+      elsif options[:pkg]
+        identifier = FastlaneCore::PkgFileAnalyser.fetch_app_identifier(options[:pkg])
       end
 
+      options[:app_identifier] = identifier if identifier.to_s.length > 0
       options[:app_identifier] ||= ask("The Bundle Identifier of your App: ")
     end
 
@@ -41,6 +43,8 @@ module Deliver
     def find_version(options)
       if options[:ipa]
         options[:app_version] ||= FastlaneCore::IpaFileAnalyser.fetch_app_version(options[:ipa])
+      elsif options[:pkg]
+        options[:app_version] ||= FastlaneCore::PkgFileAnalyser.fetch_app_version(options[:pkg])
       end
     end
   end

data/lib/deliver/options.rb

@@ -33,6 +33,24 @@ module Deliver
                                      verify_block: proc do |value|
                                        raise "Could not find ipa file at path '#{value}'".red unless File.exist?(value)
                                        raise "'#{value}' doesn't seem to be an ipa file".red unless value.end_with?(".ipa")
+                                     end,
+                                     conflicting_options: [:pkg],
+                                     conflict_block: proc do |value|
+                                       raise "You can't use 'ipa' and '#{value.key}' options in one run.".red
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :pkg,
+                                     short_option: "-c",
+                                     optional: true,
+                                     env_name: "DELIVER_PKG_PATH",
+                                     description: "Path to your pkg file",
+                                     default_value: Dir["*.pkg"].first,
+                                     verify_block: proc do |value|
+                                       raise "Could not find pkg file at path '#{value}'".red unless File.exist?(value)
+                                       raise "'#{value}' doesn't seem to be a pkg file".red unless value.end_with?(".pkg")
+                                     end,
+                                     conflicting_options: [:ipa],
+                                     conflict_block: proc do |value|
+                                       raise "You can't use 'pkg' and '#{value.key}' options in one run.".red
                                      end),
         FastlaneCore::ConfigItem.new(key: :metadata_path,
                                      short_option: '-m',

data/lib/deliver/runner.rb

@@ -19,7 +19,7 @@ module Deliver
     def run
       verify_version if options[:app_version].to_s.length > 0
       upload_metadata
-      upload_binary if options[:ipa]
+      upload_binary if options[:ipa] || options[:pkg]
 
       Helper.log.info "Finished the upload to iTunes Connect".green
 
@@ -59,11 +59,19 @@ module Deliver
     # Upload the binary to iTunes Connect
     def upload_binary
       Helper.log.info "Uploading binary to iTunes Connect"
-      package_path = FastlaneCore::IpaUploadPackageBuilder.new.generate(
-        app_id: options[:app].apple_id,
-        ipa_path: options[:ipa],
-        package_path: "/tmp"
-      )
+      if options[:ipa]
+        package_path = FastlaneCore::IpaUploadPackageBuilder.new.generate(
+          app_id: options[:app].apple_id,
+          ipa_path: options[:ipa],
+          package_path: "/tmp"
+        )
+      elsif options[:pkg]
+        package_path = FastlaneCore::PkgUploadPackageBuilder.new.generate(
+          app_id: options[:app].apple_id,
+          pkg_path: options[:pkg],
+          package_path: "/tmp"
+        )
+      end
 
       transporter = FastlaneCore::ItunesTransporter.new(options[:username])
       transporter.upload(options[:app].apple_id, package_path)

data/lib/deliver/setup.rb

@@ -2,16 +2,12 @@ module Deliver
   class Setup
     def run(options)
       containing = (File.directory?("fastlane") ? 'fastlane' : '.')
-      create_based_on_identifier(containing, options)
+      file_path = File.join(containing, 'Deliverfile')
+      data = generate_deliver_file(containing, options)
+      setup_deliver(file_path, data, containing, options)
     end
 
-    # This will download all the app metadata and store its data into JSON files
-    # @param deliver_path (String) The directory in which the Deliverfile should be created
-    # @param identifier (String) The app identifier we want to create Deliverfile based on
-    # @param project_name (String) The default name of the project, which is used in the generated Deliverfile
-    def create_based_on_identifier(deliver_path, options)
-      file_path = File.join(deliver_path, 'Deliverfile')
-      data = generate_deliver_file(deliver_path, options)
+    def setup_deliver(file_path, data, deliver_path, options)
       File.write(file_path, data)
 
       download_screenshots(deliver_path, options)
@@ -34,7 +30,6 @@ module Deliver
       deliver = File.read("#{gem_path}/lib/assets/DeliverfileDefault")
       deliver.gsub!("[[APP_IDENTIFIER]]", options[:app].bundle_id)
       deliver.gsub!("[[USERNAME]]", Spaceship::Tunes.client.user)
-
       return deliver
     end
 

data/lib/deliver/version.rb

@@ -1,4 +1,4 @@
 module Deliver
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
   DESCRIPTION = 'Upload screenshots, metadata and your app to the App Store using a single command'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core