From fbca969b678e1651f76086ced3925ea391b14d32 Mon Sep 17 00:00:00 2001 From: Dave Copeland Date: Mon, 3 Jan 2011 19:24:05 -0500 Subject: [PATCH] Using GLI 1.2.5's version directive Also, using GLI's exit code while I'm at it. --- bin/showoff | 10 ++-------- showoff.gemspec | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/bin/showoff b/bin/showoff index eb60e46a1..e02561dc4 100755 --- a/bin/showoff +++ b/bin/showoff @@ -7,13 +7,7 @@ require 'gli' include GLI -desc 'Show ShowOff version' -long_desc 'This command shows the currently installed version of ShowOff' -command [:version] do |c| - c.action do |global_options,options,args| - puts "ShowOff Version " + ShowOff::Version - end -end +version ShowOff::Version desc 'Create new showoff presentation' arg_name 'dir_name' @@ -139,4 +133,4 @@ on_error do |exception| true end -GLI.run(ARGV) +exit GLI.run(ARGV) diff --git a/showoff.gemspec b/showoff.gemspec index 50920da02..e67c931ae 100644 --- a/showoff.gemspec +++ b/showoff.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.add_dependency "bluecloth" s.add_dependency "nokogiri" s.add_dependency "json" - s.add_dependency ("gli",">= 1.1.1") + s.add_dependency ("gli",">= 1.2.5") s.description = <<-desc ShowOff is a Sinatra web app that reads simple configuration files for a presentation. It is sort of like a Keynote web app engine. I am using it