Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove support for widgets #8751

Merged
merged 1 commit into from
Jan 11, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions USAGE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions doc/CASK_LANGUAGE_REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion doc/cask_language_deltas.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
6 changes: 1 addition & 5 deletions doc/man/brew-cask.1
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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=<path>\fR
Target location for Dashboard Widget links\. The default value is \fB~/Library/Widgets\fR\.
.
.TP
\fB\-\-servicedir=<path>\fR
Target location for Service links\. The default value is \fB~/Library/Services\fR\.
.
Expand Down
3 changes: 0 additions & 3 deletions doc/src/brew-cask.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,6 @@ in a future version.
* `--fontdir=<path>`:
Target location for Font links. The default value is `~/Library/Fonts`.

* `--widgetdir=<path>`:
Target location for Dashboard Widget links. The default value is `~/Library/Widgets`.

* `--servicedir=<path>`:
Target location for Service links. The default value is `~/Library/Services`.

Expand Down
2 changes: 0 additions & 2 deletions lib/hbc/artifact.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions lib/hbc/artifact/widget.rb

This file was deleted.

3 changes: 0 additions & 3 deletions lib/hbc/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion lib/hbc/cli/internal_stanza.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ class Hbc::CLI::InternalStanza < Hbc::CLI::InternalUseBase
:prefpane,
:qlplugin,
:font,
:widget,
:service,
:colorpicker,
:binary,
Expand Down
1 change: 0 additions & 1 deletion lib/hbc/dsl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ def self.ordinary_artifact_types
:prefpane,
:qlplugin,
:font,
:widget,
:service,
:colorpicker,
:binary,
Expand Down
8 changes: 0 additions & 8 deletions lib/hbc/locations.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 0 additions & 14 deletions test/cask/cli/options_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down