nix 0.0.3 → 0.1

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

@@ -31,23 +31,12 @@ class Gem::Specification
   def nix_meta
     {
       :homepage => homepage,
-      :description => nix_description(false),
-      :longDescription => nix_description(true),
+      :description => summary,
+      :longDescription => description,
       :license => licenses
     }.reject { |k, v| v.nil? or (v.respond_to?(:empty?) and v.empty?) }
   end
 
-  def nix_description(long)
-    return nil if description.nil? or description.empty?
-    desc = description.dup
-    if not long then
-      desc.sub!(/\A[[:space:]]*([^.\n]*[^.\n[:space:]]).*\z/,'\1')
-      desc.sub!(/ +/, ' ')
-      desc.sub!(/(.{120}).+/, '\1[...]') # Trim to 120 chars
-    end
-    desc
-  end
-
   def src_url
     "http://production.cf.rubygems.org/gems/#{full_name}.gem"
   end
@@ -89,18 +78,29 @@ class Gem::Specification
 end
 
 class Gem::Commands::NixCommand < Gem::Command
-  include Gem::VersionOption
-  include Gem::LocalRemoteOptions
-  include Gem::InstallUpdateOptions
-
   def exec
     begin
       @prerelease = false;
 
       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])
+        File.open(options[:nix_file], 'r') do |f|
+          l = f.readlines.select {|s| s =~ /gem_nix_args =/}.first
+          args += l.
+            sub(/ *gem_nix_args = \[ (.*) \];/, '\1').split(' ').
+            map do |s|
+              s.sub(/\A''/, '').sub(/''\Z/, '')
+            end
+        end unless options[:ignore_existing]
+      end
+
+      args.sort!
+
+      say "Will generate nix file for the following gems: #{args.join ', '}" if Gem::configuration.really_verbose
+
       @gems_with_deps = {}
-      @seen = {}
 
       # args to dep informations
       args.each { |arg|
@@ -116,11 +116,6 @@ class Gem::Commands::NixCommand < Gem::Command
 
       say " total: #{@gems_with_deps.length}" if Gem.configuration.really_verbose
 
-      print <<-EOF
-# WARNING: automatically generated file
-# the gem nix command comes from 'nix' gem
-g: # Get dependencies from patched gems
-      EOF
       # define aliases
       aliases = {}
       output_gems = {}
@@ -135,14 +130,19 @@ g: # Get dependencies from patched gems
         })
       end
 
-      print ({
-        :gem_nix_args => args,
-        :gems => output_gems,
-        :aliases => aliases.values.inject({}) do |h, s|
-          h[s.nix_name(:short_sym)] = s.nix_name(:rhs_sym)
-          h
-        end
-      }.to_nix)
+      File.open(options[:nix_file], 'w') do |f|
+        f << "# WARNING: automatically generated file\n"
+        f << "# Generated by 'gem nix' command that comes from 'nix' gem\n"
+        f << "g: # Get dependencies from patched gems\n"
+        f << ({
+          :gem_nix_args => args,
+          :gems => output_gems,
+          :aliases => aliases.values.inject({}) do |h, s|
+            h[s.nix_name(:short_sym)] = s.nix_name(:rhs_sym)
+            h
+          end
+        }.to_nix) << "\n"
+      end
       exit_code = 0
 
     rescue => e
@@ -155,15 +155,14 @@ g: # Get dependencies from patched gems
 
   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
+    spec, source_uri = find_gem_with_source(dep)
+    full_name = spec.full_name
 
-    return if @seen[full_name]
-    @seen[full_name] = true # there maybe circular dependencies. thus mark this gem seen as early as possible
+    return if @gems_with_deps.key?(full_name)
+    @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 = gem[0].dependencies.find_all { |d| d.type == :runtime }
+    deps = spec.dependencies.find_all { |d| d.type == :runtime }
 
     say " total deps of #{full_name}: #{deps.length}" if Gem.configuration.really_verbose
 
@@ -171,11 +170,9 @@ g: # Get dependencies from patched gems
     dep_specs = deps.map { |dep| adddep(dep) }
 
     @gems_with_deps[full_name] = [
-      gem[0], # spec
-      gem[1], # src
-      dep_specs # deps
+      spec, source_uri, dep_specs
     ]
-    gem[0] # only return spec, no source for dep list
+    spec # only return spec, no source for dep list
   end
 
 
@@ -199,6 +196,8 @@ g: # Get dependencies from patched gems
       dep.match?(dep.name, version)
     end
 
+    raise Gem::CommandLineError, "couldn't find #{dep}" if found.empty?
+
     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

data/lib/nix/version.rb

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

data/lib/rubygems_plugin.rb

@@ -3,8 +3,19 @@ require 'rubygems/dependency_installer'
 
 class Gem::Commands::NixCommand < Gem::Command
   def initialize
-    defaults = Gem::DependencyInstaller::DEFAULT_OPTIONS.merge({ })
+    defaults = Gem::DependencyInstaller::DEFAULT_OPTIONS.merge({
+      :nix_file => ENV.fetch('NIXPKGS_ALL', '/etc/nixos/nixpkgs') + '/pkgs/development/interpreters/ruby/gems-generated.nix',
+      :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|
+      options[:nix_file] = value
+    end
+
+    add_option('--[no-]ignore-existing', 'Ignore gems from the previous run') do |value, options|
+      options[:ignore_existing] = value
+    end
   end
 
   def description # :nodoc:
@@ -31,7 +42,7 @@ class Gem::Commands::NixCommand < Gem::Command
 
   def execute
     require 'nix/gem-nix-command' unless respond_to? :exec
-	exec
+    exec
   end
 end
 

data/nix.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["urkud@ya.ru"]
   s.homepage    = "http://gitorious.org/ruby-nix"
   s.summary     = %q{Nix package manager interface}
-  s.description = %q{See http://www.nixos.org}
+  s.description = %q{Adds 'gem nix' command that dumps given set of gems to format suitable for Nix package manager}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: nix
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 9
   prerelease: 
   segments: 
   - 0
-  - 0
-  - 3
-  version: 0.0.3
+  - 1
+  version: "0.1"
 platform: ruby
 authors: 
 - Yury G. Kudryashov
@@ -19,7 +18,7 @@ date: 2011-01-18 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
-description: See http://www.nixos.org
+description: Adds 'gem nix' command that dumps given set of gems to format suitable for Nix package manager
 email: 
 - urkud@ya.ru
 executables: []