Merging in changes from a fork

.gitignore

@@ -0,0 +1,6 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
+out
+*.html

Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'rake'
 

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    Saikuro (1.1.1)
+    Saikuro (1.2.1)
 
 GEM
   remote: http://rubygems.org/

README

@@ -36,7 +36,7 @@ Saikuro is a command line program.
 Running "saikuro -h" will output a usage statement describing all
 the various arguments you can pass to it.
 
-"saikuro -c -p tests/samples.rb"
+"saikuro -c -p examples/samples.rb"
 
 The above command is a simple example that generates a cyclomatic
 complexity report on the samples.rb file, using the default filter,
@@ -45,9 +45,9 @@ directory.
 
 
 A more detailed example is
-"saikuro -c -t -i tests -y 0 -w 11 -e 16 -o out/"
+"saikuro -c -t -i examples -y 0 -w 11 -e 16 -o out/"
 
-This will analyze all Ruby files found in the "tests/" directory.
+This will analyze all Ruby files found in the "examples/" directory.
 Saikuro will generate a token count report and a cyclomatic complexity
 report in the "out" directory .  The "-y 0" command will turn off
 filtering and thus show the complexity of all methods.  The "-w 11"
@@ -126,10 +126,10 @@ Mainly, because we have not gotten around to it.  We are wondering if
 this would increase the noise more than it should.
 
 
-Tests:
+Examples:
 In the test directory is a sample file that has examples of the
 various possible cases that we examined and documented the expected
-cyclomatic complexity result.  If you find mistakes or missing tests
+cyclomatic complexity result.  If you find mistakes or missing examples
 please report them.
 
 Contact:

Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

bin/saikuro

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# $Id$
+# $Id: saikuro 33 2006-12-07 16:09:55Z zev $
 # Version 0.2
 # == Usage
 #
@@ -88,8 +88,7 @@
 # == Author
 # Zev Blut ([email protected])
 
-$:.unshift File.expand_path('../../lib',__FILE__)
-require 'saikuro'
-
-SaikuroCMDLineRunner.new.run
+$LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
+require "saikuro"
 
+Saikuro::CLI.new.run

tests/large_example.rb → examples/large_example.rb

@@ -26,8 +26,8 @@ def warn_method_cc8(a, b, c)
     end
     if s
       c = s + a
-    end    
-    # large token count 
+    end
+    # large token count
     a + b + c + q + r + s + a + b + c + q + r + s + a + b + c + q + r + s + a + b + c + q + r + s
   end
 
@@ -60,11 +60,11 @@ def error_method_cc11(a, b, c)
     end
     if r
       s = a + r
-    end    
+    end
     a + b + c + q + r + s + a + b + c + q + r + s
   rescue => err
     puts err
   end
-    
+
 
 end