fig18 0.1.41 → 0.1.42

data/lib/fig/package.rb

@@ -1,216 +1,69 @@
 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)
-      @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
-      Fig::Logging.fatal "Configuration not found: #{@package_name}/#{@version_name}:#{config_name}"
-      raise PackageError.new
-    end
-
-    def configs
-      @statements.select { |statement| statement.is_a?(Configuration) }
-    end
-
-    def retrieves
-      retrieves = {}
-      statements.each { |statement| retrieves[statement.var] = statement.path if statement.is_a?(Retrieve) }
-      retrieves
-    end
-
-    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
-
-    def ==(other)
-      @package_name == other.package_name && @version_name == other.version_name && @statements.to_yaml == other.statements.to_yaml
-    end
-
-    def to_s
-      @package_name + '/' + @version_name
-    end
+require 'fig/package/archive'
+require 'fig/package/configuration'
+require 'fig/package/resource'
+require 'fig/package/retrieve'
+
+module Fig; end
+
+class Fig::Package
+  attr_reader :package_name, :version_name, :directory, :statements
+  attr_accessor :backtrace
+
+  def initialize(package_name, version_name, directory, statements)
+    @package_name = package_name
+    @version_name = version_name
+    @directory = directory
+    @statements = statements
+    @backtrace = nil
   end
 
-  class Archive
-    attr_reader :url
-
-    def initialize(url)
-      @url = url
-    end
-
-    def unparse(indent)
-      %Q<#{indent}archive "#{url}">
+  def [](config_name)
+    @statements.each do |stmt|
+      return stmt if stmt.is_a?(Configuration) && stmt.name == config_name
     end
+    Fig::Logging.fatal "Configuration not found: #{@package_name}/#{@version_name}:#{config_name}"
+    raise PackageError.new
   end
 
-  class Resource
-    attr_reader :url
-
-    def initialize(url)
-      @url = url
-    end
-
-    def unparse(indent)
-      "#{indent}resource #{url}"
-    end
+  def configs
+    @statements.select { |statement| statement.is_a?(Configuration) }
   end
 
-  class Retrieve
-    attr_reader :var, :path
-
-    def initialize(var, path)
-      @var = var
-      @path = path
-    end
-
-    def unparse(indent)
-      "#{indent}retrieve #{var}->#{path}"
-    end
+  def retrieves
+    retrieves = {}
+    statements.each { |statement| retrieves[statement.var] = statement.path if statement.is_a?(Retrieve) }
+    retrieves
   end
 
-  class Publish
-    attr_reader :local_name, :remote_name
-
-    def initialize(local_name, remote_name)
-      @local_name = local_name
-      @remote_name = remote_name
-    end
-
-    def unparse(indent)
-      "#{indent}publish #{@local_name}->#{@remote_name}"
-    end
+  def archive_urls
+    @statements.select{|s| s.is_a?(Archive)}.map{|s|s.url}
   end
 
-  class Install
-    def initialize(statements)
-      @statements = statements
-    end
-
-    def unparse(indent)
-      prefix = "\n#{indent}install"
-      body = @statements.map { |statement| statement.unparse(indent+'  ') }.join("\n")
-      suffix = "#{indent}end"
-      return [prefix, body, suffix].join("\n")
-    end
-  end
-
-  class Configuration
-    attr_reader :name, :statements
-
-    def initialize(name, statements)
-      @name = name
-      @statements = statements
-    end
-
-    def with_name(name)
-      Configuration.new(name, statements)
-    end
-
-    def commands
-      result = statements.select { |statement| statement.is_a?(Command) }
-      result
-    end
-
-    def unparse(indent)
-      unparse_statements(indent, "config #{@name}", @statements, 'end')
-    end
-  end
-
-  class Path
-    attr_reader :name, :value
-
-    def initialize(name, value)
-      @name = name
-      @value = value
-    end
-
-    def unparse(indent)
-      "#{indent}append #{name}=#{value}"
-    end
+  def resource_urls
+    @statements.select{|s| s.is_a?(Resource)}.map{|s|s.url}
   end
 
-  class Set
-    attr_reader :name, :value
-
-    def initialize(name, value)
-      @name = name
-      @value = value
-    end
-
-    def unparse(indent)
-      "#{indent}set #{name}=#{value}"
+  def walk_statements(&block)
+    @statements.each do |statement|
+      yield statement
+      statement.walk_statements &block
     end
   end
 
-  class Include
-    attr_reader :package_name, :config_name, :version_name, :overrides
-
-    def initialize(package_name, config_name, version_name, overrides)
-      @package_name = package_name
-      @config_name = config_name
-      @version_name = version_name
-      @overrides = overrides
-    end
-
-    def unparse(indent)
-      descriptor = ''
-      descriptor += @package_name if @package_name
-      descriptor += "/#{@version_name}" if @version_name
-      descriptor += ":#{@config_name}" if @config_name
-      @overrides.each do |override|
-        descriptor += override.unparse
-      end
-      return "#{indent}include #{descriptor}"
-    end
+  def unparse
+    @statements.map { |statement| statement.unparse('') }.join("\n")
   end
 
