nix 0.0.2 → 0.0.3

data/lib/nix/gem-nix-command.rb

@@ -55,12 +55,8 @@ class Gem::Specification
   @@sha256_cache = {} unless self.class_variable_defined?(:@@sha256_cache)
   def sha256
     cache_file = "#{ENV['HOME']}/.gem/nix-sha256.cache"
-    if @@sha256_cache.empty?
-      if FileTest.exists?(cache_file)
-        File.open(cache_file,'r') do |f|
-          @@sha256_cache = Marshal.load(f)
-        end
-      end
+    if @@sha256_cache.empty? and FileTest.exists?(cache_file)
+      File.open(cache_file,'r') { |f| @@sha256_cache = Marshal.load(f) }
     end
 
     unless @@sha256_cache.key?(src_url)
@@ -107,7 +103,7 @@ class Gem::Commands::NixCommand < Gem::Command
       @seen = {}
 
       # args to dep informations
-      args.map { |arg|
+      args.each { |arg|
         if arg =~ /(.+)-?(.*)?/ then
           gem_name = $1
           version =  $2.empty? ?  Gem::Requirement.default : Gem::Version.new($2)
@@ -115,12 +111,10 @@ class Gem::Commands::NixCommand < Gem::Command
           raise Gem::CommandLineError, "couldn't parse arg. expected: name or name-version"
         end
 
-        warn "adding #{gem_name}\n"
-
         adddep(Gem::Dependency.new gem_name, version)
       }
 
-      warn " total: #{@gems_with_deps.length}"
+      say " total: #{@gems_with_deps.length}" if Gem.configuration.really_verbose
 
       print <<-EOF
 # WARNING: automatically generated file
@@ -160,6 +154,7 @@ g: # Get dependencies from patched gems
   # helper funtions ================
 
   def adddep(dep)
+    say "adding dep #{dep.name}." if Gem.configuration.really_verbose
     gem = find_gem_with_source(dep)
     raise Gem::CommandLineError, "couldn't find #{dep}" if gem.nil?
     full_name = gem[0].full_name
@@ -170,12 +165,10 @@ g: # Get dependencies from patched gems
     # development deps can't be found. Some are old. Thus only add rutime dependencies
     deps = gem[0].dependencies.find_all { |d| d.type == :runtime }
 
-    warn " total deps of #{full_name}: #{deps.length}"
+    say " total deps of #{full_name}: #{deps.length}" if Gem.configuration.really_verbose
 
-    dep_specs = []
     # recurse while collecting deps
-    deps.each {|dep_var| dep_specs.push(adddep(dep_var)) }
-
+    dep_specs = deps.map { |dep| adddep(dep) }
 
     @gems_with_deps[full_name] = [
       gem[0], # spec
@@ -186,18 +179,27 @@ g: # Get dependencies from patched gems
   end
 
 
-  # copied from dependency_installer, stripped
+  # copied from various rubygems sources, added caching to speedup subsequent executions
+  # TODO: develop a patch to rubygems sources that will increase speed for all users
   def find_gem_with_source(dep)
-    gems_and_sources = []
-
-    # no local
-
-      requirements = dep.requirement.requirements.map do |req, ver|
-        req
+    if @specs_by_name.nil? or @specs_by_name.empty?
+      @specs_by_name = { }
+      f = Gem::SpecFetcher.fetcher
+      f.list(true, @prerelease).map do |source_uri, specs|
+        specs.each do |spec_name, version, spec_platform|
+          if Gem::Platform.match(spec_platform)
+            @specs_by_name[spec_name] = [] unless @specs_by_name.key?(spec_name)
+            @specs_by_name[spec_name].push([version, spec_platform, source_uri])
+          end
+        end
       end
+    end
+
+    found = @specs_by_name[dep.name].select do |version, spec_platform, source_uri|
+      dep.match?(dep.name, version)
+    end
 
-      all = true
-      found = Gem::SpecFetcher.fetcher.fetch dep, all, true, @prerelease
-      found.reverse[0]
+    latest = found.sort { |a, b| a.first <=> b.first }.last
+    [Gem::SpecFetcher.fetcher.fetch_spec([dep.name, latest.first, latest[1]], latest.last), latest.last.to_s]
   end
 end

data/lib/nix/version.rb

@@ -1,3 +1,3 @@
 module Nix
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nix
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Yury G. Kudryashov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 +03:00
+date: 2011-01-18 00:00:00 +03:00
 default_executable: 
 dependencies: []