fig18 0.1.39 → 0.1.40

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
 

data/lib/fig/packageerror.rb

@@ -0,0 +1,7 @@
+require 'fig/userinputerror'
+
+module Fig
+  # An issue with a stored package.
+  class PackageError < UserInputError
+  end
+end

data/lib/fig/parser.rb

@@ -2,6 +2,8 @@ require 'polyglot'
 require 'treetop'
 
 require 'fig/grammar'
+require 'fig/logging'
+require 'fig/packageerror'
 
 module Fig
   class Parser
@@ -12,16 +14,11 @@ module Fig
     def parse_package(package_name, version_name, directory, input)
       input = input.gsub(/#.*$/, '')
       result = @parser.parse(" #{input} ")
-      if result.nil? 
-        $stderr.puts "#{directory}: #{@parser.failure_reason}"
-        exit 10
+      if result.nil?
+        Fig::Logging.fatal "#{directory}: #{@parser.failure_reason}"
+        raise PackageError.new
       end
       result.to_package(package_name, version_name, directory)
     end
-
-#    def parse_descriptor(descriptor)
-#      puts @parser.methods.sort
-#    end
   end
-
 end

data/lib/fig/repository.rb

@@ -1,12 +1,17 @@
+require 'fig/logging'
+require 'fig/notfounderror'
 require 'fig/parser'
+require 'fig/repositoryerror'
+require 'fig/urlaccesserror'
 
 module Fig
   class Repository
-    def initialize(os, local_repository_dir, remote_repository_url, remote_repository_user=nil, update=false, update_if_missing=true)
+    def initialize(os, local_repository_dir, remote_repository_url, application_config, remote_repository_user=nil, update=false, update_if_missing=true)
       @os = os
       @local_repository_dir = local_repository_dir
       @remote_repository_url = remote_repository_url
       @remote_repository_user = remote_repository_user
+      @application_config = application_config
       @update = update
       @update_if_missing = update_if_missing
       @parser = Parser.new
@@ -20,7 +25,7 @@ module Fig
       end
     end
 
-    def clean(package_name, version_name) 
+    def clean(package_name, version_name)
       dir = File.join(@local_repository_dir, package_name)
       dir = File.join(dir, version_name) if version_name
       FileUtils.rm_rf(dir)
@@ -42,13 +47,13 @@ module Fig
       @os.download_list(@remote_repository_url)
     end
 
-    def publish_package(package_statements, package_name, version_name, local_only) 
+    def publish_package(package_statements, package_name, version_name, local_only)
       temp_dir = temp_dir_for_package(package_name, version_name)
       @os.clear_directory(temp_dir)
       local_dir = local_dir_for_package(package_name, version_name)
       @os.clear_directory(local_dir)
-      fig_file = File.join(temp_dir, ".fig")
-      content = bundle_resources(package_statements).map do |statement| 
+      fig_file = File.join(temp_dir, '.fig')
+      content = bundle_resources(package_statements).map do |statement|
         if statement.is_a?(Publish)
           nil
         elsif statement.is_a?(Archive) || statement.is_a?(Resource)
@@ -56,17 +61,17 @@ module Fig
             archive_name = statement.url
             archive_remote = "#{remote_dir_for_package(package_name, version_name)}/#{statement.url}"
           else
-            archive_name = statement.url.split("/").last
+            archive_name = statement.url.split('/').last
             archive_remote = "#{remote_dir_for_package(package_name, version_name)}/#{archive_name}"
           end
-          if is_url?(statement.url)
+          if is_url_with_access?(statement.url)
             archive_local = File.join(temp_dir, archive_name)
             @os.download(statement.url, archive_local)
           else
             archive_local = statement.url
           end
           @os.upload(archive_local, archive_remote, @remote_repository_user) unless local_only
-          @os.copy(archive_local, local_dir + "/" + archive_name)
+          @os.copy(archive_local, local_dir + '/' + archive_name)
           if statement.is_a?(Archive)
             @os.unpack_archive(local_dir, archive_name)
           end
@@ -92,7 +97,7 @@ module Fig
       end
       if resources.size > 0
         resources = expand_globs_from(resources)
-        file = "resources.tar.gz"
+        file = 'resources.tar.gz'
         @os.create_archive(file, resources)
         new_package_statements.unshift(Archive.new(file))
         at_exit { File.delete(file) }
@@ -101,12 +106,17 @@ module Fig
     end
 
     def load_package(package_name, version_name)
+      Logging.debug "Considering #{package_name}/#{version_name}."
       if @update || (@update_if_missing && package_missing?(package_name, version_name))
         update_package(package_name, version_name)
       end
       read_local_package(package_name, version_name)
     end
 
+    def updating?
+      return @update || @update_if_missing
+    end
+
     def update_package(package_name, version_name)
       remote_fig_file = remote_fig_file_for_package(package_name, version_name)
       local_fig_file = local_fig_file_for_package(package_name, version_name)
@@ -114,17 +124,17 @@ module Fig
         if @os.download(remote_fig_file, local_fig_file)
           install_package(package_name, version_name)
         end
-      rescue NotFoundException
-        $stderr.puts "Package not found in remote repository: #{package_name}/#{version_name}"
+      rescue NotFoundError
+        Logging.fatal "Package not found in remote repository: #{package_name}/#{version_name}"
         delete_local_package(package_name, version_name)
-        exit 1
+        raise RepositoryError.new
       end
     end
 
     def read_local_package(package_name, version_name)
       dir = local_dir_for_package(package_name, version_name)
       read_package_from_directory(dir, package_name, version_name)
-    end 
+    end
 
     def read_remote_package(package_name, version_name)
       url = remote_fig_file_for_package(package_name, version_name)
@@ -133,21 +143,21 @@ module Fig
     end
 
     def read_package_from_directory(dir, package_name, version_name)
-      file = File.join(dir, ".fig")
+      file = File.join(dir, '.fig')
       if not File.exist?(file)
-        file = File.join(dir, "package.fig")
+        file = File.join(dir, 'package.fig')
       end
       if not File.exist?(file)
-        $stderr.puts "Fig file not found for package: #{file}"
-        exit 10
+        Logging.fatal "Fig file not found for package: #{file}"
+        raise RepositoryError.new
       end
       read_package_from_file(file, package_name, version_name)
     end
 
     def read_package_from_file(file_name, package_name, version_name)
       if not @os.exist?(file_name)
-        $stderr.puts "Package not found: #{package_name}/#{version_name}" 
-        exit 1
+        Logging.fatal "Package not found: #{package_name}/#{version_name}"
+        raise RepositoryError.new
       end
       modified_time = @os.mtime(file_name)
       content = @os.read(file_name)
@@ -158,7 +168,7 @@ module Fig
       descriptor = "#{package_name}/#{version_name}"
       dir = @overrides[descriptor]
       if dir
-        $stderr.puts "override: #{descriptor}=#{dir}"
+        Logging.info "override: #{descriptor}=#{dir}"
       else
         dir = File.join(@local_repository_dir, package_name, version_name)
       end
@@ -174,13 +184,13 @@ module Fig
         @os.clear_directory(temp_dir)
         package.archive_urls.each do |archive_url|
           if not is_url?(archive_url)
-            archive_url = remote_dir_for_package(package_name, version_name) + "/" + archive_url
+            archive_url = remote_dir_for_package(package_name, version_name) + '/' + archive_url
           end
           @os.download_archive(archive_url, File.join(temp_dir))
         end
         package.resource_urls.each do |resource_url|
           if not is_url?(resource_url)
-            resource_url = remote_dir_for_package(package_name, version_name) + "/" + resource_url
+            resource_url = remote_dir_for_package(package_name, version_name) + '/' + resource_url
           end
           @os.download_resource(resource_url, File.join(temp_dir))
         end
@@ -188,13 +198,13 @@ module Fig
         @os.clear_directory(local_dir)
         # some packages contain no files, only a fig file.
         if not (package.archive_urls.empty? && package.resource_urls.empty?)
-          FileUtils.mv(Dir.glob(File.join(temp_dir, "*")), local_dir)
+          FileUtils.mv(Dir.glob(File.join(temp_dir, '*')), local_dir)
         end
         write_local_package(package_name, version_name, package)
       rescue
-        $stderr.puts "Install failed, cleaning up" 
+        Logging.fatal 'Install failed, cleaning up.'
         delete_local_package(package_name, version_name)
-        exit 10
+        raise RepositoryError.new
       end
     end
 
@@ -209,6 +219,12 @@ module Fig
       not (/ftp:\/\/|http:\/\/|file:\/\/|ssh:\/\// =~ url).nil?
     end
 
+    def is_url_with_access?(url)
+      return false if not is_url?(url)
+      raise URLAccessError.new(url) if not @application_config.url_access_allowed?(url)
+      return true
+    end
+
     def delete_local_package(package_name, version_name)
       FileUtils.rm_rf(local_dir_for_package(package_name, version_name))
     end
@@ -220,10 +236,10 @@ module Fig
 
     def remote_fig_file_for_package(package_name, version_name)
       "#{@remote_repository_url}/#{package_name}/#{version_name}/.fig"
-    end  
+    end
 
     def local_fig_file_for_package(package_name, version_name)
-      File.join(local_dir_for_package(package_name, version_name), ".fig")
+      File.join(local_dir_for_package(package_name, version_name), '.fig')
     end
 
     def remote_dir_for_package(package_name, version_name)
@@ -231,7 +247,7 @@ module Fig
     end
 
     def temp_dir_for_package(package_name, version_name)
-      File.join(@local_repository_dir, "tmp")
+      File.join(@local_repository_dir, 'tmp')
     end
 
     def package_missing?(package_name, version_name)

data/lib/fig/repositoryerror.rb

@@ -0,0 +1,7 @@
+require 'fig/userinputerror'
+
+module Fig
+  # A problem within/related to a repository.
+  class RepositoryError < UserInputError
+  end
+end

data/lib/fig/retriever.rb

@@ -1,35 +1,37 @@
 require 'ostruct'
 require 'set'
 
-# This class copies files from the project directories in ~/.fighome to the 
-# user's working directory. It keeps track of which files have already been copied, and which 
+require 'fig/logging'
+
+# This class copies files from the project directories in ~/.fighome to the
+# user's working directory. It keeps track of which files have already been copied, and which
 # package/versions they came from, and deletes files as necessary to ensure that
-# we never have files from two different versions of the same package in the user's 
-# working directory. 
+# we never have files from two different versions of the same package in the user's
+# working directory.
 class Retriever
   def initialize(base_dir)
     @base_dir = base_dir
     @configs = {}
-    @fig_dir = File.join(@base_dir, ".fig")
+    @fig_dir = File.join(@base_dir, '.fig')
 
-    file = File.join(@fig_dir, "retrieve")
+    file = File.join(@fig_dir, 'retrieve')
     if File.exist?(file)
       load(file)
     end
   end
 
-  def with_config(name, version)
+  def with_package_config(name, version)
     if name and version
       @config = @configs[name]
       if @config && @config.version != version
         @config.files.each do |relpath|
-          $stderr.puts "\033[31m- [#{@config.name}/#{@config.version}] #{relpath}\033[0m" 
+          Fig::Logging.info "- [#{@config.name}/#{@config.version}] #{relpath}"
           FileUtils.rm_f(File.join(@base_dir, relpath))
         end
         @config = nil
       end
       if not @config
-        @config = new_config(name, version)
+        @config = new_package_config(name, version)
         @configs[name] = @config
       end
     else
@@ -44,10 +46,10 @@ class Retriever
 
   def save
     FileUtils.mkdir_p(@fig_dir)
-    File.open(File.join(@fig_dir, "retrieve"), 'w') do |f|
+    File.open(File.join(@fig_dir, 'retrieve'), 'w') do |f|
       @configs.each do |name,config|
         config.files.each do |target|
-          f << target << "=" << config.name << "/" << config.version << "\n"
+          f << target << '=' << config.name << '/' << config.version << "\n"
         end
       end
     end
@@ -65,10 +67,10 @@ private
         config = @configs[config_name]
         if config
           if config.version != config_version
-            raise "version mismatch in .figretrieve"
+            raise 'version mismatch in .figretrieve'
           end
         else
-          config = new_config(config_name, config_version)
+          config = new_package_config(config_name, config_version)
           @configs[config_name] = config
         end
         config.files << target
@@ -78,7 +80,7 @@ private
     end
   end
 
-  def new_config(name, version) 
+  def new_package_config(name, version)
     config = OpenStruct.new
     config.name = name
     config.version = version
@@ -91,13 +93,20 @@ private
     if File.directory?(source)
       FileUtils.mkdir_p(target)
       Dir.foreach(source) do |child|
-        if child != "." and child != ".."
-          copy(File.join(source, child), File.join(relpath, child))
+        if child != '.' and child != '..'
+          source_file = File.join(source, child)
+          target_file = File.join(relpath, child)
+          Fig::Logging.debug "Copying #{source_file} to #{target_file}."
+          copy(source_file, target_file)
         end
       end
     else
       if !File.exist?(target) || File.mtime(source) > File.mtime(target)
-        $stderr.puts "\033[32m+ [#{@config.name}/#{@config.version}] #{relpath}\033[0m" 
+        if Fig::Logging.debug?
+          Fig::Logging.debug "Copying package [#{@config.name}/#{@config.version}] from #{source} to #{target}."
+        else
+          Fig::Logging.info "+ [#{@config.name}/#{@config.version}] #{relpath}"
+        end
         FileUtils.mkdir_p(File.dirname(target))
         FileUtils.cp(source, target, :preserve => true)
       end

data/lib/fig/urlaccesserror.rb

@@ -0,0 +1,9 @@
+require 'fig/userinputerror'
+
+module Fig
+  class URLAccessError < UserInputError
+    def initialize(url)
+      @url = url
+    end
+  end
+end

data/lib/fig/userinputerror.rb

@@ -0,0 +1,4 @@
+module Fig
+  class UserInputError < StandardError
+  end
+end

data/lib/fig/windows.rb

@@ -22,12 +22,12 @@ EOF
 
     def self.with_generated_batch_script(cmd)
       command = cmd.join(' ')
-      template = ERB.new(BATCH_SCRIPT_TEMPLATE, 0, "%")
+      template = ERB.new(BATCH_SCRIPT_TEMPLATE, 0, '%')
       output = template.result(binding)
       begin
-        tf = File.new("C:/tmp/fig_command.bat", "w")
+        tf = File.new('C:/tmp/fig_command.bat', 'w')
         FileUtils.chmod(0755, tf.path)
-        File.open(tf.path, "w") do |fh|
+        File.open(tf.path, 'w') do |fh|
           fh.puts output
         end
         tf.close