fig 1.21.0 → 1.21.1.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6fb010050e5c804acf3af9f5ceae178afb126fd
-  data.tar.gz: 93efb2bc6db5f828625426a28475d4ef1aae86ab
+  metadata.gz: 92694a12f488f9612add81bcd327fc0d20a3d737
+  data.tar.gz: 6e63c440c727bf1f5ec5fbe01d17d6b88c65ba7b
 SHA512:
-  metadata.gz: 55e4c84950b0e197e39099804d7f5d661b2cb3b69d7f043a31419a34798d53c0fc6741f29bdc7666f8edee4b658a335050333083cab4c0421514c444ff551902
-  data.tar.gz: 77bad3feeadbfbe9de0faa5dc77efde9d0bf01aa825ec9b6ac68d903b1fc3940306fccb8caf30bfe4dddcd8e5bb04f39c62140507de461560b49e88e2dadc816
+  metadata.gz: df1ee56e6af7a3afd428aff6a8d42d1015ddbac0384720ddfa2ad7d67ef26c507672148e0af89d9620bae86afcb90b6132fbe4d967a0464740902e55cf9714f3
+  data.tar.gz: c6548fd362610c76c21a8ef5e5b7cea0011aff7a1295f842dbc432f0d8caf18d5c14248ae962e72b6957dd9d451c278c88163672c9867961891cec673291fe7d

data/Changes

@@ -1,3 +1,24 @@
+v1.21.1.beta.1 - 2014/11/17
+
+  Bug fixes:
+
+  - Republishing a package did not clean out no-longer-extant files from the
+    runtime directory.
+
+  New feature:
+
+  - New --add synonym for the --append option.  A slight fix for the misnomer
+    that the latter option is.
+
+  Miscellaneous:
+
+  - Include file size in checks for whether a local file is up-to-date for
+    copying.
+  - Command-line options listing in --options and --help-long output is now
+    broken up into sections.
+  - Stack trace no longer emitted when releasing repository lock after exec
+    error.
+
 v1.21.0 - 2014/10/13
 
   Bug fixes:

data/lib/fig.rb

@@ -1,3 +1,3 @@
 module Fig
-  VERSION = '1.21.0'
+  VERSION = '1.21.1.beta.1'
 end

data/lib/fig/command/options.rb

@@ -165,6 +165,8 @@ class Fig::Command::Options
   private
 
   EXTRA_OPTIONS_DESCRIPTION = <<-'END_DESCRIPTION'
+
+Running commands:
         --                           end of Fig options; anything after this is used as a command to run
         --command-extra-args         end of Fig options; anything after this is appended to the end of a
                                      "command" statement in a "config" block.
@@ -223,143 +225,110 @@ class Fig::Command::Options
     set_up_asset_statements()
     set_up_queries()
     set_up_program_configuration()
+    set_up_help()
 
     return
   end
 
-  def set_up_queries()
-    @parser.on_tail(
-      '-?', '-h', '--help', 'display short usage summary'
-    ) do
-      set_base_action(Fig::Command::Action::Help)
-    end
-    @parser.on_tail(
-      '--help-long', 'display full usage'
-    ) do
-      set_base_action(Fig::Command::Action::HelpLong)
-    end
-    @parser.on_tail(
-      '--options', 'just list Fig options'
-    ) do
-      set_base_action(Fig::Command::Action::Options)
-    end
+  FILE_OPTION_VALUE_PATTERN =
+    %r<
+      \A
+      (?:
+          -         # Solely a hyphen, to allow for stdin
+        | [^-] .*   # or anything not starting with a hyphen.
+      )
+      \z
+    >x
 
