gem-dependent 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/gem-dependent.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gem-dependent}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-11-03}
+  s.date = %q{2010-11-04}
   s.email = %q{grosser.michael@gmail.com}
   s.files = [
     "Gemfile",

data/lib/rubygems/dependent.rb

@@ -6,7 +6,8 @@ module Gem
     VERSION = File.read( File.join(File.dirname(__FILE__),'..','..','VERSION') ).strip
 
     def self.find(gem, options={})
-      specs_and_sources = with_changed_source(options[:source]) do
+      # get all gems
+      specs_and_sources = with_changed_gem_source(options[:source]) do
         all_specs_and_sources
       end
 
@@ -14,50 +15,60 @@ module Gem
         specs_and_sources = specs_and_sources.first(options[:fetch_limit])
       end
 
-      puts "Downloading specs for #{specs_and_sources.size} gems" if options[:progress]
-
-      # fetch dependencies
-      gem_names_and_dependencies = Parallel.map(specs_and_sources, :in_processes => 20) do |spec_tuple, source_uri|
-        if options[:progress]
-          print '.'
-          $stdout.flush if rand(20) == 0 # make progress visible
-        end
-        name = spec_tuple.first
-        dependencies = dependencies(spec_tuple, source_uri)
-        [name, dependencies]
+      if options[:progress]
+        puts "Downloading specs for #{specs_and_sources.size} gems"
       end
 
+      gems_and_dependencies = fetch_all_dependencies(specs_and_sources) do
+        print_dot if options[:progress]
+      end
       print "\n" if options[:progress]
 
-      # select those that depend on #{gem}
-      gem_names_and_dependencies.map do |_, dependencies|
-        found = dependencies.select{|d| d.name == gem}
-        next if found.empty?
-        [_, found]
-      end.compact
+      select_dependent(gems_and_dependencies, gem)
     end
 
     private
 
-    # dependencies for given gem
-    def self.dependencies(spec_tuple, source_uri)
+    def self.fetch_all_dependencies(specs_and_sources)
+      Parallel.map(specs_and_sources, :in_processes => 20) do |spec, source|
+        yield if block_given?
+        name = spec.first
+        dependencies = fetch_dependencies(spec, source)
+        [name, dependencies]
+      end
+    end
+
+    def self.fetch_dependencies(spec, source)
       begin
         fetcher = Gem::SpecFetcher.fetcher
-        fetcher.fetch_spec(spec_tuple, URI.parse(source_uri)).dependencies
+        fetcher.fetch_spec(spec, URI.parse(source)).dependencies
       rescue Gem::RemoteFetcher::FetchError, Zlib::DataError => e
         $stderr.puts e
         []
       end
     end
 
+    def self.select_dependent(gems_and_dependencies, gem)
+      gems_and_dependencies.map do |name, dependencies|
+        matching_dependencies = dependencies.select{|d| d.name == gem }
+        next if matching_dependencies.empty?
+        [name, matching_dependencies]
+      end.compact
+    end
+
+    def self.print_dot
+      print '.'
+      $stdout.flush if rand(20) == 0 # make progress visible
+    end
+
     def self.all_specs_and_sources
       fetcher = Gem::SpecFetcher.fetcher
       all = true
       matching_platform = false
       prerelease = false
-      name = Gem::Dependency.new(//i, Gem::Requirement.default)
-      specs_and_sources = fetcher.find_matching name, all, matching_platform, prerelease
-      uniq_by(specs_and_sources){|a|a.first.first} 
+      matcher = Gem::Dependency.new(//, Gem::Requirement.default) # any name, any version
+      specs_and_sources = fetcher.find_matching matcher, all, matching_platform, prerelease
+      uniq_by(specs_and_sources){|a| a.first.first } 
     end
 
     # get unique elements from an array (last found is used)
@@ -74,7 +85,7 @@ module Gem
       values
     end
 
-    def self.with_changed_source(sources)
+    def self.with_changed_gem_source(sources)
       sources = [*sources].compact
       if sources.empty?
         yield

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gem-dependent
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 +01:00
+date: 2010-11-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency