fig 1.24.0 → 1.24.1.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d99866feed5b6eb83d604fab879d601c996acb4
-  data.tar.gz: bfed1252e9d45b6da5a7b13524de2a3e7c996077
+  metadata.gz: 2ea33a3e608936d3bc7ba5dfa2e844cfa425f979
+  data.tar.gz: b062f1064cac523af1372d5197001b06ffd5c7e1
 SHA512:
-  metadata.gz: c4b4a0e59742d104a3fe257af19b700edf45096ccf4e11043fa8be32fb410d3f97fd446a33044cf9f0d5f6ba64e4c0d3db21da394a3de83f6c2b2e7081683619
-  data.tar.gz: 9bdd6433c1edc83df1165c20d66676a0818b734e8b02067b6baee11ab9cb04b9a83fe2a402e619a19193f8c53c82ff85782783d2b52d6c546fedf1a630f56a82
+  metadata.gz: c0c03e39ab625727c7a1570ccecb581e16d0a188eda16d7e91cfbe5213975e7340fd8133fd5f4d453627f1f62d82251f1b7c802471ff40897d3bedf8e255c5bf
+  data.tar.gz: 2b8cc76a6b3d749978e72800a1dde63f03bdf2db741f77b2a4001aebe67cc67d1f34ad9d8b2824544d376685f806373c626197b104d5d3e868def67ee30b2822

data/Changes

