fig 0.1.39 → 0.1.41

data/lib/fig/os.rb

@@ -10,23 +10,24 @@ require 'net/netrc'
 require 'tempfile'
 require 'highline/import'
 
-module Fig
-  class NotFoundException < Exception
-  end
+require 'fig/logging'
+require 'fig/networkerror'
+require 'fig/notfounderror'
 
+module Fig
   class OS
     def initialize(login)
       @login = login
-      @username = ENV["FIG_USERNAME"]
-      @password = ENV["FIG_PASSWORD"]
+      @username = ENV['FIG_USERNAME']
+      @password = ENV['FIG_PASSWORD']
     end
 
     def get_username()
-      @username ||= ask("Username: ") { |q| q.echo = true }
+      @username ||= ask('Username: ') { |q| q.echo = true }
     end
-    
+
     def get_password()
-      @password ||= ask("Password: ") { |q| q.echo = false }
+      @password ||= ask('Password: ') { |q| q.echo = false }
     end
 
     def ftp_login(ftp, host)
@@ -37,7 +38,7 @@ module Fig
           @password = rc.password
         end
         ftp.login(get_username, get_password)
-      else 
+      else
         ftp.login()
       end
       ftp.passive = true
@@ -46,36 +47,36 @@ module Fig
     def list(dir)
       Dir.entries(dir) - ['.','..']
     end
-    
+
     def exist?(path)
       File.exist?(path)
     end
-    
+
     def mtime(path)
       File.mtime(path)
     end
-    
+
     def read(path)
       File.read(path)
     end
-    
+
     def write(path, content)
-      File.open(path, "wb") { |f| f.binmode; f << content }
+      File.open(path, 'wb') { |f| f.binmode; f << content }
     end
-    
+
     SUCCESS = 0
     NOT_MODIFIED = 3
     NOT_FOUND = 4
-    
+
     def download_list(url)
       begin
         uri = URI.parse(url)
-      rescue 
-        $stderr.puts "Unable to parse url: '#{url}'"
-        exit 10
+      rescue
+        Logging.fatal %Q<Unable to parse url: "#{url}">
+        raise NetworkError.new
       end
       case uri.scheme
-      when "ftp"
+      when 'ftp'
         ftp = Net::FTP.new(uri.host)
         ftp_login(ftp, uri.host)
         ftp.chdir(uri.path)
@@ -83,12 +84,12 @@ module Fig
         ftp.close
 
         download_ftp_list(uri, dirs)
-      when "ssh"
+      when 'ssh'
         packages = []
         Net::SSH.start(uri.host, uri.user) do |ssh|
           ls = ssh.exec!("[ -d #{uri.path} ] && find #{uri.path}")
           if not ls.nil?
