deliver 0.13.5 → 1.0.0.beta1

data/lib/deliver/runner.rb

@@ -0,0 +1,75 @@
+module Deliver
+  class Runner
+    attr_accessor :options
+
+    def initialize(options)
+      self.options = options
+      login
+      Deliver::DetectValues.new.run!(self.options)
+    end
+
+    def login
+      Helper.log.info "Login to iTunes Connect (#{options[:username]})"
+      Spaceship::Tunes.login(options[:username])
+      Helper.log.info "Login successful"
+    end
+
+    def run
+      upload_metadata unless options[:skip_metadata]
+      upload_binary if options[:ipa]
+
+      Helper.log.info "Finished the upload to iTunes Connect".green
+
+      submit_for_review if options[:submit_for_review]
+    end
+
+    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"
+      )
+
+      transporter = FastlaneCore::ItunesTransporter.new(options[:username])
+      transporter.upload(options[:app].apple_id, package_path)
+    end
+
+    def upload_metadata
+      # First, collect all the things for the HTML Report
+      screenshots = UploadScreenshots.new.collect_screenshots(options)
+      UploadMetadata.new.load_from_filesystem(options)
+
+      # Validate
+      validate_html(screenshots)
+
+      # Commit
+      UploadMetadata.new.upload(options)
+      UploadScreenshots.new.upload(options, screenshots)
+      UploadPriceTier.new.upload(options)
+      UploadAssets.new.upload(options) # e.g. app icon
+    end
+
+    def submit_for_review
+      SubmitForReview.new.submit!(options)
+    end
+
+    private
+
+    def validate_html(screenshots)
+      html_path = HtmlGenerator.new.render(options, screenshots, '.')
+      return if options[:force]
+      puts "----------------------------------------------------------------------------"
+      puts "Verifying the upload via the HTML file can be disabled by either adding"
+      puts "'skip_pdf true' to your Deliverfile or using the flag --force."
+      puts "----------------------------------------------------------------------------"
+
+      system("open '#{html_path}'")
+      okay = agree("Does the Preview on path '#{html_path}' look okay for you? (blue = updated) (y/n)", true)
+
+      unless okay
+        raise "Did not upload the metadata, because the HTML file was rejected by the user".yellow
+      end
+    end
+  end
+end

data/lib/deliver/setup.rb

