gem-mirror 0.0.3 → 0.0.4

data/gem-mirror.gemspec

@@ -3,7 +3,7 @@ require File.expand_path('../lib/gem-mirror/version', __FILE__)
 Gem::Specification.new do |s|
   s.name        = 'gem-mirror'
   s.version     = GemMirror::VERSION
-  s.date        = '2012-02-03'
+  s.date        = '2012-02-04'
   s.authors     = ['Yorick Peterse']
   s.email       = 'yorickpeterse@gmail.com'
   s.summary     = 'Gem for easily creating your own RubyGems mirror.'

data/lib/gem-mirror/gem.rb

@@ -27,8 +27,14 @@ module GemMirror
     # @param [Gem::Requirement] requirement
     #
     def initialize(name, requirement = nil)
+      requirement ||= ::Gem::Requirement.default
+
+      if requirement.is_a?(String)
+        requirement = ::Gem::Requirement.new(requirement)
+      end
+
       @name        = name
-      @requirement = requirement || ::Gem::Requirement.default
+      @requirement = requirement
     end
 
     ##
@@ -42,7 +48,7 @@ module GemMirror
     # @return [TrueClass|FalseClass]
     #
     def has_version?
-      return version && version != '0.0.0'
+      return version && !version.segments.reject { |s| s == 0 }.empty?
     end
 
     ##

data/lib/gem-mirror/gems_fetcher.rb

@@ -25,13 +25,7 @@ module GemMirror
     #
     def fetch
       source.gems.each do |gem|
-        if gem.has_version?
-          versions = [gem.version]
-        else
-         versions = versions_file.versions_for(gem.name)
-        end
-
-        versions.each do |version|
+        versions_for(gem).each do |version|
           filename  = gem.filename(version)
           satisfied = gem.requirement.satisfied_by?(version)
           name      = gem.name
@@ -68,6 +62,30 @@ module GemMirror
       end
     end
 
+    ##
+    # Returns an Array containing the versions that should be fetched for a
+    # Gem.
+    #
+    # @param [GemMirror::Gem] gem
+    # @return [Array]
+    #
+    def versions_for(gem)
+      available       = versions_file.versions_for(gem.name)
+      versions        = gem.has_version? ? [gem.version] : available
+      available_names = available.map(&:to_s)
+
+      # Get rid of invalid versions. Due to Gem::Version having a custom ==
+      # method, which treats "3.4" the same as "3.4.0" we'll have to compare
+      # the versions as String instances.
+      versions = versions.select do |version|
+        available_names.include?(version.to_s)
+      end
+
+      versions = [available.last] if versions.empty?
+
+      return versions
+    end
+
     ##
     # Tries to download the specification for a Gem and version. This method
     # returns the raw inflated data instead of an instance of
@@ -150,10 +168,23 @@ module GemMirror
     # @return [Array]
     #
     def dependencies_for(spec)
-      dependencies          = []
       possible_dependencies = configuration.development ? spec.dependencies \
         : spec.runtime_dependencies
 
+      dependencies = filter_dependencies(possible_dependencies)
+
+      return assign_gem_versions(dependencies)
+    end
+
+    ##
+    # Filters a list of dependencies based on whether or not they are ignored.
+    #
+    # @param [Array] possible_dependencies
+    # @return [Array]
+    #
+    def filter_dependencies(possible_dependencies)
+      dependencies = []
+
       possible_dependencies.each do |dependency|
         gem = Gem.new(dependency.name, dependency.requirement)
 
@@ -165,6 +196,26 @@ module GemMirror
       return dependencies
     end
 
+    ##
+    # Processes a list of Gems and sets their versions to the latest one
+    # available in case no specific version is given.
+    #
+    # @param [Array] gems
+    # @return [Array]
+    #
+    def assign_gem_versions(gems)
+      gems = gems.map do |gem|
+        unless gem.has_version?
+          latest = versions_file.versions_for(gem.name).last
+          gem    = Gem.new(gem.name, latest.to_s) if latest
+        end
+
+        gem
+      end
+
+      return gems
+    end
+
     ##
     # @see GemMirror::Configuration#logger
     # @return [Logger]

data/lib/gem-mirror/source.rb

@@ -75,7 +75,7 @@ module GemMirror
     # @param [String] requirement
     #
     def gem(name, requirement = nil)
-      gems << Gem.new(name, ::Gem::Requirement.new(requirement))
+      gems << Gem.new(name, requirement)
     end
 
     private

data/lib/gem-mirror/version.rb

@@ -1,3 +1,3 @@
 module GemMirror
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end # GemMirror

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem-mirror
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000 Z
+date: 2012-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop