@@ -35,6 +35,8 @@ BANNER "Add the given log message when punching in/out") { |message| OPTIONS[:message] = message } opts.on('--full', "Show full output for the command") { |full| OPTIONS[:full] = true } + opts.on('--short', + "Show short output for the command") { |full| OPTIONS[:short] = true } opts.on("-h", "--help", "Show this help message.") { puts opts; exit } opts.parse!(ARGV) @@ -58,7 +60,7 @@ Punch.load commands = { 'status' => lambda do |project| result = Punch.status(project, OPTIONS) - if project.nil? or OPTIONS[:full] + if result.is_a?(Hash) puts result.to_yaml else puts result.inspect bin/punch @@ -163,8 +163,8 @@ describe 'punch command' do run_command('status', @project) end - it 'should output the status as YAML if no project given' do - result = 'status data' + it "should output the status as YAML if the status data is a Hash" do + result = { 'status' => 'data' } Punch.stub!(:status).and_return(result) self.should.receive(:puts).with(result.to_yaml) run_command('status') @@ -180,18 +180,14 @@ describe 'punch command' do run_command('status', '--full') end - it 'should output the status as YAML if a full option is given' do - result = 'status data' - Punch.stub!(:status).and_return(result) - self.should.receive(:puts).with(result.to_yaml) - run_command('status', @project, '--full') + it 'should pass a true short option if specified on the command line (with --short)' do + Punch.should.receive(:status).with(@project, :short => true) + run_command('status', @project, '--short') end - it 'should output the status as YAML if no project given even if a full option is given' do - result = 'status data' - Punch.stub!(:status).and_return(result) - self.should.receive(:puts).with(result.to_yaml) - run_command('status', '--full') + it 'should pass a true short option if specified on the command line (with --short) and no project given' do + Punch.should.receive(:status).with(nil, :short => true) + run_command('status', '--short') end it 'should not write the data' do spec/punch_command_spec.rb a4fb8b416b591a3f97ed39e028da2863a9e9c259 Yossef Mendelssohn ymendel@pobox.com http://github.com/ymendel/one_inch_punch/commit/de5db99209adfe3c003c0cf509f6d4c43ddc9d26 de5db99209adfe3c003c0cf509f6d4c43ddc9d26 2009-06-25T15:13:42-07:00 2009-06-25T15:13:42-07:00 Adding short command-line option. Right now it's for status only, like 'full'. 503b663416d9611a19dd52c210f883bf3dfa9bd1 Yossef Mendelssohn ymendel@pobox.com