gemnasium-parser 0.1.0 → 0.1.1

data/lib/gemnasium/parser/gemspec.rb

@@ -18,7 +18,7 @@ module Gemnasium
 
       private
         def runtime_matches
-          @runtime_matches ||= matches(Patterns::RUNTIME_CALL)
+          @runtime_matches ||= matches(Patterns::ADD_DEPENDENCY_CALL)
         end
 
         def matches(pattern)

data/lib/gemnasium/parser/patterns.rb

@@ -20,18 +20,18 @@ module Gemnasium
       PAIR = /(?:(#{KEY})\s*=>\s*(#{VALUE})|(\w+):\s+(#{VALUE}))/
       OPTIONS = /#{PAIR}(?:\s*,\s*#{PAIR})*/
 
-      GEM_CALL = /^\s*gem\s+(?<q1>["'])(?<name>#{GEM_NAME})\k<q1>(?:\s*,\s*#{REQUIREMENT_LIST})?(?:\s*,\s*(?<opts>#{OPTIONS}))?\s*$/
+      GEM_CALL = /^\s*gem\s*\(?\s*(?<q1>["'])(?<name>#{GEM_NAME})\k<q1>(?:\s*,\s*#{REQUIREMENT_LIST})?(?:\s*,\s*(?<opts>#{OPTIONS}))?\s*\)?\s*$/
 
       SYMBOLS = /#{SYMBOL}(\s*,\s*#{SYMBOL})*/
-      GROUP_CALL = /^(?<i1>\s*)group\s+(?<grps>#{SYMBOLS})\s+do\s*?\n(?<blk>.*?)\n^\k<i1>end\s*$/m
+      GROUP_CALL = /^(?<i1>\s*)group\s*\(?\s*(?<grps>#{SYMBOLS})\s*\)?\s+do\s*?\n(?<blk>.*?)\n^\k<i1>end\s*$/m
 
-      GIT_CALL = /^(?<i1>\s*)git\s+.*?\n(?<blk>.*?)\n^\k<i1>end\s*$/m
+      GIT_CALL = /^(?<i1>\s*)git[\s\(].*?do\s*?\n(?<blk>.*?)\n^\k<i1>end\s*$/m
 
-      PATH_CALL = /^(?<i1>\s*)path\s+.*?\n(?<blk>.*?)\n^\k<i1>end\s*$/m
+      PATH_CALL = /^(?<i1>\s*)path[\s\(].*?do\s*?\n(?<blk>.*?)\n^\k<i1>end\s*$/m
 
       GEMSPEC_CALL = /^\s*gemspec(?:\s+(?<opts>#{OPTIONS}))?\s*$/
 
-      RUNTIME_CALL = /^\s*\w+\.add(?<type>_runtime|_development)?_dependency\s+(?<q1>["'])(?<name>#{GEM_NAME})\k<q1>(?:\s*,\s*#{REQUIREMENTS})?\s*$/
+      ADD_DEPENDENCY_CALL = /^\s*\w+\.add(?<type>_runtime|_development)?_dependency\s*\(?\s*(?<q1>["'])(?<name>#{GEM_NAME})\k<q1>(?:\s*,\s*#{REQUIREMENTS})?\s*\)?\s*$/
 
       def self.options(string)
         {}.tap do |hash|

data/lib/gemnasium/parser/version.rb

@@ -1,5 +1,5 @@
 module Gemnasium
   module Parser
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/spec/gemnasium/parser/gemfile_spec.rb

@@ -122,6 +122,15 @@ describe Gemnasium::Parser::Gemfile do
     dependencies[2].groups.should == [:development]
   end
 
+  it "parses gems in a group with parentheses" do
+    content(<<-EOF)
+      group(:production) do
+        gem "pg"
+      end
+    EOF
+    dependency.groups.should == [:production]
+  end
+
   it "parses gems in multiple groups" do
     content(<<-EOF)
       group :development, :test do
@@ -161,6 +170,15 @@ describe Gemnasium::Parser::Gemfile do
     dependencies.size.should == 0
   end
 
+  it "ignores gems in a git block with parentheses" do
+    content(<<-EOF)
+      git("https://github.com/rails/rails.git") do
+        gem "rails"
+      end
+    EOF
+    dependencies.size.should == 0
+  end
+
   it "ignores gems in a path block" do
     content(<<-EOF)
       path "vendor/rails" do
@@ -170,6 +188,15 @@ describe Gemnasium::Parser::Gemfile do
     dependencies.size.should == 0
   end
 
+  it "ignores gems in a path block with parentheses" do
+    content(<<-EOF)
+      path("vendor/rails") do
+        gem "rails"
+      end
+    EOF
+    dependencies.size.should == 0
+  end
+
   it "records dependency line numbers" do
     content(<<-EOF)
       gem "rake"
@@ -203,4 +230,10 @@ describe Gemnasium::Parser::Gemfile do
     dependencies[2].type.should == :runtime
     dependencies[3].type.should == :development
   end
+
+  it "parses parentheses" do
+    content(%(gem("rake", ">= 0.8.7")))
+    dependency.name.should == "rake"
+    dependency.requirement.should == ">= 0.8.7"
+  end
 end

data/spec/gemnasium/parser/gemspec_spec.rb

@@ -125,4 +125,14 @@ describe Gemnasium::Parser::Gemspec do
     dependencies[0].instance_variable_get(:@line).should == 2
     dependencies[1].instance_variable_get(:@line).should == 3
   end
+
+  it "parses parentheses" do
+    content(<<-EOF)
+      Gem::Specification.new do |gem|
+        gem.add_dependency("rake", ">= 0.8.7")
+      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.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70223212269420 !ruby/object:Gem::Requirement
+  requirement: &70182727808960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70223212269420
+  version_requirements: *70182727808960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70223212268920 !ruby/object:Gem::Requirement
+  requirement: &70182727808460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70223212268920
+  version_requirements: *70182727808460
 description: Safely parse Gemfiles and gemspecs
 email: steve.richert@gmail.com
 executables: []