fig 1.17.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76d9ac356f55b4c0274b1fb0f9973e411e80bab5
-  data.tar.gz: d18ee1ea1a717f42a6a8ba1bd765d5463110ded4
+  metadata.gz: a7fb3073d76f5c0d7cbd185a72f45ba89f871298
+  data.tar.gz: de9a393a476bf59a2ab1326d1783f8cf7fe20ad8
 SHA512:
-  metadata.gz: a87e39f8ff0d0ca7fd8fb4308c8f7d3e52d2702ed1d8fb38042d2a93005f45c202e7fc572e7c713d7c9834721b019ad9281c8e8fcdb964de3cba49b5287fe38d
-  data.tar.gz: e5f67c6da61b3ec42bc81667fb36231850903853889c5a08a13868bf128e7559c815ee508accf55328a3c5c5d5407c21af8abfd1ca08c9c0592f083301f16a77
+  metadata.gz: 36ce73abd3571db773da546054a36a612e29f57976f6aa2bccec0010c4c53ff5a57e51e9a271ba7958b247316fb0eec5db98ceabc63b2cc7e8a534b2e5fd1c71
+  data.tar.gz: 5ff243dc821b138dae732e3d77e67e60b85780519396b239666548cc59575780cf2a11522b52dcc773f164a7a5d9ea4b0ace72c20e50960b5285f545186f4f49

data/Changes

@@ -1,3 +1,12 @@
+v1.18.0 - 2014/7/1
+
+  New features:
+
+  - New --log-to-stdout option that, surprise, sends log output to standard
+    output instead of standard error.  Can't be used with --log-config, but,
+    then, you can get log output to go whereever you want with a configuration
+    file.  ;]
+
 v1.17.0 - 2014/5/5
 
   Miscellaneous:

data/lib/fig.rb

@@ -1,3 +1,3 @@
 module Fig
-  VERSION = '1.17.0'
+  VERSION = '1.18.0'
 end

data/lib/fig/command.rb

@@ -39,7 +39,9 @@ class Fig::Command
       return @options.exit_code
     end
 
-    Fig::Logging.initialize_pre_configuration(@options.log_level())
+    Fig::Logging.initialize_pre_configuration(
+      @options.log_to_stdout(), @options.log_level(),
+    )
 
     actions = @options.actions()
     if actions.empty?
@@ -189,6 +191,7 @@ class Fig::Command
 
     Fig::Logging.initialize_post_configuration(
       @options.log_config() || @application_configuration['log configuration'],
+      @options.log_to_stdout(),
       @options.log_level()
     )
 

data/lib/fig/command/options.rb

@@ -57,6 +57,7 @@ class Fig::Command::Options
   attr_reader   :file_to_find_package_for
   attr_reader   :home
   attr_reader   :log_config
+  attr_reader   :log_to_stdout
   attr_reader   :log_level
   attr_reader   :package_definition_file
   attr_reader   :parser
@@ -630,6 +631,12 @@ class Fig::Command::Options
       @log_config = path
     end
 
+    @parser.on(
+      '--log-to-stdout', 'write log output to stdout instead of stderr',
+    ) do
+      @log_to_stdout = true
+    end
+
     level_list = LOG_LEVELS.join(', ')
     @parser.on(
       '--log-level LEVEL',
@@ -807,6 +814,12 @@ class Fig::Command::Options
       )
     end
 
+    if @log_to_stdout && @log_config
+      raise Fig::Command::OptionError.new(
+        'Cannot use --log-to-stdout and --log-config at the same time.'
+      )
+    end
+
     return
   end
 

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

@@ -92,7 +92,7 @@ Standard options (represented as "[...]" above):
 
       [-l | --login]
 
-      [--log-level LEVEL] [--log-config PATH]
+      [--log-level LEVEL] [--log-config PATH | --log-to-stdout]
       [--figrc PATH]      [--no-figrc]
 
       [--suppress-vcs-comments-in-published-packages]

data/lib/fig/logging.rb

@@ -25,16 +25,17 @@ module Fig::Logging
     'all'   => Log4r::ALL
   }
 
-  def self.initialize_pre_configuration(log_level = nil)
+  def self.initialize_pre_configuration(log_to_stdout, log_level)
     log_level ||= 'info'
 
     assign_log_level(@@logger, log_level)
-    setup_default_outputter(@@logger)
+    setup_default_outputter(@@logger, log_to_stdout)
   end
 
   def self.initialize_post_configuration(
-    config_file = nil,
-    log_level = nil,
+    config_file,
+    log_to_stdout,
+    log_level,
     suppress_default_configuration = false
   )
     if config_file
@@ -64,7 +65,7 @@ module Fig::Logging
 
     if not config_file and not suppress_default_configuration
       assign_log_level(@@logger, 'info')
-      setup_default_outputter(@@logger)
+      setup_default_outputter(@@logger, log_to_stdout)
     end
 
     assign_log_level(@@logger, log_level)
@@ -124,8 +125,13 @@ module Fig::Logging
     return
   end
 
-  def self.setup_default_outputter(logger)
-    outputter = Fig::Log4r::Outputter.new('fig stderr', $stderr)
+  def self.setup_default_outputter(logger, log_to_stdout)
+    if log_to_stdout
+      outputter = Fig::Log4r::Outputter.new('fig stdout', $stdout)
+    else
+      outputter = Fig::Log4r::Outputter.new('fig stderr', $stderr)
+    end
+
     logger.add outputter
     outputter.formatter = Log4r::PatternFormatter.new :pattern => '%M'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Matthew Foemmel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize