fig 0.1.53 → 0.1.54

data/Changes

@@ -1,3 +1,11 @@
+v0.1.54
+
+  - Emits an error when you've got an "include" of another package without
+    specifying the version.  It used to be the case that you could leave the
+    version off, but that would only work if there was a "current" version of
+    the depended upon package published.  Which meant that you'd have to
+    --force the publication of the "current" version.
+
 v0.1.53
 
   - Fix bug in doing "fig -u" when the remote repository has a figrc file.

data/README.md

@@ -504,6 +504,15 @@ https://github.com/oneclick/rubyinstaller/wiki/Development-Kit.
 
     rake build
 
+## Building a gem for ruby 1.8.7 on Windows ##
+
+You can no longer use the rakefile to produce this specific gem. You will need
+to create a fig.gemspec file manually. Use the list of gem dependencies found
+in the rakefile as a guide. There are two specific gems that need to be
+depended on: json v 1.4.2 and libarchive-static-ruby186. Also, the spec.files
+should specificly list all the source files, pathed from the base directory
+of the project.
+
 Community
 =========
 

data/VERSION

@@ -1 +1 @@
-0.1.53
+0.1.54

data/lib/fig/command.rb

@@ -11,6 +11,7 @@ require 'fig/options'
 require 'fig/package'
 require 'fig/parser'
 require 'fig/repository'
+require 'fig/repositoryerror'
 require 'fig/retriever'
 require 'fig/statement/configuration'
 require 'fig/statement/publish'

data/lib/fig/figrc.rb

@@ -3,13 +3,15 @@ require 'json'
 require 'fig/applicationconfiguration'
 require 'fig/configfileerror'
 require 'fig/operatingsystem'
-
-REPOSITORY_CONFIGURATION = '_meta/figrc'
+require 'fig/repository'
 
 module Fig
   # Parse multiple figrc files and assemble them into a single
   # ApplicationConfiguration object.
   class FigRC
+    REPOSITORY_CONFIGURATION =
+        "#{Repository::METADATA_SUBDIRECTORY}/figrc"
+
     def self.find(
       override_path, repository_url, login, fig_home, disable_figrc = false
     )

data/lib/fig/grammar.treetop

@@ -21,7 +21,10 @@ grammar Fig
           package_name,
           version_name,
           directory,
-          statements.elements.map { |statement| statement.to_package_statement }
+          statements.elements.map do
+            |statement|
+            statement.to_package_statement(package_name)
+          end
         )
       end
     }
@@ -33,7 +36,7 @@ grammar Fig
 
   rule archive
     "archive" ws url {
-      def to_package_statement
+      def to_package_statement(package_name)
         Statement::Archive.new(url.value.text_value)
       end
     }
@@ -41,7 +44,7 @@ grammar Fig
 
   rule resource
     "resource" ws url {
-      def to_package_statement
+      def to_package_statement(package_name)
         Statement::Resource.new(url.value.text_value)
       end
     }
@@ -49,7 +52,7 @@ grammar Fig
 
   rule retrieve
     "retrieve" ws var:retrieve_variable "->" path:retrieve_path ws {
-      def to_package_statement
+      def to_package_statement(package_name)
         Statement::Retrieve.new(var.text_value, path.text_value)
       end
     }
@@ -65,8 +68,14 @@ grammar Fig
 
   rule config
     "config" ws config_name ws statements:config_statement* "end" ws {
-      def to_package_statement
-        Statement::Configuration.new(config_name.text_value, statements.elements.map { |statement| statement.to_config_statement })
+      def to_package_statement(package_name)
+        Statement::Configuration.new(
+          config_name.text_value,
+          statements.elements.map do
+            |statement|
+            statement.to_config_statement(package_name)
+          end
+        )
       end
     }
   end
@@ -77,10 +86,11 @@ grammar Fig
 
   rule include
     "include" ws descriptor overrides:(override*) {
-      def to_config_statement
+      def to_config_statement(package_name)
         Statement::Include.new(
           PackageDescriptor.parse(descriptor.text_value.strip),
-          overrides.elements.map{ |e| e.to_override }
+          overrides.elements.map{ |e| e.to_override },
+          package_name
         )
       end
     }
@@ -96,7 +106,7 @@ grammar Fig
 
   rule path
     ("append" / "path" / "add") ws name:path_name "=" value:path_value ws {
-      def to_config_statement
+      def to_config_statement(package_name)
         Statement::Path.new(name.text_value, value.text_value)
       end
     }
@@ -112,7 +122,7 @@ grammar Fig
 
   rule set
     "set" ws name:set_name "=" value:set_value ws {
-      def to_config_statement
+      def to_config_statement(package_name)
         Statement::Set.new(name.text_value, value.text_value)
       end
     }
@@ -128,7 +138,7 @@ grammar Fig
 
   rule command
     "command" ws string {
-      def to_config_statement
+      def to_config_statement(package_name)
         Statement::Command.new(string.value.text_value)
       end
     }

data/lib/fig/options.rb

@@ -365,7 +365,9 @@ Environment variables:
       'include package/version:config specified in DESCRIPTOR (with any variable prepends) in environment'
     ) do |descriptor|
       @options[:non_command_package_statements] <<
