deliver 0.13.5 → 1.0.0.beta1

data/lib/deliver/app_metadata_screenshots.rb

@@ -1,189 +0,0 @@
-module Deliver
-  class AppMetadata
-    #####################################################
-    # @!group Screenshot related
-    #####################################################
-
-    # Removes all currently enabled screenshots for the given language.
-    # @param (String) language The language, which has to be in this list: {FastlaneCore::Languages}.
-    def clear_all_screenshots(language)
-      raise AppMetadataParameterError.new(INVALID_LANGUAGE_ERROR) unless FastlaneCore::Languages::ALL_LANGUAGES.include?language
-
-      update_localized_value('software_screenshots', {language => {}}) do |field, useless, language|
-        field.children.remove # remove all the screenshots
-      end
-      information[language][:screenshots] = []
-      true
-    end
-
-    # Appends another screenshot to the already existing ones
-    # @param (String) language The language, which has to be in this list: {FastlaneCore::Languages}.
-    # @param (Deliver::AppScreenshot) app_screenshot The screenshot you want to add to the app metadata.
-    # @raise (AppMetadataTooManyScreenshotsError) When there are already 5 screenshots (MAXIMUM_NUMBER_OF_SCREENSHOTS).
-
-    def add_screenshot(language, app_screenshot)
-      raise AppMetadataParameterError.new(INVALID_LANGUAGE_ERROR) unless FastlaneCore::Languages::ALL_LANGUAGES.include?language
-
-      create_locale_if_not_exists(language)
-
-      # Fetch the 'software_screenshots' node (array) for the specific locale
-      locales = self.fetch_value("//x:locale[@name='#{language}']")
-
-      screenshots = self.fetch_value("//x:locale[@name='#{language}']/x:software_screenshots").first
-
-      if not screenshots or screenshots.children.count == 0
-        screenshots.remove if screenshots
-
-        # First screenshot ever
-        screenshots = Nokogiri::XML::Node.new('software_screenshots', @data)
-        locales.first << screenshots
-
-        node_set = Nokogiri::XML::NodeSet.new(@data)
-        node_set << app_screenshot.create_xml_node(@data, 1)
-        screenshots.children = node_set
-      else
-        # There is already at least one screenshot
-        next_index = 1
-        screenshots.children.each do |screen|
-          if screen['display_target'] == app_screenshot.screen_size
-            next_index += 1
-          end
-        end
-
-        if next_index > MAXIMUM_NUMBER_OF_SCREENSHOTS
-          raise AppMetadataTooManyScreenshotsError.new("Only #{MAXIMUM_NUMBER_OF_SCREENSHOTS} screenshots are allowed per language per device type (#{app_screenshot.screen_size})")
-        end
-
-        # Ready for storing the screenshot into the metadata.xml now
-        screenshots.children.after(app_screenshot.create_xml_node(@data, next_index))
-      end
-
-      information[language][:screenshots] << app_screenshot
-
-      app_screenshot.store_file_inside_package(@package_path)
-    end
-
-    # This method will clear all screenshots and set the new ones you pass
-    # @param new_screenshots
-    #   +code+
-    #    {
-    #     'de-DE' => [
-    #       AppScreenshot.new('path/screenshot1.png', Deliver::ScreenSize::IOS_35),
-    #       AppScreenshot.new('path/screenshot2.png', Deliver::ScreenSize::IOS_40),
-    #       AppScreenshot.new('path/screenshot3.png', Deliver::ScreenSize::IOS_IPAD)
-    #     ]
-    #    }
-    # This method uses {#clear_all_screenshots} and {#add_screenshot} under the hood.
-    # @return [bool] true if everything was successful
-    # @raise [AppMetadataParameterError] error is raised when parameters are invalid
-    def set_all_screenshots(new_screenshots)
-      error_text = "Please pass a hash, containing an array of AppScreenshot objects"
-      raise AppMetadataParameterError.new(error_text) unless new_screenshots.kind_of?Hash
-
-      new_screenshots.each do |key, value|
-        if key.kind_of?String and value.kind_of?Array and value.count > 0 and value.first.kind_of?AppScreenshot
-
-          self.clear_all_screenshots(key)
-
-          value.each do |screen|
-            add_screenshot(key, screen)
-          end
-        else
-          raise AppMetadataParameterError.new(error_text)
-        end
-      end
-      true
-    end
-
-    # Automatically add all screenshots contained in the given directory to the app.
-    #
-    # This method will automatically detect which device type each screenshot is.
-    #
-    # This will also clear all existing screenshots before setting the new ones.
-    # @param (Hash) hash A hash containing a different path for each locale ({FastlaneCore::Languages::ALL_LANGUAGES})
-    # @param (Bool) Use the framed screenshots? Only use it if you use frameit 2.0
-
-    def set_screenshots_for_each_language(hash, use_framed = false)
-      raise AppMetadataParameterError.new("Parameter needs to be an hash, containg strings with the new description") unless hash.kind_of?Hash
-      hash.each do |language, current_path|
-        resulting_path = "#{current_path}/**/*.{png,jpg,jpeg}"
-
-        raise AppMetadataParameterError.new(INVALID_LANGUAGE_ERROR) unless FastlaneCore::Languages::ALL_LANGUAGES.include?language
-
-        # https://stackoverflow.com/questions/21688855/
-        # File::FNM_CASEFOLD = ignore case
-        if Dir.glob(resulting_path, File::FNM_CASEFOLD).count == 0
-          Helper.log.error("No screenshots found at the given path '#{resulting_path}'")
-        else
-          self.clear_all_screenshots(language)
-
-          Dir.glob(resulting_path, File::FNM_CASEFOLD).sort.each do |path|
-            # When frameit is enabled, we only want to upload the framed screenshots
-            if use_framed
-              # Except for Watch screenshots, they are okay without _framed
-              is_apple_watch = ((AppScreenshot.new(path).screen_size == AppScreenshot::ScreenSize::IOS_APPLE_WATCH) rescue false)
-              unless is_apple_watch
-                next unless path.include?"_framed."
-              end
-            else
-              next if path.include?"_framed."
-            end
-
-            begin
-              add_screenshot(language, Deliver::AppScreenshot.new(path))
-            rescue AppMetadataTooManyScreenshotsError => ex
-              # We just use the first 5 ones
-            end
-          end
-        end
-      end
-
-      true
-    end
-
-    # This method will run through all the available locales, check if there is
-    # a folder for this language (e.g. 'en-US') and use all screenshots in there
-    # @param (String) path A path to the folder, which contains a folder for each locale
-    # @param (Bool) Use the framed screenshots? Only use it if you use frameit 2.0
-    def set_all_screenshots_from_path(path, use_framed = false)
-      raise AppMetadataParameterError.new("Parameter needs to be a path (string)") unless path.kind_of?String
-
-      found = false
-      FastlaneCore::Languages::ALL_LANGUAGES.each do |language|
-        full_path = File.join(path, language)
-        if File.directory?(full_path)
-          found = true
-          set_screenshots_for_each_language({
-            language => full_path
-          }, use_framed)
-        end
-      end
-
-      # Legacy: 
-      # We also want to support the "legacy" language format (ja-JP instead of just ja)
-      FastlaneCore::Languages::ALL_LANGUAGES_LEGACY.each do |language|
-        full_path = File.join(path, language)
-        if File.directory?(full_path)
-
-          if FastlaneCore::Languages::ALL_LANGUAGES.include?language
-            # We're all good, this language code is still supported
-          else
-            # This language code was changed - need to modify that
-            short_code = language.match(/(\w\w)\-.*/)
-            if short_code and short_code.length == 2
-              Helper.log.info "Using language code #{short_code[1]} instead of #{language}"
-              language = short_code[1]
-            end
-          end
-
-          found = true
-          set_screenshots_for_each_language({
-            language => full_path
-          }, use_framed)
-        end
-      end
-
-      return found
-    end
-  end
-end

