fig 1.11.0 → 1.12.0

data/Changes

@@ -1,3 +1,22 @@
+v1.12.0 - 2013/10/14
+
+  Bug fixes:
+
+  - The --suppress-*-includes options didn't affect --include options.  Thanks
+    to Peter Royal for the report.
+
+  Miscellaneous:
+
+  - Now looks for "application.fig" in the current directory after looking for
+    "package.fig".  There's no semantic difference, but it provides for an
+    idiom for things which are "client" packages which will never be published,
+    but just for pulling down dependencies.
+
+v1.11.1.beta.2 - 2013/10/11
+v1.11.1.beta.1 - 2013/10/09
+
+  - Test releases.
+
 v1.11.0 - 2013/09/25
 
   Bug fixes:

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2012, Matthew Foemmel
+Copyright (c) 2009-2013, Matthew Foemmel
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.md

@@ -42,4 +42,4 @@ Community
 Copyright
 =========
 
-Copyright (c) 2009-2012 Matthew Foemmel. See LICENSE for details.
+Copyright (c) 2009-2013 Matthew Foemmel. See LICENSE for details.

data/lib/fig.rb

@@ -1,3 +1,3 @@
 module Fig
-  VERSION = '1.11.0'
+  VERSION = '1.12.0'
 end

data/lib/fig/command/action/role/publish.rb

@@ -97,11 +97,13 @@ module Fig::Command::Action::Role::Publish
       message << ') and --set/--append options.'
 
       if @execution_context.package_source_description ==
-        Fig::Command::PackageLoader::DEFAULT_FIG_FILE
+        Fig::Command::PackageLoader::DEFAULT_PACKAGE_FILE ||
+        @execution_context.package_source_description ==
+        Fig::Command::PackageLoader::DEFAULT_APPLICATION_FILE ||
 
         message << "\n\n"
         message << 'You can avoid loading '
-        message << Fig::Command::PackageLoader::DEFAULT_FIG_FILE
+        message << @execution_context.package_source_description
         message << ' by using the --no-file option.'
       end
 

data/lib/fig/command/options.rb

@@ -433,7 +433,7 @@ class Fig::Command::Options
     end
 
     @parser.on(
-      '--no-file', 'ignore package.fig file in current directory'
+      '--no-file', 'ignore package.fig/application.fig file in current directory'
     ) do
       set_package_definition_file(:none)
     end

data/lib/fig/command/package_loader.rb

@@ -9,7 +9,8 @@ class Fig::Command; end
 class Fig::Command::PackageLoader
   attr_reader :package_loaded_from_path
 
-  DEFAULT_FIG_FILE = 'package.fig'
+  DEFAULT_PACKAGE_FILE = 'package.fig'
+  DEFAULT_APPLICATION_FILE = 'application.fig'
 
   def initialize(
     application_configuration,
@@ -65,10 +66,14 @@ class Fig::Command::PackageLoader
 
       return $stdin.read
     elsif @package_definition_file.nil?
-      if File.exist?(DEFAULT_FIG_FILE)
-        @package_loaded_from_path = DEFAULT_FIG_FILE
+      if File.exist?(DEFAULT_PACKAGE_FILE)
+        @package_loaded_from_path = DEFAULT_PACKAGE_FILE
+      elsif File.exist?(DEFAULT_APPLICATION_FILE)
+        @package_loaded_from_path = DEFAULT_APPLICATION_FILE
+      end
 
-        return File.read(DEFAULT_FIG_FILE)
+      if @package_loaded_from_path
+        return File.read(@package_loaded_from_path)
       end
     else
       return read_in_package_definition_file(@package_definition_file)

data/lib/fig/runtime_environment.rb

@@ -198,16 +198,18 @@ class Fig::RuntimeEnvironment
   def include_config(starting_package, include_statement, backtrace)
     # Because package application starts with the synthetic package for the
     # command-line, we can't really disable includes, full stop.  Instead, we
-    # use the flag on the base package to break the chain of includes.
-    return if starting_package.base? && @suppress_includes == :all
+    # use the fact that the synthetic package hands the Statement::Include the
+    # base Package object instead of a descriptor.
+    return if
+      include_statement.included_package.nil? && @suppress_includes == :all
 
     package, resolved_descriptor, new_backtrace =
       determine_included_package starting_package, include_statement, backtrace
 
-    return if                                   \
-          starting_package.base?                \
-      &&  @suppress_includes == :cross_package  \
-      &&  package != starting_package
+    return if
+          @suppress_includes == :cross_package \
+      &&  package != starting_package          \
+      &&  package != include_statement.included_package
 
     apply_config(
       package,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &24784560 !ruby/object:Gem::Requirement
+  requirement: &27632120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *24784560
+  version_requirements: *27632120
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &24784100 !ruby/object:Gem::Requirement
+  requirement: &27631660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.19
   type: :runtime
   prerelease: false
-  version_requirements: *24784100
+  version_requirements: *27631660
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &24783640 !ruby/object:Gem::Requirement
+  requirement: &27631200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '1.8'
   type: :runtime
   prerelease: false
-  version_requirements: *24783640
+  version_requirements: *27631200
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &24783180 !ruby/object:Gem::Requirement
+  requirement: &27630740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *24783180
+  version_requirements: *27630740
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &24782720 !ruby/object:Gem::Requirement
+  requirement: &27630280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *24782720
+  version_requirements: *27630280
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &24782260 !ruby/object:Gem::Requirement
+  requirement: &27629820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *24782260
+  version_requirements: *27629820
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &24781800 !ruby/object:Gem::Requirement
+  requirement: &27629360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *24781800
+  version_requirements: *27629360
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &24781340 !ruby/object:Gem::Requirement
+  requirement: &27628900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *24781340
+  version_requirements: *27628900
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &24780880 !ruby/object:Gem::Requirement
+  requirement: &27628440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *24780880
+  version_requirements: *27628440
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &24780420 !ruby/object:Gem::Requirement
+  requirement: &27627980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '4'
   type: :runtime
   prerelease: false
-  version_requirements: *24780420
+  version_requirements: *27627980
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &24779960 !ruby/object:Gem::Requirement
+  requirement: &27627520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.4.14
   type: :runtime
   prerelease: false
-  version_requirements: *24779960
+  version_requirements: *27627520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &24779500 !ruby/object:Gem::Requirement
+  requirement: &27627060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 1.0.15
   type: :development
   prerelease: false
-  version_requirements: *24779500
+  version_requirements: *27627060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &24779040 !ruby/object:Gem::Requirement
+  requirement: &27626600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *24779040
+  version_requirements: *27626600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &24778580 !ruby/object:Gem::Requirement
+  requirement: &27626140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *24778580
+  version_requirements: *27626140
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &24778120 !ruby/object:Gem::Requirement
+  requirement: &27669600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *24778120
+  version_requirements: *27669600
 - !ruby/object:Gem::Dependency
   name: simplecov-html
-  requirement: &24777660 !ruby/object:Gem::Requirement
+  requirement: &27669140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *24777660
+  version_requirements: *27669140
 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
@@ -341,7 +341,8 @@ files:
 - LICENSE
 - README.md
 homepage: http://github.com/mfoemmel/fig
-licenses: []
+licenses:
+- BSD
 post_install_message: 
 rdoc_options: []
 require_paths: