fig18 0.1.48-i386-mswin32 → 0.1.49-i386-mswin32

data/Changes

@@ -1,11 +1,56 @@
-v0.1.xx
+v0.1.49
+
+  - Finalizing figrc name for URL whitelist.
+
+v0.1.47-48
+
+  - Exception, regex, and test refactoring.
+
+  - Fixing operator precedence in environment.
+
+  - Updated copyright years.
+
+  - Changed README example to use file:// URL.
+
+  - Change ssh:// tests to file:// tests.
+
+  - Refactored '[package]' substitution.
+
+  - Implemented @ escaping in variables.
+
+v0.1.46
+
+  - Rakefile improvements.
+
+  - Fixing broken reference to Fig::Logging in environment.rb.
 
-  - "file:" protocol works for FIG_REMOTE_HOME.
+
+v0.1.43-0.1.45
+
+  - Rakefile improvements.
+
+  - Test file refactoring/improvements.
 
   - Complains if it has nothing to do.
 
+v0.1.42
+
+  - Fig::Package refactoring.
+
+  - "file:" protocol works for FIG_REMOTE_HOME.
+
   - Testing no longer requires ssh.
 
+  - Implemented whitelist chceking after parse.
+
+  - Simplify character classes in grammar, slight grammar refactoring.
+
+  - Supports MacOS (better) in Rakefile.
+
+  - No longer emits stack trace for invalid command line option(s).
+
+  - Tests emits std(out|err) on failure, for ease in debugging test failures.
+
 
 v0.1.41
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009, Matthew Foemmel
+Copyright (c) 2009-2011, Matthew Foemmel
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -24,4 +24,4 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -200,9 +200,9 @@ A config section can be included in another config section:
 Let's share our little script with the rest of the team by bundling it into a
 package and publishing it. First, point the `FIG_REMOTE_URL` environment
 variable to the remote repository. If you just want to play around with fig,
-you can have it point to localhost:
+you can have it point to a local directory:
 
-    $ export FIG_REMOTE_URL=ssh://localhost$(pwd)/remote
+    $ export FIG_REMOTE_URL=file://$(pwd)/remote
 
 Before we publish our package, we'll need to tell fig which files we want to include. We do this by using the "resource" statement in our "package.fig" file:
 
@@ -283,4 +283,4 @@ Community
 Copyright
 =========
 
-Copyright (c) 2009 Matthew Foemmel. See LICENSE for details.
+Copyright (c) 2009-2011 Matthew Foemmel. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.1.48
+0.1.49

data/lib/fig/applicationconfiguration.rb

@@ -9,7 +9,7 @@ module Fig
 
     def ensure_url_whitelist_initialized()
       return if not @whitelist.nil?
-      whitelist = self['url_whitelist']
+      whitelist = self['url whitelist']
       if whitelist.nil?
         @whitelist = []
       else

data/lib/fig/environment.rb

@@ -30,7 +30,6 @@ module Fig
     end
 
     # Indicates that the values from a particular envrionment variable path
-
     def add_retrieve(name, path)
       @retrieve_vars[name] = path
     end
@@ -57,18 +56,27 @@ module Fig
 
     def execute_shell(command)
       with_environment do
-        yield command.map{|arg| expand_arg(arg)}
+        yield command.map{|arg| expand_command_line_argument(arg)}
       end
     end
 
     def execute_config(base_package, package_name, config_name, version_name, args)
-      package = lookup_package(package_name || base_package.package_name, version_name, Backtrace.new(nil, package_name, version_name, config_name))
+      package = lookup_package(
+        package_name || base_package.package_name,
+        version_name,
+        Backtrace.new(nil, package_name, version_name, config_name)
+      )
       result = nil
       commands = package[config_name || 'default'].commands
       with_environment do
         # TODO nil check
         commands.each do |command|
-          result = yield expand_arg("#{command.command} #{args.join(' ')}").gsub('@', package.directory).split(' ')
+          argument =
+            expand_command_line_argument(
+              "#{command.command} #{args.join(' ')}"
+            )
+
+          result = yield expand_path(argument, package).split(' ')
         end
       end
       result
@@ -114,11 +122,11 @@ module Fig
     private
 
     def set_variable(base_package, name, value)
-      @variables[name] = expand_value(base_package, name, value)
+      @variables[name] = expand_and_retrieve_variable_value(base_package, name, value)
     end
 
     def append_variable(base_package, name, value)
-      value = expand_value(base_package, name, value)
+      value = expand_and_retrieve_variable_value(base_package, name, value)
       # TODO: converting all environment variables to upcase is not a robust
       #       comparison. It also assumes all env vars will be in upcase
       #       in package.fig
@@ -165,28 +173,25 @@ module Fig
       package
     end
 
