diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ea7c68432b3f..a0ffe568dfaa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -160,7 +160,6 @@ Additional stanzas you might need for special use-cases: | `colorpicker` | relative path to a ColorPicker plugin that should be linked into the `~/Library/ColorPickers` folder on installation | `qlplugin` | relative path to a QuickLook plugin that should be linked into the `~/Library/QuickLook` folder on installation | `font` | relative path to a font that should be linked into the `~/Library/Fonts` folder on installation -| `widget` | relative path to a widget that should be linked into the `~/Library/Widgets` folder on installation (ALPHA: DOES NOT WORK YET) | `service` | relative path to a service that should be linked into the `~/Library/Services` folder on installation | `binary` | relative path to a binary that should be linked into the `/usr/local/bin` folder on installation | `input_method` | relative path to a input method that should be linked into the `~/Library/Input Methods` folder on installation diff --git a/USAGE.md b/USAGE.md index a457e5201159..e41b85d53f02 100644 --- a/USAGE.md +++ b/USAGE.md @@ -189,8 +189,6 @@ instead of the _home_ Applications directory by specifying `--appdir=/Applicatio Default is `~/Library/PreferencePanes` * `--qlplugindir=/my/path` changes the path for Quicklook Plugin symlinks. Default is `~/Library/QuickLook` -* `--widgetdir=/my/path` changes the path for Dashboard Widget symlinks. -Default is `~/Library/Widgets` * `--fontdir=/my/path` changes the path for Fonts symlinks. Default is `~/Library/Fonts` * `--binarydir=/my/path` changes the path for binary symlinks. diff --git a/doc/CASK_LANGUAGE_REFERENCE.md b/doc/CASK_LANGUAGE_REFERENCE.md index 554aaaefd257..9fb7e5ab58bc 100644 --- a/doc/CASK_LANGUAGE_REFERENCE.md +++ b/doc/CASK_LANGUAGE_REFERENCE.md @@ -97,7 +97,6 @@ Each Cask must declare one or more *artifacts* (i.e. something to install) | `qlplugin` | yes | relative path to a QuickLook plugin that should be linked into the `~/Library/QuickLook` folder on installation | `screen_saver` | yes | relative path to a Screen Saver that should be linked into the `~/Library/Screen Savers` folder on installation | `service` | yes | relative path to a service that should be linked into the `~/Library/Services` folder on installation -| `widget` | yes | relative path to a widget that should be linked into the `~/Library/Widgets` folder on installation (ALPHA: DOES NOT WORK YET) | `suite` | yes | relative path to a containing directory that should be linked into the `~/Applications` folder on installation (see also [Suite Stanza Details](#suite-stanza-details)) | `artifact` | yes | relative path to an arbitrary path that should be symlinked on installation. This is only for unusual cases. The `app` stanza is strongly preferred when linking `.app` bundles. | `installer` | yes | describes an executable which must be run to complete the installation. (see [Installer Stanza Details](#installer-stanza-details)) @@ -483,7 +482,7 @@ artifact 'openman.1', :target => '/usr/local/share/man/man1/openman.1' The `:target` key works similarly for most Cask artifacts, such as `app`, `binary`, `colorpicker`, `font`, `input_method`, `prefpane`, `qlplugin`, -`service`, `widget`, `suite`, and `artifact`. +`service`, `suite`, and `artifact`. ### :target Should Only Be Used in Select Cases diff --git a/doc/cask_language_deltas.md b/doc/cask_language_deltas.md index 0ce11a658eee..89beb5111d47 100644 --- a/doc/cask_language_deltas.md +++ b/doc/cask_language_deltas.md @@ -124,7 +124,6 @@ features which are available for the current Cask. * [`uninstall`](CASK_LANGUAGE_REFERENCE.md#uninstall-stanza-details) * [`url`](CASK_LANGUAGE_REFERENCE.md#url-stanza-details) * [`version`](CASK_LANGUAGE_REFERENCE.md#required-stanzas) - * [`widget`](CASK_LANGUAGE_REFERENCE.md#at-least-one-artifact-stanza-is-also-required) * [`zap`](CASK_LANGUAGE_REFERENCE.md#zap-stanza-details) diff --git a/doc/man/brew-cask.1 b/doc/man/brew-cask.1 index 86474f83b08f..6cc76502e350 100644 --- a/doc/man/brew-cask.1 +++ b/doc/man/brew-cask.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "HOMEBREW\-CASK" "1" "December 2014" "Homebrew-cask" "brew-cask" +.TH "HOMEBREW\-CASK" "1" "January 2015" "Homebrew-cask" "brew-cask" . .SH "NAME" \fBhomebrew\-cask\fR \- A friendly binary installer for OS X @@ -168,10 +168,6 @@ Target location for QuickLook Plugin links\. The default value is \fB~/Library/Q Target location for Font links\. The default value is \fB~/Library/Fonts\fR\. . .TP -\fB\-\-widgetdir=\fR -Target location for Dashboard Widget links\. The default value is \fB~/Library/Widgets\fR\. -. -.TP \fB\-\-servicedir=\fR Target location for Service links\. The default value is \fB~/Library/Services\fR\. . diff --git a/doc/src/brew-cask.1.md b/doc/src/brew-cask.1.md index 2493097b683f..513fc2793443 100644 --- a/doc/src/brew-cask.1.md +++ b/doc/src/brew-cask.1.md @@ -161,9 +161,6 @@ in a future version. * `--fontdir=`: Target location for Font links. The default value is `~/Library/Fonts`. - * `--widgetdir=`: - Target location for Dashboard Widget links. The default value is `~/Library/Widgets`. - * `--servicedir=`: Target location for Service links. The default value is `~/Library/Services`. diff --git a/lib/hbc/artifact.rb b/lib/hbc/artifact.rb index 62d835b9bbc8..6e9e2cc492fc 100644 --- a/lib/hbc/artifact.rb +++ b/lib/hbc/artifact.rb @@ -24,7 +24,6 @@ module Hbc::Artifact; end require 'hbc/artifact/stage_only' require 'hbc/artifact/suite' require 'hbc/artifact/uninstall' -require 'hbc/artifact/widget' require 'hbc/artifact/zap' module Hbc::Artifact @@ -45,7 +44,6 @@ def self.artifacts Hbc::Artifact::Prefpane, Hbc::Artifact::Qlplugin, Hbc::Artifact::Font, - Hbc::Artifact::Widget, Hbc::Artifact::Service, Hbc::Artifact::StageOnly, Hbc::Artifact::Binary, diff --git a/lib/hbc/artifact/widget.rb b/lib/hbc/artifact/widget.rb deleted file mode 100644 index 00325fb66ccc..000000000000 --- a/lib/hbc/artifact/widget.rb +++ /dev/null @@ -1,2 +0,0 @@ -class Hbc::Artifact::Widget < Hbc::Artifact::Symlinked -end diff --git a/lib/hbc/cli.rb b/lib/hbc/cli.rb index 7b870e297ae7..39a45e633e3b 100644 --- a/lib/hbc/cli.rb +++ b/lib/hbc/cli.rb @@ -168,9 +168,6 @@ def self.parser opts.on("--fontdir=MANDATORY") do |v| Hbc.fontdir = Pathname(v).expand_path end - opts.on("--widgetdir=MANDATORY") do |v| - Hbc.widgetdir = Pathname(v).expand_path - end opts.on("--servicedir=MANDATORY") do |v| Hbc.servicedir = Pathname(v).expand_path end diff --git a/lib/hbc/cli/internal_stanza.rb b/lib/hbc/cli/internal_stanza.rb index 54037823f219..9b8ef28f59d0 100644 --- a/lib/hbc/cli/internal_stanza.rb +++ b/lib/hbc/cli/internal_stanza.rb @@ -28,7 +28,6 @@ class Hbc::CLI::InternalStanza < Hbc::CLI::InternalUseBase :prefpane, :qlplugin, :font, - :widget, :service, :colorpicker, :binary, diff --git a/lib/hbc/dsl.rb b/lib/hbc/dsl.rb index 1fdc450a1cbf..d9797b769d03 100644 --- a/lib/hbc/dsl.rb +++ b/lib/hbc/dsl.rb @@ -244,7 +244,6 @@ def self.ordinary_artifact_types :prefpane, :qlplugin, :font, - :widget, :service, :colorpicker, :binary, diff --git a/lib/hbc/locations.rb b/lib/hbc/locations.rb index 257e5da052c1..c9875dc1c2d7 100644 --- a/lib/hbc/locations.rb +++ b/lib/hbc/locations.rb @@ -44,14 +44,6 @@ def qlplugindir=(_qlplugindir) @qlplugindir = _qlplugindir end - def widgetdir - @widgetdir ||= Pathname.new('~/Library/Widgets').expand_path - end - - def widgetdir=(_widgetdir) - @widgetdir = _widgetdir - end - def fontdir @fontdir ||= Pathname.new('~/Library/Fonts').expand_path end diff --git a/test/cask/cli/options_test.rb b/test/cask/cli/options_test.rb index c3b39afa0d6f..7732e3c14388 100644 --- a/test/cask/cli/options_test.rb +++ b/test/cask/cli/options_test.rb @@ -71,20 +71,6 @@ Hbc.fontdir.must_equal Pathname('/some/path/bar') end - it "supports setting the widgetdir" do - Hbc::CLI.process_options %w{help --widgetdir=/some/path/foo} - - Hbc.widgetdir.must_equal Pathname('/some/path/foo') - end - - it "supports setting the widgetdir from ENV" do - ENV['HOMEBREW_CASK_OPTS'] = "--widgetdir=/some/path/bar" - - Hbc::CLI.process_options %w{help} - - Hbc.widgetdir.must_equal Pathname('/some/path/bar') - end - it "supports setting the servicedir" do Hbc::CLI.process_options %w{help --servicedir=/some/path/foo}