summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsawanoboly <sawanoboriyu@higanworks.com>2015-04-21 14:08:52 +0900
committersawanoboly <sawanoboriyu@higanworks.com>2015-04-21 14:08:52 +0900
commite8d917583ec42fafe50f0ceef3ba252b8fabc94f (patch)
tree5790c19f295e737c979a8f260efa16f9c6160a7d
parent9a26ba99476563b3be7e1ca5f8e8ebbf87a8fc6c (diff)
downloadchef-e8d917583ec42fafe50f0ceef3ba252b8fabc94f.tar.gz
reflect https://github.com/chef/chef/pull/3227#issuecomment-94560685
-rw-r--r--lib/chef/shell.rb2
-rw-r--r--spec/unit/shell_spec.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/shell.rb b/lib/chef/shell.rb
index 1589832bef..3a68785ce9 100644
--- a/lib/chef/shell.rb
+++ b/lib/chef/shell.rb
@@ -108,7 +108,7 @@ module Shell
irb_conf[:IRB_RC] = lambda do |conf|
m = conf.main
- conf.prompt_c = "chef#{leader(m)} (#{Chef::VERSION})> "
+ conf.prompt_c = "chef#{leader(m)} > "
conf.return_format = " => %s \n"
conf.prompt_i = "chef#{leader(m)} (#{Chef::VERSION})> "
conf.prompt_n = "chef#{leader(m)} ?> "
diff --git a/spec/unit/shell_spec.rb b/spec/unit/shell_spec.rb
index e6d11da523..3a8f1a5346 100644
--- a/spec/unit/shell_spec.rb
+++ b/spec/unit/shell_spec.rb
@@ -69,7 +69,7 @@ describe Shell do
conf.main = Object.new
conf.main.instance_eval(&ObjectTestHarness)
Shell.irb_conf[:IRB_RC].call(conf)
- expect(conf.prompt_c).to eq("chef (#{Chef::VERSION})> ")
+ expect(conf.prompt_c).to eq("chef > ")
expect(conf.return_format).to eq(" => %s \n")
expect(conf.prompt_i).to eq("chef (#{Chef::VERSION})> ")
expect(conf.prompt_n).to eq("chef ?> ")
@@ -84,7 +84,7 @@ describe Shell do
events = Chef::EventDispatch::Dispatcher.new
conf.main = Chef::Recipe.new(nil,nil,Chef::RunContext.new(Chef::Node.new, {}, events))
Shell.irb_conf[:IRB_RC].call(conf)
- expect(conf.prompt_c).to eq("chef:recipe (#{Chef::VERSION})> ")
+ expect(conf.prompt_c).to eq("chef:recipe > ")
expect(conf.prompt_i).to eq("chef:recipe (#{Chef::VERSION})> ")
expect(conf.prompt_n).to eq("chef:recipe ?> ")
expect(conf.prompt_s).to eq("chef:recipe%l> ")
@@ -96,7 +96,7 @@ describe Shell do
conf = OpenStruct.new
conf.main = Chef::Node.new
Shell.irb_conf[:IRB_RC].call(conf)
- expect(conf.prompt_c).to eq("chef:attributes (#{Chef::VERSION})> ")
+ expect(conf.prompt_c).to eq("chef:attributes > ")
expect(conf.prompt_i).to eq("chef:attributes (#{Chef::VERSION})> ")
expect(conf.prompt_n).to eq("chef:attributes ?> ")
expect(conf.prompt_s).to eq("chef:attributes%l> ")