coypond 0.2.2 → 0.2.3

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-
+gem 'ripper', :platforms => :ruby_18
 
 group :development do
   gem "shoulda", ">= 0"

data/Gemfile.lock

@@ -8,6 +8,7 @@ GEM
       rake
     rake (0.9.2)
     rcov (0.9.10)
+    ripper (1.0.2)
     shoulda (2.11.3)
 
 PLATFORMS
@@ -17,4 +18,5 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
   rcov
+  ripper
   shoulda

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/bin/coypond

@@ -49,7 +49,7 @@ options[:all] ||= (options.keys & [:class, :method, :module]).empty?
 
 def expand(file, pattern=["**"])
   if File.directory?(file)
-    return Dir.glob(File.join(file, *pattern, '*.rb') )
+    return Dir.glob(File.join([file, pattern, "*.rb"].flatten) )
   else
     return file
   end

data/coypond.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{coypond}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Amit Levy"]
@@ -44,17 +44,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ripper>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
+      s.add_dependency(%q<ripper>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
+    s.add_dependency(%q<ripper>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/lib/coypond.rb

@@ -13,10 +13,10 @@ module Coypond
       each_file do |file_name, source, parser|
         final_result[file_name] = []
         classes = modules = methods = {}
-        classes = search_in_collection(parser.classes, options) if options[:class] || options[:all]
-        modules = search_in_collection(parser.modules, options) if options[:module] || options[:all]
-        methods = search_in_collection(parser.methods, options) if options[:method] || options[:all]
-        result = classes.merge(modules.merge(methods))
+        classes = search_in_collection(parser.classes, options).to_a if options[:class] || options[:all]
+        modules = search_in_collection(parser.modules, options).to_a if options[:module] || options[:all]
+        methods = search_in_collection(parser.methods, options).to_a if options[:method] || options[:all]
+        result = Hash[classes + modules + methods]
         result.each do |dec, location|
           context = source.lines.to_a[location.first - 1]
           final_result[file_name] << [dec, location, context]

data/test/coypond/test_parser.rb

@@ -37,7 +37,7 @@ class TestParser < Test::Unit::TestCase
                                     [:void_stmt]], nil, nil, nil]]]]
     parser = Coypond::Parser.new.parse(parse_tree)
 
-    assert_equal ["Foo", "Baz"], parser.classes.keys
+    assert_equal ["Baz", "Foo"], parser.classes.keys.sort
   end
 
   should "use fully qualified class name in classes instance variable" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coypond
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,9 +12,20 @@ cert_chain: []
 date: 2011-08-10 00:00:00.000000000 -07:00
 default_executable: coypond
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ripper
+  requirement: &2157310080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157310080
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2156810780 !ruby/object:Gem::Requirement
+  requirement: &2157309600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156810780
+  version_requirements: *2157309600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156809820 !ruby/object:Gem::Requirement
+  requirement: &2157309120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156809820
+  version_requirements: *2157309120
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156808340 !ruby/object:Gem::Requirement
+  requirement: &2157308640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +55,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2156808340
+  version_requirements: *2157308640
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156807160 !ruby/object:Gem::Requirement
+  requirement: &2157308160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156807160
+  version_requirements: *2157308160
 description: Semantic grep for Ruby
 email: aalevy@gmail.com
 executables:
@@ -95,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -73129731692111590
+      hash: 3188914366153975721
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: