fig 1.24.1.beta.1 → 1.24.1.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ea33a3e608936d3bc7ba5dfa2e844cfa425f979
-  data.tar.gz: b062f1064cac523af1372d5197001b06ffd5c7e1
+  metadata.gz: e1e5215c6b2a2e43e74fc04c1d3edbdf085db2c0
+  data.tar.gz: 40ae3c1877969e31dea223d4594fec1fa0b88cf2
 SHA512:
-  metadata.gz: c0c03e39ab625727c7a1570ccecb581e16d0a188eda16d7e91cfbe5213975e7340fd8133fd5f4d453627f1f62d82251f1b7c802471ff40897d3bedf8e255c5bf
-  data.tar.gz: 2b8cc76a6b3d749978e72800a1dde63f03bdf2db741f77b2a4001aebe67cc67d1f34ad9d8b2824544d376685f806373c626197b104d5d3e868def67ee30b2822
+  metadata.gz: 88d441ff92224c341e3e79346eb4952b50b00841205fe17c2f7c2179ba2cc67ccc06c4ccdfc6a8c116f220656c5266d875e83813773cc7623bdd7c5486629f37
+  data.tar.gz: 6e30cb231f647fc7b50b09c7570c1ce7bf9415eda4df9e5a70db3ac543f3cd302d44ec48213749e31571d0979af72d375e4098536c4a866e429606c115938505

data/Changes

@@ -1,3 +1,14 @@
+v1.24.1.beta.2 - 2015/04/24
+
+  Bug fix:
+
+  - Fixed crash when combining --list-all-configs with JSON and YAML output.
+
+  Miscellaneous:
+
+  - Renamed --list-yaml & --list-json to --yaml & --json to make them more
+    consistent with the existing --graphviz.
+
 v1.24.1.beta.1 - 2015/04/23
 
   Announcement:

data/lib/fig.rb

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

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

@@ -21,7 +21,7 @@ class Fig::Command::Action::ListDependencies::JSON
   include Fig::Command::Action::Role::ListWalkingDependencyTree
 
   def options()
-    return %w<--list-dependencies --list-json>
+    return %w<--list-dependencies --json>
   end
 
   def descriptor_requirement()

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

@@ -21,7 +21,7 @@ class Fig::Command::Action::ListDependencies::JSONAllConfigs
   include Fig::Command::Action::Role::ListWalkingDependencyTree
 
   def options()
-    return %w<--list-dependencies --list-json --list-all-configs>
+    return %w<--list-dependencies --json --list-all-configs>
   end
 
   def descriptor_requirement()

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

@@ -21,7 +21,7 @@ class Fig::Command::Action::ListDependencies::YAML
   include Fig::Command::Action::Role::ListWalkingDependencyTree
 
   def options()
-    return %w<--list-dependencies --list-yaml>
+    return %w<--list-dependencies --yaml>
   end
 
   def descriptor_requirement()

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

@@ -21,7 +21,7 @@ class Fig::Command::Action::ListDependencies::YAMLAllConfigs
   include Fig::Command::Action::Role::ListWalkingDependencyTree
 
   def options()
-    return %w<--list-dependencies --list-yaml --list-all-configs>
+    return %w<--list-dependencies --yaml --list-all-configs>
   end
 
   def descriptor_requirement()

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

@@ -21,6 +21,6 @@ class Fig::Command::Action::ListVariables::JSON
   include Fig::Command::Action::Role::ListWalkingDependencyTree
 
   def options()
-    return %w<--list-variables --list-json>
+    return %w<--list-variables --json>
   end
 end

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

@@ -21,6 +21,6 @@ class Fig::Command::Action::ListVariables::JSONAllConfigs
   include Fig::Command::Action::Role::ListWalkingDependencyTree
 
   def options()
-    return %w<--list-variables --list-json --list-all-configs>
+    return %w<--list-variables --json --list-all-configs>
   end
 end

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

@@ -21,6 +21,6 @@ class Fig::Command::Action::ListVariables::YAML
   include Fig::Command::Action::Role::ListWalkingDependencyTree
 
   def options()
-    return %w<--list-variables --list-yaml>
+    return %w<--list-variables --yaml>
   end
 end

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

@@ -21,6 +21,6 @@ class Fig::Command::Action::ListVariables::YAMLAllConfigs
   include Fig::Command::Action::Role::ListWalkingDependencyTree
 
   def options()
-    return %w<--list-variables --list-yaml --list-all-configs>
+    return %w<--list-variables --yaml --list-all-configs>
   end
 end

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

@@ -21,14 +21,15 @@ module Fig::Command::Action::Role::ListFromDataStructure
       base_package, base_configs, include_gather, &package_gather
     )
 
+    base_id = package_id base_package
     if base_configs.size > 1
-      @object_to_be_serialized = @package_configs[base_package].keys.collect do
+      @object_to_be_serialized = @package_configs[base_id].keys.collect do
         |config_name|
 
-        @package_configs[base_package][config_name]
+        @package_configs[base_id][config_name]
       end
     else
-      @object_to_be_serialized = @package_configs[base_package][base_configs[0]]
+      @object_to_be_serialized = @package_configs[base_id][base_configs[0]]
     end
   end
 
@@ -45,10 +46,13 @@ module Fig::Command::Action::Role::ListFromDataStructure
       if ! visited.include? edge
         visited << edge
 
-        including_hash = @package_configs[including_package][including_config]
+        included_id    = package_id included_package
+        including_id   = package_id including_package
+        including_hash = @package_configs[including_id][including_config]
+
         including_hash['dependencies'] ||= []
         including_hash['dependencies'] <<
-          @package_configs[included_package][included_config]
+          @package_configs[included_id][included_config]
       end
     end
   end
@@ -64,9 +68,9 @@ module Fig::Command::Action::Role::ListFromDataStructure
       if ! visited.include? name
         visited << name
 
-        @package_configs[package] ||= {}
-        @package_configs[package][config_name] =
-          node_content package, config_name
+        id = package_id package
+        @package_configs[id] ||= {}
+        @package_configs[id][config_name] = node_content package, config_name
       end
     end
   end
@@ -87,4 +91,8 @@ module Fig::Command::Action::Role::ListFromDataStructure
 
     return hash
   end
+
+  def package_id(package)
+    return package.name || "description: #{package.description}"
+  end
 end

data/lib/fig/command/options.rb

@@ -197,12 +197,12 @@ Running commands:
     return @list_tree
   end
 
-  def list_json?()
-    return @list_json
+  def json?()
+    return @json
   end
 
-  def list_yaml?()
-    return @list_yaml
+  def yaml?()
+    return @yaml
   end
 
   def graphviz?()
@@ -650,15 +650,15 @@ Running commands:
     end
 
     @parser.on(
-      '--list-json', 'for listings, output JSON (http://json.org)'
+      '--json', 'for listings, output JSON (http://json.org)'
     ) do
-      @list_json = true
+      @json = true
     end
 
     @parser.on(
-      '--list-yaml', 'for listings, output YAML (http://yaml.org)'
+      '--yaml', 'for listings, output YAML (http://yaml.org)'
     ) do
-      @list_yaml = true
+      @yaml = true
     end
 
     @parser.on(
@@ -874,13 +874,13 @@ Running commands:
         raise Fig::Command::OptionError.new(
           'Cannot use --suppress-all-includes/--suppress-cross-package-includes with --list-tree.'
         )
-      elsif list_json?
+      elsif json?
         raise Fig::Command::OptionError.new(
-          'Cannot use --suppress-all-includes/--suppress-cross-package-includes with --list-json.'
+          'Cannot use --suppress-all-includes/--suppress-cross-package-includes with --json.'
         )
-      elsif list_yaml?
+      elsif yaml?
         raise Fig::Command::OptionError.new(
-          'Cannot use --suppress-all-includes/--suppress-cross-package-includes with --list-yaml.'
+          'Cannot use --suppress-all-includes/--suppress-cross-package-includes with --yaml.'
         )
       elsif graphviz?
         raise Fig::Command::OptionError.new(
@@ -905,10 +905,10 @@ 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 json?
+      validate_list_option '--json'
+    elsif yaml?
+      validate_list_option '--yaml'
     elsif graphviz?
       validate_list_option '--graphviz'
     elsif list_all_configs?
@@ -920,30 +920,30 @@ Running commands:
         raise Fig::Command::OptionError.new(
           'Cannot use --list-tree and --graphviz at the same time.'
         )
-      elsif list_json?
+      elsif json?
         raise Fig::Command::OptionError.new(
-          'Cannot use --list-tree and --list-json at the same time.'
+          'Cannot use --list-tree and --json at the same time.'
         )
-      elsif list_yaml?
+      elsif yaml?
         raise Fig::Command::OptionError.new(
-          'Cannot use --list-tree and --list-json at the same time.'
+          'Cannot use --list-tree and --json at the same time.'
         )
       end
     end
     if graphviz?
-      if list_json?
+      if json?
         raise Fig::Command::OptionError.new(
-          'Cannot use --graphviz and --list-json at the same time.'
+          'Cannot use --graphviz and --json at the same time.'
         )
-      elsif list_yaml?
+      elsif yaml?
         raise Fig::Command::OptionError.new(
-          'Cannot use --graphviz and --list-yaml at the same time.'
+          'Cannot use --graphviz and --yaml at the same time.'
         )
       end
     end
-    if list_json? and list_yaml?
+    if json? and yaml?
       raise Fig::Command::OptionError.new(
-        'Cannot use --list-json and --list-yaml at the same time.'
+        'Cannot use --json and --yaml at the same time.'
       )
     end
 
@@ -989,9 +989,9 @@ Running commands:
       sub_action_name = :Default
       if list_tree?
         sub_action_name = list_all_configs? ? :TreeAllConfigs : :Tree
-      elsif list_json?
+      elsif json?
         sub_action_name = list_all_configs? ? :JSONAllConfigs : :JSON
-      elsif list_yaml?
+      elsif yaml?
         sub_action_name = list_all_configs? ? :YAMLAllConfigs : :YAML
       elsif graphviz?
         sub_action_name = list_all_configs? ? :GraphvizAllConfigs : :Graphviz

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

@@ -68,7 +68,7 @@ Querying:
 
 List options (represented as "[...list options...]" above):
 
-      [--list-tree | --graphviz]
+      [--list-tree | --json | --yaml | --graphviz]
       [--list-all-configs]
 
 Standard options (represented as "[...]" above):

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 1.24.1.beta.1
+  version: 1.24.1.beta.2
 platform: ruby
 authors:
 - Matthew Foemmel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize