rstyle 0.0.1 → 0.0.2

data/.rstyle

@@ -0,0 +1 @@
+--all

data/bin/rstyle

@@ -36,7 +36,15 @@ require "rstyle"
 
 trap("INT") { puts "Exiting..."; exit(0) }
 
-s = Rstyle.new
+RSTYLE_FILE = ".rstyle"
+lines = []
+if File.exist?(RSTYLE_FILE)
+  File.open(RSTYLE_FILE) do |f|
+    lines = f.readlines.collect {|l| l.chomp}
+  end
+end
+
+s = Rstyle.new([lines, ARGV].flatten)
 
 if ARGV.length == 0
   files = []
@@ -45,7 +53,7 @@ if ARGV.length == 0
       $stderr.puts "failed to execute 'git status'"
       exit 2
     end
-    if line =~ /^[MA].\s(.+)\S*$/
+    if line =~ /^\s*[MA].*\s(.+\.rb)\S*$/
       files << $1
     end
   end

data/lib/rstyle/version.rb

@@ -13,5 +13,5 @@
 # limitations under the License.
 
 module Rstyle
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/rstyle.rb

@@ -12,14 +12,32 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require "trollop"
+
 class Rstyle
   attr_reader :line_count, :errors, :warnings
 
-  def initialize
+  def initialize(options)
+    @options = parse_options(options)
     @errors = 0
     @warnings = 0
   end
 
+  def parse_options(options)
+    Trollop::options(options) do
+      opt :all, "enable all options"
+      opt :empty_line, "empty lines"
+      opt :tabs, "line contains tab(s)"
+      opt :ends_with_whitespace, "line ends with whitespace"
+      opt :no_space_after_comma, "no space after ','"
+      opt :space_after, "space after ( and [ or before ) and ]"
+      opt :two_spaces, "use two spaces before statement modifiers"
+      opt :snake_case, "methods should be in snake_case"
+      opt :no_for, "don't use for unless you know what you are doing"
+      opt :line_length, "line length", :default => 80
+    end
+  end
+
   def source(files)
     files.each do |file|
       if File.directory?(file)
@@ -55,28 +73,29 @@ class Rstyle
       # strip out text from regexps
       @line = @line.gsub(/\/([^\/]+)\//, "//")
 
-      if @oline.length > 80
-        error "line longer than 80 characters"
+      if @oline.length > @options[:line_length]
+        error "line longer than #{@options[:line_length]} characters"
       end
 
-      check "empty line contains whitespace", /^\s+$/
+      check :empty_line, "empty line contains whitespace", /^\s+$/
 
-      check "line contains tab(s)", /\t/
+      check :tabs, "line contains tab(s)", /\t/
 
-      check "line ends with whitespace", /\S+\s+$/
+      check :ends_with_whitespace, "line ends with whitespace", /\S+\s+$/
 
-      check "no space after ,", /,\S+/
+      check :no_space_after_comma, "no space after ,", /,\S+/
 
-      check "space after ( and [ or before ) and ]", /[\(\[]\s+|\s+[\)\]]/
+      check :space_after, "space after ( and [ or before ) and ]",
+            /[\(\[]\s+|\s+[\)\]]/
 
-      check "use two spaces before statement modifiers",
-          /\S+( | {3,})(if|unless|until|rescue|while)/
+      check :two_spaces, "use two spaces before statement modifiers",
+            /\S+( | {3,})(if|unless|until|rescue|while)/
 
-      check(/\s*def (\S+)/) do |method|
+      check(:snake_case, /\s*def (\S+)/) do |method|
         error "methods should be in snake_case"  if method =~ /[A-Z]/
       end
 
-      check(/^\s*for/) do
+      check(:no_for, /^\s*for/) do
         warning "don't use for unless you know what you are doing"
       end
     end
@@ -84,12 +103,14 @@ class Rstyle
 
   private
 
-  def check(*args)
-    if @line =~ args[args.length - 1]
-      if block_given?
-        yield($1)
-      else
-        error(args[0])
+  def check(name, *args)
+    if @options[name] || @options[:all]
+      if @line =~ args[args.length - 1]
+        if block_given?
+          yield($1)
+        else
+          error(args[0])
+        end
       end
     end
   end

data/rstyle.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "highline"
+  s.add_runtime_dependency "trollop"
 
   s.add_development_dependency "rspec"
 end

data/spec/assets/test.rb

@@ -0,0 +1,7 @@
+class Test
+	def foo
+  bar
+
+  def FooBar
+  end
+end

data/spec/rstyle_spec.rb

@@ -18,7 +18,7 @@ require 'rstyle'
 describe Rstyle do
 
   before(:each) do
-    @s = Rstyle.new
+    @s = Rstyle.new(["--all"])
     @s.stub(:e)
   end
 

metadata

@@ -2,7 +2,7 @@
 name: rstyle
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Martin Englund
@@ -25,7 +25,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: trollop
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -33,8 +33,19 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Style checking for Ruby code
 email: 
 - martin@englund.nu
@@ -48,6 +59,7 @@ files:
 - .autotest
 - .gitignore
 - .rspec
+- .rstyle
 - Gemfile
 - LICENSE
 - README.md
@@ -56,6 +68,7 @@ files:
 - lib/rstyle.rb
 - lib/rstyle/version.rb
 - rstyle.gemspec
+- spec/assets/test.rb
 - spec/rstyle_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -87,5 +100,6 @@ signing_key:
 specification_version: 3
 summary: Style checking for Ruby code
 test_files: 
+- spec/assets/test.rb
 - spec/rstyle_spec.rb
 - spec/spec_helper.rb