gemnasium-parser 0.1.2 → 0.1.3

data/lib/gemnasium/parser/patterns.rb

@@ -5,9 +5,9 @@ module Gemnasium
 
       MATCHER = /(?:=|!=|>|<|>=|<=|~>)/
       VERSION = /[0-9]+(?:\.[a-zA-Z0-9]+)*/
-      REQUIREMENT = /\s*(?:#{MATCHER}\s*)?#{VERSION}\s*/
-      REQUIREMENT_LIST = /(?<qr1>["'])(?<req1>#{REQUIREMENT})\k<qr1>(?:\s*,\s*(?<qr2>["'])(?<req2>#{REQUIREMENT})\k<qr2>)?/
-      REQUIREMENTS = /(?:#{REQUIREMENT_LIST}|\[\s*#{REQUIREMENT_LIST}\s*\])/
+      REQUIREMENT = /[ \t]*(?:#{MATCHER}[ \t]*)?#{VERSION}[ \t]*/
+      REQUIREMENT_LIST = /(?<qr1>["'])(?<req1>#{REQUIREMENT})\k<qr1>(?:[ \t]*,[ \t]*(?<qr2>["'])(?<req2>#{REQUIREMENT})\k<qr2>)?/
+      REQUIREMENTS = /(?:#{REQUIREMENT_LIST}|\[[ \t]*#{REQUIREMENT_LIST}[ \t]*\])/
 
       KEY = /(?::\w+|:?"\w+"|:?'\w+')/
       SYMBOL = /(?::\w+|:"[^"#]+"|:'[^']+')/
@@ -15,23 +15,24 @@ module Gemnasium
       BOOLEAN = /(?:true|false)/
       NIL = /nil/
       ELEMENT = /(?:#{SYMBOL}|#{STRING})/
-      ARRAY = /\[(?:#{ELEMENT}(?:\s*,\s*#{ELEMENT})*)?\]/
+      ARRAY = /\[(?:#{ELEMENT}(?:[ \t]*,[ \t]*#{ELEMENT})*)?\]/
       VALUE = /(?:#{BOOLEAN}|#{NIL}|#{ELEMENT}|#{ARRAY}|)/
-      PAIR = /(?:(#{KEY})\s*=>\s*(#{VALUE})|(\w+):\s+(#{VALUE}))/
-      OPTIONS = /#{PAIR}(?:\s*,\s*#{PAIR})*/
+      PAIR = /(?:(#{KEY})[ \t]*=>[ \t]*(#{VALUE})|(\w+):[ \t]+(#{VALUE}))/
+      OPTIONS = /#{PAIR}(?:[ \t]*,[ \t]*#{PAIR})*/
+      COMMENT = /(#[^\n]*)?/
 
-      GEM_CALL = /^\s*gem\(?\s*(?<q1>["'])(?<name>#{GEM_NAME})\k<q1>(?:\s*,\s*#{REQUIREMENT_LIST})?(?:\s*,\s*(?<opts>#{OPTIONS}))?\s*\)?\s*$/
+      GEM_CALL = /^[ \t]*gem\(?[ \t]*(?<q1>["'])(?<name>#{GEM_NAME})\k<q1>(?:[ \t]*,[ \t]*#{REQUIREMENT_LIST})?(?:[ \t]*,[ \t]*(?<opts>#{OPTIONS}))?[ \t]*\)?[ \t]*#{COMMENT}$/
 
-      SYMBOLS = /#{SYMBOL}(\s*,\s*#{SYMBOL})*/
-      GROUP_CALL = /^(?<i1>\s*)group\(?\s*(?<grps>#{SYMBOLS})\s*\)?\s+do\s*?\n(?<blk>.*?)\n^\k<i1>end\s*$/m
+      SYMBOLS = /#{SYMBOL}([ \t]*,[ \t]*#{SYMBOL})*/
+      GROUP_CALL = /^(?<i1>[ \t]*)group\(?[ \t]*(?<grps>#{SYMBOLS})[ \t]*\)?[ \t]+do[ \t]*?\n(?<blk>[^\n]*?)\n^\k<i1>end[ \t]*$/m
 
-      GIT_CALL = /^(?<i1>\s*)git[\s\(].*?do\s*?\n(?<blk>.*?)\n^\k<i1>end\s*$/m
+      GIT_CALL = /^(?<i1>[ \t]*)git[ \(][^\n]*?do[ \t]*?\n(?<blk>.*?)\n^\k<i1>end[ \t]*$/m
 
-      PATH_CALL = /^(?<i1>\s*)path[\s\(].*?do\s*?\n(?<blk>.*?)\n^\k<i1>end\s*$/m
+      PATH_CALL = /^(?<i1>[ \t]*)path[ \(][^\n]*?do[ \t]*?\n(?<blk>.*?)\n^\k<i1>end[ \t]*$/m
 
-      GEMSPEC_CALL = /^\s*gemspec(?:\(?\s*(?<opts>#{OPTIONS}))?\s*\)?\s*$/
+      GEMSPEC_CALL = /^[ \t]*gemspec(?:\(?[ \t]*(?<opts>#{OPTIONS}))?[ \t]*\)?[ \t]*$/
 
-      ADD_DEPENDENCY_CALL = /^\s*\w+\.add(?<type>_runtime|_development)?_dependency\(?\s*(?<q1>["'])(?<name>#{GEM_NAME})\k<q1>(?:\s*,\s*#{REQUIREMENTS})?\s*\)?\s*$/
+      ADD_DEPENDENCY_CALL = /^[ \t]*\w+\.add(?<type>_runtime|_development)?_dependency\(?[ \t]*(?<q1>["'])(?<name>#{GEM_NAME})\k<q1>(?:[ \t]*,[ \t]*#{REQUIREMENTS})?[ \t]*\)?[ \t]*#{COMMENT}$/
 
       def self.options(string)
         {}.tap do |hash|
@@ -56,7 +57,7 @@ module Gemnasium
       end
 
       def self.values(string)
-        string.strip.split(/\s*,\s*/).map{|v| value(v) }
+        string.strip.split(/[ \t]*,[ \t]*/).map{|v| value(v) }
       end
     end
   end

data/lib/gemnasium/parser/version.rb

@@ -1,5 +1,5 @@
 module Gemnasium
   module Parser
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/spec/gemnasium/parser/gemfile_spec.rb

@@ -205,10 +205,11 @@ describe Gemnasium::Parser::Gemfile do
   it "records dependency line numbers" do
     content(<<-EOF)
       gem "rake"
+
       gem "rails"
     EOF
     dependencies[0].instance_variable_get(:@line).should == 1
-    dependencies[1].instance_variable_get(:@line).should == 2
+    dependencies[1].instance_variable_get(:@line).should == 3
   end
 
   it "maps groups to types" do
@@ -241,4 +242,10 @@ describe Gemnasium::Parser::Gemfile do
     dependency.name.should == "rake"
     dependency.requirement.should == ">= 0.8.7"
   end
+
+  it "parses gems followed by inline comments" do
+    content(%(gem "rake", ">= 0.8.7" # Comment))
+    dependency.name.should == "rake"
+    dependency.requirement.should == ">= 0.8.7"
+  end
 end

data/spec/gemnasium/parser/gemspec_spec.rb

@@ -119,11 +119,12 @@ describe Gemnasium::Parser::Gemspec do
     content(<<-EOF)
       Gem::Specification.new do |gem|
         gem.add_dependency "rake"
+
         gem.add_dependency "rails"
       end
     EOF
     dependencies[0].instance_variable_get(:@line).should == 2
-    dependencies[1].instance_variable_get(:@line).should == 3
+    dependencies[1].instance_variable_get(:@line).should == 4
   end
 
   it "parses parentheses" do
@@ -135,4 +136,14 @@ describe Gemnasium::Parser::Gemspec do
     dependency.name.should == "rake"
     dependency.requirement.should == ">= 0.8.7"
   end
+
+  it "parses gems followed by inline comments" do
+    content(<<-EOF)
+      Gem::Specification.new do |gem|
+        gem.add_dependency "rake", ">= 0.8.7" # Comment
+      end
+    EOF
+    dependency.name.should == "rake"
+    dependency.requirement.should == ">= 0.8.7"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemnasium-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-16 00:00:00.000000000Z
+date: 2012-01-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70197965178760 !ruby/object:Gem::Requirement
+  requirement: &70152881719700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70197965178760
+  version_requirements: *70152881719700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70197965178260 !ruby/object:Gem::Requirement
+  requirement: &70152881719200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70197965178260
+  version_requirements: *70152881719200
 description: Safely parse Gemfiles and gemspecs
 email: steve.richert@gmail.com
 executables: []
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Safely parse Gemfiles and gemspecs