-    # Replace @ symbol with the package's directory
-    def expand_value(base_package, name, value)
+    # Replace @ symbol with the package's directory, "[package]" with the
+    # package name.
+    def expand_and_retrieve_variable_value(base_package, name, value)
       return value unless base_package && base_package.package_name
-      file = value.gsub(/\@/, base_package.directory)
+
+      file = expand_path(value, base_package)
+
       if @retrieve_vars.member?(name)
         # A '//' in the source file's path tells us to preserve path
         # information after the '//' when doing a retrieve.
         if file.split('//').size > 1
           preserved_path = file.split('//').last
           target = File.join(
-            @retrieve_vars[name].gsub(
-              /\[package\]/,
-              base_package.package_name
-            ),
+            translate_retrieve_variables(base_package, name),
             preserved_path
           )
         else
           target = File.join(
-            @retrieve_vars[name].gsub(
-              /\[package\]/,
-              base_package.package_name
-            )
+            translate_retrieve_variables(base_package, name)
           )
           if not File.directory?(file)
             target = File.join(target, File.basename(file))
@@ -199,18 +204,73 @@ module Fig
         end
         file = target
       end
-      file
+      return file
+    end
+
+    def expand_path(path, base_package)
+      expanded_path = expand_at_sign_package_references(path, base_package)
+      check_for_bad_escape(expanded_path, path)
+      return expanded_path.gsub(%r< \\ ([\\@]) >x, '\1')
     end
 
-    def expand_arg(arg)
-      arg.gsub( / @ ( [a-zA-Z0-9.-]+ ) /x ) do |match|
-        package = @packages[$1]
+    def expand_at_sign_package_references(arg, base_package)
+      return arg.gsub(
+        %r<
+          (?: ^ | \G)           # Zero-width anchor.
+          ( [^\\@]* (?:\\{2})*) # An even number of leading backslashes
+          \@                    # The package indicator
+        >x
+      ) do |match|
+        backslashes = $1 || ''
+        backslashes + base_package.directory
+      end
+    end
+
+    def expand_command_line_argument(arg)
+      package_substituted = expand_named_package_references(arg)
+      check_for_bad_escape(package_substituted, arg)
+
+      return package_substituted.gsub(%r< \\ ([\\@]) >x, '\1')
+    end
+
+    def expand_named_package_references(arg)
+      return arg.gsub(
+        %r<
+          (?: ^ | \G)           # Zero-width anchor.
+          ( [^\\@]* (?:\\{2})*) # An even number of leading backslashes
+          \@                    # The package indicator
+          ( [a-zA-Z0-9.-]+ )    # Package name
+        >x
+      ) do |match|
+        backslashes = $1 || ''
+        package = @packages[$2]
         if package.nil?
-          Logging.fatal "Package not found: #{$1}"
-          raise RepositoryError.new
+          raise RepositoryError.new "Package not found: #{$1}"
         end
-        package.directory
+        backslashes + package.directory
       end
     end
+
+    # The value is expected to have had any @ substitution already done, but
+    # collapsing of escapes not done yet.
+    def check_for_bad_escape(substituted, original)
+      if substituted =~ %r<
+        (?: ^ | [^\\])  # Start of line or non backslash
+        (?: \\{2})*     # Even number of backslashes (including zero)
+        ( \\ [^\\@] )   # A bad escape
+      >x
+        raise RepositoryError.new(
+          %Q<Unknown escape "#{$1}" in "#{original}">
+        )
+      end
+    end
+
+    def translate_retrieve_variables(base_package, name)
+      return \
+        @retrieve_vars[name].gsub(
+          / \[package\] /x,
+          base_package.package_name
+        )
+    end
   end
 end

data/lib/fig/options.rb

@@ -101,12 +101,12 @@ EOF
         options[:debug] = true
       end
 
-      options[:input] = nil
+      options[:package_config_file] = nil
       opts.on(
         '--file FILE',
         %q<read fig file FILE. Use '-' for stdin. See also --no-file>
       ) do |path|
-        options[:input] = path
+        options[:package_config_file] = path
       end
 
       options[:force] = nil
@@ -162,7 +162,7 @@ EOF
       opts.on(
         '--no-file', 'ignore package.fig file in current directory'
       ) do |path|
-        options[:input] = :none
+        options[:package_config_file] = :none
       end
 
       options[:publish] = nil
@@ -200,7 +200,7 @@ EOF
         '--update',
         'check remote repo for updates and download to $FIG_HOME as necessary'
       ) do
-        options[:update] = true; options[:retrieve] = true
+        options[:update] = true
       end
 
       options[:update_if_missing] = false
@@ -209,7 +209,7 @@ EOF
         '--update-if-missing',
         'check remote repo for updates only if package missing from $FIG_HOME'
       ) do
