fig 0.1.11 → 0.1.12

data/lib/fig/environment.rb

@@ -114,7 +114,7 @@ module Fig
 
     # Replace @ symbol with the package's directory
     def expand_value(base_package, name, value)
-      return value if base_package.nil?
+      return value unless base_package && base_package.package_name
       file = value.gsub(/\@/, base_package.directory)
       if @retrieve_vars.member?(name)
         target = File.join(@retrieve_vars[name].gsub(/\[package\]/, base_package.package_name), File.basename(file))

data/lib/fig/os.rb

@@ -38,16 +38,13 @@ module Fig
       when "ftp"
         ftp = Net::FTP.new(uri.host)
         ftp.login
-        dirs = [] 
-        ftp.list("-1 " + uri.path) do |line|
-          dirs << line
-        end
+        ftp.chdir(uri.path)
         packages = []
-        dirs.each do |dir|
-          ftp.list("-1 #{uri.path}/#{dir}") do |line|
-            packages << "#{dir}/#{line}"
-          end
+        ftp.retrlines('LIST -R .') do |line|
+          parts = line.gsub(/\\/, '/').sub(/^\.\//, '').sub(/:$/, '').split('/')
+          packages << parts.join('/') if parts.size == 2
         end
+        ftp.close
         packages
       else
         raise "Protocol not supported: #{url}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fig
 version: !ruby/object:Gem::Version 
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-27 00:00:00 -06:00
+date: 2010-02-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,5 +104,5 @@ signing_key:
 specification_version: 3
 summary: Fig is a utility for configuring environments and managing dependencies across a team of developers..
 test_files: 
-- spec/fig_spec.rb
 - spec/spec_helper.rb
+- spec/fig_spec.rb