-    @parser.on_tail('-v', '--version', 'print Fig version') do
-      set_base_action(Fig::Command::Action::Version)
-    end
-    @parser.on_tail(
-      '--version-plain', 'print Fig version without embellishment (no newline)'
-    ) do
-      set_base_action(Fig::Command::Action::VersionPlain)
-    end
+  def set_up_package_definition()
+    @parser.separator 'Package definition:'
 
     @parser.on(
-      '-g',
-      '--get VARIABLE',
+      '-c',
+      '--config CONFIG',
       STARTS_WITH_NON_HYPHEN,
-      'print value of environment variable VARIABLE'
-    ) do |variable_to_get|
-      set_base_action(Fig::Command::Action::Get)
-      @variable_to_get = variable_to_get
+      %q<apply configuration CONFIG, default is "default">
+    ) do |config|
+      @config = config
     end
 
-    set_up_listings()
-
     @parser.on(
-      '--source-package FILE',
-      STARTS_WITH_NON_HYPHEN,
-      'print package FILE was retrieved from'
-    ) do |file_to_find_package_for|
-      set_base_action(Fig::Command::Action::SourcePackage)
-      @file_to_find_package_for = file_to_find_package_for
+      '--file FILE',
+      FILE_OPTION_VALUE_PATTERN,
+      %q<read package definition FILE. Use '-' for stdin. See also --no-file>
+    ) do |path|
+      set_package_definition_file(path)
     end
 
     @parser.on(
-      '-T', '--dump-package-definition-text',
-      'emit the unparsed definition of the base package, if there is one'
+      '--no-file', 'ignore package.fig/application.fig file in current directory'
     ) do
-      set_base_action(Fig::Command::Action::DumpPackageDefinitionText)
+      set_package_definition_file(:none)
     end
+
     @parser.on(
-      '--dump-package-definition-parsed',
-      'emit the parsed definition of the base package'
+      '--suppress-all-includes', %q<don't process include statements>,
     ) do
-      set_base_action(Fig::Command::Action::DumpPackageDefinitionParsed)
+      set_suppress_includes(:all)
     end
+
     @parser.on(
-      '--dump-package-definition-for-command-line',
-      'emit the synthetic package for the other options (--set/--archive/etc.)'
+      '--suppress-cross-package-includes',
+      %q<don't process includes of configs from other packages>,
     ) do
-      set_base_action(Fig::Command::Action::DumpPackageDefinitionForCommandLine)
+      set_suppress_includes(:cross_package)
     end
 
     return
   end
 
-  def set_up_listings()
-    option_mapping = {
-      :local_packages => [
-        ['--list-local', '--list', 'list packages in $FIG_HOME'],
-        Fig::Command::Action::ListLocal
-      ],
-
-      :configs => [
-        ['--list-configs', 'list configurations'],
-        Fig::Command::Action::ListConfigs
-      ],
-
-      :dependencies => [
-        ['--list-dependencies', 'list package dependencies, recursively'],
-        Fig::Command::Action::ListDependencies
-      ],
-
-      :variables => [
-        [
-          '--list-variables',
-          'list all variables defined/used by package and its dependencies'
-        ],
-        Fig::Command::Action::ListVariables
-      ],
-
-      :remote_packages => [
-        ['--list-remote', 'list packages in remote repo'],
-        Fig::Command::Action::ListRemote
-      ],
-    }
+  def set_up_remote_repository_access()
+    @parser.separator ''
+    @parser.separator 'Remote repository access:'
 
-    option_mapping.each_pair do
-      | type, specification_action_class |
+    @parser.on(
+      '-u',
+      '--update',
+      'check remote repo for updates, download to $FIG_HOME and process retrieves'
+    ) do
+      set_update_action(Fig::Command::Action::Update)
+    end
 
-      specification, action_class = *specification_action_class
-      @parser.on(*specification) do
-        set_base_action(action_class)
-      end
+    @parser.on(
+      '-m',
+      '--update-if-missing',
+      'check remote repo for updates only if package missing from $FIG_HOME'
+    ) do
+      set_update_action(Fig::Command::Action::UpdateIfMissing)
     end
 
     @parser.on(
-      '--list-tree', 'for listings, output a tree instead of a list'
+      '-R', '--suppress-retrieves',
+      %q<don't process retrieves, even if they would otherwise be active>,
     ) do
-      @list_tree = true
+      @suppress_retrieves = true
     end
 
     @parser.on(
-      '--graphviz',
-      'for listings, output DOT (http://graphviz.org/content/dot-language)'
+      '--suppress-cleanup-of-retrieves',
+      %q<don't delete files from unreferenced retrieves>,
     ) do
-      @graphviz = true
+      @suppress_cleanup_of_retrieves = true
     end
 
     @parser.on(
-      '--list-all-configs',
-      'for listings, follow all configurations of the base package'
+      '-l', '--login', 'login to FTP repo as a non-anonymous user'
     ) do
-      @list_all_configs = true
+      @login = true
     end
 
     return
   end
 
   def set_up_commands()
+    @parser.separator ''
+    @parser.separator 'Commands:'
+
     @parser.on(
       '--publish', 'install package in $FIG_HOME and in remote repo'
     ) do |publish|
@@ -409,57 +378,10 @@ class Fig::Command::Options
     return
   end
 
-  FILE_OPTION_VALUE_PATTERN =
-    %r<
-      \A
-      (?:
-          -         # Solely a hyphen, to allow for stdin
-        | [^-] .*   # or anything not starting with a hyphen.
-      )
-      \z
-    >x
-
-  def set_up_package_definition()
-    @parser.on(
-      '-c',
-      '--config CONFIG',
-      STARTS_WITH_NON_HYPHEN,
-      %q<apply configuration CONFIG, default is "default">
-    ) do |config|
-      @config = config
-    end
-
-    @parser.on(
-      '--file FILE',
-      FILE_OPTION_VALUE_PATTERN,
-      %q<read package definition FILE. Use '-' for stdin. See also --no-file>
-    ) do |path|
-      set_package_definition_file(path)
-    end
-
-    @parser.on(
-      '--no-file', 'ignore package.fig/application.fig file in current directory'
-    ) do
-      set_package_definition_file(:none)
-    end
-
-    @parser.on(
-      '--suppress-all-includes', %q<don't process include statements>,
-    ) do
-      set_suppress_includes(:all)
-    end
-
-    @parser.on(
-      '--suppress-cross-package-includes',
-      %q<don't process includes of configs from other packages>,
-    ) do
-      set_suppress_includes(:cross_package)
-    end
-
-    return
-  end
-
   def set_up_environment_statements()
+    @parser.separator ''
+    @parser.separator 'Environment variable statement equivalents:'
+
     @environment_statements = []
     @parser.on(
       '-p',
@@ -473,6 +395,17 @@ class Fig::Command::Options
     @parser.add_argument_description(
       %w<-p --append>, %q<The value of this option must look like "NAME=VALUE".>
     )
+    @parser.on(
+      '--add VARIABLE=VALUE',
+      STARTS_WITH_NON_HYPHEN,
+      'prepend VALUE to PATH-like environment variable VARIABLE (synonym for --append)'
+    ) do |name_value|
+      @environment_statements <<
+        new_variable_statement('--add', name_value, Fig::Statement::Path)
+    end
+    @parser.add_argument_description(
+      %w<--add>, %q<The value of this option must look like "NAME=VALUE".>
+    )
 
     @parser.on(
       '-s',
@@ -487,6 +420,9 @@ class Fig::Command::Options
       %w<-s --set>, %q<The value of this option must look like "NAME=VALUE".>
     )
 
+    @parser.separator ''
+    @parser.separator 'Package includes and overrides:'
+
     @parser.on(
       '-i',
       '--include DESCRIPTOR',
@@ -551,6 +487,9 @@ class Fig::Command::Options
   end
 
   def set_up_asset_statements()
+    @parser.separator ''
+    @parser.separator 'Asset statement equivalents:'
+
     @asset_statements = []
     @parser.on(
       '--archive PATH',
@@ -573,41 +512,114 @@ class Fig::Command::Options
     return
   end
 
-  def set_up_remote_repository_access()
+  def set_up_queries()
+    @parser.separator ''
+    @parser.separator 'Querying:'
+
     @parser.on(
-      '-u',
-      '--update',
-      'check remote repo for updates, download to $FIG_HOME and process retrieves'
-    ) do
-      set_update_action(Fig::Command::Action::Update)
+      '-g',
+      '--get VARIABLE',
+      STARTS_WITH_NON_HYPHEN,
+      'print value of environment variable VARIABLE'
+    ) do |variable_to_get|
+      set_base_action(Fig::Command::Action::Get)
+      @variable_to_get = variable_to_get
     end
 
     @parser.on(
-      '-m',
-      '--update-if-missing',
-      'check remote repo for updates only if package missing from $FIG_HOME'
+      '--source-package FILE',
+      STARTS_WITH_NON_HYPHEN,
+      'print package FILE was retrieved from'
+    ) do |file_to_find_package_for|
+      set_base_action(Fig::Command::Action::SourcePackage)
+      @file_to_find_package_for = file_to_find_package_for
+    end
+
+    @parser.on(
+      '-T', '--dump-package-definition-text',
+      'emit the unparsed definition of the base package, if there is one'
     ) do
-      set_update_action(Fig::Command::Action::UpdateIfMissing)
+      set_base_action(Fig::Command::Action::DumpPackageDefinitionText)
+    end
+    @parser.on(
+      '--dump-package-definition-parsed',
+      'emit the parsed definition of the base package'
+    ) do
+      set_base_action(Fig::Command::Action::DumpPackageDefinitionParsed)
+    end
+    @parser.on(
+      '--dump-package-definition-for-command-line',
+      'emit the synthetic package for the other options (--set/--archive/etc.)'
+    ) do
+      set_base_action(Fig::Command::Action::DumpPackageDefinitionForCommandLine)
+    end
+
+    set_up_listings()
+
+    return
+  end
+
+  def set_up_listings()
+    @parser.separator ''
+    @parser.separator 'Listings:'
+
+    option_mapping = {
+      :local_packages => [
+        ['--list-local', '--list', 'list packages in $FIG_HOME'],
+        Fig::Command::Action::ListLocal
+      ],
+
+      :configs => [
+        ['--list-configs', 'list configurations'],
+        Fig::Command::Action::ListConfigs
+      ],
+
+      :dependencies => [
+        ['--list-dependencies', 'list package dependencies, recursively'],
+        Fig::Command::Action::ListDependencies
+      ],
+
+      :variables => [
+        [
+          '--list-variables',
+          'list all variables defined/used by package and its dependencies'
+        ],
+        Fig::Command::Action::ListVariables
+      ],
+
+      :remote_packages => [
+        ['--list-remote', 'list packages in remote repo'],
+        Fig::Command::Action::ListRemote
+      ],
+    }
+
+    option_mapping.each_pair do
+      | type, specification_action_class |
+
+      specification, action_class = *specification_action_class
+      @parser.on(*specification) do
+        set_base_action(action_class)
+      end
     end
 
     @parser.on(
-      '-R', '--suppress-retrieves',
-      %q<don't process retrieves, even if they would otherwise be active>,
+      '--list-tree', 'for listings, output a tree instead of a list'
     ) do
-      @suppress_retrieves = true
+      @list_tree = true
     end
 
     @parser.on(
-      '--suppress-cleanup-of-retrieves',
-      %q<don't delete files from unreferenced retrieves>,
+      '--graphviz',
+      'for listings, output DOT (http://graphviz.org/content/dot-language)'
     ) do
-      @suppress_cleanup_of_retrieves = true
+      @graphviz = true
     end
 
     @parser.on(
-      '-l', '--login', 'login to FTP repo as a non-anonymous user'
+      '--list-all-configs',
+      'for listings, follow all configurations of the base package'
     ) do
-      @login = true
+      @list_all_configs = true
     end
 
     return
@@ -617,6 +629,9 @@ class Fig::Command::Options
   LOG_ALIASES = { 'warning' => 'warn' }
 
   def set_up_program_configuration()
+    @parser.separator ''
+    @parser.separator 'Fig configuration:'
+
     @parser.on(
       '--figrc PATH',
       STARTS_WITH_NON_HYPHEN,
@@ -684,6 +699,36 @@ class Fig::Command::Options
     return
   end
 
+  def set_up_help()
+    @parser.separator ''
+    @parser.separator 'Help:'
+
+    @parser.on(
+      '-?', '-h', '--help', 'display short usage summary'
+    ) do
+      set_base_action(Fig::Command::Action::Help)
+    end
+    @parser.on(
+      '--help-long', 'display full usage'
+    ) do
+      set_base_action(Fig::Command::Action::HelpLong)
+    end
+    @parser.on(
+      '--options', 'just list Fig options'
+    ) do
+      set_base_action(Fig::Command::Action::Options)
+    end
+
+    @parser.on('-v', '--version', 'print Fig version') do
+      set_base_action(Fig::Command::Action::Version)
+    end
+    @parser.on(
+      '--version-plain', 'print Fig version without embellishment (no newline)'
+    ) do
+      set_base_action(Fig::Command::Action::VersionPlain)
+    end
+  end
+
   def set_base_action(action_class)
     action = action_class.new
     # Help overrides anything.

data/lib/fig/command/options/parser.rb

@@ -28,8 +28,7 @@ Querying:
 
 Standard options (represented as "[...]" above):
       [--update | --update-if-missing]
-      [--set    VARIABLE=VALUE]
-      [--append VARIABLE=VALUE]
+      [--set VARIABLE=VALUE] [--add VARIABLE=VALUE]
       [--resource PATH]      [--archive  PATH]
       [--include DESCRIPTOR] [--include-file PATH:CONFIG]
       [--override DESCRIPTOR]
@@ -75,8 +74,8 @@ Standard options (represented as "[...]" above):
       [-u | --update | -m | --update-if-missing]
       --update-lock-response {wait | fail | ignore}
 
-      [{-s | --set}    VARIABLE=VALUE]
-      [{-p | --append} VARIABLE=VALUE]
+      [{-s | --set}            VARIABLE=VALUE]
+      [{-p | --add | --append} VARIABLE=VALUE]
 
       [--resource       PATH]
       [--archive        PATH]
@@ -164,6 +163,12 @@ Environment variables:
     return
   end
 
+  def separator(string)
+    @parser.separator string
+
+    return
+  end
+
   def on_tail(*arguments, &block)
     switch_array = make_switch_array(arguments, block)
 

data/lib/fig/operating_system.rb

@@ -165,7 +165,11 @@ class Fig::OperatingSystem
         end
       end
     else
-      if ! File.exist?(target) || File.mtime(source) != File.mtime(target)
+      if (
+            ! File.exist?(target)                     \
+        ||  File.mtime(source) != File.mtime(target)  \
+        ||  File.size(source) != File.size(target)
+      )
         Fig::Logging.info "#{msg} #{target}" if msg
         FileUtils.mkdir_p(File.dirname(target))
         FileUtils.cp(source, target)

data/lib/fig/repository_package_publisher.rb

@@ -62,6 +62,7 @@ class Fig::RepositoryPackagePublisher
     @operating_system.delete_and_recreate_directory(
       @local_directory_for_package
     )
+    @operating_system.delete_and_recreate_directory(@runtime_for_package)
 
     fig_file = File.join(temp_dir, Fig::Repository::PACKAGE_FILE_IN_REPO)
     content, published_package =

data/lib/fig/update_lock.rb

@@ -12,7 +12,11 @@ class Fig::UpdateLock
   end
 
   def close()
-    @lock.close
+    begin
+      @lock.close
+    rescue IOError => error
+      # Don't care if it's already closed.
+    end
 
     return
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.21.1.beta.1
 platform: ruby
 authors:
 - Matthew Foemmel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -404,9 +404,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2