nix 0.1 → 0.1.1

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

@@ -82,7 +82,10 @@ class Gem::Commands::NixCommand < Gem::Command
     begin
       @prerelease = false;
 
-      args = options[:args];
+      options[:nix_file] = options[:nix_file] ||
+        (options[:user_install] ? options[:user_generated_nix] : options[:system_generated_nix])
+
+      args = options[:args]
 
       if FileTest.exists?(options[:nix_file])
         raise "File #{options[:nix_file]} is not a regular file" unless FileTest.file?(options[:nix_file])
@@ -97,6 +100,7 @@ class Gem::Commands::NixCommand < Gem::Command
       end
 
       args.sort!
+      args.uniq!
 
       say "Will generate nix file for the following gems: #{args.join ', '}" if Gem::configuration.really_verbose
 
@@ -162,7 +166,7 @@ class Gem::Commands::NixCommand < Gem::Command
     @gems_with_deps[full_name] = nil # there maybe circular dependencies. thus mark this gem seen as early as possible
 
     # development deps can't be found. Some are old. Thus only add rutime dependencies
-    deps = spec.dependencies.find_all { |d| d.type == :runtime }
+    deps = spec.dependencies.find_all { |d| d.type != :development }
 
     say " total deps of #{full_name}: #{deps.length}" if Gem.configuration.really_verbose
 
@@ -192,6 +196,8 @@ class Gem::Commands::NixCommand < Gem::Command
       end
     end
 
+    raise "#{dep.name} not found!" unless @specs_by_name.key?(dep.name)
+
     found = @specs_by_name[dep.name].select do |version, spec_platform, source_uri|
       dep.match?(dep.name, version)
     end

data/lib/nix/version.rb

@@ -1,3 +1,3 @@
 module Nix
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end

data/lib/rubygems_plugin.rb

@@ -4,15 +4,26 @@ require 'rubygems/dependency_installer'
 class Gem::Commands::NixCommand < Gem::Command
   def initialize
     defaults = Gem::DependencyInstaller::DEFAULT_OPTIONS.merge({
-      :nix_file => ENV.fetch('NIXPKGS_ALL', '/etc/nixos/nixpkgs') + '/pkgs/development/interpreters/ruby/gems-generated.nix',
+      :system_generated_nix => ENV.fetch('NIXPKGS_ALL', '/etc/nixos/nixpkgs') + '/pkgs/development/interpreters/ruby/generated.nix',
+      :user_generated_nix => ENV['HOME'] + '/.nixpkgs/gems/generated.nix',
+      :user_install => true,
+      :nix_file => nil,
       :ignore_existing => false
     })
     super 'nix', 'Create a nix file containing expressions of the gems', defaults
 
-    add_option('--nix-file=/path/to/gems-generated.nix', 'Use specified nix file instead of default one') do |value, options|
+    add_option('--nix-file=/path/to/generated.nix', 'Use specified nix file instead of default one') do |value, options|
       options[:nix_file] = value
     end
 
+    add_option('--[no-]user-install',
+               "Which generated.nix file to use:",
+               "  * user-specific (#{defaults[:user_generated_nix]})",
+               "  * system-wide (#{defaults[:system_generated_nix]})"
+			  ) do |value, options|
+      options[:user_install] = value
+    end
+
     add_option('--[no-]ignore-existing', 'Ignore gems from the previous run') do |value, options|
       options[:ignore_existing] = value
     end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nix
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  version: "0.1"
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Yury G. Kudryashov
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 +03:00
+date: 2011-04-04 00:00:00 +04:00
 default_executable: 
 dependencies: []