cuporter 0.3.7 → 0.3.9

data/README.textile

@@ -114,56 +114,71 @@ h4. help
 <pre>
   $ cuporter -h
 
-  Usage: cuporter [options]
-
-      -r, --report [tag|feature|tree]  View, or type of report.
-                                           Default: "tag"
-
-      -f, --format [xml|html|csv|text] Output format.
-      Default: text (it's pretty, though!)
-
-      -i, --input-dir DIR              Root directory of *.feature files.
-                                           Default: "features"
-
-                                           Used to build the glob pattern '[--input-dir]/**/*.feature', which is really most likely
-                                           "features/**/*.features" and finds all feature files anywhere under "features" or
-                                           your custom root supplied with this option.
-                                           Overridden by "--file-input'.
-
-      -I, --file-input FILE            Single *.feature file.  Full name with extension, like 'path/to/file.feature.'
-                                           Overrides "--input-dir" and used mostly for testing.
-
-      -o, --output-file FILE           Output file path, like 'tmp/cucumber/tag_report.html'.
-
-      -t, --tags TAG_EXPRESSION        Filter on tags for name report.
-                                           TAG_EXPRESSION rules:
-                                               1. $ cucumber --help
-                                               2. http://github.com/aslakhellesoy/cucumber/wiki/Tags
-
-      -T, --title STRING               Override report default title, which is different for each view/report.
-                                           This affects the xml 'report' node title and the html head > title attributes.
+Usage: cuporter [options]
+
+    -r, --report [tag|feature|tree]  View, or type of report.
+                                         Default: "tag"
+          
+    -f, --format [xml|html|csv|text] Output format.
+                                         Default: text (it's pretty, though!)
+          
+    -i, --input-dir DIR              Root directory of *.feature files.
+                                         Default: "features"
+     
+                                         Used to build the glob pattern '[--input-dir]/**/*.feature', which is really most likely
+                                         "features/**/*.features" and finds all feature files anywhere under "features" or
+                                         your custom root supplied with this option.
+                                         Overridden by "--file-input'.
+          
+    -I, --file-input FILE            Single *.feature file.  Full name with extension, like 'path/to/file.feature.'
+                                         Overrides "--input-dir" and used mostly for testing.
+          
+    -o, --output-file FILE           Output file path, like 'tmp/cucumber/tag_report.html'.
+          
+    -t, --tags TAG_EXPRESSION        Filter on tags for name report.
+                                         TAG_EXPRESSION rules:
+                                             1. $ cucumber --help
+                                             2. http://github.com/aslakhellesoy/cucumber/wiki/Tags
+          
+    -T, --title STRING               Override report default title, which is different for each view/report.
+                                         This affects the xml 'report' node title and the html head > title attributes.
+          
 CSS and Javascript asset options:
 
-    -a, --assets-dir PATH            Path to folder for CSS and Javascript assets.
-                                           Only applies with '--link-assets', which is off by default.
-                                           Setting this will cause assets to be copied from 'public';
-                                           otherwise, the html will link to the files under 'cuporter/public' in
-                                           your gempath.
-
-    -l, --link-assets                Do not inline CSS and js in <style/> and <script/> tags, but link to
-                                       external files instead.
+    -l, --link-assets                Do not inline CSS and js in <style/> and <script/> tags, but link to external files instead.
                                            Default:  'false' for the tag and feature views, not optional for the
                                                      tree view, which requires external gifs.
-
-  Reporting options: on by default but can be turned off:
-  
-          --no-sort                    Do not sort tags, features, scenarios, or outlines
-          --no-number                  Do not get or show scenario or example numbers, (i.e., do not number the leaf nodes).
-          --no-total                   Do not get or show totals
-          --no-show-tags               Do not show cucumber tags at the feature, scenario, or outline level.
-          --no-show-files              Do not show feature file paths.
-          --no-leaves                  Show features only, with no scenarios or outlines.
-  
+          
+    -c, --copy-public-assets         If --output-file is supplied, and you're linking to external 
+                                           CSS and JavaScript assets, copy them from 'public/' to 'cuporter_public'
+                                           in the same dir as the output file.
+                                           Sets --use-copied-public-assets to 'true', and
+                                           the html report will link to these files by relative path.
+
+                                           Default: 'false'
+          
+    -u, --use-copied-public-assets   When running batches of reports, and the assets folder has already been
+                                           created by another call to cuporter with '--copy-public-assets'.
+                                           Set to 'true' automatically along with --copy-public-assets.
+
+                                           Default: 'false'
+          
+        --config-file PATH           Specify any of these options in a yml file.
+                                           Order of precedence:
+                                              1 - command line
+                                              2 - yaml file
+                                              3 - these defaults
+
+                                           Default: 'cuporter.yml'
+          
+Reporting options: on by default but can be turned off:
+
+        --no-sort                    Do not sort tags, features, scenarios, or outlines
+        --no-number                  Do not get or show scenario or example numbers, (i.e., do not number the leaf nodes).
+        --no-total                   Do not get or show totals
+        --no-show-tags               Do not show cucumber tags at the feature, scenario, or outline level.
+        --no-show-files              Do not show feature file paths.
+        --no-leaves                  Show features only, with no scenarios or outlines.
 
 </pre>
 
@@ -191,7 +206,7 @@ h4. Examples
 
 h3. Dependencies
 
-# Nokogiri 1.4.4 or above
+# Nokogiri 1.4.1 or above
 ** For all things Nodular: XML document building and XSL transformation into HTML
 ** Not tested on earlier versions yet but I'd guess you'll be fine with anything recent.
 ** @libxml2@ and @libxslt@ are required by this gem, which *should* handle them smoothly.  However, @libxml@ and cousins
@@ -206,6 +221,3 @@ h3. Acknowledgements
 
 * Acknowledgements remain due to the Cucumber HTML formatter, and to the human one, too!.
 * Thanks to everyone involved in Nokogiri, jQuery and the Treeview plugin.
-
-  I used to _"Consider this a stop-gap until we get this functionality in a proper cucumber formatter"_, but now I'm not so sure.  Megalomania?
-

data/Rakefile

@@ -65,7 +65,7 @@ namespace :cuporter do
 
   spec = Gem::Specification.new do |s|
     s.name = 'cuporter'
-    s.version = '0.3.7'
+    s.version = '0.3.9'
     s.rubyforge_project = s.name
 
     s.platform = Gem::Platform::RUBY
@@ -83,7 +83,7 @@ namespace :cuporter do
     s.executables = [s.default_executable]
 
     s.files =  %w(LICENSE README.textile Rakefile) + 
-      FileList["lib/**/*.{rb,xslt}", "bin/*", "public/**/*.{css,js,gif}"].to_a
+      FileList["config/**/*", "lib/**/*.{rb,xslt}", "bin/*", "public/**/*.{css,js,gif}"].to_a
 
     s.require_path = "lib"
   end

data/bin/cuporter

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 
+$LOAD_PATH.unshift File.expand_path('../config', File.dirname(__FILE__))
 $LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__))
