Rename --deploy to --deployment

6 files changed, 24 insertions, 24 deletions

diff --git a/lib/bundler.rb b/lib/bundler.rb
index f54deefdeb..e8700192a7 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -60,7 +60,7 @@ module Bundler
 
   class << self
     attr_writer :ui, :bundle_path
-    attr_accessor :deploy
+    attr_accessor :deployment
 
     def configure
       @configured ||= begin
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index af420e56fb..fdacf7c181 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -112,22 +112,22 @@ module Bundler
       "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME). Bundler will remember this value for future installs on this machine"
     method_option "system", :type => :boolean, :banner =>
       "Install to the system location ($BUNDLE_PATH or $GEM_HOME) even if the bundle was previously installed somewhere else for this application"
-    method_option "deploy", :type => :boolean, :banner =>
+    method_option "deployment", :type => :boolean, :banner =>
       "Install using defaults tuned for deployment environments"
     method_option "production", :type => :boolean, :banner =>
-      "Deprecated, please use --deploy instead"
+      "Deprecated, please use --deployment instead"
     def install(path = nil)
       opts = options.dup
       opts[:without] ||= []
       opts[:without].map! { |g| g.to_sym }
 
       if opts[:production]
-        opts[:deploy] = true
+        opts[:deployment] = true
         Bundler.ui.warn "The --production option is deprecated, and will be removed in " \
-                        "the final release of Bundler 1.0. Please use --deploy instead."
+                        "the final release of Bundler 1.0. Please use --deployment instead."
       end
 
-      if (path || opts[:path] || opts[:deploy]) && opts[:system]
+      if (path || opts[:path] || opts[:deployment]) && opts[:system]
         Bundler.ui.error "You have specified both a path to install your gems to, \n" \
                          "as well as --system. Please choose."
         exit 1
@@ -149,12 +149,12 @@ module Bundler
         exit 1
       end
 
-      if opts[:deploy]
-        Bundler.deploy = true
+      if opts[:deployment]
+        Bundler.deployment = true
 
         unless Bundler.default_lockfile.exist?
-          raise ProductionError, "The --deploy flag requires a Gemfile.lock. Please make sure " \
-                                 "you have checked your Gemfile.lock into version control " \
+          raise ProductionError, "The --deployment flag requires a Gemfile.lock. Please make " \
+                                 "sure you have checked your Gemfile.lock into version control " \
                                  "before deploying."
         end
 
@@ -166,7 +166,7 @@ module Bundler
       # Can't use Bundler.settings for this because settings needs gemfile.dirname
       ENV['BUNDLE_GEMFILE'] = File.expand_path(opts[:gemfile]) if opts[:gemfile]
       Bundler.settings[:path] = nil if opts[:system]
-      Bundler.settings[:path] = "vendor/bundle" if opts[:deploy]
+      Bundler.settings[:path] = "vendor/bundle" if opts[:deployment]
       Bundler.settings[:path] = path if path
       Bundler.settings[:path] = opts[:path] if opts[:path]
       Bundler.settings[:bin] = opts["binstubs"] if opts[:binstubs]
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index b01c438f25..9c91c8e963 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -68,7 +68,7 @@ module Bundler
       @new_platform = !@platforms.include?(current_platform)
       @platforms |= [current_platform]
 
-      ensure_equivalent_gemfile_and_lockfile if Bundler.deploy
+      ensure_equivalent_gemfile_and_lockfile if Bundler.deployment
 
       converge_sources
       converge_dependencies
diff --git a/spec/install/deploy_spec.rb b/spec/install/deploy_spec.rb
index 1c4896fc5e..28d25e97a5 100644
--- a/spec/install/deploy_spec.rb
+++ b/spec/install/deploy_spec.rb
@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "install with --deploy" do
+describe "install with --deployment" do
   before do
     gemfile <<-G
       source "file://#{gem_repo1}"
@@ -9,8 +9,8 @@ describe "install with --deploy" do
   end
 
   it "fails without a lockfile" do
-    bundle "install --deploy"
-    out.should include("The --deploy flag requires a Gemfile.lock")
+    bundle "install --deployment"
+    out.should include("The --deployment flag requires a Gemfile.lock")
   end
 
   describe "with an existing lockfile" do
@@ -19,7 +19,7 @@ describe "install with --deploy" do
     end
 
     it "works if you didn't change anything" do
-      bundle "install --deploy", :exit_status => true
+      bundle "install --deployment", :exit_status => true
       exitstatus.should == 0
     end
 
@@ -30,7 +30,7 @@ describe "install with --deploy" do
         gem "rack-obama"
       G
 
-      bundle "install --deploy"
+      bundle "install --deployment"
       out.should include("You have modified your Gemfile")
       out.should include("You have added to the Gemfile")
       out.should include("* rack-obama")
@@ -44,7 +44,7 @@ describe "install with --deploy" do
         gem "activesupport"
       G
 
-      bundle "install --deploy"
+      bundle "install --deployment"
       out.should include("You have modified your Gemfile")
       out.should include("You have added to the Gemfile:\n* activesupport\n\n")
       out.should include("You have deleted from the Gemfile:\n* rack")
@@ -57,7 +57,7 @@ describe "install with --deploy" do
         gem "rack", :git => "git://hubz.com"
       G
 
-      bundle "install --deploy"
+      bundle "install --deployment"
       out.should include("You have modified your Gemfile")
       out.should include("You have added to the Gemfile:\n* source: git://hubz.com (at master)")
       out.should_not include("You have changed in the Gemfile")
@@ -76,7 +76,7 @@ describe "install with --deploy" do
         gem "rack"
       G
 
-      bundle "install --deploy"
+      bundle "install --deployment"
       out.should include("You have modified your Gemfile")
       out.should include("You have deleted from the Gemfile:\n* source: #{lib_path("rack-1.0")} (at master)")
       out.should_not include("You have added to the Gemfile")
@@ -99,7 +99,7 @@ describe "install with --deploy" do
         gem "foo", :git => "#{lib_path("rack")}"
       G
 
-      bundle "install --deploy"
+      bundle "install --deployment"
       out.should include("You have modified your Gemfile")
       out.should include("You have changed in the Gemfile:\n* rack from `no specified source` to `#{lib_path("rack")} (at master)`")
       out.should_not include("You have added to the Gemfile")
diff --git a/spec/install/gems/packed_spec.rb b/spec/install/gems/packed_spec.rb
index 9ba330c6bd..a89a4eee3d 100644
--- a/spec/install/gems/packed_spec.rb
+++ b/spec/install/gems/packed_spec.rb
@@ -28,7 +28,7 @@ describe "bundle install with gem sources" do
       simulate_new_machine
       FileUtils.rm_rf gem_repo2
 
-      bundle "install --deploy"
+      bundle "install --deployment"
       should_be_installed "rack 1.0.0"
     end
 
diff --git a/spec/install/gems/simple_case_spec.rb b/spec/install/gems/simple_case_spec.rb
index ac208aee34..54550d748c 100644
--- a/spec/install/gems/simple_case_spec.rb
+++ b/spec/install/gems/simple_case_spec.rb
@@ -457,9 +457,9 @@ describe "bundle install with gem sources" do
       G
     end
 
-    it "behaves like bundle install vendor/bundle with --deploy" do
+    it "behaves like bundle install vendor/bundle with --deployment" do
       bundle "install"
-      bundle "install --deploy"
+      bundle "install --deployment"
       out.should include("Your bundle was installed to `vendor/bundle`")
       should_be_installed "rack 1.0.0"
       bundled_app("vendor/bundle").should exist