@@ -0,0 +1,84 @@
+module Deliver
+  class Setup
+    def run(options)
+      containing = (File.directory?("fastlane") ? 'fastlane' : '.')
+      create_based_on_identifier(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)
+      File.write(file_path, data)
+
+      download_screenshots(deliver_path, options)
+
+      # Add a README to the screenshots folder
+      FileUtils.mkdir_p File.join(deliver_path, 'screenshots') # just in case the fetching didn't work
+      File.write(File.join(deliver_path, 'screenshots', 'README.txt'), File.read("#{Helper.gem_path('deliver')}/lib/assets/ScreenshotsHelp"))
+
+      Helper.log.info "Successfully created new Deliverfile at path '#{file_path}'".green
+    end
+
+    private
+
+    # This method takes care of creating a new 'deliver' folder, containg the app metadata
+    # and screenshots folders
+    def generate_deliver_file(deliver_path, options)
+      v = options[:app].latest_version
+      generate_metadata_files(v, deliver_path)
+
+      # Generate the final Deliverfile here
+      gem_path = Helper.gem_path('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
+
+    def generate_metadata_files(v, deliver_path)
+      app_details = v.application.details
+      containing = File.join(deliver_path, 'metadata')
+
+      # All the localised metadata
+      (UploadMetadata::LOCALISED_VERSION_VALUES + UploadMetadata::LOCALISED_APP_VALUES).each do |key|
+        v.description.languages.each do |language|
+          if UploadMetadata::LOCALISED_VERSION_VALUES.include?(key)
+            content = v.send(key)[language]
+          else
+            content = app_details.send(key)[language]
+          end
+
+          resulting_path = File.join(containing, language, "#{key}.txt")
+          FileUtils.mkdir_p(File.expand_path('..', resulting_path))
+          File.write(resulting_path, content)
+          Helper.log.debug "Writing to '#{resulting_path}'"
+        end
+      end
+
+      # All non-localised metadata
+      (UploadMetadata::NON_LOCALISED_VERSION_VALUES + UploadMetadata::NON_LOCALISED_APP_VALUES).each do |key|
+        if UploadMetadata::NON_LOCALISED_VERSION_VALUES.include?(key)
+          content = v.send(key)
+        else
+          content = app_details.send(key)
+        end
+
+        resulting_path = File.join(containing, "#{key}.txt")
+        File.write(resulting_path, content)
+        Helper.log.debug "Writing to '#{resulting_path}'"
+      end
+
+      puts "Successfully created new configuration files.".green
+    end
+
+    def download_screenshots(deliver_path, options)
+      FileUtils.mkdir_p(File.join(deliver_path, 'screenshots'))
+      Deliver::DownloadScreenshots.run(options, deliver_path)
+    end
+  end
+end

data/lib/deliver/submit_for_review.rb

@@ -0,0 +1,60 @@
+module Deliver
+  class SubmitForReview
+    def submit!(options)
+      app = options[:app]
+      select_build(options)
+
+      Helper.log.info "Submitting the app for review..."
+      submission = app.create_submission
+
+      # Set app submission information
+      submission.content_rights_contains_third_party_content = false
+      submission.content_rights_has_rights = true
+      submission.add_id_info_uses_idfa = false
+
+      # Finalize app submission
+      submission.complete!
+
+      Helper.log.info "Successfully submitted the app for review!".green
+    end
+
+    def select_build(options)
+      Helper.log.info "Selecting the latest build..."
+      app = options[:app]
+      v = app.edit_version
+
+      start = Time.now
+
+      loop do
+        processing = v.candidate_builds.find_all(&:processing)
+        break if processing.count == 0
+
+        Helper.log.info "Waiting iTunes Connect processing... this might take a while..."
+        if (Time.now - start) > (60 * 5)
+          Helper.log.info ""
+          Helper.log.info "You can tweet: \"iTunes Connect #iosprocessingtime #{((Time.now - start) / 60).round} minutes\""
+        end
+        sleep 10
+      end
+
+      build = nil
+      v.candidate_builds.each do |b|
+        if !build or b.upload_date > build.upload_date
+          build = b
+        end
+      end
+
+      unless build
+        Helper.log.fatal v.candidate_builds
+        raise "Could not find build to select".red
+      end
+
+      Helper.log.info "Selecting build #{build.train_version} (#{build.build_version})..."
+
+      v.select_build(build)
+      v.save!
+
+      Helper.log.info "Successfully selected build".green
+    end
+  end
+end

data/lib/deliver/upload_assets.rb

@@ -0,0 +1,22 @@
+module Deliver
+  class UploadAssets
+    def upload(options)
+      app = options[:app]
+
+      v = app.edit_version
+      raise "Could not find a version to edit for app '#{app.name}'".red unless v
+
+      if options[:app_icon]
+        Helper.log.info "Uploading app icon..."
+        v.upload_large_icon!(options[:app_icon])
+      end
+
+      if options[:apple_watch_app_icon]
+        Helper.log.info "Uploading apple watchapp icon..."
+        v.upload_watch_icon!(options[:apple_watch_app_icon])
+      end
+
+      v.save!
+    end
+  end
+end

data/lib/deliver/upload_metadata.rb

@@ -0,0 +1,100 @@
+module Deliver
+  # upload description, rating, etc.
+  class UploadMetadata
+    # All the localised values attached to the version
+    LOCALISED_VERSION_VALUES = [:description, :keywords, :release_notes, :support_url, :marketing_url]
+
+    # Everything attached to the version but not being localised
+    NON_LOCALISED_VERSION_VALUES = [:copyright]
+
+    # Localised app details values
+    LOCALISED_APP_VALUES = [:name, :privacy_url]
+
+    # Non localized app details values
+    NON_LOCALISED_APP_VALUES = [:primary_category, :secondary_category]
+
+    # Make sure to call `load_from_filesystem` before calling upload
+    def upload(options)
+      app = options[:app]
+
+      details = app.details
+      v = app.edit_version
+      raise "Could not find a version to edit for app '#{app.name}'".red unless v
+
+      # TODO: Create new language
+
+      (LOCALISED_VERSION_VALUES + LOCALISED_APP_VALUES).each do |key|
+        current = options[key]
+        next unless current
+
+        unless current.kind_of?(Hash)
+          Helper.log.error "Error with provided '#{key}'. Must be a hash, the key being the language.".red
+          next
+        end
+
+        current.each do |language, value|
+          next unless value.to_s.length > 0
+          v.send(key)[language] = value if LOCALISED_VERSION_VALUES.include?(key)
+          details.send(key)[language] = value if LOCALISED_APP_VALUES.include?(key)
+        end
+      end
+
+      (NON_LOCALISED_VERSION_VALUES + NON_LOCALISED_APP_VALUES).each do |key|
+        current = options[key]
+        next unless current.to_s.length > 0
+        v.send("#{key}=", current) if NON_LOCALISED_VERSION_VALUES.include?(key)
+        details.send("#{key}=", current) if NON_LOCALISED_APP_VALUES.include?(key)
+      end
+
+      set_review_information(v, options) if options[:app_review_information]
+
+      Helper.log.info "Uploading metadata to iTunes Connect"
+      v.save!
+      details.save!
+      Helper.log.info "Successfully uploaded initial set of metadata to iTunes Connect".green
+    end
+
+    # Loads the metadata files and stores them into the options object
+    def load_from_filesystem(options)
+      # Load localised data
+      Dir.glob(File.join(options[:metadata_folder], "*")).each do |lng_folder|
+        next unless File.directory?(lng_folder) # We don't want to read txt as they are non localised
+
+        language = File.basename(lng_folder)
+
+        (LOCALISED_VERSION_VALUES + LOCALISED_APP_VALUES).each do |key|
+          path = File.join(lng_folder, "#{key}.txt")
+          next unless File.exist?(path)
+
+          Helper.log.info "Loading '#{path}'..."
+          options[key] ||= {}
+          options[key][language] ||= File.read(path)
+        end
+      end
+
+      # Load non localised data
+      (NON_LOCALISED_VERSION_VALUES + NON_LOCALISED_APP_VALUES).each do |key|
+        path = File.join(options[:metadata_folder], "#{key}.txt")
+        next unless File.exist?(path)
+
+        Helper.log.info "Loading '#{path}'..."
+        options[key] ||= File.read(path)
+      end
+    end
+
+    private
+
+    def set_review_information(v, options)
+      info = options[:app_review_information]
+      raise "`app_review_information` must be a hash" unless info.kind_of?(Hash)
+
+      v.review_first_name = info[:first_name] if info[:first_name]
+      v.review_last_name = info[:last_name] if info[:last_name]
+      v.review_phone_number = info[:phone_number] if info[:phone_number]
+      v.review_email = info[:email_address] if info[:email_address]
+      v.review_demo_user = info[:demo_user] if info[:demo_user]
+      v.review_demo_password = info[:demo_password] if info[:demo_password]
+      v.review_notes = info[:notes] if info[:notes]
+    end
+  end
+end

data/lib/deliver/upload_price_tier.rb

@@ -0,0 +1,21 @@
+module Deliver
+  # Set the app's pricing
+  class UploadPriceTier
+    def upload(options)
+      return unless options[:price_tier]
+      app = options[:app]
+
+      # just to be sure, the user might have passed an int (which is fine with us)
+      options[:price_tier] = options[:price_tier].to_s
+
+      old_price = app.price_tier
+      if options[:price_tier] == old_price
+        Helper.log.info "Price Tier unchanged (tier #{options[:price_tier]})".green
+        return
+      end
+
+      app.update_price_tier!(options[:price_tier])
+      Helper.log.info "Successfully updated the pricing from #{old_price} to #{options[:price_tier]}".green
+    end
+  end
+end

data/lib/deliver/upload_screenshots.rb

@@ -0,0 +1,63 @@
+module Deliver
+  # upload screenshots to iTunes Connect
+  class UploadScreenshots
+    def upload(options, screenshots)
+      app = options[:app]
+
+      v = app.edit_version
+      raise "Could not find a version to edit for app '#{app.name}'".red unless v
+
+      Helper.log.info "Starting with the upload of screenshots..."
+
+      # First, clear all previously uploaded screenshots, but only where we have new ones
+      # screenshots.each do |screenshot|
+      #   to_remove = v.screenshots[screenshot.language].find_all do |current|
+      #     current.device_type == screenshot.device_type
+      #   end
+      #   to_remove.each { |t| t.reset! }
+      # end
+      # This part is not working yet...
+
+      # Now, fill in the new ones
+      indized = {} # per language and device type
+      screenshots.each do |screenshot|
+        indized[screenshot.language] ||= {}
+        indized[screenshot.language][screenshot.device_type] ||= 0
+        indized[screenshot.language][screenshot.device_type] += 1 # we actually start with 1... wtf iTC
+
+        index = indized[screenshot.language][screenshot.device_type]
+
+        if index > 5
+          Helper.log.error "Too many screenshots found for device '#{screenshot.device_type}' in '#{screenshot.language}'"
+          next
+        end
+
+        Helper.log.info "Uploading '#{screenshot.path}'..."
+        v.upload_screenshot!(screenshot.path,
+                             index,
+                             screenshot.language,
+                             screenshot.device_type)
+      end
+
+      Helper.log.info "Saving changes"
+      v.save!
+      Helper.log.info "Successfully uploaded screenshots to iTunes Connect".green
+    end
+
+    def collect_screenshots(options)
+      screenshots = []
+      Dir.glob(File.join(options[:screenshots_path], "*"), File::FNM_CASEFOLD).sort.each do |lng_folder|
+        language = File.basename(lng_folder)
+
+        files = Dir.glob(File.join(lng_folder, '*.png'))
+        next if files.count == 0
+
+        files.each do |path|
+          screenshots << AppScreenshot.new(path, language)
+        end
+      end
+
+      return screenshots
+    end
+  end
+end

data/lib/deliver/version.rb

@@ -1,3 +1,4 @@
 module Deliver
-  VERSION = "0.13.5"
+  VERSION = "1.0.0.beta1"
+  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: 0.13.5
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.18.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.18.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -36,84 +36,76 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: spaceship
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: 0.9.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: 0.9.0
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: fastimage
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.6.5
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: fastimage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: excon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -224,40 +216,23 @@ files:
 - LICENSE
 - README.md
 - bin/deliver
-- lib/assets/DeliverLanguageMapping.json
 - lib/assets/DeliverfileDefault
-- lib/assets/DeliverfileExample
 - lib/assets/ScreenshotsHelp
 - lib/assets/summary.html.erb
 - lib/deliver.rb
-- lib/deliver/app.rb
-- lib/deliver/app_metadata.rb
-- lib/deliver/app_metadata_screenshots.rb
 - lib/deliver/app_screenshot.rb
 - lib/deliver/commands_generator.rb
-- lib/deliver/deliver_process.rb
-- lib/deliver/deliverer.rb
-- lib/deliver/deliverfile/deliverfile.rb
-- lib/deliver/deliverfile/deliverfile_creator.rb
-- lib/deliver/deliverfile/dsl.rb
-- lib/deliver/dependency_checker.rb
+- lib/deliver/detect_values.rb
 - lib/deliver/download_screenshots.rb
 - lib/deliver/html_generator.rb
-- lib/deliver/ipa_file_analyser.rb
-- lib/deliver/ipa_uploader.rb
-- lib/deliver/itunes_connect/itunes_connect.rb
-- lib/deliver/itunes_connect/itunes_connect_additional.rb
-- lib/deliver/itunes_connect/itunes_connect_app_icon.rb
-- lib/deliver/itunes_connect/itunes_connect_app_rating.rb
-- lib/deliver/itunes_connect/itunes_connect_apple_watch_app_icon.rb
-- lib/deliver/itunes_connect/itunes_connect_information.rb
-- lib/deliver/itunes_connect/itunes_connect_new_version.rb
-- lib/deliver/itunes_connect/itunes_connect_reader.rb
-- lib/deliver/itunes_connect/itunes_connect_screenshot_fetcher.rb
-- lib/deliver/itunes_connect/itunes_connect_submission.rb
-- lib/deliver/itunes_transporter.rb
-- lib/deliver/metadata_item.rb
-- lib/deliver/testflight.rb
+- lib/deliver/options.rb
+- lib/deliver/runner.rb
+- lib/deliver/setup.rb
+- lib/deliver/submit_for_review.rb
+- lib/deliver/upload_assets.rb
+- lib/deliver/upload_metadata.rb
+- lib/deliver/upload_price_tier.rb
+- lib/deliver/upload_screenshots.rb
 - lib/deliver/version.rb
 homepage: https://fastlane.tools
 licenses:
@@ -274,12 +249,12 @@ 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.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Upload screenshots, metadata and your app to the App Store using a single