deliver/lib/deliver/commands_generator.rb in fastlane-2.38.0.beta.20170612010035 vs deliver/lib/deliver/commands_generator.rb in fastlane-2.38.0

- old
+ new

@@ -26,10 +26,17 @@ end return available_options end + def self.force_overwrite_metadata?(options, path) + res = options[:force] + res ||= ENV["DELIVER_FORCE_OVERWRITE"] # for backward compatibility + res ||= UI.confirm("Do you want to overwrite existing metadata on path '#{File.expand_path(path)}'?") if UI.interactive? + res + end + # rubocop:disable Metrics/PerceivedComplexity def run program :name, 'deliver' program :version, Fastlane::VERSION program :description, Deliver::DESCRIPTION @@ -144,11 +151,10 @@ options = FastlaneCore::Configuration.create(deliverfile_options(skip_verification: true), options.__hash__) options.load_configuration_file("Deliverfile") Deliver::Runner.new(options) # to login... containing = FastlaneCore::Helper.fastlane_enabled? ? FastlaneCore::FastlaneFolder.path : '.' path = options[:metadata_path] || File.join(containing, 'metadata') - res = ENV["DELIVER_FORCE_OVERWRITE"] - res ||= UI.confirm("Do you want to overwrite existing metadata on path '#{File.expand_path(path)}'?") + res = Deliver::CommandsGenerator.force_overwrite_metadata?(options, path) return 0 unless res require 'deliver/setup' v = options[:app].latest_version if options[:app_version].to_s.length > 0