-        options[:update_if_missing] = true; options[:retrieve] = true
+        options[:update_if_missing] = true
       end
 
       opts.on(

data/lib/fig/os.rb

@@ -48,18 +48,10 @@ module Fig
       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 }
     end
@@ -132,7 +124,10 @@ module Fig
                 packages << pkg + '/' + ver
               end
             rescue Net::FTPPermError
-              # ignore
+              # Ignore this error because it's indicative of the FTP library encountering a file
+              # or directory that it does not have permission to open.
+              # Fig needs to be able to have secure repos/packages
+              # and there is no way easy way to deal with the permissions issues other than consuming these errors.
             end
             pos += num_threads
           end
@@ -148,9 +143,10 @@ module Fig
       uri = URI.parse(url)
       case uri.scheme
       when 'ftp'
-        ftp = Net::FTP.new(uri.host)
-        ftp_login(ftp, uri.host)
         begin
+          ftp = Net::FTP.new(uri.host)
+          ftp_login(ftp, uri.host)
+
           if File.exist?(path) && ftp.mtime(uri.path) <= File.mtime(path)
             Logging.debug "#{path} is up to date."
             return false
@@ -159,8 +155,11 @@ module Fig
             ftp.getbinaryfile(uri.path, path, 256*1024)
             return true
           end
-        rescue Net::FTPPermError => e
-          Logging.warn e
+        rescue Net::FTPPermError => error
+          Logging.warn error.message
+          raise NotFoundError.new
+        rescue SocketError => error
+          Logging.warn error.message
           raise NotFoundError.new
         end
       when 'http'
@@ -182,6 +181,7 @@ module Fig
       when 'file'
         begin
           FileUtils.cp(uri.path, path)
+          return true
         rescue Errno::ENOENT => e
           raise NotFoundError.new
         end

data/lib/fig/package.rb

@@ -12,8 +12,8 @@ class Fig::Package
   attr_accessor :backtrace
 
   def initialize(package_name, version_name, directory, statements)
-    @package_name = package_name
-    @version_name = version_name
+    @package_name = package_name || 'uninitialized'
+    @version_name = version_name || 'default'
     @directory = directory
     @statements = statements
     @backtrace = nil
@@ -23,8 +23,10 @@ class Fig::Package
     @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
+    message =
+      "Configuration not found: #{@package_name}/#{@version_name}:#{config_name}"
+    Fig::Logging.fatal message
+    raise Fig::PackageError.new message
   end
 
   def configs

data/lib/fig/repository.rb

@@ -142,12 +142,6 @@ module Fig
       read_package_from_directory(dir, package_name, version_name)
     end
 
-    def read_remote_package(package_name, version_name)
-      url = remote_fig_file_for_package(package_name, version_name)
-      content = @os.read_url(url)
-      return @parser.parse_package(package_name, version_name, nil, content)
-    end
-
     def read_package_from_directory(dir, package_name, version_name)
       file = File.join(dir, '.fig')
       if not File.exist?(file)
@@ -161,11 +155,11 @@ module Fig
     end
 
     def read_package_from_file(file_name, package_name, version_name)
-      if not @os.exist?(file_name)
+      if not File.exist?(file_name)
         Logging.fatal "Package not found: #{package_name}/#{version_name}"
         raise RepositoryError.new
       end
-      content = @os.read(file_name)
+      content = File.read(file_name)
       return @parser.parse_package(package_name, version_name, File.dirname(file_name), content)
     end
 

data/lib/fig.rb

@@ -79,7 +79,7 @@ module Fig
       options[:update_if_missing]
     )
     retriever = Retriever.new('.')
-  # Check to see if this is still happening with the new layers of abstraction.
+    # Check to see if this is still happening with the new layers of abstraction.
     at_exit { retriever.save }
     env = Environment.new(os, repos, vars, retriever)
 
@@ -87,18 +87,18 @@ module Fig
       env.apply_config_statement(nil, modifier, nil)
     end
 
-    input = nil
-    if options[:input] == :none
+    package_config_file = nil
+    if options[:package_config_file] == :none
       # ignore
-    elsif options[:input] == '-'
-      input = $stdin.read
-    elsif options[:input].nil?
-      input = os.read(DEFAULT_FIG_FILE) if os.exist?(DEFAULT_FIG_FILE)
+    elsif options[:package_config_file] == '-'
+      package_config_file = $stdin.read
+    elsif options[:package_config_file].nil?
+      package_config_file = File.read(DEFAULT_FIG_FILE) if File.exist?(DEFAULT_FIG_FILE)
     else
-      if os.exist?(options[:input])
-        input = os.read(options[:input])
+      if File.exist?(options[:package_config_file])
+        package_config_file = File.read(options[:package_config_file])
       else