+require 'configuration'
 require 'cuporter'
 
 
@@ -14,8 +16,12 @@ when 'csv'
 when 'text', 'pretty'
   report.doc.to_text
 when 'html'
-  Cuporter.options[:link_assets] = true if Cuporter.options[:report] == "tree"
-  html = Cuporter::Document.new_html(Cuporter.options[:report], Cuporter.options[:link_assets], Cuporter.options[:assets_dir])
+  if Cuporter.options[:copy_public_assets]
+    Cuporter::Document::Assets.copy(Cuporter.options[:output_file])
+  end
+  html = Cuporter::Document.new_html(Cuporter.options[:report],
+                                     Cuporter.options[:link_assets], 
+                                     Cuporter.options[:use_copied_public_assets])
   formatters = File.expand_path("../lib/cuporter/formatters", File.dirname(__FILE__))
   xslt = Nokogiri::XSLT(File.read("#{formatters}/xml_to_html.xslt"))
   html.add_report(xslt.transform(report.doc).at('.report'))

data/config/cli/filter_args_builder.rb

@@ -0,0 +1,39 @@
+# Copyright 2011 ThoughtWorks, Inc. Licensed under the MIT License
+
+module Cuporter
+  module Config
+    module CLI
+      class FilterArgsBuilder
+        def initialize(cli_tags = [])
+          @cli_tags = cli_tags
+          @all  = []
+          @any  = []
+          @none = []
+          @args = {}
+          filter_args
+        end
+
+        def filter_args
+          @cli_tags.each do |expression|
+            case expression
+            when /^~@/
+              @none << expression.sub(/~/,'')
+            when /,/
+              @any |= expression.split(',')
+            else
+              @all << expression
+            end
+          end
+        end
+
+        def args
+          @args[:any]  = @any unless @any.empty?
+          @args[:all]  = @all unless @all.empty?
+          @args[:none] = @none unless @none.empty?
+          @args
+        end
+
+      end
+    end
+  end
+end