@@ -1,3 +1,35 @@
+v1.24.1.beta.1 - 2015/04/23
+
+  Announcement:
+
+  - This is the final version that will support Ruby 1.9.x.  The next version
+    will require Ruby 2.0.0.
+
+  Bug fix:
+
+  - No longer crashes when using --graphviz, --list-tree, or --list-all-configs
+    without any other options.  Thanks to Matt Godbolt for the report.
+
+  New features:
+
+  - New --list-yaml option to get --list-dependencies and --list-variables to
+    emit their data as YAML (http://yaml.org).
+
+  - New --list-json option to get --list-dependencies and --list-variables to
+    emit their data as JSON (http://json.org).  Note that JSON isn't exactly
+    ideal for representing the directed acyclic graph that even a mildly
+    complicated set of dependencies can result in and you can end up with large
+    amounts of duplicate data in the output.  If you can handle parsing YAML,
+    you are probably better off with that.
+
+  Miscellaneous:
+
+  - Small tweaks to --publish-comment and --publish-comment-file handling to
+    remove some trailing whitespace when there are blank lines in the input.
+
+  - A blank line is added after grammar statements in published packages in
+    order to seperate them from other statements.
+
 v1.24.0 - 2015/01/13
 
   New feature:

data/README.md

@@ -39,7 +39,13 @@ Community
 
 [Fig Mailing List](http://groups.google.com/group/fig-user)
 
+Extensions for other tools
+==========================
+
+These live in the `support` directory within the repository.  For example,
+there's a Vim plugin in `support/vim`.
+
 Copyright
 =========
 
-Copyright (c) 2009-2013 Matthew Foemmel. See LICENSE for details.
+Copyright (c) 2009-2015 Matthew Foemmel. See LICENSE for details.

data/lib/fig.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
 
 module Fig
-  VERSION = '1.24.0'
+  VERSION = '1.24.1.beta.1'
 end

data/lib/fig/command/action/list_dependencies/json.rb

@@ -0,0 +1,46 @@
+# coding: utf-8
+
+require 'fig/command/action'
+require 'fig/command/action/role/list_as_json'
+require 'fig/command/action/role/list_base_config'
+require 'fig/command/action/role/list_dependencies_from_data_structure'
+require 'fig/command/action/role/list_from_data_structure'
+require 'fig/command/action/role/list_walking_dependency_tree'
+
+module  Fig; end
+class   Fig::Command; end
+module  Fig::Command::Action; end
+class   Fig::Command::Action::ListDependencies; end
+
+class Fig::Command::Action::ListDependencies::JSON
+  include Fig::Command::Action
+  include Fig::Command::Action::Role::ListAsJSON
+  include Fig::Command::Action::Role::ListBaseConfig
+  include Fig::Command::Action::Role::ListDependenciesFromDataStructure
+  include Fig::Command::Action::Role::ListFromDataStructure
+  include Fig::Command::Action::Role::ListWalkingDependencyTree
+
+  def options()
+    return %w<--list-dependencies --list-json>
+  end
+
+  def descriptor_requirement()
+    return nil
+  end
+
+  def load_base_package?()
+    return true
+  end
+
+  def register_base_package?()
+    return nil # don't care
+  end
+
+  def apply_config?()
+    return nil # don't care
+  end
+
+  def apply_base_config?()
+    return nil # don't care
+  end
+end

data/lib/fig/command/action/list_dependencies/json_all_configs.rb

@@ -0,0 +1,46 @@
+# coding: utf-8
+
+require 'fig/command/action'
+require 'fig/command/action/role/list_all_configs'
+require 'fig/command/action/role/list_as_json'
+require 'fig/command/action/role/list_dependencies_from_data_structure'
+require 'fig/command/action/role/list_from_data_structure'
+require 'fig/command/action/role/list_walking_dependency_tree'
+
+module  Fig; end
+class   Fig::Command; end
+module  Fig::Command::Action; end
+class   Fig::Command::Action::ListDependencies; end
+
+class Fig::Command::Action::ListDependencies::JSONAllConfigs
+  include Fig::Command::Action
+  include Fig::Command::Action::Role::ListAllConfigs
+  include Fig::Command::Action::Role::ListAsJSON
+  include Fig::Command::Action::Role::ListDependenciesFromDataStructure
+  include Fig::Command::Action::Role::ListFromDataStructure
+  include Fig::Command::Action::Role::ListWalkingDependencyTree
+
+  def options()
+    return %w<--list-dependencies --list-json --list-all-configs>
+  end
+
+  def descriptor_requirement()
+    return nil
+  end
+
+  def load_base_package?()
+    return true
+  end
+
+  def register_base_package?()
+    return nil # don't care
+  end
+
+  def apply_config?()
+    return nil # don't care
+  end
+
+  def apply_base_config?()
+    return nil # don't care
+  end
+end

data/lib/fig/command/action/list_dependencies/yaml.rb

@@ -0,0 +1,46 @@
+# coding: utf-8
+
+require 'fig/command/action'
+require 'fig/command/action/role/list_as_yaml'
+require 'fig/command/action/role/list_base_config'
+require 'fig/command/action/role/list_dependencies_from_data_structure'
+require 'fig/command/action/role/list_from_data_structure'
+require 'fig/command/action/role/list_walking_dependency_tree'
+
+module  Fig; end
+class   Fig::Command; end
+module  Fig::Command::Action; end
+class   Fig::Command::Action::ListDependencies; end
+
+class Fig::Command::Action::ListDependencies::YAML
+  include Fig::Command::Action
+  include Fig::Command::Action::Role::ListAsYAML
+  include Fig::Command::Action::Role::ListBaseConfig
+  include Fig::Command::Action::Role::ListDependenciesFromDataStructure
+  include Fig::Command::Action::Role::ListFromDataStructure
+  include Fig::Command::Action::Role::ListWalkingDependencyTree
+
+  def options()
+    return %w<--list-dependencies --list-yaml>
+  end
+
+  def descriptor_requirement()
+    return nil
+  end
+
+  def load_base_package?()
+    return true
+  end
+
+  def register_base_package?()
+    return nil # don't care
+  end
+
+  def apply_config?()
+    return nil # don't care
+  end
+
+  def apply_base_config?()
+    return nil # don't care
+  end
+end

data/lib/fig/command/action/list_dependencies/yaml_all_configs.rb

@@ -0,0 +1,46 @@
+# coding: utf-8
+
+require 'fig/command/action'
+require 'fig/command/action/role/list_all_configs'
+require 'fig/command/action/role/list_as_yaml'
+require 'fig/command/action/role/list_dependencies_from_data_structure'
+require 'fig/command/action/role/list_from_data_structure'
+require 'fig/command/action/role/list_walking_dependency_tree'
+
+module  Fig; end
+class   Fig::Command; end
+module  Fig::Command::Action; end
+class   Fig::Command::Action::ListDependencies; end
+
+class Fig::Command::Action::ListDependencies::YAMLAllConfigs
+  include Fig::Command::Action
+  include Fig::Command::Action::Role::ListAllConfigs
+  include Fig::Command::Action::Role::ListAsYAML
+  include Fig::Command::Action::Role::ListDependenciesFromDataStructure
+  include Fig::Command::Action::Role::ListFromDataStructure
+  include Fig::Command::Action::Role::ListWalkingDependencyTree
+
+  def options()
+    return %w<--list-dependencies --list-yaml --list-all-configs>
+  end
+
+  def descriptor_requirement()
+    return nil
+  end
+
+  def load_base_package?()
+    return true
+  end
+
+  def register_base_package?()
+    return nil # don't care
+  end
+
+  def apply_config?()
+    return nil # don't care
+  end
+
+  def apply_base_config?()
+    return nil # don't care
+  end
+end

data/lib/fig/command/action/list_variables/json.rb

@@ -0,0 +1,26 @@
+# coding: utf-8
+
+require 'fig/command/action'
+require 'fig/command/action/role/list_as_json'
+require 'fig/command/action/role/list_base_config'
+require 'fig/command/action/role/list_from_data_structure'
+require 'fig/command/action/role/list_variables_from_data_structure'
+require 'fig/command/action/role/list_walking_dependency_tree'
+
+module  Fig; end
+class   Fig::Command; end
+module  Fig::Command::Action; end
+class   Fig::Command::Action::ListVariables; end
+
+class Fig::Command::Action::ListVariables::JSON
+  include Fig::Command::Action
+  include Fig::Command::Action::Role::ListAsJSON
+  include Fig::Command::Action::Role::ListBaseConfig
+  include Fig::Command::Action::Role::ListFromDataStructure
+  include Fig::Command::Action::Role::ListVariablesFromDataStructure
+  include Fig::Command::Action::Role::ListWalkingDependencyTree
+
+  def options()
+    return %w<--list-variables --list-json>
+  end
+end

data/lib/fig/command/action/list_variables/json_all_configs.rb

@@ -0,0 +1,26 @@
+# coding: utf-8
+
+require 'fig/command/action'
+require 'fig/command/action/role/list_all_configs'
+require 'fig/command/action/role/list_as_json'
+require 'fig/command/action/role/list_from_data_structure'
+require 'fig/command/action/role/list_variables_from_data_structure'
+require 'fig/command/action/role/list_walking_dependency_tree'
+
+module  Fig; end
+class   Fig::Command; end
+module  Fig::Command::Action; end
+class   Fig::Command::Action::ListVariables; end
+
+class Fig::Command::Action::ListVariables::JSONAllConfigs
+  include Fig::Command::Action
+  include Fig::Command::Action::Role::ListAllConfigs
+  include Fig::Command::Action::Role::ListAsJSON
+  include Fig::Command::Action::Role::ListFromDataStructure
+  include Fig::Command::Action::Role::ListVariablesFromDataStructure
+  include Fig::Command::Action::Role::ListWalkingDependencyTree
+
+  def options()
+    return %w<--list-variables --list-json --list-all-configs>
+  end
+end

data/lib/fig/command/action/list_variables/yaml.rb

@@ -0,0 +1,26 @@
+# coding: utf-8
+
+require 'fig/command/action'
+require 'fig/command/action/role/list_as_yaml'
+require 'fig/command/action/role/list_base_config'
+require 'fig/command/action/role/list_from_data_structure'
+require 'fig/command/action/role/list_variables_from_data_structure'
+require 'fig/command/action/role/list_walking_dependency_tree'
+
+module  Fig; end
+class   Fig::Command; end
+module  Fig::Command::Action; end
+class   Fig::Command::Action::ListVariables; end
+
+class Fig::Command::Action::ListVariables::YAML
+  include Fig::Command::Action
+  include Fig::Command::Action::Role::ListAsYAML
+  include Fig::Command::Action::Role::ListBaseConfig
+  include Fig::Command::Action::Role::ListFromDataStructure
+  include Fig::Command::Action::Role::ListVariablesFromDataStructure
+  include Fig::Command::Action::Role::ListWalkingDependencyTree
+
+  def options()
+    return %w<--list-variables --list-yaml>
+  end
+end

data/lib/fig/command/action/list_variables/yaml_all_configs.rb

@@ -0,0 +1,26 @@
+# coding: utf-8
+
+require 'fig/command/action'
+require 'fig/command/action/role/list_all_configs'
+require 'fig/command/action/role/list_as_yaml'
+require 'fig/command/action/role/list_from_data_structure'
+require 'fig/command/action/role/list_variables_from_data_structure'
+require 'fig/command/action/role/list_walking_dependency_tree'
+
+module  Fig; end
+class   Fig::Command; end
+module  Fig::Command::Action; end
+class   Fig::Command::Action::ListVariables; end
+
+class Fig::Command::Action::ListVariables::YAMLAllConfigs
+  include Fig::Command::Action
+  include Fig::Command::Action::Role::ListAllConfigs
+  include Fig::Command::Action::Role::ListAsYAML
+  include Fig::Command::Action::Role::ListFromDataStructure
+  include Fig::Command::Action::Role::ListVariablesFromDataStructure
+  include Fig::Command::Action::Role::ListWalkingDependencyTree
+
+  def options()
+    return %w<--list-variables --list-yaml --list-all-configs>
+  end
+end

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

@@ -0,0 +1,19 @@
+# coding: utf-8
+
+require 'json'
+
+module  Fig; end
+class   Fig::Command; end
+module  Fig::Command::Action; end
+module  Fig::Command::Action::Role; end
+
+# Requires a #set_up_object_to_be_serialized method.
+module Fig::Command::Action::Role::ListAsJSON
+  def execute()
+    set_up_object_to_be_serialized
+
+    puts JSON.pretty_generate @object_to_be_serialized
+
+    return Fig::Command::Action::EXIT_SUCCESS
+  end
+end

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

@@ -0,0 +1,19 @@
+# coding: utf-8
+
+require 'yaml'
+
+module  Fig; end
+class   Fig::Command; end
+module  Fig::Command::Action; end
+module  Fig::Command::Action::Role; end
+
+# Requires a #set_up_object_to_be_serialized method.
+module Fig::Command::Action::Role::ListAsYAML
+  def execute()
+    set_up_object_to_be_serialized
+
+    YAML.dump @object_to_be_serialized, $stdout
+
+    return Fig::Command::Action::EXIT_SUCCESS
+  end
+end

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

@@ -0,0 +1,14 @@
+# coding: utf-8
+
+module  Fig; end
+class   Fig::Command; end
+module  Fig::Command::Action; end
+module  Fig::Command::Action::Role; end
+
+module Fig::Command::Action::Role::ListDependenciesFromDataStructure
+  private
+
+  def node_content(package, config_name)
+    return new_package_config_hash package, config_name
+  end
+end

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

@@ -0,0 +1,90 @@
+# coding: utf-8
+
+require 'set'
+
+module  Fig; end
+class   Fig::Command; end
+module  Fig::Command::Action; end
+module  Fig::Command::Action::Role; end
+
+# Requires #node_content(package, config_name) and #walk_dependency_tree()
+# methods.
+module Fig::Command::Action::Role::ListFromDataStructure
+  private
+
+  def set_up_object_to_be_serialized
+    @package_configs = {}
+
+    base_package = @execution_context.base_package
+    base_configs = base_display_config_names
+    walk_dependency_tree(
+      base_package, base_configs, include_gather, &package_gather
+    )
+
+    if base_configs.size > 1
+      @object_to_be_serialized = @package_configs[base_package].keys.collect do
+        |config_name|
+
+        @package_configs[base_package][config_name]
+      end
+    else
+      @object_to_be_serialized = @package_configs[base_package][base_configs[0]]
+    end
+  end
+
+  def include_gather
+    visited = Set.new
+
+    return lambda do
+      |including_package, including_config, included_package, included_config|
+
+      including_name = including_package.to_s_with_config including_config
+      included_name = included_package.to_s_with_config included_config
+      edge = [including_name, included_name]
+
+      if ! visited.include? edge
+        visited << edge
+
+        including_hash = @package_configs[including_package][including_config]
+        including_hash['dependencies'] ||= []
+        including_hash['dependencies'] <<
+          @package_configs[included_package][included_config]
+      end
+    end
+  end
+
+  def package_gather
+    visited = Set.new
+
+    return lambda do
+      |package, config_name, depth|
+
+      name = package.to_s_with_config config_name
+
+      if ! visited.include? name
+        visited << name
+
+        @package_configs[package] ||= {}
+        @package_configs[package][config_name] =
+          node_content package, config_name
+      end
+    end
+  end
+
+  def new_package_config_hash(package, config_name)
+    hash = {}
+
+    if package.name
+      hash['name'] = package.name
+    end
+    if package.version
+      hash['version'] = package.version
+    end
+    if package.description
+      hash['description'] = package.description
+    end
+    hash['config'] = config_name
+
+    return hash
+  end
+end

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

@@ -0,0 +1,60 @@
+# coding: utf-8
+
+require 'cgi'
+
+module  Fig; end
+class   Fig::Command; end
+module  Fig::Command::Action; end
+module  Fig::Command::Action::Role; end
+
+module Fig::Command::Action::Role::ListVariablesFromDataStructure
+  def descriptor_requirement()
+    return nil
+  end
+
+  def load_base_package?()
+    return true
+  end
+
+  def register_base_package?()
+    return nil # don't care
+  end
+
+  def apply_config?()
+    return nil # don't care
+  end
+
+  private
+
+  def node_content(package, config_name)
+    hash       = new_package_config_hash package, config_name
+    statements = variable_statements package, config_name
+    if not statements.empty?
+      hash['variables'] = statements
+    end
+
+    return hash
+  end
+
+  def variable_statements(package, config_name)
+    statements = []
+
+    package[config_name].walk_statements do
+      |statement|
+
+      if statement.is_environment_variable?
+        statements << hash_for_variable_statement(statement)
+      end
+    end
+
+    return statements
+  end
+
+  def hash_for_variable_statement(statement)
+    return {
+      'type'  => statement.statement_type,
+      'name'  => statement.name,
+      'value' => statement.tokenized_value.to_escaped_string,
+    }
+  end
+end

data/lib/fig/command/options.rb

@@ -13,8 +13,12 @@ require 'fig/command/action/list_dependencies/all_configs'
 require 'fig/command/action/list_dependencies/default'
 require 'fig/command/action/list_dependencies/graphviz'
 require 'fig/command/action/list_dependencies/graphviz_all_configs'
+require 'fig/command/action/list_dependencies/json'
+require 'fig/command/action/list_dependencies/json_all_configs'
 require 'fig/command/action/list_dependencies/tree'
 require 'fig/command/action/list_dependencies/tree_all_configs'
+require 'fig/command/action/list_dependencies/yaml'
+require 'fig/command/action/list_dependencies/yaml_all_configs'
 require 'fig/command/action/list_local'
 require 'fig/command/action/list_remote'
 require 'fig/command/action/list_variables'
@@ -22,8 +26,12 @@ require 'fig/command/action/list_variables/all_configs'
 require 'fig/command/action/list_variables/default'
 require 'fig/command/action/list_variables/graphviz'
 require 'fig/command/action/list_variables/graphviz_all_configs'
+require 'fig/command/action/list_variables/json'
+require 'fig/command/action/list_variables/json_all_configs'
 require 'fig/command/action/list_variables/tree'
 require 'fig/command/action/list_variables/tree_all_configs'
+require 'fig/command/action/list_variables/yaml'
+require 'fig/command/action/list_variables/yaml_all_configs'
 require 'fig/command/action/options'
 require 'fig/command/action/publish'
 require 'fig/command/action/publish_local'
@@ -189,6 +197,14 @@ Running commands:
     return @list_tree
   end
 
+  def list_json?()
+    return @list_json
+  end
+
+  def list_yaml?()
+    return @list_yaml
+  end
+
   def graphviz?()
     return @graphviz
   end
@@ -633,6 +649,18 @@ Running commands:
       @list_tree = true
     end
 
+    @parser.on(
+      '--list-json', 'for listings, output JSON (http://json.org)'
+    ) do
+      @list_json = true
+    end
+
+    @parser.on(
+      '--list-yaml', 'for listings, output YAML (http://yaml.org)'
+    ) do
+      @list_yaml = true
+    end
+
     @parser.on(
       '--graphviz',
       'for listings, output DOT (http://graphviz.org/content/dot-language)'
@@ -840,21 +868,25 @@ Running commands:
 
   def validate()
     if suppress_includes
+      # Not conceptually incompatible, just not implemented (would need to
+      # handle in command/action/role/list_*)
       if list_tree?
-        # Not conceptually incompatible, just not implemented (would need to
-        # handle in command/action/role/list_*)
         raise Fig::Command::OptionError.new(
           'Cannot use --suppress-all-includes/--suppress-cross-package-includes with --list-tree.'
         )
+      elsif list_json?
+        raise Fig::Command::OptionError.new(
+          'Cannot use --suppress-all-includes/--suppress-cross-package-includes with --list-json.'
+        )
+      elsif list_yaml?
+        raise Fig::Command::OptionError.new(
+          'Cannot use --suppress-all-includes/--suppress-cross-package-includes with --list-yaml.'
+        )
       elsif graphviz?
-        # Not conceptually incompatible, just not implemented (would need to
-        # handle in command/action/role/list_*)
         raise Fig::Command::OptionError.new(
           'Cannot use --suppress-all-includes/--suppress-cross-package-includes with --graphviz.'
         )
       elsif list_all_configs?
-        # Not conceptually incompatible, just not implemented (would need to
-        # handle in command/action/role/list_*)
         raise Fig::Command::OptionError.new(
           'Cannot use --suppress-all-includes/--suppress-cross-package-includes with --list-all-configs.'
         )
@@ -873,15 +905,45 @@ Running commands:
       end
     elsif list_tree?
       validate_list_option '--list-tree'
+    elsif list_json?
+      validate_list_option '--list-json'
+    elsif list_yaml?
+      validate_list_option '--list-yaml'
     elsif graphviz?
       validate_list_option '--graphviz'
     elsif list_all_configs?
       validate_list_option '--list-all-configs'
     end
 
-    if list_tree? && graphviz?
+    if list_tree?
+      if graphviz?
+        raise Fig::Command::OptionError.new(
+          'Cannot use --list-tree and --graphviz at the same time.'
+        )
+      elsif list_json?
+        raise Fig::Command::OptionError.new(
+          'Cannot use --list-tree and --list-json at the same time.'
+        )
+      elsif list_yaml?
+        raise Fig::Command::OptionError.new(
+          'Cannot use --list-tree and --list-json at the same time.'
+        )
+      end
+    end
+    if graphviz?
+      if list_json?
+        raise Fig::Command::OptionError.new(
+          'Cannot use --graphviz and --list-json at the same time.'
+        )
+      elsif list_yaml?
+        raise Fig::Command::OptionError.new(
+          'Cannot use --graphviz and --list-yaml at the same time.'
+        )
+      end
+    end
+    if list_json? and list_yaml?
       raise Fig::Command::OptionError.new(
-        'Cannot use --list-tree and --graphviz at the same time.'
+        'Cannot use --list-json and --list-yaml at the same time.'
       )
     end
 
@@ -907,7 +969,10 @@ Running commands:
   end
 
   def validate_list_option(option)
-    if ! @base_action.list_dependencies? && ! @base_action.list_variables?
+    if (
+          ! @base_action \
+      ||  ! @base_action.list_dependencies? && ! @base_action.list_variables?
+    )
       raise Fig::Command::OptionError.new(
         %Q<The #{option} option isn't useful without --list-dependencies/--list-variables.>
       )
@@ -924,6 +989,10 @@ Running commands:
       sub_action_name = :Default
       if list_tree?
         sub_action_name = list_all_configs? ? :TreeAllConfigs : :Tree
+      elsif list_json?
+        sub_action_name = list_all_configs? ? :JSONAllConfigs : :JSON
+      elsif list_yaml?
+        sub_action_name = list_all_configs? ? :YAMLAllConfigs : :YAML
       elsif graphviz?
         sub_action_name = list_all_configs? ? :GraphvizAllConfigs : :Graphviz
       elsif list_all_configs?

data/lib/fig/deparser/v0.rb

@@ -36,7 +36,7 @@ class Fig::Deparser::V0
     add_indent
 
     # Comment out so that older clients don't have issues.
-    @text << "# grammar v0\n"
+    @text << "# grammar v0\n\n"
 
     return
   end

data/lib/fig/deparser/v1.rb

@@ -27,7 +27,7 @@ class Fig::Deparser::V1
   def grammar_version(statement)
     add_indent
 
-    @text << "grammar v1\n"
+    @text << "grammar v1\n\n"
 
     return
   end

data/lib/fig/deparser/v2.rb

@@ -27,7 +27,7 @@ class Fig::Deparser::V2
   def grammar_version(statement)
     add_indent
 
-    @text << "grammar v2\n"
+    @text << "grammar v2\n\n"
 
     return
   end

data/lib/fig/repository_package_publisher.rb

@@ -170,7 +170,8 @@ class Fig::RepositoryPackagePublisher
     return if not @options.publish_comment and not @options.publish_comment_path
 
     if @options.publish_comment
-      comment = @options.publish_comment.strip.gsub(/[ \t]*\n/, "\n# ")
+      comment = @options.publish_comment
+      comment = comment.strip.gsub(/[ \t]*\n/, "\n# ").gsub(/^#[ ]+\n/, "#\n")
       @text_assembler.add_header %Q<# #{comment}>
       @text_assembler.add_header %q<#>
     end
@@ -180,7 +181,7 @@ class Fig::RepositoryPackagePublisher
         comment = IO.read(
           @options.publish_comment_path, :external_encoding => Encoding::UTF_8,
         )
-        comment = comment.strip.gsub(/[ \t]*\n/, "\n# ")
+        comment = comment.strip.gsub(/[ \t]*\n/, "\n# ").gsub(/^#[ ]+\n/, "#\n")
       rescue Errno::ENOENT
         Fig::Logging.fatal(
           %Q<Comment file "#{@options.publish_comment_path}" does not exist.>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 1.24.0
+  version: 1.24.1.beta.1
 platform: ruby
 authors:
 - Matthew Foemmel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -255,8 +255,12 @@ files:
 - lib/fig/command/action/list_dependencies/default.rb
 - lib/fig/command/action/list_dependencies/graphviz.rb
 - lib/fig/command/action/list_dependencies/graphviz_all_configs.rb
+- lib/fig/command/action/list_dependencies/json.rb
+- lib/fig/command/action/list_dependencies/json_all_configs.rb
 - lib/fig/command/action/list_dependencies/tree.rb
 - lib/fig/command/action/list_dependencies/tree_all_configs.rb
+- lib/fig/command/action/list_dependencies/yaml.rb
+- lib/fig/command/action/list_dependencies/yaml_all_configs.rb
 - lib/fig/command/action/list_local.rb
 - lib/fig/command/action/list_remote.rb
 - lib/fig/command/action/list_variables.rb
@@ -264,8 +268,12 @@ files:
 - lib/fig/command/action/list_variables/default.rb
 - lib/fig/command/action/list_variables/graphviz.rb
 - lib/fig/command/action/list_variables/graphviz_all_configs.rb
+- lib/fig/command/action/list_variables/json.rb
+- lib/fig/command/action/list_variables/json_all_configs.rb
 - lib/fig/command/action/list_variables/tree.rb
 - lib/fig/command/action/list_variables/tree_all_configs.rb
+- lib/fig/command/action/list_variables/yaml.rb
+- lib/fig/command/action/list_variables/yaml_all_configs.rb
 - lib/fig/command/action/options.rb
 - lib/fig/command/action/publish.rb
 - lib/fig/command/action/publish_local.rb
@@ -273,11 +281,16 @@ files:
 - lib/fig/command/action/role/has_sub_action.rb
 - lib/fig/command/action/role/list_all_configs.rb
 - lib/fig/command/action/role/list_as_graphviz.rb
+- lib/fig/command/action/role/list_as_json.rb
+- lib/fig/command/action/role/list_as_yaml.rb
 - lib/fig/command/action/role/list_base_config.rb
 - lib/fig/command/action/role/list_dependencies_as_graphviz.rb
 - lib/fig/command/action/role/list_dependencies_flat.rb
+- lib/fig/command/action/role/list_dependencies_from_data_structure.rb
 - lib/fig/command/action/role/list_dependencies_in_a_tree.rb
+- lib/fig/command/action/role/list_from_data_structure.rb
 - lib/fig/command/action/role/list_variables_as_graphviz.rb
+- lib/fig/command/action/role/list_variables_from_data_structure.rb
 - lib/fig/command/action/role/list_variables_in_a_tree.rb
 - lib/fig/command/action/role/list_walking_dependency_tree.rb
 - lib/fig/command/action/role/publish.rb
@@ -391,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