-        $stderr.puts %Q<File not found: "#{options[:input]}".>
+        $stderr.puts %Q<File not found: "#{options[:package_config_file]}".>
         return 1
       end
     end
@@ -131,12 +131,12 @@ module Fig
       return 0
     end
 
-    if input
-      package = Parser.new(configuration).parse_package(nil, nil, '.', input)
+    if package_config_file
+      package = Parser.new(configuration).parse_package(nil, nil, '.', package_config_file)
       direct_retrieves=[]
-      if options[:retrieve]
+      if options[:update] || options[:update_if_missing]
         package.retrieves.each do |var, path|
-          if var =~ /^@([^\/]+)(.*)/
+          if var =~ %r< ^ \@ ([^/]+) (.*) >x
             direct_retrieves << [$1, $2, path]
           else
             env.add_retrieve(var, path)
@@ -219,13 +219,20 @@ module Fig
     rescue UserInputError => exception
       # If there's no message, we assume that the cause has already been logged.
       if not exception_has_message?(exception)
-        $stderr.puts exception.to_s
+        Logging.fatal exception.to_s
       end
 
       return 1
     rescue OptionParser::InvalidOption => exception
       $stderr.puts exception.to_s
       $stderr.puts USAGE
+      return 1
+    rescue RepositoryError => error
+      # If there's no message, we assume that the cause has already been logged.
+      if not exception_has_message?(error)
+        Logging.fatal error.to_s
+      end
+
       return 1
     end
   end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fig18
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.48
+  hash: 121
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 49
+  version: 0.1.49
 platform: i386-mswin32
 authors: 
 - Matthew Foemmel
@@ -10,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 Z
+date: 2011-12-02 00:00:00 -06:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libarchive-static-ruby186
@@ -20,6 +26,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :runtime
   version_requirements: *id001
@@ -31,6 +42,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
         version: 1.6.2
   type: :runtime
   version_requirements: *id002
@@ -42,6 +58,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 1
+        - 5
         version: 1.1.5
   type: :runtime
   version_requirements: *id003
@@ -53,6 +74,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 2
+        - 2
         version: 0.2.2
   type: :runtime
   version_requirements: *id004
@@ -64,6 +90,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
         version: 2.0.4
   type: :runtime
   version_requirements: *id005
@@ -75,6 +106,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 2
+        - 0
+        - 15
         version: 2.0.15
   type: :runtime
   version_requirements: *id006
@@ -86,6 +122,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 2
+        - 9
         version: 0.2.9
   type: :runtime
   version_requirements: *id007
@@ -97,6 +138,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 4
+        - 2
         version: 2.4.2
   type: :runtime
   version_requirements: *id008
@@ -108,6 +154,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 4
+        - 2
         version: 1.4.2
   type: :runtime
   version_requirements: *id009
@@ -119,6 +170,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
   type: :development
   version_requirements: *id010
@@ -130,6 +186,9 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
         version: "2"
   type: :development
   version_requirements: *id011
@@ -141,6 +200,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :runtime
   version_requirements: *id012
@@ -152,6 +216,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
         version: 1.6.2
   type: :runtime
   version_requirements: *id013
@@ -163,6 +232,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 1
+        - 5
         version: 1.1.5
   type: :runtime
   version_requirements: *id014
@@ -174,6 +248,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 2
+        - 2
         version: 0.2.2
   type: :runtime
   version_requirements: *id015
@@ -185,6 +264,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
         version: 2.0.4
   type: :runtime
   version_requirements: *id016
@@ -196,6 +280,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 2
+        - 0
+        - 15
         version: 2.0.15
   type: :runtime
   version_requirements: *id017
@@ -207,6 +296,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 2
+        - 9
         version: 0.2.9
   type: :runtime
   version_requirements: *id018
@@ -218,6 +312,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 4
+        - 2
         version: 2.4.2
   type: :runtime
   version_requirements: *id019
@@ -229,6 +328,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 4
+        - 2
         version: 1.4.2
   type: :runtime
   version_requirements: *id020
@@ -240,6 +344,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
   type: :development
   version_requirements: *id021
@@ -251,6 +360,9 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
         version: "2"
   type: :development
   version_requirements: *id022
@@ -305,6 +417,7 @@ files:
 - lib/fig/windows.rb
 - LICENSE
 - README.md
+has_rdoc: true
 homepage: http://github.com/mfoemmel/fig
 licenses: []
 
@@ -318,19 +431,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Fig is a utility for configuring environments and managing dependencies across a team of developers.
+summary: Fig is a utility for configuring environments and managing dependencies across a team of developers. (fig18/i386-mswin32 version)
 test_files: []