-        Fig::Statement::Include.new(Fig::PackageDescriptor.parse(descriptor), {})
+        Fig::Statement::Include.new(
+          Fig::PackageDescriptor.parse(descriptor), {}, nil
+        )
     end
 
     parser.on(

data/lib/fig/repository.rb

@@ -11,6 +11,8 @@ module Fig
   # Overall management of a repository.  Handles local operations itself;
   # defers remote operations to others.
   class Repository
+    METADATA_SUBDIRECTORY = '_meta'
+
     def self.is_url?(url)
       not (/ftp:\/\/|http:\/\/|file:\/\/|ssh:\/\// =~ url).nil?
     end
@@ -44,11 +46,14 @@ module Fig
           end
         end
       end
-      results
+
+      return results
     end
 
     def list_remote_packages
-      @operating_system.download_list(@remote_repository_url)
+      paths = @operating_system.download_list(@remote_repository_url)
+
+      return paths.reject { |path| path =~ %r< ^ #{METADATA_SUBDIRECTORY} / >xs }
     end
 
     def get_package(package_name, version_name, disable_updating = false)

data/lib/fig/statement/include.rb

@@ -12,7 +12,18 @@ class Fig::Statement::Include
 
   attr_reader :descriptor, :overrides
 
-  def initialize(descriptor, overrides)
+  def initialize(descriptor, overrides, containing_package_name)
+    if descriptor.name && ! descriptor.version
+      message =
+        %Q<Must specify a version in the package descriptor of "#{descriptor.name}" for an include statement>
+      if containing_package_name
+        message += %Q< in the .fig file for "#{containing_package_name}">
+      end
+      message += '.'
+
+      raise Fig::PackageError.new(message)
+    end
+
     @descriptor = descriptor
     @overrides = overrides
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 0.1.53
+  version: 0.1.54
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &21702760 !ruby/object:Gem::Requirement
+  requirement: &24818540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21702760
+  version_requirements: *24818540
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &21702220 !ruby/object:Gem::Requirement
+  requirement: &24818040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *21702220
+  version_requirements: *24818040
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &21701700 !ruby/object:Gem::Requirement
+  requirement: &24817520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *21701700
+  version_requirements: *24817520
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &21701160 !ruby/object:Gem::Requirement
+  requirement: &24817000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *21701160
+  version_requirements: *24817000
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &21700600 !ruby/object:Gem::Requirement
+  requirement: &24816480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *21700600
+  version_requirements: *24816480
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &21700100 !ruby/object:Gem::Requirement
+  requirement: &24815960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *21700100
+  version_requirements: *24815960
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &21699560 !ruby/object:Gem::Requirement
+  requirement: &24815420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *21699560
+  version_requirements: *24815420
 - !ruby/object:Gem::Dependency
   name: polyglot
-  requirement: &21699060 !ruby/object:Gem::Requirement
+  requirement: &24814880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *21699060
+  version_requirements: *24814880
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &21698480 !ruby/object:Gem::Requirement
+  requirement: &24814360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *21698480
+  version_requirements: *24814360
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &21714380 !ruby/object:Gem::Requirement
+  requirement: &24813840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *21714380
+  version_requirements: *24813840
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &21713860 !ruby/object:Gem::Requirement
+  requirement: &24813320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *21713860
+  version_requirements: *24813320
 - !ruby/object:Gem::Dependency
   name: ftp
-  requirement: &21713340 !ruby/object:Gem::Requirement
+  requirement: &24812820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0.69'
   type: :runtime
   prerelease: false
-  version_requirements: *21713340
+  version_requirements: *24812820
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &21712800 !ruby/object:Gem::Requirement
+  requirement: &24812320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *21712800
+  version_requirements: *24812320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21712260 !ruby/object:Gem::Requirement
+  requirement: &24811840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *21712260
+  version_requirements: *24811840
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &21711720 !ruby/object:Gem::Requirement
+  requirement: &24811300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21711720
+  version_requirements: *24811300
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &21711160 !ruby/object:Gem::Requirement
+  requirement: &24818940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *21711160
+  version_requirements: *24818940
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &21710540 !ruby/object:Gem::Requirement
+  requirement: &24818140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *21710540
+  version_requirements: *24818140
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &21710040 !ruby/object:Gem::Requirement
+  requirement: &24817400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *21710040
+  version_requirements: *24817400
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &21709520 !ruby/object:Gem::Requirement
+  requirement: &24816580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *21709520
+  version_requirements: *24816580
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &21708860 !ruby/object:Gem::Requirement
+  requirement: &24815840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *21708860
+  version_requirements: *24815840
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &21708160 !ruby/object:Gem::Requirement
+  requirement: &24815000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: 2.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *21708160
+  version_requirements: *24815000
 - !ruby/object:Gem::Dependency
   name: polyglot
-  requirement: &21707660 !ruby/object:Gem::Requirement
+  requirement: &24814220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: 0.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *21707660
+  version_requirements: *24814220
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &21707140 !ruby/object:Gem::Requirement
+  requirement: &24813420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,10 +263,10 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *21707140
+  version_requirements: *24813420
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &21723040 !ruby/object:Gem::Requirement
+  requirement: &24812680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,10 +274,10 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *21723040
+  version_requirements: *24812680
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &21722540 !ruby/object:Gem::Requirement
+  requirement: &24811940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -285,10 +285,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *21722540
+  version_requirements: *24811940
 - !ruby/object:Gem::Dependency
   name: ftp
-  requirement: &21722020 !ruby/object:Gem::Requirement
+  requirement: &24809300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -296,10 +296,10 @@ dependencies:
         version: '0.69'
   type: :runtime
   prerelease: false
-  version_requirements: *21722020
+  version_requirements: *24809300
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &21721500 !ruby/object:Gem::Requirement
+  requirement: &24808520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -307,10 +307,10 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *21721500
+  version_requirements: *24808520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21721020 !ruby/object:Gem::Requirement
+  requirement: &24807920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -318,7 +318,7 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *21721020
+  version_requirements: *24807920
 description: Fig is a utility for configuring environments and managing dependencies
   across a team of developers. Given a list of packages and a command to run, Fig
   builds environment variables named in those packages (e.g., CLASSPATH), then executes