fig 0.1.26 → 0.1.27

data/bin/fig

@@ -57,7 +57,7 @@ if options[:publish]
 #  end
 end
 
-os = OS.new
+os = OS.new(options[:login])
 repos = Repository.new(os, File.expand_path(File.join(options[:home], 'repos')), remote_url, remote_user, options[:update], options[:update_if_missing])
 env = Environment.new(os, repos, vars)
 

data/lib/fig/options.rb

@@ -55,6 +55,9 @@ module Fig
         options[:archives] << Archive.new(path)
       end
 
+      options[:login] = false
+      opts.on('-l', '--login', 'login into the FTP server as a non-anonymous user') { options[:login] = true }
+
       options[:list] = false
       opts.on('--list', 'list packages in local repository') { options[:list] = true }
 

data/lib/fig/os.rb

@@ -7,12 +7,35 @@ require 'net/http'
 require 'net/ssh'
 require 'net/sftp'
 require 'tempfile'
+require 'highline/import'
 
 module Fig
   class NotFoundException < Exception
   end
 
   class OS
+    def initialize(login)
+      @login = login
+      @username = ENV["FIG_USERNAME"]
+      @password = ENV["FIG_PASSWORD"]
+    end
+
+    def get_username()
+      @username ||= ask("Username: ") { |q| q.echo = true }
+    end
+    
+    def get_password()
+      @password ||= ask("Password: ") { |q| q.echo = false }
+    end
+
+    def ftp_login(ftp)
+      if @login
+        ftp.login(get_username, get_password)
+      else 
+        ftp.login()
+      end
+    end
+
     def list(dir)
       Dir.entries(dir) - ['.','..']
     end
@@ -47,7 +70,8 @@ module Fig
       case uri.scheme
       when "ftp"
         ftp = Net::FTP.new(uri.host)
-        ftp.login
+        ftp_login(ftp)
+        puts(uri.path)
         ftp.chdir(uri.path)
         packages = []
         ftp.retrlines('LIST -R .') do |line|
@@ -81,7 +105,7 @@ module Fig
       case uri.scheme
       when "ftp"
         ftp = Net::FTP.new(uri.host)
-        ftp.login
+        ftp_login(ftp)
         begin
           if File.exist?(path) && ftp.mtime(uri.path) <= File.mtime(path)
             return false
@@ -157,7 +181,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_login(ftp)
           # Assume that the FIG_REMOTE_URL path exists.
           ftp.chdir(ftp_root_path)
           remote_project_dirs.each do |dir|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fig
 version: !ruby/object:Gem::Version 
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 -05:00
+date: 2011-05-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.4.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: highline
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.6.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development