cli_spec.rb in picky-1.3.2

- old
+ new

@@ -17,20 +17,20 @@
     describe 'executor_class_for' do
       it 'returns Help by default' do
         @cli.executor_class_for.should == [Picky::CLI::Help]
       end
       it 'returns Generator for generate' do
-        @cli.executor_class_for(:generate).should == [Picky::CLI::Generate, "sinatra_client | unicorn_server | empty_unicorn_server", "app_directory_name (optional)"]
+        @cli.executor_class_for(:generate).should == [Picky::CLI::Generate, :"(sinatra_client | unicorn_server | empty_unicorn_server)", :"app_directory_name"]
       end
       it 'returns Help for help' do
         @cli.executor_class_for(:help).should == [Picky::CLI::Help]
       end
       it 'returns Statistics for stats' do
-        @cli.executor_class_for(:stats).should == [Picky::CLI::Statistics, "logfile, e.g. log/search.log", "port (optional)"]
+        @cli.executor_class_for(:stats).should == [Picky::CLI::Statistics, :"logfile (e.g. log/search.log)", "port (default: 4567)"]
       end
       it 'returns Live for live' do
-        @cli.executor_class_for(:live).should == [Picky::CLI::Live, "host:port/path (optional, default: localhost:8080/admin)", "port (optional)"]
+        @cli.executor_class_for(:live).should == [Picky::CLI::Live, "host:port/path (default: localhost:8080/admin)", "port (default: 4568)"]
       end
     end
   end
   
   describe Picky::CLI::Live do
@@ -43,17 +43,17 @@
     before(:each) do
       @executor = Picky::CLI::Base.new
     end
     describe 'usage' do
       it 'calls puts with an usage' do
-        @executor.should_receive(:puts).once.with "Usage\n  picky some_name <param1> <param 2 (optional)>"
+        @executor.should_receive(:puts).once.with "Usage\n  picky some_name param1 [param2]"
         
-        @executor.usage :some_name, [:param1, 'param 2 (optional)']
+        @executor.usage :some_name, [:param1, 'param2']
       end
     end
     describe 'params_to_s' do
       it 'returns the right string' do
-        @executor.params_to_s([:param1, 'param 2 (optional)']).should == '<param1> <param 2 (optional)>'
+        @executor.params_to_s([:param1, 'param2']).should == 'param1 [param2]'
       end
     end
   end
   
 end
\ No newline at end of file