tdd 1.0.1 → 1.0.2

data/bin/tdd

@@ -67,60 +67,19 @@ test file for changes.
   __
 
   def run
+    print_usage_and_exit if ARGV.empty?
     parse_the_command_line
     print_a_summary_of_watched_files
     loop_watching_files_and_running_commands
   end
 
-  def parse_the_command_line
-    if ARGV.empty?
-      puts usage['examples']
-      exit 1
-    end
-
-    pos = ARGV.index('--')
-    if pos
-      @paths = ARGV[0 ... pos]
-      @test_args = ARGV[pos + 1 .. -1].join(' ')
-    else
-      @paths = %w[app lib config test spec]
-      @test_args = ARGV[0..-1].join(' ')
-    end
-    
-    @test_file = @test_args.scan(/^.+.rb/).first
-
-    if @paths.first == "glob"
-      search = File.basename(@test_file).gsub(/(_spec|_test)/, '')
-      @paths = Dir.glob("**/#{search}")
-      @paths << @test_file
-    end
-
-    if @paths.first == "controller"
-      resource = File.basename(@test_file).gsub(/(_controller_spec.rb|_controller_test.rb)/, '')
-      search = File.basename(@test_file).gsub(/(_spec|_test)/, '')
-      puts "="*45
-      puts resource
-      puts "="*45
-      @paths = Dir.glob("app/views/#{resource}/**")
-      @paths += Dir.glob("**/#{search}")
-      @paths << @test_file
-    end
-
-    test_command = 'rspec' if @test_args.match(/^spec$/) || @test_file && @test_file.match(/_spec.rb/)
-    test_command = 'ruby -Itest' if @test_file && @test_file.match(/_test.rb/)
-    if @test_args.match(/^rake/)
-      test_command = @test_args
-      @test_args = nil
-    end
-
-    if test_command.nil?
-      say("No test or spec command could be built.", :color => :red)
-      say("Pass -h option to see examples.", :color => :red)
-      exit 1
-    end
-    
-    @command = "#{test_command} #{@test_args}"
+  def print_usage_and_exit
+    puts usage['examples']
+    exit 1
+  end
 
+  def parse_the_command_line
+    @paths, @command = Tdd::CommandLineParser.parse
     @paths = %w[.] if @paths.empty?
 
     @paths.map!{|path| test(?d, path) ? [path, Dir.glob(File.join(path, '**/**'))] : path}
@@ -138,14 +97,13 @@ test file for changes.
   end
 
   def print_a_summary_of_watched_files
-    puts "## #{ @command }"
-    puts "#"
+    puts "Running: #{ @command }"
     if @paths.length > 15
-      puts "Watching #{@paths.length} files"
+       puts "Watching: #{@paths.length} files"
     else
+      puts "Watching:"
       puts @paths.join("\n")
     end
-    puts
   end
 
   def loop_watching_files_and_running_commands

data/lib/tdd.rb

@@ -1,4 +1,5 @@
 require "tdd/version"
+require 'tdd/command_line_parser'
 require 'main'
 require 'rb-fsevent'
 require 'time'

data/lib/tdd/command_line_parser.rb

@@ -0,0 +1,66 @@
+class Tdd::CommandLineParser
+  def self.parse
+    parser = self.new
+    [parser.paths, parser.test_command]
+  end
+
+  attr_accessor :paths, :test_framework
+
+  def initialize
+    pos = ARGV.index('--')
+    if pos
+      @paths = ARGV[0 ... pos]
+      @test_args = ARGV[pos + 1 .. -1].join(' ')
+    else
+      @paths = %w[app lib config test spec]
+      @test_args = ARGV[0..-1].join(' ')
+    end
+    @test_file = @test_args.scan(/^.+.rb/).first
+    parse_glob_mode
+    parse_controller_mode
+    parse_test_framework
+  end
+
+  def test_command
+    "#{@test_framework} #{@test_args}"
+  end
+
+  private
+
+  def exit_if_no_test_framework
+    say("No test or spec command could be built.", :color => :red)
+    say("Pass -h option to see examples.", :color => :red)
+    exit 1
+  end
+
+  def parse_glob_mode
+    if @paths.first == "glob"
+      search = File.basename(@test_file).gsub(/(_spec|_test)/, '')
+      @paths = Dir.glob("**/#{search}")
+      @paths << @test_file
+    end
+  end
+
+  def parse_controller_mode
+    if @paths.first == "controller"
+      resource = File.basename(@test_file).gsub(/(_controller_spec.rb|_controller_test.rb)/, '')
+      search = File.basename(@test_file).gsub(/(_spec|_test)/, '')
+      @paths = Dir.glob("app/views/#{resource}/**")
+      @paths += Dir.glob("**/#{search}")
+      @paths << @test_file
+    end
+  end
+
+  def parse_test_framework
+    if @test_args.match(/^spec/) || @test_file && @test_file.match(/_spec.rb/)
+      @test_framework = 'rspec'
+    elsif @test_file && @test_file.match(/_test.rb/)
+      @test_framework = 'ruby -Itest'
+    elsif @test_args.match(/^rake/)
+      @test_framework = @test_args
+      @test_args = nil
+    else
+      exit_if_no_test_framework
+    end
+  end
+end

data/lib/tdd/version.rb

@@ -1,3 +1,3 @@
 module Tdd
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tdd
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Tyler Montgomery
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-10 00:00:00 Z
+date: 2013-01-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: main
@@ -64,6 +64,7 @@ files:
 - Rakefile
 - bin/tdd
 - lib/tdd.rb
+- lib/tdd/command_line_parser.rb
 - lib/tdd/version.rb
 - tdd.gemspec
 homepage: ""