fig 0.1.31 → 0.1.32

data/README.md

@@ -1,15 +1,15 @@
 Description
 ===========
 
-Fig is a utility for configuring environments and managing dependencies across a team of developers. You give it a list of packages and a shell command to run; it creates an environment that includes those packages, then executes the shell command in it (the caller's environment is not affected). 
+Fig is a utility for configuring environments and managing dependencies across a team of developers. Fig takes a list of packages and a shell command to run, creates an environment that includes those packages, then executes the shell command in that environment. The caller's environment is not affected. 
 
 An "environment" in fig is just a set of environment variables. A "package" is a collection of files, plus some metadata describing what environment variables should be modified when the package is included. 
 
-Developers can use package files to specify the list of dependencies to use for different tasks. This file will typically be versioned along with the rest of the source files. This ensures that all developers on a team are using the same environemnts. 
+Developers can use package files to specify the list of dependencies to use for different tasks. This file will typically be versioned along with the rest of the source files, ensuring that all developers on a team are using the same environemnts. 
 
-Packages exist in two places: a "local" repository in the user's home directory, and a "remote" repository on a server somewhere that is shared by a team. Fig will automatically download packages from the remote repository and install them in the local repository, when needed. 
+Packages exist in two places: a "local" repository in the user's home directory, and a "remote" repository on a shared server. Fig will automatically download packages from the remote repository and install them in the local repository as needed. 
 
-Fig is similar to a lot of other package/dependnency managment tools. In particular, it steals a lot of ideas from Apache Ivy and Debian APT. However, unlike Ivy, fig is meant to be lightweight (no XML, no JVM startup time), language agnostic (Java doesn't get preferential treatment), and work with executables as well as libraries. And unlike APT, fig is meant to be cross platform (Windows support is coming) and project-oriented.
+Fig is similar to a lot of other package/dependency managment tools. In particular, it steals a lot of ideas from Apache Ivy and Debian APT. However, unlike Ivy, fig is meant to be lightweight (no XML, no JVM startup time), language agnostic (Java doesn't get preferential treatment), and work with executables as well as libraries. And unlike APT, fig is cross platform and project-oriented.
 
 Installation
 ============
@@ -19,8 +19,11 @@ Fig can be installed via rubygems. The gems are hosted at [Gemcutter](http://gem
     $ gem install gemcutter
     $ gem tumble
 
-Fig also depends on a third-party library named, [libarchive](http://libarchive.rubyforge.org/). Libarchive is easily available 
-via most package management systems on Linux, FreeBSD, and OS X.  Libarchive versions greater than 2.6.0 are preferred.  If you are on Windows, the gem will install the libarchive binaries for you.
+Fig also depends on a third-party library named
+[libarchive](http://libarchive.rubyforge.org/). Libarchive is easily available
+via most package management systems on Linux, FreeBSD, and OS X.  Libarchive
+versions greater than 2.6.0 are preferred.  If you are on Windows (not Cygwin Ruby), the gem will
+install the libarchive binaries for you.
 
     [Linux - Debian / Ubuntu]
     apt-get libarchive-dev
@@ -48,10 +51,15 @@ Fig recognizes the following options (not all are implemented yet):
     -m, --update-if-missing  Download/install packages from remote repository, if not already installed
     -l, --login              Authenticate with remote server using username/password (default is anonymous)
 
-If the `--login` option is supplied, fig will prompt for a username and password and use them
-to authentication against the remote server. If either the `FIG_REMOTE_USER` or `FIG_REMOTE_PASSWORD`
-environment variables are defined, fig will use those values instead of prompting the user. Even if
-both environment variables are defined, fig will not use them unless the `--login` option is supplied.
+If the `--login` option is supplied, fig will look for credentials.  If
+environment variables `FIG_REMOTE_USER` and/or `FIG_REMOTE_PASSWORD` are
+defined, fig will use them instead of prompting the user.  If ~/.netrc exists,
+with an entry corresponding to the host parsed from `FIG_REMOTE_URL`, that
+entry will take precedence over `FIG_REMOTE_USER` and `FIG_REMOTE_PASSWORD`.
+If sufficient credentials are still not found, fig will prompt for whatever is
+still missing, and use the accumulated credentials to authenticate against the
+remote server.  Even if both environment variables are defined, fig will only
+use them if `--login` is given.
 
 ### Environment Modifiers ###
 

data/lib/fig/os.rb

@@ -6,6 +6,7 @@ require 'uri'
 require 'net/http'
 require 'net/ssh'
 require 'net/sftp'
+require 'net/netrc'
 require 'tempfile'
 require 'highline/import'
 
@@ -28,8 +29,13 @@ module Fig
       @password ||= ask("Password: ") { |q| q.echo = false }
     end
 
-    def ftp_login(ftp)
+    def ftp_login(ftp, host)
       if @login
+        rc = Net::Netrc.locate(host)
+        if rc
+          @username = rc.login
+          @password = rc.password
+        end
         ftp.login(get_username, get_password)
       else 
         ftp.login()
@@ -71,7 +77,7 @@ module Fig
       case uri.scheme
       when "ftp"
         ftp = Net::FTP.new(uri.host)
-        ftp_login(ftp)
+        ftp_login(ftp, uri.host)
         ftp.chdir(uri.path)
         dirs = ftp.nlst
         ftp.close
@@ -106,7 +112,7 @@ module Fig
         threads << Thread.new do
           packages = all_packages[num]
           ftp = Net::FTP.new(uri.host)
-          ftp_login(ftp)
+          ftp_login(ftp, uri.host)
           ftp.chdir(uri.path)
           pos = num
           while pos < dirs.length
@@ -133,7 +139,7 @@ module Fig
       case uri.scheme
       when "ftp"
         ftp = Net::FTP.new(uri.host)
-        ftp_login(ftp)
+        ftp_login(ftp, uri.host)
         begin
           if File.exist?(path) && ftp.mtime(uri.path) <= File.mtime(path)
             return false
@@ -209,7 +215,7 @@ module Fig
         # i.e. [1,2,3] - [2,3,4] = [1]
         remote_project_dirs = remote_publish_dirs - ftp_root_dirs
         Net::FTP.open(uri.host) do |ftp|
-          ftp_login(ftp)
+          ftp_login(ftp, uri.host)
           # Assume that the FIG_REMOTE_URL path exists.
           ftp.chdir(ftp_root_path)
           remote_project_dirs.each do |dir|

data/lib/fig/repository.rb

@@ -116,6 +116,7 @@ module Fig
         end
       rescue NotFoundException
         $stderr.puts "Package not found in remote repository: #{package_name}/#{version_name}"
+        delete_local_package(package_name, version_name)
         exit 1
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fig
 version: !ruby/object:Gem::Version 
-  version: 0.1.31
+  version: 0.1.32
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 -05:00
+date: 2011-06-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,14 +33,14 @@ dependencies:
         version: 2.0.15
     version: 
 - !ruby/object:Gem::Dependency 
-  name: net-sftp
+  name: net-netrc
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 0.2.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: polyglot