-            ls = ls.gsub(uri.path + "/", "").gsub(uri.path, "").split("\n")
+            ls = ls.gsub(uri.path + '/', '').gsub(uri.path, '').split("\n")
             ls.each do |line|
               parts = line.gsub(/\\/, '/').sub(/^\.\//, '').sub(/:$/, '').chomp().split('/')
               packages << parts.join('/') if parts.size == 2
@@ -97,16 +98,16 @@ module Fig
         end
         packages
       else
-        $stderr.puts "Protocol not supported: #{url}"
-        exit 10
+        Logging.fatal "Protocol not supported: #{url}"
+        raise NetworkError.new
       end
     end
 
     def download_ftp_list(uri, dirs)
       # Run a bunch of these in parallel since they're slow as hell
-      num_threads = (ENV["FIG_FTP_THREADS"] || "16").to_i
+      num_threads = (ENV['FIG_FTP_THREADS'] || '16').to_i
       threads = []
-      all_packages = []        
+      all_packages = []
       (0..num_threads-1).each { |num| all_packages[num] = [] }
       (0..num_threads-1).each do |num|
         threads << Thread.new do
@@ -137,46 +138,49 @@ module Fig
       FileUtils.mkdir_p(File.dirname(path))
       uri = URI.parse(url)
       case uri.scheme
-      when "ftp"
+      when 'ftp'
         ftp = Net::FTP.new(uri.host)
         ftp_login(ftp, uri.host)
         begin
           if File.exist?(path) && ftp.mtime(uri.path) <= File.mtime(path)
+            Logging.debug "#{path} is up to date."
             return false
-          else 
-            $stderr.puts "downloading #{url}"
+          else
+            log_download(url, path)
             ftp.getbinaryfile(uri.path, path, 256*1024)
             return true
           end
-        rescue Net::FTPPermError
-          raise NotFoundException.new
+        rescue Net::FTPPermError => e
+          Logging.warn e
+          raise NotFoundError.new
         end
-      when "http"
+      when 'http'
         http = Net::HTTP.new(uri.host)
-        $stderr.puts "downloading #{url}"
-        File.open(path, "wb") do |file|
+        log_download(url, path)
+        File.open(path, 'wb') do |file|
           file.binmode
           http.get(uri.path) do |block|
             file.write(block)
           end
         end
-      when "ssh"
+      when 'ssh'
         # TODO need better way to do conditional download
-        #       timestamp = `ssh #{uri.user + '@' if uri.user}#{uri.host} "ruby -e 'puts File.mtime(\\"#{uri.path}\\").to_i'"`.to_i
-        timestamp = File.exist?(path) ? File.mtime(path).to_i : 0 
+        timestamp = File.exist?(path) ? File.mtime(path).to_i : 0
+        # Requires that remote installation of fig be at the same location as the local machine.
         cmd = `which fig-download`.strip + " #{timestamp} #{uri.path}"
+        log_download(url, path)
         ssh_download(uri.user, uri.host, path, cmd)
       else
-        $stderr.puts "Unknown protocol: #{url}"
-        exit 10
+        Logging.fatal "Unknown protocol: #{url}"
+        raise NetworkError.new
       end
-   end
-    
+    end
+
     def download_resource(url, dir)
       FileUtils.mkdir_p(dir)
       download(url, File.join(dir, URI.parse(url).path.split('/').last))
     end
-    
+
     def download_archive(url, dir)
       FileUtils.mkdir_p(dir)
       basename = URI.parse(url).path.split('/').last
@@ -192,25 +196,25 @@ module Fig
       when /\.zip$/
         unpack_archive(dir, path)
       else
-        $stderr.puts "Unknown archive type: #{basename}"
-        exit 10
+        Logging.fatal "Unknown archive type: #{basename}"
+        raise NetworkError.new
       end
     end
-    
+
     def upload(local_file, remote_file, user)
-      puts "uploading #{local_file} to #{remote_file}"
+      Logging.debug "Uploading #{local_file} to #{remote_file}."
       uri = URI.parse(remote_file)
       case uri.scheme
-      when "ssh"
+      when 'ssh'
         ssh_upload(uri.user, uri.host, local_file, remote_file)
-      when "ftp"
+      when 'ftp'
         #      fail unless system "curl -T #{local_file} --create-dirs --ftp-create-dirs #{remote_file}"
        require 'net/ftp'
-        ftp_uri = URI.parse(ENV["FIG_REMOTE_URL"])
+        ftp_uri = URI.parse(ENV['FIG_REMOTE_URL'])
         ftp_root_path = ftp_uri.path
-        ftp_root_dirs = ftp_uri.path.split("/")
-        remote_publish_path = uri.path[0, uri.path.rindex("/")]
-        remote_publish_dirs = remote_publish_path.split("/")
+        ftp_root_dirs = ftp_uri.path.split('/')
+        remote_publish_path = uri.path[0, uri.path.rindex('/')]
+        remote_publish_dirs = remote_publish_path.split('/')
         # Use array subtraction to deduce which project/version folder to upload to,
         # i.e. [1,2,3] - [2,3,4] = [1]
         remote_project_dirs = remote_publish_dirs - ftp_root_dirs
@@ -231,26 +235,17 @@ module Fig
         end
       end
     end
-    
+
     def clear_directory(dir)
       FileUtils.rm_rf(dir)
       FileUtils.mkdir_p(dir)
     end
 
-    def exec(dir,command)
-      Dir.chdir(dir) {
-        unless system command
-          $stderr.puts "Command failed"
-          exit 10
-        end
-      }
-    end
-    
     def copy(source, target, msg = nil)
       if File.directory?(source)
         FileUtils.mkdir_p(target)
         Dir.foreach(source) do |child|
-          if child != "." and child != ".."
+          if child != '.' and child != '..'
             copy(File.join(source, child), File.join(target, child), msg)
           end
         end
@@ -267,9 +262,9 @@ module Fig
     def move_file(dir, from, to)
       Dir.chdir(dir) { FileUtils.mv(from, to, :force => true) }
     end
-    
+
     def log_info(msg)
-      $stderr.puts msg
+      Logging.info msg
     end
 
     # Expects files_to_archive as an Array of filenames.
@@ -339,8 +334,8 @@ module Fig
     end
 
     def shell_exec_windows(cmd)
-      #command = ["C:/WINDOWS/system32/cmd.exe", "/C", "call"] + cmd
-      command = ["cmd.exe", "/C"] + cmd
+      #command = ['C:/WINDOWS/system32/cmd.exe', '/C', 'call'] + cmd
+      command = ['cmd.exe', '/C'] + cmd
       command = command.join(' ')
       Kernel.exec(command)
     end
@@ -349,13 +344,13 @@ module Fig
     # cmd = The command to be run on the remote host.
     def ssh_download(user, host, path, cmd)
       return_code = nil
-      tempfile = Tempfile.new("tmp")
+      tempfile = Tempfile.new('tmp')
       Net::SSH.start(host, user) do |ssh|
         ssh.open_channel do |channel|
           channel.exec(cmd)
           channel.on_data() { |ch, data| tempfile << data }
-          channel.on_extended_data() { |ch, type, data| $stderr.puts "SSH Download ERROR: #{data}" }
-          channel.on_request("exit-status") { |ch, request|
+          channel.on_extended_data() { |ch, type, data| Logging.error "SSH Download ERROR: #{data}" }
+          channel.on_request('exit-status') { |ch, request|
             return_code = request.read_long
           }
         end
@@ -369,15 +364,14 @@ module Fig
         return false
       when NOT_FOUND
         tempfile.delete
-        $stderr.puts "File not found: #{path}"
-        exit 10
+        raise NotFoundError.new
       when SUCCESS
         FileUtils.mv(tempfile.path, path)
         return true
       else
         tempfile.delete
-        $stderr.puts "Unable to download file: #{return_code}"
-        exit 1
+        Logging.fatal "Unable to download file #{path}: #{return_code}"
+        raise NetworkError.new
       end
     end
 
@@ -392,5 +386,10 @@ module Fig
       end
     end
 
+    private
+
+    def log_download(url, path)
+      Logging.debug "Downloading #{url} to #{path}."
+    end
   end
 end

data/lib/fig/package.rb

@@ -1,22 +1,25 @@
+require 'fig/logging'
+require 'fig/packageerror'
+
 module Fig
   class Package
     attr_reader :package_name, :version_name, :directory, :statements
     attr_accessor :backtrace
-    
-    def initialize(package_name, version_name, directory, statements) 
+
+    def initialize(package_name, version_name, directory, statements)
       @package_name = package_name
       @version_name = version_name
       @directory = directory
       @statements = statements
       @backtrace = nil
     end
-    
+
     def [](config_name)
       @statements.each do |stmt|
         return stmt if stmt.is_a?(Configuration) && stmt.name == config_name
       end
-      $stderr.puts "Configuration not found: #{@package_name}/#{@version_name}:#{config_name}"
-      exit 10
+      Fig::Logging.fatal "Configuration not found: #{@package_name}/#{@version_name}:#{config_name}"
+      raise PackageError.new
     end
 
     def configs
@@ -32,11 +35,11 @@ module Fig
     def archive_urls
       @statements.select{|s| s.is_a?(Archive)}.map{|s|s.url}
     end
-    
+
     def resource_urls
       @statements.select{|s| s.is_a?(Resource)}.map{|s|s.url}
     end
-    
+
     def unparse
       @statements.map { |statement| statement.unparse('') }.join("\n")
     end
@@ -46,34 +49,34 @@ module Fig
     end
 
     def to_s
-      @package_name + "/" + @version_name
+      @package_name + '/' + @version_name
     end
   end
-  
+
   class Archive
     attr_reader :url
-    
+
     def initialize(url)
       @url = url
     end
-    
+
     def unparse(indent)
-      "#{indent}archive \"#{url}\""
+      %Q<#{indent}archive "#{url}">
     end
   end
-  
+
   class Resource
     attr_reader :url
-    
+
     def initialize(url)
       @url = url
     end
-    
+
     def unparse(indent)
       "#{indent}resource #{url}"
     end
   end
-  
+
   class Retrieve
     attr_reader :var, :path
 
@@ -94,7 +97,7 @@ module Fig
       @local_name = local_name
       @remote_name = remote_name
     end
-    
+
     def unparse(indent)
       "#{indent}publish #{@local_name}->#{@remote_name}"
     end
@@ -110,9 +113,9 @@ module Fig
       body = @statements.map { |statement| statement.unparse(indent+'  ') }.join("\n")
       suffix = "#{indent}end"
       return [prefix, body, suffix].join("\n")
-    end 
+    end
   end
-  
+
   class Configuration
     attr_reader :name, :statements
 
@@ -127,14 +130,11 @@ module Fig
 
     def commands
       result = statements.select { |statement| statement.is_a?(Command) }
-#      if result.empty?
-#        raise "No commands found for config: #{@name}"
-#      end
       result
     end
 
     def unparse(indent)
-      unparse_statements(indent, "config #{@name}", @statements, "end")
+      unparse_statements(indent, "config #{@name}", @statements, 'end')
     end
   end
 
@@ -145,7 +145,7 @@ module Fig
       @name = name
       @value = value
     end
-  
+
     def unparse(indent)
       "#{indent}append #{name}=#{value}"
     end
@@ -158,7 +158,7 @@ module Fig
       @name = name
       @value = value
     end
-  
+
     def unparse(indent)
       "#{indent}set #{name}=#{value}"
     end
@@ -175,7 +175,7 @@ module Fig
     end
 
     def unparse(indent)
-      descriptor = ""
+      descriptor = ''
       descriptor += @package_name if @package_name
       descriptor += "/#{@version_name}" if @version_name
       descriptor += ":#{@config_name}" if @config_name
@@ -188,14 +188,14 @@ module Fig
 
   class Override
     attr_reader :package_name, :version_name
-    
+
     def initialize(package_name, version_name)
       @package_name = package_name
       @version_name = version_name
     end
 
     def unparse()
-      return " override " + @package_name + "/" + @version_name
+      return ' override ' + @package_name + '/' + @version_name
     end
   end
 
@@ -207,7 +207,7 @@ module Fig
     end
 
     def unparse(indent)
-      "#{indent}command \"#{@command}\""
+      %Q<#{indent}command "#{@command}">
     end
   end
 
@@ -216,5 +216,5 @@ end
 def unparse_statements(indent, prefix, statements, suffix)
   body = @statements.map { |statement| statement.unparse(indent+'  ') }.join("\n")
   return ["\n#{indent}#{prefix}", body, "#{indent}#{suffix}"].join("\n")
-end   
+end