-  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
-    end
+  def ==(other)
+    return false if other.nil?
+    @package_name == other.package_name && @version_name == other.version_name && @statements.to_yaml == other.statements.to_yaml
   end
 
-  class Command
-    attr_reader :command
-
-    def initialize(command)
-      @command = command
-    end
-
-    def unparse(indent)
-      %Q<#{indent}command "#{@command}">
-    end
+  def to_s
+    @package_name + '/' + @version_name
   end
-
 end
 
 def unparse_statements(indent, prefix, statements, suffix)

data/lib/fig/parser.rb

@@ -4,21 +4,34 @@ require 'treetop'
 require 'fig/grammar'
 require 'fig/logging'
 require 'fig/packageerror'
+require 'fig/repository'
+require 'fig/urlaccesserror'
 
 module Fig
   class Parser
-    def initialize
+    def initialize(application_config)
       @parser = FigParser.new
+      @application_config = application_config
     end
 
     def parse_package(package_name, version_name, directory, input)
       input = input.gsub(/#.*$/, '')
       result = @parser.parse(" #{input} ")
       if result.nil?
-        Fig::Logging.fatal "#{directory}: #{@parser.failure_reason}"
-        raise PackageError.new
+        Logging.fatal "#{directory}: #{@parser.failure_reason}"
+        raise PackageError.new("#{directory}: #{@parser.failure_reason}")
       end
-      result.to_package(package_name, version_name, directory)
+      package = result.to_package(package_name, version_name, directory)
+      bad_urls = []
+      package.walk_statements do |statement|
+        statement.urls.each do |url|
+          # collect all bad urls in bad_urls
+          next if not Repository.is_url?(url)
+          bad_urls << url if not @application_config.url_access_allowed?(url)
+        end
+      end
+      raise URLAccessError.new(bad_urls, package_name, version_name) if not bad_urls.empty?
+      return package
     end
   end
 end

data/lib/fig/repository.rb

@@ -1,11 +1,17 @@
 require 'fig/logging'
 require 'fig/notfounderror'
+require 'fig/package/archive'
+require 'fig/package/resource'
 require 'fig/parser'
 require 'fig/repositoryerror'
 require 'fig/urlaccesserror'
 
 module Fig
   class Repository
+    def self.is_url?(url)
+      not (/ftp:\/\/|http:\/\/|file:\/\/|ssh:\/\// =~ url).nil?
+    end
+
     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
@@ -14,7 +20,7 @@ module Fig
       @application_config = application_config
       @update = update
       @update_if_missing = update_if_missing
-      @parser = Parser.new
+      @parser = Parser.new(@application_config)
 
       @overrides = {}
       if File.exist?('fig.properties')
@@ -54,17 +60,17 @@ module Fig
       @os.clear_directory(local_dir)
       fig_file = File.join(temp_dir, '.fig')
       content = bundle_resources(package_statements).map do |statement|
-        if statement.is_a?(Publish)
+        if statement.is_a?(Package::Publish)
           nil
-        elsif statement.is_a?(Archive) || statement.is_a?(Resource)
-          if statement.is_a?(Resource) && !is_url?(statement.url)
+        elsif statement.is_a?(Package::Archive) || statement.is_a?(Package::Resource)
+          if statement.is_a?(Package::Resource) && !Repository.is_url?(statement.url)
             archive_name = statement.url
             archive_remote = "#{remote_dir_for_package(package_name, version_name)}/#{statement.url}"
           else
             archive_name = statement.url.split('/').last
             archive_remote = "#{remote_dir_for_package(package_name, version_name)}/#{archive_name}"
           end
-          if is_url_with_access?(statement.url)
+          if Repository.is_url?(statement.url)
             archive_local = File.join(temp_dir, archive_name)
             @os.download(statement.url, archive_local)
           else
@@ -72,7 +78,7 @@ module Fig
           end
           @os.upload(archive_local, archive_remote, @remote_repository_user) unless local_only
           @os.copy(archive_local, local_dir + '/' + archive_name)
-          if statement.is_a?(Archive)
+          if statement.is_a?(Package::Archive)
             @os.unpack_archive(local_dir, archive_name)
           end
           statement.class.new(archive_name).unparse('')
@@ -88,7 +94,7 @@ module Fig
     def bundle_resources(package_statements)
       resources = []
       new_package_statements = package_statements.reject do |statement|
-        if statement.is_a?(Resource) && !is_url?(statement.url)
+        if statement.is_a?(Package::Resource) && !Repository.is_url?(statement.url)
           resources << statement.url
           true
         else
@@ -99,7 +105,7 @@ module Fig
         resources = expand_globs_from(resources)
         file = 'resources.tar.gz'
         @os.create_archive(file, resources)
-        new_package_statements.unshift(Archive.new(file))
+        new_package_statements.unshift(Package::Archive.new(file))
         at_exit { File.delete(file) }
       end
       new_package_statements
@@ -139,7 +145,7 @@ module Fig
     def read_remote_package(package_name, version_name)
       url = remote_fig_file_for_package(package_name, version_name)
       content = @os.read_url(url)
-      @parser.parse_package(package_name, version_name, nil, content)
+      return @parser.parse_package(package_name, version_name, nil, content)
     end
 
     def read_package_from_directory(dir, package_name, version_name)
@@ -159,9 +165,8 @@ module Fig
         Logging.fatal "Package not found: #{package_name}/#{version_name}"
         raise RepositoryError.new
       end
-      modified_time = @os.mtime(file_name)
       content = @os.read(file_name)
-      @parser.parse_package(package_name, version_name, File.dirname(file_name), content)
+      return @parser.parse_package(package_name, version_name, File.dirname(file_name), content)
     end
 
     def local_dir_for_package(package_name, version_name)
@@ -183,13 +188,13 @@ module Fig
         temp_dir = temp_dir_for_package(package_name, version_name)
         @os.clear_directory(temp_dir)
         package.archive_urls.each do |archive_url|
-          if not is_url?(archive_url)
+          if not Repository.is_url?(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)
+          if not Repository.is_url?(resource_url)
             resource_url = remote_dir_for_package(package_name, version_name) + '/' + resource_url
           end
           @os.download_resource(resource_url, File.join(temp_dir))
@@ -215,16 +220,6 @@ module Fig
       expanded_files
     end
 
-    def is_url?(url)
-      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

data/lib/fig/urlaccesserror.rb

@@ -2,8 +2,12 @@ require 'fig/userinputerror'
 
 module Fig
   class URLAccessError < UserInputError
-    def initialize(url)
-      @url = url
+    attr_reader :urls, :package, :version
+
+    def initialize(urls, package, version)
+      @urls = urls
+      @package = package
+      @version = version
     end
   end
 end

data/lib/fig.rb

@@ -7,6 +7,9 @@ require 'fig/figrc'
 require 'fig/logging'
 require 'fig/options'
 require 'fig/os'
+require 'fig/package'
+require 'fig/package/configuration'
+require 'fig/package/publish'
 require 'fig/parser'
 require 'fig/repository'
 require 'fig/retriever'
@@ -18,9 +21,9 @@ module Fig
 
   def parse_descriptor(descriptor)
     # todo should use treetop for these:
-    package_name = descriptor =~ /^([^:\/]+)/ ? $1 : nil
-    config_name = descriptor =~ /:([^:\/]+)/ ? $1 : nil
-    version_name = descriptor =~ /\/([^:\/]+)/ ? $1 : nil
+    package_name = descriptor =~ %r< ^ ( [^:/]+ ) >x ? $1 : nil
+    config_name  = descriptor =~ %r< : ( [^:/]+ ) >x ? $1 : nil
+    version_name = descriptor =~ %r< / ( [^:/]+ ) >x ? $1 : nil
     return package_name, config_name, version_name
   end
 
@@ -129,7 +132,7 @@ module Fig
     end
 
     if input
-      package = Parser.new.parse_package(nil, nil, '.', input)
+      package = Parser.new(configuration).parse_package(nil, nil, '.', input)
       direct_retrieves=[]
       if options[:retrieve]
         package.retrieves.each do |var, path|
@@ -162,8 +165,8 @@ module Fig
         return 10
       end
       if not options[:modifiers].empty?
-        publish_statements = options[:resources] + options[:archives] + [Configuration.new('default', options[:modifiers])]
-        publish_statements << Publish.new('default','default')
+        publish_statements = options[:resources] + options[:archives] + [Package::Configuration.new('default', options[:modifiers])]
+        publish_statements << Package::Publish.new('default','default')
       elsif not package.statements.empty?
         publish_statements = package.statements
       else
@@ -208,7 +211,8 @@ module Fig
       return_code = run_fig(argv)
       return return_code
     rescue URLAccessError => exception
-      $stderr.puts "Access to #{exception.url} not allowed."
+      urls = exception.urls.join(', ')
+      $stderr.puts "Access to #{urls} in #{exception.package}/#{exception.version} not allowed."
       return 1
     rescue UserInputError => exception
       # If there's no message, we assume that the cause has already been logged.
@@ -216,6 +220,10 @@ module Fig
         $stderr.puts exception.to_s
       end
 
+      return 1
+    rescue OptionParser::InvalidOption => exception
+      $stderr.puts exception.to_s
+      $stderr.puts USAGE
       return 1
     end
   end