@@ -6,7 +6,8 @@ class Noober::Command::SparkleInstallCommand < Noober::Command::BaseCommand @app_name = app_name end - def run + def run options = {} + return true if skip?(options) download_url = Sparkleology::LatestVersionCommand.new(rss_feed_url).run filename = File.basename download_url in_safe_dir do @@ -15,10 +16,22 @@ class Noober::Command::SparkleInstallCommand < Noober::Command::BaseCommand end end + def skip? options = {} + options[:force] || File.exists?(app_target_path) + end + protected def fetch_file download_url, save_filename open(save_filename,"w").write(open(download_url).read) end + def applications_path + # The ENV['APPLICATIONS_PATH'] override is used for testing + ENV['APPLICATIONS_PATH'] || "/Applications" + end + + def app_target_path + File.join applications_path, app_name + end end lib/noober/command/sparkle_install_command.rb @@ -25,6 +25,19 @@ class TestSparkleInstallCommand < Test::Unit::TestCase should "pass expectations" do; end should_not_be_skipped "if run again" end + + context "but application already exists" do + setup do + `touch #{File.join(test_applications_path, 'SomeAppZip.app')}` + Sparkleology::LatestVersionCommand.any_instance.expects(:run).never + Noober::Command::AppInstallCommand.any_instance.expects(:run).never + @command.run + end + + should_have_application "SomeAppZip.app" + should_be_skipped "if run again" + end + end end test/test_sparkle_install_command.rb b64905e8f25c0cf6de9be06cfda4a146ac8ef6c9 Dr Nic Williams drnicwilliams@gmail.com http://github.com/bjeanes/noober/commit/f7f65344e3bd72d2dee7f26e3863db39c94c4485 f7f65344e3bd72d2dee7f26e3863db39c94c4485 2008-09-21T01:36:26-07:00 2008-09-21T01:36:26-07:00 sparkle_install doesn't run if app already exists; assume that Sparkle will manage the upgrades itself be42793383539b6f5170b1821709c796882be637 Dr Nic Williams drnicwilliams@gmail.com