data/lib/deliver/deliver_process.rb

@@ -1,426 +0,0 @@
-module Deliver
-  # This class takes care of verifying all inputs and triggering the upload process
-  class DeliverProcess
-
-    # DeliverUnitTestsError is triggered, when the unit tests of the given block failed.
-    class DeliverUnitTestsError < StandardError
-    end
-
-    # @return (Deliver::App) The App that is currently being edited.
-    attr_accessor :app
-
-    # @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
-
-    # @return (String): The app identifier of the currently used app (e.g. com.krausefx.app)
-    attr_accessor :app_identifier
-
-    def initialize(deploy_information = nil)
-      @deploy_information = deploy_information || {}
-      @deploy_information[:blocks] ||= {}
-    end
-
-    def run
-      begin
-        fetch_information_from_ipa_file
-        pre_load_default_values
-
-        unless metadata_only?
-          run_unit_tests
-        end
-
-        Helper.log.info("Got all information needed to deploy a new update ('#{app_version}') for app '#{app_identifier}'")
-
-        verify_app_on_itunesconnect unless metadata_only?
-
-
-        if is_beta_build?
-          Helper.log.info "Beta builds don't upload new metadata to iTunesConnect".yellow
-        else
-          upload_metadata
-        end
-
-        # Always upload a new ipa (except if none was given)
-        trigger_ipa_upload unless metadata_only?
-
-        call_success_block
-      rescue => ex
-        call_error_block(ex)
-      end
-    end
-
-    def upload_metadata
-      if ready_for_sale?
-        raise "Cannot update metadata of apps 'Ready for Sale'. You can dupe: http://www.openradar.appspot.com/18263306".red
-      end
-
-      load_metadata_from_config_json_folder # the json file generated from the quick start # deprecated
-      load_metadata_folder # this is the new way of defining app metadata
-      set_app_metadata
-      set_screenshots
-
-      verify_pdf_file
-
-      additional_itc_information # e.g. copyright, age rating
-
-      trigger_metadata_upload
-    end
-
-    #####################################################
-    # @!group Getters
-    #####################################################
-
-    def app
-      return @app if @app
-
-      @app = Deliver::App.new(app_identifier: app_identifier,
-                                    apple_id: @deploy_information[Deliverer::ValKey::APPLE_ID]) # apple_id can be nil, will be fetched automatically
-    end
-
-    def app_version
-      return @app_version if @app_version
-
-      if Helper.is_test?
-        raise "No App Version given"
-      end
-
-      @app_version ||= ask("Which version number should be updated? ")
-    end
-
-    def app_identifier
-      return @app_identifier if @app_identifier
-
-      if Helper.is_test?
-        raise "No App Identifier given"
-      end
-
-      Helper.log.info "No App Identifier found. Pass one using `app_identifier` in your Deliverfile".yellow
-      @app_identifier = ask("App Identifier (e.g. com.krausefx.app): ")
-    end
-
-    # Preloads default values from the given hashes + Appfile
-    def pre_load_default_values
-      @app_identifier ||= @deploy_information[Deliverer::ValKey::APP_IDENTIFIER]
-      @app_identifier ||= (CredentialsManager::AppfileConfig.try_fetch_value(:app_identifier) rescue nil)
-      @app_identifier ||= (@ipa.fetch_app_identifier rescue nil) # since ipa might be nil
-
-      @app_version ||= @deploy_information[Deliverer::ValKey::APP_VERSION]
-      @app_version ||= ENV["DELIVER_VERSION"] if ENV["DELIVER_VERSION"].to_s.length > 0
-      @app_version ||= (@ipa.fetch_app_version rescue nil) # since ipa might be nil
-      @app_version ||= (app.get_live_version rescue nil) # pull the latest version from iTunes Connect
-    end
-
-    #####################################################
-    # @!group What kind of release
-    #####################################################
-
-    # Deployment = Submission of the binary
-    def skip_deployment?
-      @deploy_information[Deliverer::ValKey::SKIP_DEPLOY]
-    end
-
-    # Release = App Store and not TestFlight
-    def is_release_build?
-      is_beta_build? == false
-    end
-
-    # TestFlight Buil
-    def is_beta_build?
-      @deploy_information[Deliverer::ValKey::IS_BETA_IPA]
-    end
-
-    # Only upload metadata and no binary
-    def metadata_only?
-      ENV["DELIVER_SKIP_BINARY"]
-    end
-
-    # Is the app already ready for sale?
-    # if so, we can't update the app metadata: http://www.openradar.appspot.com/18263306
-    def ready_for_sale?
-      return false if Helper.is_test?
-      return @ready if @checked_for_ready
-
-      @checked_for_ready = true
-      @ready = (app.get_app_status == App::AppStatus::READY_FOR_SALE)
-    end
-
-    #####################################################
-    # @!group All the methods
-    #####################################################
-
-    def run_unit_tests
-      if @deploy_information[:blocks][:unit_tests]
-        result = @deploy_information[:blocks][:unit_tests].call
-        if result
-          Helper.log.debug("Unit tests successful".green)
-        else
-          raise DeliverUnitTestsError.new("Unit tests failed. Got result: '#{result}'. Need 'true' or 1 to succeed.".red)
-        end
-      end
-    end
-
-    def fetch_information_from_ipa_file
-      used_ipa_file = ENV["IPA_OUTPUT_PATH"]# if (ENV["IPA_OUTPUT_PATH"] and File.exists?(ENV["IPA_OUTPUT_PATH"]))
-
-      if is_release_build?
-        used_ipa_file = @deploy_information[:ipa] if @deploy_information[:ipa]
-      elsif is_beta_build?
-        used_ipa_file = @deploy_information[:beta_ipa] if @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
-        used_ipa_file = Dir["*.ipa"].first
-
-        unless used_ipa_file
-          raise "Could not find an ipa file for 'beta' mode. Provide one using `beta_ipa do ... end` in your Deliverfile.".red
-        end
-      end
-
-      ENV["DELIVER_IPA_PATH"] = used_ipa_file
-
-      if used_ipa_file
-        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
-          Helper.log.info "Skipping submission of app update"
-        end
-
-        @ipa = Deliver::IpaUploader.new(Deliver::App.new, '/tmp/', used_ipa_file, upload_strategy)
-      end
-    end
-
-    def verify_app_on_itunesconnect
-      if (@ipa and is_release_build?) or !@ipa
-        # 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) if @ipa
-      end
-    end
-
-    def options_mapping
-      {
-        'title' => Deliverer::ValKey::TITLE,
-        'description' => Deliverer::ValKey::DESCRIPTION,
-        'version_whats_new' => Deliverer::ValKey::CHANGELOG,
-        'keywords' => Deliverer::ValKey::KEYWORDS,
-        'privacy_url' => Deliverer::ValKey::PRIVACY_URL,
-        'software_url' => Deliverer::ValKey::MARKETING_URL,
-        'support_url' => Deliverer::ValKey::SUPPORT_URL
-      }
-    end
-
-    def load_metadata_from_config_json_folder
-      return unless @deploy_information[Deliverer::ValKey::CONFIG_JSON_FOLDER]
-
-      file_path = @deploy_information[:config_json_folder]
-      unless file_path.split("/").last.include?"metadata.json"
-        file_path += "/metadata.json"
-      end
-
-      raise "Could not find metadatafile at path '#{file_path}'".red unless File.exists?file_path
-
-      content = JSON.parse(File.read(file_path))
-      content.each do |language, current|
-
-        options_mapping.each do |key, value|
-          if current[key]
-            @deploy_information[value] ||= {}
-            @deploy_information[value][language] ||= current[key]
-          end
-        end
-      end
-    end
-
-    def load_metadata_folder
-      # Fetch the information from the ./metadata folder if it exists
-      metadata_folder = './metadata'
-      return unless File.exists?metadata_folder
-
-      Dir[File.join(metadata_folder, '*')].each do |language_folder|
-        language = File.basename(language_folder)
-
-        options_mapping.each do |key, value|
-          content = File.read(File.join(language_folder, "#{key}.txt")) rescue nil
-          next unless content
-          content = content.split("\n") if key == 'keywords'
-          content = content.strip if ['privacy_url', 'software_url', 'support_url'].include?key
-          @deploy_information[value] ||= {}
-          @deploy_information[value][language] ||= content
-
-          Helper.log.info "Successfully loaded content from '#{key}.txt' for language #{language_folder}"
-        end
-      end
-    end
-
-    def set_app_metadata
-      app.metadata.update_title(@deploy_information[Deliverer::ValKey::TITLE]) if @deploy_information[Deliverer::ValKey::TITLE]
-      app.metadata.update_description(@deploy_information[Deliverer::ValKey::DESCRIPTION]) if @deploy_information[Deliverer::ValKey::DESCRIPTION]
-
-      app.metadata.update_support_url(@deploy_information[Deliverer::ValKey::SUPPORT_URL]) if @deploy_information[Deliverer::ValKey::SUPPORT_URL]
-      app.metadata.update_changelog(@deploy_information[Deliverer::ValKey::CHANGELOG]) if @deploy_information[Deliverer::ValKey::CHANGELOG]
-      app.metadata.update_marketing_url(@deploy_information[Deliverer::ValKey::MARKETING_URL]) if @deploy_information[Deliverer::ValKey::MARKETING_URL]
-      app.metadata.update_privacy_url(@deploy_information[Deliverer::ValKey::PRIVACY_URL]) if @deploy_information[Deliverer::ValKey::PRIVACY_URL]
-
-      app.metadata.update_keywords(@deploy_information[Deliverer::ValKey::KEYWORDS]) if @deploy_information[Deliverer::ValKey::KEYWORDS]
-
-      app.metadata.update_price_tier(@deploy_information[Deliverer::ValKey::PRICE_TIER]) if @deploy_information[Deliverer::ValKey::PRICE_TIER]
-    end
-
-    def screenshots_path
-      return @screens_path if @screens_path
-
-      @screens_path = @deploy_information[Deliverer::ValKey::SCREENSHOTS_PATH]
-      if (ENV["DELIVER_SCREENSHOTS_PATH"] || '').length > 0
-        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
-
-      return @screens_path
-    end
-
-    def set_screenshots
-      screens_path = screenshots_path
-      if screens_path
-        # Not using Snapfile. Not a good user.
-        if not app.metadata.set_all_screenshots_from_path(screens_path, use_framed_screenshots?)
-          # This path does not contain folders for each language
-          if screens_path.kind_of?String
-            if @deploy_information[Deliverer::ValKey::DEFAULT_LANGUAGE]
-              screens_path = { @deploy_information[Deliverer::ValKey::DEFAULT_LANGUAGE] => screens_path } # use the default language
-              @deploy_information[Deliverer::ValKey::SCREENSHOTS_PATH] = screens_path
-            else
-              Helper.log.error "You must have folders for the screenshots (#{screens_path}) for each language (e.g. en-US, de-DE)."
-              screens_path = nil
-            end
-          end
-          app.metadata.set_screenshots_for_each_language(screens_path, use_framed_screenshots?) if screens_path
-        end
-      end
-    end
-
-    # Should _framed screenshots be used for the screenshot upload?
-    # This will only be true if there is a Framefile, as this makes the screenshots valid
-    # since the resolution is only correct when using a background + title using frameit 2.0
-    def use_framed_screenshots?
-      return Dir[screenshots_path + "**/Framefile.json"].count > 0
-    end
-
-    def verify_pdf_file
-      if @deploy_information[Deliverer::ValKey::SKIP_PDF]
-        Helper.log.debug "PDF verify was skipped"
-      else
-        # Everything is prepared for the upload
-        # We may have to ask the user if that's okay
-        html_path = HtmlGenerator.new.render(self)
-        unless Helper.is_test?
-          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
-            dir ||= app.get_metadata_directory
-            dir += "/#{app.apple_id}.itmsp"
-            FileUtils.rm_rf(dir) unless Helper.is_test?
-            raise "Did not upload the metadata, because the HTML file was rejected by the user".yellow
-          end
-        end
-      end
-    end
-
-    def trigger_metadata_upload
-      result = app.metadata.upload!
-      raise "Error uploading app metadata".red unless result == true
-    end
-
-    def itc
-      @itc ||= ItunesConnect.new
-    end
-
-    def additional_itc_information
-      # e.g. rating or copyright
-      itc.set_copyright!(app, @deploy_information[Deliverer::ValKey::COPYRIGHT]) if @deploy_information[Deliverer::ValKey::COPYRIGHT]
-      itc.set_app_review_information!(app, @deploy_information[Deliverer::ValKey::APP_REVIEW_INFORMATION]) if @deploy_information[Deliverer::ValKey::APP_REVIEW_INFORMATION]
-      itc.set_release_after_approval!(app, @deploy_information[Deliverer::ValKey::AUTOMATIC_RELEASE]) if @deploy_information[Deliverer::ValKey::AUTOMATIC_RELEASE] != nil
-
-      # Categories
-      primary = @deploy_information[Deliverer::ValKey::PRIMARY_CATEGORY]
-      secondary = @deploy_information[Deliverer::ValKey::SECONDARY_CATEGORY]
-      primary_subcategories = @deploy_information[Deliverer::ValKey::PRIMARY_SUBCATEGORIES]
-      secondary_subcategories = @deploy_information[Deliverer::ValKey::SECONDARY_SUBCATEGORIES]
-      itc.set_categories!(app, primary, secondary, primary_subcategories, secondary_subcategories) if (primary or secondary)
-
-      # App Rating
-      itc.set_app_rating!(app, @deploy_information[Deliverer::ValKey::RATINGS_CONFIG_PATH]) if @deploy_information[Deliverer::ValKey::RATINGS_CONFIG_PATH]
-
-      # App Icon
-      itc.upload_app_icon!(app, @deploy_information[Deliverer::ValKey::APP_ICON]) if @deploy_information[Deliverer::ValKey::APP_ICON]
-
-      # Apple Watch App Icon
-      itc.upload_apple_watch_app_icon!(app, @deploy_information[Deliverer::ValKey::APPLE_WATCH_APP_ICON]) if @deploy_information[Deliverer::ValKey::APPLE_WATCH_APP_ICON]
-    end
-
-    def trigger_ipa_upload
-      if @ipa
-        @ipa.app = app # we now have the resulting app
-        result = @ipa.upload! # Important: this will also actually deploy the app on iTunesConnect
-        raise "Error uploading ipa file".red unless result == true
-      else
-        Helper.log.warn "No IPA file given. Only the metadata was uploaded. If you want to deploy a full update, provide an ipa file."
-      end
-    end
-
-    def call_success_block
-      if @deploy_information[:blocks][:success]
-        @deploy_information[:blocks][:success].call(hash_for_callback)
-      end
-    end
-
-    def call_error_block(ex)
-      if @deploy_information[:blocks][:error]
-        # Custom error handling, we just call this one
-        @deploy_information[:blocks][:error].call(hash_for_callback(ex))
-      end
-
-      # Re-Raise the exception
-      raise ex
-    end
-
-    private
-      #####################################################
-      # @!group All the helper methods
-      #####################################################
-
-      def hash_for_callback(error = nil)
-        {
-          error: error,
-          app_version: (app_version rescue nil),
-          app_identifier: (app_identifier rescue nil),
-          skipped_deploy: skip_deployment?,
-          is_release_build: is_release_build?,
-          is_beta_build: is_beta_build?,
-          ipa_path: ENV["DELIVER_IPA_PATH"]
-        }
-      end
-  end
-end