From 850e8cf3c07d4124eb6a3ccba974daf95ed1b004 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Fri, 21 Nov 2014 09:47:13 -0500 Subject: [PATCH] remove support for legacy form `destination_path` replaced by `staged_path` --- doc/cask_language_deltas.md | 1 + lib/cask.rb | 5 ----- lib/cask/caveats.rb | 5 ----- lib/cask/dsl/base.rb | 5 ----- lib/cask/without_source.rb | 5 ----- 5 files changed, 1 insertion(+), 20 deletions(-) diff --git a/doc/cask_language_deltas.md b/doc/cask_language_deltas.md index a20bdc5f0e..d5c979fd57 100644 --- a/doc/cask_language_deltas.md +++ b/doc/cask_language_deltas.md @@ -74,6 +74,7 @@ This notice will be removed for the final form.** | `uninstall :files` | `uninstall :delete` | `version 'latest'` | `version :latest` | `manual_installer(path)` (within `caveats`) | `installer :manual` +| `destination_path` | `staged_path` ## All Supported Stanzas (1.0) diff --git a/lib/cask.rb b/lib/cask.rb index 7bee190a96..72f08864c2 100644 --- a/lib/cask.rb +++ b/lib/cask.rb @@ -155,11 +155,6 @@ class Cask caskroom_path.join(cask_version.to_s) end - # todo transitional method, removeme after DSL 1.0 - def destination_path - staged_path - end - def metadata_master_container_path caskroom_path.join(self.class.metadata_subdir) end diff --git a/lib/cask/caveats.rb b/lib/cask/caveats.rb index ad0ac147c9..f0a59e29df 100644 --- a/lib/cask/caveats.rb +++ b/lib/cask/caveats.rb @@ -36,11 +36,6 @@ class Cask::CaveatsDSL caskroom_path.join(@cask.version.to_s) end - # todo transitional method, removeme after DSL 1.0 - def destination_path - staged_path - end - # DSL. Each method should handle output, following the convention of # at least one trailing blank line so that the user can distinguish # separate caveats. diff --git a/lib/cask/dsl/base.rb b/lib/cask/dsl/base.rb index d325853f74..5698dd3931 100644 --- a/lib/cask/dsl/base.rb +++ b/lib/cask/dsl/base.rb @@ -23,9 +23,4 @@ class Cask::DSL::Base def staged_path caskroom_path.join(@cask.version.to_s) end - - # todo transitional method, removeme after DSL 1.0 - def destination_path - staged_path - end end diff --git a/lib/cask/without_source.rb b/lib/cask/without_source.rb index d2121bd3a0..214b9deb75 100644 --- a/lib/cask/without_source.rb +++ b/lib/cask/without_source.rb @@ -3,11 +3,6 @@ class Cask::WithoutSource < Cask caskroom_path.children.first end - # todo transitional method, removeme after DSL 1.0 - def destination_path - staged_path - end - def to_s "#{title} (!)" end