lucid 0.0.3 → 0.0.4

data/lib/lucid/app.rb

@@ -14,7 +14,6 @@ module Lucid
       parser = Lucid::Parser.new(@options)
       
       @specs = parser.specs
-      #puts "[App.initialize] After calling parser for specs, I have: #{@specs.inspect}"
       @tags = parser.tags
       
       @message = "No specs were found matching the pattern '#{@options[:pattern]}'." and return unless @specs
@@ -81,8 +80,6 @@ module Lucid
     end
     
     def construct_spec_file(path, file, file_name)
-      #puts "[App.construct_spec_file] Path = #{path} || File = #{file} || File name = #{file_name}"
-      
       construct = ""
       
       # If the file that is passed in matches the name of the specs path
@@ -99,8 +96,6 @@ module Lucid
         construct = "#{file_name}".gsub('//', '/')
       end
       
-      #puts "[App.construct_spec_file] Construct = #{construct}"
-      
       construct
     end
     

data/lib/lucid/options.rb

@@ -5,6 +5,14 @@ require 'yaml'
 module Lucid
   class Options
     def self.parse(args)
+      orig_args = args.dup
+      name = nil
+      
+      if orig_args.index("--name")
+        name_loc = orig_args.index("--name") + 1
+        name = orig_args[name_loc]
+      end
+      
       default_options = self.get_options(:default)
       project_options = self.get_options(:project)
       combine_options = default_options.merge(project_options)
@@ -20,7 +28,11 @@ module Lucid
         end
         
         opts.on('-o', '--options OPTIONS', "Options to pass to the tool.") do |options|
-          combine_options[:options] = options
+          if options =~ (/^--name/)
+            combine_options[:c_options] = "#{options} \"#{name}\""
+          else
+            combine_options[:c_options] = options
+          end
         end
         
         opts.on('-t', '--tags TAGS', "Tags to include or exclude.") do |tags|
@@ -42,8 +54,12 @@ module Lucid
       
       # This statement is necessary to get the spec execution pattern from
       # the command line. This will not be a switch and so it will be the
-      # only actual command line argument.
-      combine_options[:pattern] = args.first if args.any?
+      # only actual command line argument. However, account must be taken
+      # of the potential of using the --name option, which means that the
+      # argument to that option will be the first argument and thus the
+      # second argument will be the spec execution pattern.
+      combine_options[:pattern] = args.first if args.count == 1
+      combine_options[:pattern] = args[1]    if args.count == 2
       
       return self.establish(combine_options)
     end
@@ -69,12 +85,12 @@ module Lucid
         project_options
       else
         {
-          :command         => 'cucumber',     # :cuke_command
-          :options         => nil,            # :cucumber
-          :spec_path       => 'features',     # :feature_path
+          :command         => 'cucumber',
+          :options         => nil,
+          :spec_path       => 'features',
           :step_path       => 'features/step_definitions',
           :requires        => [],
-          :shared          => 'true',         # value was 'shared'
+          :shared          => 'true',
           :print           => false,
           :tags            => nil,
           :spec_path_regex => nil,
@@ -86,9 +102,13 @@ module Lucid
     end
     
     def self.establish(options)
+      # The next statement makes sure that any project options and command
+      # line options are merged.
+      options[:options] += " #{options[:c_options]}"
+      
       defaults = self.get_options(:default)
       
-      current_set = options.dup  # tmp_options
+      current_set = options.dup
       
       current_set[:spec_path] = current_set[:spec_path].gsub(/\\/, '/')
       current_set[:spec_path] = current_set[:spec_path].sub(/\/$/, '')

data/lib/lucid/parser.rb

@@ -6,13 +6,10 @@ module Lucid
     end
     
     def specs
-      #puts "[Parser.specs] Is @options[:pattern] nil? #{@options[:pattern].nil?}"
       return [] if @options[:pattern].nil?
       
       set_of_specs = gather_specs_by_glob
       
-      #puts "[Parser.specs] Were there any specs? #{set_of_specs.any?}"
-      
       return set_of_specs.any? ? set_of_specs : nil
     end
     
@@ -90,8 +87,6 @@ module Lucid
       
       pattern = @options[:pattern].dup
       
-      #puts "[Parser.gather_specs_by_glob] The pattern is: #{pattern}"
-      
       # Determine if some specs were indicated to be excluded
       # and mark those separately. This also handles when only
       # specific specs are to be executed.
@@ -109,32 +104,21 @@ module Lucid
       pattern = '**/*' if except.any?
       pattern = nil if only.any?
       
-      #puts "[Parser.gather_specs_by_glob] Is the pattern after only/except nil?: #{pattern.nil?}"
-      #puts "[Parser.gather_specs_by_glob] The @options[:spec_path] is: #{@options[:spec_path]}"      
-      
       if only.any?
         only.each do |f|
-          #puts "[Parser.gather_specs_by_glob] There is an only and it is: #{f}"
-          
           #specs_to_include += Dir.glob("#{@options[:spec_path]}/#{f}.feature")
           specs_to_include += Dir.glob("#{f}")
         end
       else
-        #puts "[Parser.gather_specs_by_glob] There is no only so pattern is: #{pattern}"
         specs_to_include += Dir.glob("#{@options[:spec_path]}/#{pattern}.feature")
       end
       
-      #puts "[Parser.gather_specs_by_glob] After checking only, specs_to_include is: #{specs_to_include}"
-      
       if except.any?
         except.each do |f|
-          #puts "[Parser.gather_specs_by_glob] There is an except and it is: #{f}"
           specs_to_exclude = Dir.glob("#{@options[:spec_path]}/#{f}.feature")
         end
       end
       
-      #puts "[Parser.gather_specs_by_glob] Returning #{specs_to_include - specs_to_exclude}"
-      
       (specs_to_include - specs_to_exclude).uniq
     end
     

data/lib/lucid/version.rb

@@ -1,3 +1,3 @@
 module Lucid
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lucid
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies: []
 description: Execution Wrapper for Cucumber
 email: