nix 0.0.1 → 0.0.2

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

@@ -48,38 +48,45 @@ class Gem::Specification
     desc
   end
 
-  def nix_hash
-    src = "http://rubygems.org/downloads/#{full_name}.gem"
-    cashfile="#{ENV['HOME']}/.nix-ruby-gems-cache"
-    cash = {}
-    if FileTest.exists?(cashfile)
-      File.open(cashfile,'r') do |f| Marshal.load(f) end
+  def src_url
+    "http://production.cf.rubygems.org/gems/#{full_name}.gem"
+  end
+
+  @@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
     end
 
-    if cash[src].nil? then
+    unless @@sha256_cache.key?(src_url)
       tmp="/tmp/ruby-gems-nix-tmp-file"
-      system("nix-prefetch-url #{src.gsub(/([:= `$;])/,'\\\\\1')} > #{tmp} 2>/dev/null")
+      system("nix-prefetch-url #{src_url.gsub(/([:= `$;])/,'\\\\\1')} > #{tmp} 2>/dev/null")
       if $? == 0
         file = File.new(tmp)
-        hash = file.readlines().first().split("\n")[0] # remove trailing \n
+        hash = file.readlines().first().chomp
         file.close()
         File.delete(tmp)
-        cash[src] = hash
+        @@sha256_cache[src_url] = hash
       else
-        cash[src] = "no hash"
+        @@sha256_cache[src_url] = "no hash"
       end
 
-      File.open(cashfile, "w+") do |f| Marshal.dump(cash, f) end
+      File.open(cache_file, "w+") do |f| Marshal.dump(@@sha256_cache, f) end
     end
 
-    return cash[src]
+    return @@sha256_cache[src_url]
   end
 
   def nix_derivation
     {
       :name => full_name,
       :basename => nix_name(:short),
-      :sha256 => nix_hash,
+      :sha256 => sha256,
       :meta => nix_meta
     }
   end

data/lib/nix/version.rb

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

metadata

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