Merge pull request #1157 from phinze/prefpanes

Tweaks to preference panes in response to feedback
Homebrew · Oct 8, 2013 · 6083a02 · 6083a02
2 parents 7a99af1 + 18fb8fc
commit 6083a02
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 1 deletion.
diff --git a/lib/cask/cli.rb b/lib/cask/cli.rb
@@ -56,7 +56,10 @@ def self.nice_listing(cask_list)
   def self.parser
     @parser ||= OptionParser.new do |opts|
       opts.on("--appdir=MANDATORY") do |v|
-        Cask.appdir = Pathname.new File.expand_path(v)
+        Cask.appdir = Pathname(v).expand_path
+      end
+      opts.on("--prefpanedir=MANDATORY") do |v|
+        Cask.prefpanedir = Pathname(v).expand_path
       end
     end
   end

diff --git a/test/cli/alfred_test.rb → test/cask/cli/alfred_test.rb b/test/cli/alfred_test.rb → test/cask/cli/alfred_test.rb
diff --git a/test/cli/audit_test.rb → test/cask/cli/audit_test.rb b/test/cli/audit_test.rb → test/cask/cli/audit_test.rb
diff --git a/test/cli/create_test.rb → test/cask/cli/create_test.rb b/test/cli/create_test.rb → test/cask/cli/create_test.rb
diff --git a/test/cli/edit_test.rb → test/cask/cli/edit_test.rb b/test/cli/edit_test.rb → test/cask/cli/edit_test.rb
diff --git a/test/cli/home_test.rb → test/cask/cli/home_test.rb b/test/cli/home_test.rb → test/cask/cli/home_test.rb
diff --git a/test/cli/info_test.rb → test/cask/cli/info_test.rb b/test/cli/info_test.rb → test/cask/cli/info_test.rb
diff --git a/test/cli/install_test.rb → test/cask/cli/install_test.rb b/test/cli/install_test.rb → test/cask/cli/install_test.rb
diff --git a/test/cli/list_test.rb → test/cask/cli/list_test.rb b/test/cli/list_test.rb → test/cask/cli/list_test.rb
diff --git a/test/cli/options_test.rb → test/cask/cli/options_test.rb b/test/cli/options_test.rb → test/cask/cli/options_test.rb
@@ -15,6 +15,20 @@
     Cask.appdir.must_equal Pathname('/some/path/bar')
   end
 
+  it "supports setting the prefpanedir" do
+    Cask::CLI.process_options %w{help --prefpanedir=/some/path/foo}
+
+    Cask.prefpanedir.must_equal Pathname('/some/path/foo')
+  end
+
+  it "supports setting the prefpanedir from ENV" do
+    ENV['HOMEBREW_CASK_OPTS'] = "--prefpanedir=/some/path/bar"
+
+    Cask::CLI.process_options %w{help}
+
+    Cask.prefpanedir.must_equal Pathname('/some/path/bar')
+  end
+
   it "allows additional options to be passed through" do
     rest = Cask::CLI.process_options %w{edit foo --create --appdir=/some/path/qux}
 

diff --git a/test/cli/search_test.rb → test/cask/cli/search_test.rb b/test/cli/search_test.rb → test/cask/cli/search_test.rb
diff --git a/test/cli/uninstall_test.rb → test/cask/cli/uninstall_test.rb b/test/cli/uninstall_test.rb → test/cask/cli/uninstall_test.rb