[DRE-commits] [roodi] 02/06: Merge tag 'upstream/5.0.0'

[David Suárez]

This is an automated email from the git hooks/post-receive script.

deiv-guest pushed a commit to branch master
in repository roodi.

commit 6e67e1d55f2c8bb044da4e29769b9f6f468102cb
Merge: 3cdd96b 79fd01b
Author: David Suárez <david.sephirot at gmail.com>
Date:   Fri Jun 19 20:50:07 2015 +0200

    Merge tag 'upstream/5.0.0'
    
    Upstream version 5.0.0

 .gitignore                                    |   4 +--
 .travis.yml                                   |   1 +
 History.txt => History.md                     |  50 +++++++++++++-------------
 README.md                                     |  11 ++++--
 bin/roodi                                     |  26 ++++++++++----
 checksums.yaml.gz                             | Bin 268 -> 0 bytes
 lib/roodi/core/runner.rb                      |   2 +-
 lib/roodi/core/{visitable_sexp.rb => sexp.rb} |   0
 lib/roodi/version.rb                          |   2 +-
 lib/roodi_task.rb                             |  13 +++++++
 metadata.yml                                  |  26 +++++++-------
 11 files changed, 84 insertions(+), 51 deletions(-)

diff --cc bin/roodi
index f820248,beb9bc4..e856a05
--- a/bin/roodi
+++ b/bin/roodi
@@@ -1,13 -1,29 +1,27 @@@
  #!/usr/bin/env ruby
  
 -$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 -
  require 'roodi'
  
- runner = Roodi::Core::Runner.new
  
- config_param = ARGV.detect {|arg| arg =~ /-config=.*/}
- runner.config = config_param.split("=")[1] if config_param
- ARGV.delete config_param
+ if ARGV.detect { |arg| arg == "-h" || arg == "--help" }
+   puts "Usage: roodi [options] [path1 path2 ...]"
+   puts
+   puts "By default Roodi looks for all **/*.rb files in the current directory."
+   puts
+   puts "Options are ..."
+   puts "-c, --config=FILE         use FILE as the config file."
+   puts "-h, --help                display this help."
+   puts "-v, --version             display the program version."
+ elsif ARGV.detect { |arg| arg == "-v" || arg == "--version" }
+   puts Roodi::VERSION
+ else
+   runner = Roodi::Core::Runner.new
  
- runner.start(ARGV)
+   config_param = ARGV.detect { |arg| arg=~ /-c=.*/ || arg =~ /--config=.*/ }
+   runner.config = config_param.split("=")[1] if config_param
+   ARGV.delete config_param
  
- exit runner.errors.size
+   runner.start(ARGV)
+ 
+   exit runner.errors.size
+ end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/roodi.git