Changeset 6472

Timestamp:

03/27/07 14:17:01 (3 years ago)

Author:

minam

Message:

Added -F flag to make it easier to load the default config even when other files are explicitly given

Files:

• tools/capistrano/lib/capistrano/cli/options.rb (modified) (2 diffs)
• tools/capistrano/test/cli/options_test.rb (modified) (1 diff)

tools/capistrano/lib/capistrano/cli/options.rb

@@ -31 +31 @@
-            "Displays help (if available) for the task."
-          ) { |value| options[:explain] = value }
+
+          opts.on("-F", "--default-config",
+            "Always use default config, even with -f."
+          ) { options[:default_config] = true }
-
-          opts.on("-f", "--file FILE",
@@ -111 +115 @@
-        options[:verbose] = 3 if !options.has_key?(:verbose)
-
-
+default_config] || options[:
-        extract_environment_variables!
-

tools/capistrano/test/cli/options_test.rb

@@ -149 +149 @@
-  end
-
+  def test_F_should_search_for_default_recipes_even_if_f_is_given
+    @cli.expects(:look_for_default_recipe_file!)
+    @cli.args << "-Ff" << "hello"
+    @cli.parse_options!
+  end
+
-  def test_should_extract_env_vars_from_command_line
-    assert_nil ENV["HELLO"]