data/config/cli/options.rb

@@ -0,0 +1,153 @@
+# Copyright 2010 ThoughtWorks, Inc. Licensed under the MIT License
+require 'optparse'
+require 'fileutils'
+
+module Cuporter
+  module Config
+    module CLI
+
+      class Options
+
+        def self.[](key)
+          self.options[key]
+        end
+
+        def self.options
+          parse unless @options
+          @options
+        end
+
+        def self.args
+          @@args
+        end
+
+        def self.parse
+          @@args = ARGV.dup
+          @options = {}
+
+          OptionParser.new(ARGV.dup) do |opts|
+            opts.banner = "Usage: cuporter [options]\n\n"
+
+            opts.on("-r", "--report [tag|feature|tree]", %Q{View, or type of report.
+                                         Default: "tag"
+            }) do |r|
+              @options[:report] = (r == 'name' ? 'feature' : r) 
+            end
+
+            opts.on("-f", "--format [xml|html|csv|text]", %Q{Output format.
+                                         Default: text (it's pretty, though!)
+            }) do |f|
+              @options[:format] = f
+            end
+
+            opts.on("-i", "--input-dir DIR", %Q{Root directory of *.feature files.
+                                         Default: "features"
+
+                                         Used to build the glob pattern '[--input-dir]/**/*.feature', which is really most likely
+                                         "features/**/*.features" and finds all feature files anywhere under "features" or
+                                         your custom root supplied with this option.
+                                         Overridden by "--file-input'.
+            }) do |i|
+              @options[:input_dir] = i.sub(/#{File::SEPARATOR}$/,'')
+            end
+
+            opts.on("-I", "--file-input FILE", %Q{Single *.feature file.  Full name with extension, like 'path/to/file.feature.'
+                                         Overrides "--input-dir" and used mostly for testing.
+            }) do |file|
+              @options[:input_file] = file
+            end
+
+            opts.on("-o", "--output-file FILE", %Q{Output file path, like 'tmp/cucumber/tag_report.html'.
+            }) do |o|
+              @options[:output_file] = o
+            end
+
+            @options[:tags] = []
+            opts.on("-t", "--tags TAG_EXPRESSION", %Q{Filter on tags for name report.
+                                         TAG_EXPRESSION rules:
+                                             1. $ cucumber --help
+                                             2. http://github.com/aslakhellesoy/cucumber/wiki/Tags
+            }) do |t|
+              @options[:tags] << t
+            end
+
+            opts.on("-T", "--title STRING", %Q{Override report default title, which is different for each view/report.
+                                         This affects the xml 'report' node title and the html head > title attributes.
+            }) do |title|
+              @options[:title] = title
+            end
+
+            opts.separator "CSS and Javascript asset options:\n\n"
+
+            opts.on("-l", "--link-assets", %Q{Do not inline CSS and js in <style/> and <script/> tags, but link to external files instead.
+                                           Default:  'false' for the tag and feature views, not optional for the
+                                                     tree view, which requires external gifs.
+            }) do |l|
+              @options[:link_assets] = l
+            end
+
+            opts.on("-c", "--copy-public-assets", %Q{If --output-file is supplied, and you're linking to external 
+                                           CSS and JavaScript assets, copy them from 'public/' to 'cuporter_public'
+                                           in the same dir as the output file.
+                                           Sets --use-copied-public-assets to 'true', and
+                                           the html report will link to these files by relative path.
+
+                                           Default: 'false'
+            }) do |c|
+              @options[:copy_public_assets] = c
+              @options[:use_copied_public_assets] = c
+            end
+
+            opts.on("-u", "--use-copied-public-assets", %Q{When running batches of reports, and the assets folder has already been
+                                           created by another call to cuporter with '--copy-public-assets'.
+                                           Set to 'true' automatically along with --copy-public-assets.
+
+                                           Default: 'false'
+            }) do |u|
+              @options[:use_copied_public_assets] = u
+            end
+
+            opts.on("--config-file PATH", %Q{Specify any of these options in a yml file.
+                                           Order of precedence:
+                                              1 - command line
+                                              2 - yaml file
+                                              3 - these defaults
+
+                                           Default: 'cuporter.yml'
+            }) do |path|
+              @options[:config_file] = path
+            end
+
+            opts.separator "Reporting options: on by default but can be turned off:\n\n"
+            opts.on("--no-sort", "Do not sort tags, features, scenarios, or outlines\n") do |n|
+              @options[:sort] = n
+            end
+
+            opts.on("--no-number", "Do not get or show scenario or example numbers, (i.e., do not number the leaf nodes).\n") do |n|
+              @options[:number] = n
+            end
+
+            opts.on("--no-total", "Do not get or show totals\n") do |n|
+              @options[:total] = n
+            end
+
+            opts.on("--no-show-tags", "Do not show cucumber tags at the feature, scenario, or outline level.\n") do |show_tags|
+              @options[:show_tags] = show_tags
+            end
+
+            opts.on("--no-show-files", "Do not show feature file paths.\n") do |show_files|
+              @options[:show_files] = show_files
+            end
+
+            opts.on("--no-leaves", "Show features only, with no scenarios or outlines.\n\n\n") do |l|
+              @options[:leaves] = l
+            end
+
+          end.parse!
+
+        end
+      end
+    end
+  end
+
+end

data/config/configuration.rb

@@ -0,0 +1,94 @@
+# Copyright 2011 ThoughtWorks, Inc. Licensed under the MIT License
+$LOAD_PATH.unshift( File.expand_path("#{File.dirname(__FILE__)}"))
+require 'fileutils'
+require 'cli/options'
+require 'cli/filter_args_builder'
+
+module Cuporter
+  module Config
+
+    module Options
+
+      DEFAULTS = { :report => "tag",
+                   :format => "text",
+                   :input_dir => "features",
+                   :tags => [],
+                   :copy_public_assets => false,
+                   :use_copied_public_assets => false,
+                   :sort => true,
+                   :number => true,
+                   :total => true,
+                   :show_tags => true,
+                   :show_files => true,
+                   :leaves => true
+      }
+
+      def self.options
+        unless @options
+          # empty hash if no file
+          file_config = config_file(Cuporter::Config::CLI::Options[:config_file] || "cuporter.yml")
+
+          # CLI options replace any found in the file
+          cli_options_over_file_options = file_config.merge(Cuporter::Config::CLI::Options.options)
+
+          # defaults will be used for anything not so far specified in the file
+          # or CLI
+          @options = post_process(DEFAULTS.merge(cli_options_over_file_options))
+        end
+        @options
+      end
+
+      def self.post_process(options)
+        options[:input_file_pattern] = options.delete(:input_file) || "#{options.delete(:input_dir)}/**/*.feature"
+        options[:root_dir] = options[:input_file_pattern].split(File::SEPARATOR).first
+        options[:filter_args] = Cuporter::Config::CLI::FilterArgsBuilder.new(options.delete(:tags)).args
+        if options[:output_file]
+          options[:output_file] = full_path(options[:output_file].dup)
+        else
+          options[:copy_public_assets] = false
+          options[:use_copied_public_assets] = false
+        end
+        options
+      end
+
+      def self.config_file(path)
+        return {} unless File.exists?(path)
+
+        require 'yaml'
+        pairs = {}
+        YAML.load_file(path).each do |key, value|
+          pairs[key.to_sym] = case value
+                              when /^true$/i
+                                true
+                              when /^false$/i
+                                false
+                              end || value
+        end
+        pairs
+      end
+
+      def self.full_path(path)
+        expanded_path = File.expand_path(path)
+        path_nodes = expanded_path.split(File::SEPARATOR)
+        file = path_nodes.pop
+        FileUtils.makedirs(path_nodes.join(File::SEPARATOR))
+        expanded_path
+      end
+
+    end
+  end
+
+  def self.html?
+    Config::Options[:format] == 'html'
+  end
+
+  def self.options
+    Config::Options.options
+  end
+
+  def self.output_file
+    if options[:output_file]
+      File.open(options[:output_file], "w")
+    end
+  end
+end

data/lib/cuporter.rb

@@ -2,8 +2,6 @@
 $LOAD_PATH.unshift( File.expand_path("#{File.dirname(__FILE__)}"))
 $LOAD_PATH.unshift( File.expand_path("#{File.dirname(__FILE__)}/.."))
 require 'cuporter/extensions/string'
-require 'cuporter/cli/options'
-require 'cuporter/cli/filter_args_builder'
 require 'cuporter/node'
 require 'cuporter/formatters/text'
 require 'cuporter/formatters/csv'
@@ -12,6 +10,7 @@ require 'cuporter/feature_parser'
 require 'cuporter/tag_nodes_parser'
 require 'cuporter/node_parser'
 require 'cuporter/document'
+require 'cuporter/document/assets'
 require 'cuporter/document/html_document'
 require 'cuporter/report/report_base'
 require 'cuporter/report/tag_report'

data/lib/cuporter/document.rb

@@ -10,20 +10,14 @@ module Cuporter
       doc
     end
 
-    def self.new_html(view, link_assets, assets_dir)
+    def self.new_html(view, link_assets, use_copied_public_assets)
       Nokogiri::XML::Document.send(:include, Cuporter::Document::Html)
       doc =  Nokogiri::XML::Document.new
       doc.view = view
       doc.link_assets = link_assets
-      project_assets = File.expand_path( "public", File.dirname(__FILE__) + "../../../")
+      doc.assets_src = Assets::PUBLIC_SOURCE_PATH
+      doc.assets_base_path = Assets.base_path(use_copied_public_assets)
 
-      # we count on the dirs being created by the option parser
-      if link_assets
-        FileUtils.cp_r("#{project_assets}/.", assets_dir)
-        doc.assets_dir = assets_dir
-      else
-        doc.assets_dir = project_assets
-      end
       root = Nokogiri::XML::Node.new('html', doc)
       root.create_internal_subset( 'html', "-//W3C//DTD XHTML 1.0 Strict//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd")
       doc << root

data/lib/cuporter/document/assets.rb

@@ -0,0 +1,25 @@
+# Copyright 2011 ThoughtWorks, Inc. Licensed under the MIT License
+module Cuporter
+  module Document
+    module Assets
+      PUBLIC_SOURCE_PATH = File.expand_path( "public", File.dirname(__FILE__) + "../../../../")
+      RELATIVE_PUBLIC_ASSETS_PATH = "cuporter_public"
+
+      def self.copy(output_file_path)
+        assets_target = "#{File.dirname(output_file_path)}/#{RELATIVE_PUBLIC_ASSETS_PATH}"
+        FileUtils.rm_rf(assets_target) if File.exists?(assets_target)
+        FileUtils.mkdir(assets_target)
+        FileUtils.cp_r("#{PUBLIC_SOURCE_PATH}/.", assets_target)
+      end
+
+      def self.base_path(use_copied_public_assets)
+        # we count on the dirs being created by the option parser
+        if use_copied_public_assets
+          RELATIVE_PUBLIC_ASSETS_PATH
+        else
+          PUBLIC_SOURCE_PATH
+        end
+      end
+    end
+  end
+end

data/lib/cuporter/document/html_document.rb

@@ -2,7 +2,11 @@
 module Cuporter
   module Document
     module Html
-      attr_accessor :view, :link_assets, :assets_dir
+      attr_accessor :view, :link_assets, :assets_src, :assets_base_path
+      
+      def assets_base_path
+        @assets_base_path ||= assets_target || assets_src
+      end
 
       def add_report(node)
         root << head(node['title'])
@@ -50,22 +54,22 @@ module Cuporter
 
       def style_css(file)
         style = new_node('style', 'type' => 'text/css')
-        style << file_contents("#{assets_dir}/#{file}")
+        style << file_contents("#{assets_src}/#{file}")
         style
       end
 
       def script_js(file)
         script = new_node('script', 'type' => 'text/javascript')
-        script << file_contents("#{assets_dir}/#{file}")
+        script << file_contents("#{assets_src}/#{file}")
         script
       end
 
       def link_css(file)
-        new_node('link', 'type' => 'text/css', 'rel' => 'stylesheet', 'href' => "#{assets_dir}/#{file}")
+        new_node('link', 'type' => 'text/css', 'rel' => 'stylesheet', 'href' => "#{assets_base_path}/#{file}")
       end
 
       def link_js(file)
-        new_node('script', 'type' => 'text/javascript', 'src' => "#{assets_dir}/#{file}")
+        new_node('script', 'type' => 'text/javascript', 'src' => "#{assets_base_path}/#{file}")
       end
 
       def file_contents(file_name)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cuporter
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - Tim Camper
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 -04:00
+date: 2011-06-14 00:00:00 -04:00
 default_executable: cuporter
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,8 +47,10 @@ files:
 - LICENSE
 - README.textile
 - Rakefile
-- lib/cuporter/cli/filter_args_builder.rb
-- lib/cuporter/cli/options.rb
+- config/cli/filter_args_builder.rb
+- config/cli/options.rb
+- config/configuration.rb
+- lib/cuporter/document/assets.rb
 - lib/cuporter/document/html_document.rb
 - lib/cuporter/document.rb
 - lib/cuporter/extensions/nokogiri.rb

data/lib/cuporter/cli/filter_args_builder.rb

@@ -1,37 +0,0 @@
-# Copyright 2010 ThoughtWorks, Inc. Licensed under the MIT License
-
-module Cuporter
-  module CLI
-    class FilterArgsBuilder
-      def initialize(cli_tags = [])
-        @cli_tags = cli_tags
-        @all  = []
-        @any  = []
-        @none = []
-        @args = {}
-        filter_args
-      end
-
-      def filter_args
-        @cli_tags.each do |expression|
-          case expression
-          when /^~@/
-            @none << expression.sub(/~/,'')
-          when /,/
-            @any |= expression.split(',')
-          else
-            @all << expression
-          end
-        end
-      end
-
-      def args
-        @args[:any]  = @any unless @any.empty?
-        @args[:all]  = @all unless @all.empty?
-        @args[:none] = @none unless @none.empty?
-        @args
-      end
-
-    end
-  end
-end

data/lib/cuporter/cli/options.rb

@@ -1,162 +0,0 @@
-# Copyright 2010 ThoughtWorks, Inc. Licensed under the MIT License
-require 'optparse'
-require 'fileutils'
-
-module Cuporter
-  module CLI
-
-    class Options
-
-      def self.[](key)
-        self.options[key]
-      end
-
-      def self.options
-        unless @options
-          self.parse 
-          @options[:input_file_pattern] = @options.delete(:input_file) || "#{@options.delete(:input_dir)}/**/*.feature"
-          @options[:root_dir] = @options[:input_file_pattern].split(File::SEPARATOR).first
-          @options[:filter_args] = Cuporter::CLI::FilterArgsBuilder.new(@options.delete(:tags)).args
-        end
-        @options
-      end
-
-      def self.args
-        @@args
-      end
-
-      
-      def self.full_path(path)
-        expanded_path = File.expand_path(path)
-        path_nodes = expanded_path.split(File::SEPARATOR)
-        file = path_nodes.pop
-        FileUtils.makedirs(path_nodes.join(File::SEPARATOR))
-        expanded_path
-      end
-
-      def self.parse
-        @@args = ARGV.dup
-        @options = {}
-        OptionParser.new(ARGV.dup) do |opts|
-          opts.banner = "Usage: cuporter [options]\n\n"
-
-          @options[:report] = "tag"
-          opts.on("-r", "--report [tag|feature|tree]", %Q{View, or type of report.
-                                         Default: "tag"
-          }) do |r|
-            @options[:report] = (r == 'name' ? 'feature' : r) 
-          end
-
-          @options[:format] = "text"
-          opts.on("-f", "--format [xml|html|csv|text]", %Q{Output format.
-                                         Default: text (it's pretty, though!)
-          }) do |f|
-            @options[:format] = f
-          end
-
-          @options[:input_dir] = "features"
-          opts.on("-i", "--input-dir DIR", %Q{Root directory of *.feature files.
-                                         Default: "features"
-     
-                                         Used to build the glob pattern '[--input-dir]/**/*.feature', which is really most likely
-                                         "features/**/*.features" and finds all feature files anywhere under "features" or
-                                         your custom root supplied with this option.
-                                         Overridden by "--file-input'.
-          }) do |i|
-            @options[:input_dir] = i.sub(/#{File::SEPARATOR}$/,'')
-          end
-
-          opts.on("-I", "--file-input FILE", %Q{Single *.feature file.  Full name with extension, like 'path/to/file.feature.'
-                                         Overrides "--input-dir" and used mostly for testing.
-          }) do |file|
-            @options[:input_file] = file
-          end
-          
-          opts.on("-o", "--output-file FILE", %Q{Output file path, like 'tmp/cucumber/tag_report.html'.
-          }) do |o|
-            @options[:output_file] = full_path(o)
-          end
-
-          @options[:tags] = []
-          opts.on("-t", "--tags TAG_EXPRESSION", %Q{Filter on tags for name report.
-                                         TAG_EXPRESSION rules:
-                                             1. $ cucumber --help
-                                             2. http://github.com/aslakhellesoy/cucumber/wiki/Tags
-          }) do |t|
-            @options[:tags] << t
-          end
-
-          opts.on("-T", "--title STRING", %Q{Override report default title, which is different for each view/report.
-                                         This affects the xml 'report' node title and the html head > title attributes.
-          }) do |title|
-            @options[:title] = title
-          end
-
-          opts.separator "CSS and Javascript asset options:\n\n"
-          opts.on("-a", "--assets-dir PATH", %Q{Path to folder for CSS and Javascript assets.
-                                           Only applies with '--link-assets', which is off by default.
-                                           Setting this will cause assets to be copied from 'public';
-                                           otherwise, the html will link to the files under 'cuporter/public' in
-                                           your gempath.
-          }) do |a|
-            @options[:assets_dir] = a
-          end
-
-          opts.on("-l", "--link-assets", %Q{Do not inline CSS and js in <style/> and <script/> tags, but link to external files instead.
-                                           Default:  'false' for the tag and feature views, not optional for the
-                                                     tree view, which requires external gifs.
-          }) do |l|
-            @options[:link_assets] = l
-          end
-
-          opts.separator "Reporting options: on by default but can be turned off:\n\n"
-          @options[:sort] = true
-          opts.on("--no-sort", "Do not sort tags, features, scenarios, or outlines\n") do |n|
-            @options[:sort] = n
-          end
-
-          @options[:number] = true
-          opts.on("--no-number", "Do not get or show scenario or example numbers, (i.e., do not number the leaf nodes).\n") do |n|
-            @options[:number] = n
-          end
-
-          @options[:total] = true
-          opts.on("--no-total", "Do not get or show totals\n") do |n|
-            @options[:total] = n
-          end
-
-          @options[:show_tags] = true
-          opts.on("--no-show-tags", "Do not show cucumber tags at the feature, scenario, or outline level.\n") do |show_tags|
-            @options[:show_tags] = show_tags
-          end
-
-          @options[:show_files] = true
-          opts.on("--no-show-files", "Do not show feature file paths.\n") do |show_files|
-            @options[:show_files] = show_files
-          end
-
-          @options[:leaves] = true
-          opts.on("--no-leaves", "Show features only, with no scenarios or outlines.\n\n\n") do |l|
-            @options[:leaves] = l
-          end
-
-        end.parse!
-
-      end
-    end
-  end
-
-  def self.html?
-    CLI::Options[:format] == 'html'
-  end
-
-  def self.options
-    CLI::Options.options
-  end
-
-  def self.output_file
-    if options[:output_file]
-      File.open(options[:output_file], "w")
-    end
-  end
-end