Auto merge of #4741 - bundler:seg-1-99-rebase, r=indirect

Re-integrate 1-99-dev into master

@indirect please make sure I didn't miss anything here?

2 files changed, 8 insertions, 0 deletions

diff --git a/lib/bundler/cli/console.rb b/lib/bundler/cli/console.rb
index 5e72cdbf..715abf25 100644
--- a/lib/bundler/cli/console.rb
+++ b/lib/bundler/cli/console.rb
@@ -8,6 +8,9 @@ module Bundler
     end
 
     def run
+      Bundler::SharedHelpers.major_deprecation "bundle console will be replaced " \
+                           "by `bin/console` generated by `bundle gem <name>`"
+
       group ? Bundler.require(:default, *(group.split.map!(&:to_sym))) : Bundler.require
       ARGV.clear
 
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb
index 07950c90..2dee4a5a 100644
--- a/lib/bundler/cli/install.rb
+++ b/lib/bundler/cli/install.rb
@@ -55,6 +55,11 @@ module Bundler
 
       Bundler::Fetcher.disable_endpoint = options["full-index"]
 
+      if options["binstubs"]
+        Bundler::SharedHelpers.major_deprecation \
+          "the --binstubs option will be removed in favor of `bundle binstubs`"
+      end
+
       # rubygems plugins sometimes hook into the gem install process
       Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins)