fig 0.1.73 → 0.1.75

data/Changes

@@ -1,3 +1,78 @@
+v0.1.75
+
+  Backwards incompatibilities:
+
+  - Unquoted archive statements now have their values globbed if they don't
+    look like URLs.  If you happen to have a statement like
+
+      archive some/path/foo?bar*.tar.gz
+
+    then this will match files that it did not previously find.
+
+  New features:
+
+  - Asset statements now behave identically, with the exception of the
+    extraction of archive statements and the path preservation of resource
+    statements.  Previously, archives weren't globbed, i.e. you couldn't say
+
+      archive yadda/*.tar.gz
+
+    You had to specify all archives individually.
+
+  - New --run-command-statement option that allows you to run command
+    statements in unpublished packages.  (No more need to publish to test
+    whether they work!)  Say you have a package.fig file in the current
+    directory that looks like
+
+      config default
+        command "echo hello!"
+      end
+
+    If you just run "fig", it still says that there's nothing to do, but it
+    additionally warns you about the situation.  You can get non-default
+    commands to run using the --config option, e.g. "fig
+    --run-command-statement --config run-chrome":
+
+      config run-chrome
+        command "chrome ..."
+      end
+
+  - New grammar statement to allow for future expansion.  Syntax:
+
+      grammar v<number>
+
+    This statement is only valid as the first statement in a package
+    definition.  In other words
+
+      grammar v0
+      config default
+      end
+
+    is valid, but
+
+      config default
+      end
+      grammar v0
+
+    is not.  The only valid version right now is 0, but this means that we can
+    change the syntax in the future without breaking any existing packages.
+
+    Note that this statement will be emitted for all published packages, but
+    will be commented out so that older versions of Fig can still read them.
+    For example, the significant parts of the package definition generated by
+    "fig --publish foo/5 --set variable=value" are:
+
+      # grammar v0
+      config default
+        set variable=value
+      end
+
+v0.1.74.beta.3
+v0.1.74.beta.2
+v0.1.74.beta.1
+
+  - Test releases
+
 v0.1.73
 
   Backwards incompatibilities:

data/lib/fig.rb

@@ -1,3 +1,3 @@
 module Fig
-  VERSION = '0.1.73'
+  VERSION = '0.1.75'
 end

data/lib/fig/command.rb

@@ -37,11 +37,11 @@ class Fig::Command
       return @options.exit_code
     end
 
+    Fig::Logging.initialize_pre_configuration(@options.log_level())
+
     actions = @options.actions()
     if actions.empty?
-      $stderr.puts "Nothing to do.\n\n"
-      $stderr.puts %q<Run "fig --help" for a full list of commands.>
-      return Fig::Command::Action::EXIT_FAILURE
+      return handle_nothing_to_do
     end
 
     actions.each do
@@ -53,8 +53,6 @@ class Fig::Command
       end
     end
 
-    Fig::Logging.initialize_pre_configuration(@options.log_level())
-
     @descriptor = @options.descriptor
     check_descriptor_requirement()
     if actions.any? {|action| not action.allow_both_descriptor_and_file? }
@@ -133,6 +131,26 @@ class Fig::Command
       :package_source_description
     )
 
+  def handle_nothing_to_do()
+    command_statement = nil
+    if ! @descriptor && @options.package_definition_file != :none
+      load_base_package()
+      config = base_config
+      command_statement = @base_package[config].command_statement
+    end
+
+    $stderr.puts "Nothing to do.\n\n"
+
+    if command_statement
+      $stderr.puts \
+        %Q<You have a command statement in the "#{config}" config.  If you want to run it, use the "--run-command-statement" option.\n\n>
+    end
+
+    $stderr.puts %q<Run "fig --help" for a full list of commands.>
+
+    return Fig::Command::Action::EXIT_FAILURE
+  end
+
   def check_include_statements_versions?()
     return false if @options.suppress_warning_include_statement_missing_version?
 
@@ -248,13 +266,7 @@ class Fig::Command
     apply_config            = apply_config?
     apply_base_config       = apply_config ? apply_base_config? : nil
 
-    package_loader = new_package_loader()
-    if @options.actions.all? {|action| action.base_package_can_come_from_descriptor?}
-      @base_package = package_loader.load_package_object()
-    else
-      @base_package = package_loader.load_package_object_from_file()
-    end
-    @package_source_description = package_loader.package_source_description()
+    load_base_package()
 
     applier = new_package_applier()
 
@@ -271,6 +283,18 @@ class Fig::Command
     return
   end
 
+  def load_base_package()
+    package_loader = new_package_loader()
+    if @options.actions.all? {|action| action.base_package_can_come_from_descriptor?}
+      @base_package = package_loader.load_package_object()
+    else
+      @base_package = package_loader.load_package_object_from_file()
+    end
+    @package_source_description = package_loader.package_source_description()
+
+    return
+  end
+
   def invoke_post_set_up_actions()
     @post_set_up_actions.each do
       |action|

data/lib/fig/command/action.rb

@@ -44,7 +44,7 @@ module Fig::Command::Action
   end
 
   def modifies_repository?()
-    return NotImplementedError
+    raise NotImplementedError
   end
 
   def prepare_repository(repository)

data/lib/fig/command/action/dump_package_definition_parsed.rb

@@ -1,5 +1,6 @@
 require 'fig/command/action'
 require 'fig/command/action/role/has_no_sub_action'
+require 'fig/unparser/v0'
 
 module  Fig; end
 class   Fig::Command; end
@@ -34,13 +35,10 @@ class Fig::Command::Action::DumpPackageDefinitionParsed
   end
 
   def execute()
-    lines = @execution_context.base_package.statements.map do
-      |statement|
+    unparser = Fig::Unparser::V0.new :emit_as_to_be_published
+    text = unparser.unparse(@execution_context.base_package.statements)
 
-      statement.unparse('')
-    end
-
-    print lines.join("\n").strip
+    print text.gsub(/\n{3,}/, "\n\n").strip
 
     return EXIT_SUCCESS
   end

data/lib/fig/command/action/run_command_statement.rb

@@ -14,7 +14,7 @@ class Fig::Command::Action::RunCommandStatement
   end
 
   def descriptor_requirement()
-    return :required
+    return nil
   end
 
   def modifies_repository?()
@@ -47,9 +47,10 @@ class Fig::Command::Action::RunCommandStatement
   def execute()
     environment   = @execution_context.environment
     base_package  = @execution_context.base_package
+    base_config   = @execution_context.base_config
 
     environment.execute_config(
-      base_package, @descriptor, @extra_argv || []
+      base_package, base_config, @descriptor, @extra_argv || []
     ) { |command| @execution_context.operating_system.shell_exec command }
 
     return EXIT_SUCCESS

data/lib/fig/command/options.rb

@@ -299,6 +299,12 @@ class Fig::Command::Options
       set_base_action(Fig::Command::Action::Clean)
     end
 
+    @parser.on(
+      '--run-command-statement', 'run the command in even in local file'
+    ) do
+      set_base_action(Fig::Command::Action::RunCommandStatement)
+    end
+
     @parser.on(
       '--publish', 'install package in $FIG_HOME and in remote repo'
     ) do |publish|
@@ -544,7 +550,10 @@ class Fig::Command::Options
       return
     end
 
-    return if @base_action && @base_action == Fig::Command::Action::Help
+    if @base_action
+      return if @base_action.class == Fig::Command::Action::Help
+      return if @base_action.class == action_class
+    end
 
     if @base_action
       raise Fig::Command::OptionError.new(
@@ -577,13 +586,13 @@ class Fig::Command::Options
   end
 
   def new_content_statement(option, path, statement_class)
-    statement_class.validate_url(path) {
+    need_to_glob = statement_class.validate_and_process_escapes_in_url!(path) {
       |error_description|
 
       @parser.raise_invalid_argument(option, path, error_description)
     }
 
-    return statement_class.new(nil, "#{option} option", path)
+    return statement_class.new(nil, "#{option} option", path, need_to_glob)
   end
 
   def set_up_sub_actions()

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

@@ -16,6 +16,7 @@ Short usage summary (use --help-long for everything):
 Running under Fig:
   fig [...] [DESCRIPTOR] [-- COMMAND]
   fig [...] [DESCRIPTOR] --command-extra-args VALUES
+  fig [...] [DESCRIPTOR] --run-command-statement
 
 Querying:
   fig {-g | --get} VARIABLE                                  [DESCRIPTOR] [...]
@@ -42,6 +43,7 @@ Running under Fig:
 
   fig [...] [DESCRIPTOR] [-- COMMAND]
   fig [...] [DESCRIPTOR] --command-extra-args VALUES
+  fig [...] [DESCRIPTOR] --run-command-statement
 
 Querying:
 

data/lib/fig/command/package_loader.rb

@@ -91,6 +91,7 @@ class Fig::Command::PackageLoader
     end
 
     source_description = package_source_description()
+
     @base_package =
       Fig::Parser.new(@application_configuration, :check_include_versions).parse_package(
         Fig::PackageDescriptor.new(

data/lib/fig/config_file_error.rb

@@ -4,7 +4,7 @@ module Fig
   # Could not determine some kind of information from a configuration file,
   # whether .figrc, log4r, package.fig, etc.
   class ConfigFileError < UserInputError
-    attr_accessor :file
+    attr_reader :file
 
     def initialize(message, file)
       super(message)

data/lib/fig/grammar/base.rb

@@ -0,0 +1,214 @@
+# Autogenerated from a Treetop grammar. Edits may be lost.
+
+
+# Treetop (http://treetop.rubyforge.org/) grammar for common definitions.
+
+require 'treetop'
+
+module Fig
+  module Grammar
+    module Base
+      include Treetop::Runtime
+
+      def root
+        @root ||= :ws
+      end
+
+      def _nt_ws
+        start_index = index
+        if node_cache[:ws].has_key?(index)
+          cached = node_cache[:ws][index]
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        s0, i0 = [], index
+        loop do
+          if has_terminal?('\G[ \\n\\r\\t]', true, index)
+            r1 = true
+            @index += 1
+          else
+            r1 = nil
+          end
+          if r1
+            s0 << r1
+          else
+            break
+          end
+        end
+        if s0.empty?
+          @index = i0
+          r0 = nil
+        else
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        end
+
+        node_cache[:ws][start_index] = r0
+
+        r0
+      end
+
+      def _nt_optional_ws
+        start_index = index
+        if node_cache[:optional_ws].has_key?(index)
+          cached = node_cache[:optional_ws][index]
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        s0, i0 = [], index
+        loop do
+          if has_terminal?('\G[ \\n\\r\\t]', true, index)
+            r1 = true
+            @index += 1
+          else
+            r1 = nil
+          end
+          if r1
+            s0 << r1
+          else
+            break
+          end
+        end
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+
+        node_cache[:optional_ws][start_index] = r0
+
+        r0
+      end
+
+      module Comment0
+      end
+
+      def _nt_comment
+        start_index = index
+        if node_cache[:comment].has_key?(index)
+          cached = node_cache[:comment][index]
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        i0, s0 = index, []
+        if has_terminal?('#', false, index)
+          r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('#')
+          r1 = nil
+        end
+        s0 << r1
+        if r1
+          s2, i2 = [], index
+          loop do
+            if has_terminal?('\G[^\\n]', true, index)
+              r3 = true
+              @index += 1
+            else
+              r3 = nil
+            end
+            if r3
+              s2 << r3
+            else
+              break
+            end
+          end
+          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+          s0 << r2
+          if r2
+            if has_terminal?("\n", false, index)
+              r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure("\n")
+              r4 = nil
+            end
+            s0 << r4
+          end
+        end
+        if s0.last
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+          r0.extend(Comment0)
+        else
+          @index = i0
+          r0 = nil
+        end
+
+        node_cache[:comment][start_index] = r0
+
+        r0
+      end
+
+      def _nt_ws_or_comment
+        start_index = index
+        if node_cache[:ws_or_comment].has_key?(index)
+          cached = node_cache[:ws_or_comment][index]
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        i0 = index
+        r1 = _nt_ws
+        if r1
+          r0 = r1
+        else
+          r2 = _nt_comment
+          if r2
+            r0 = r2
+          else
+            @index = i0
+            r0 = nil
+          end
+        end
+
+        node_cache[:ws_or_comment][start_index] = r0
+
+        r0
+      end
+
+      def _nt_optional_ws_or_comment
+        start_index = index
+        if node_cache[:optional_ws_or_comment].has_key?(index)
+          cached = node_cache[:optional_ws_or_comment][index]
+          if cached
+            cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        s0, i0 = [], index
+        loop do
+          r1 = _nt_ws_or_comment
+          if r1
+            s0 << r1
+          else
+            break
+          end
+        end
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+
+        node_cache[:optional_ws_or_comment][start_index] = r0
+
+        r0
+      end
+
+    end
+
+    class BaseParser < Treetop::Runtime::CompiledParser
+      include Base
+    end
+
+  end
+end