fig 1.23.0 → 1.23.1.beta.1

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/command/action'
 require 'fig/command/action/role/has_no_sub_action'
 

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/command/action'
 require 'fig/command/action/role/has_no_sub_action'
 require 'fig/command/action/role/publish'

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/command/action'
 require 'fig/command/action/role/has_no_sub_action'
 require 'fig/command/action/role/publish'

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module  Fig; end
 class   Fig::Command; end
 module  Fig::Command::Action; end

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module  Fig; end
 class   Fig::Command; end
 module  Fig::Command::Action; end

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module  Fig; end
 class   Fig::Command; end
 module  Fig::Command::Action; end

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'set'
 
 module  Fig; end

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module  Fig; end
 class   Fig::Command; end
 module  Fig::Command::Action; end

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module  Fig; end
 class   Fig::Command; end
 module  Fig::Command::Action; end

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/command/action'
 
 module  Fig; end

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/command/action'
 
 module  Fig; end

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'cgi'
 
 module  Fig; end

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/command/action'
 require 'fig/statement/path'
 require 'fig/statement/set'

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'set'
 
 require 'fig/include_backtrace'

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/command/package_loader'
 require 'fig/package'
 require 'fig/statement/configuration'

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/command/action'
 
 module  Fig; end

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/command/action'
 require 'fig/command/action/role/has_no_sub_action'
 

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/command/action'
 require 'fig/command/action/role/has_no_sub_action'
 

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/command/action'
 require 'fig/command/action/role/has_no_sub_action'
 

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/command/action'
 require 'fig/command/action/role/has_no_sub_action'
 require 'fig/command/action/role/update'

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/command/action'
 require 'fig/command/action/role/has_no_sub_action'
 require 'fig/command/action/role/update'

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig'
 require 'fig/command'
 require 'fig/command/action'
@@ -24,7 +26,7 @@ class Fig::Command::Action::Version
   end
 
   def execute()
-    puts @version_message || File.basename($0) + ' v' + Fig::VERSION
+    puts @version_message || 'fig v' + Fig::VERSION
 
     return EXIT_SUCCESS
   end

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig'
 require 'fig/command'
 require 'fig/command/action'

data/lib/fig/command/coverage_support.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 # This is not a normal module/class.  It contains code to be run by bin/fig and
 # bin/fig-debug when doing coverage.
 

data/lib/fig/command/initialization.rb

@@ -0,0 +1,21 @@
+# coding: utf-8
+
+# This is not a normal module/class.  It contains code to be run by bin/fig and
+# bin/fig-debug just after process startup.
+
+( [1, 9, 2] <=> ( RUBY_VERSION.split(".").collect {|x| x.to_i} ) ) <= 0 or
+  abort "Ruby v1.9.2 is required; this is v#{RUBY_VERSION}."
+
+if ENV['FIG_COVERAGE']
+  require File.expand_path(
+    File.join(
+      File.dirname(__FILE__), %w< coverage_support.rb >
+    )
+  )
+end
+
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), %w< .. .. > ))
+
+require 'rubygems'
+
+require 'fig/command'

data/lib/fig/command/option_error.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/user_input_error'
 
 module Fig; end

data/lib/fig/command/options.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/command/action/clean'
 require 'fig/command/action/dump_package_definition_for_command_line'
 require 'fig/command/action/dump_package_definition_parsed'
@@ -62,6 +64,7 @@ class Fig::Command::Options
   attr_reader   :package_definition_file
   attr_reader   :parser
   attr_reader   :publish_comment
+  attr_reader   :publish_comment_path
   attr_reader   :shell_command
   attr_reader   :suppress_cleanup_of_retrieves
   attr_reader   :suppress_includes
@@ -349,6 +352,14 @@ Running commands:
       @publish_comment = comment
     end
 
+    @parser.on(
+      '--publish-comment-file PATH',
+      STARTS_WITH_NON_HYPHEN,
+      'file to include as a comment in published package'
+    ) do |path|
+      @publish_comment_path = path
+    end
+
     @force = nil
     @parser.on(
       '--force',
@@ -880,6 +891,12 @@ Running commands:
       )
     end
 
+    if @publish_comment_path && (! @base_action || ! @base_action.publish?)
+      raise Fig::Command::OptionError.new(
+        'Cannot use --publish-comment-file when not publishing.'
+      )
+    end
+
     if @log_to_stdout && @log_config
       raise Fig::Command::OptionError.new(
         'Cannot use --log-to-stdout and --log-config at the same time.'

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

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'optparse'
 
 require 'fig/command/option_error'

data/lib/fig/command/package_applier.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/package'
 require 'fig/package_descriptor'
 

data/lib/fig/command/package_loader.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/not_yet_parsed_package'
 require 'fig/package_descriptor'
 require 'fig/parser'

data/lib/fig/config_file_error.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/user_input_error'
 
 module Fig

data/lib/fig/deparser.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 # Note: we very specifically do not require the files containing the
 # Deparser classes in order to avoid circular dependencies.
 

data/lib/fig/deparser/v0.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/deparser'
 
 module Fig; end

data/lib/fig/deparser/v1.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/deparser'
 require 'fig/deparser/v1_base'
 

data/lib/fig/deparser/v1_base.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module Fig; end
 module Fig::Deparser; end
 

data/lib/fig/deparser/v2.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/deparser'
 require 'fig/deparser/v1_base'
 

data/lib/fig/environment_variables.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module Fig; end;
 
 # Abstract manager of a set of environment variables.

data/lib/fig/environment_variables/case_insensitive.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/environment_variables'
 
 module Fig; end;

data/lib/fig/environment_variables/case_sensitive.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/environment_variables'
 
 module Fig; end;

data/lib/fig/external_program.rb

@@ -1,34 +1,40 @@
+# coding: utf-8
+
 require 'stringio'
 
-require 'fig/operating_system'
+require 'fig/user_input_error'
 
 module Fig; end
 
 class Fig::ExternalProgram
-  def self.set_up_open3
-    require 'open3'
-    def self.popen(*cmd)
-      exit_code = nil
+  def self.popen(*cmd)
+    exit_code = nil
 
-      Open3.popen3(*cmd) { |stdin, stdout, stderr, wait_thread|
-        yield stdin, stdout, stderr
+    options = {}
+    stdin_read, stdin_write = IO.pipe Encoding::UTF_8, Encoding::UTF_8
+    options[:in] = stdin_read
+    stdin_write.sync = true
 
-        exit_code = wait_thread.value
-      }
+    stdout_read, stdout_write = IO.pipe Encoding::UTF_8, Encoding::UTF_8
+    options[:out] = stdout_write
 
-      return exit_code
-    end
-  end
+    stderr_read, stderr_write = IO.pipe Encoding::UTF_8, Encoding::UTF_8
+    options[:err] = stderr_write
+
+    popen_run(
+      cmd,
+      options,
+      [stdin_read, stdout_write, stderr_write],
+      [stdin_write, stdout_read, stderr_read],
+    ) do
+      |stdin, stdout, stderr, wait_thread|
 
-  if Fig::OperatingSystem.windows?
-    set_up_open3
-  else
-    require 'open4'
-    def self.popen(*cmd)
-      return Open4::popen4(*cmd) { |pid, stdin, stdout, stderr|
-        yield stdin, stdout, stderr
-      }
+      yield stdin, stdout, stderr
+
+      exit_code = wait_thread.value
     end
+
+    return exit_code
   end
 
   def self.capture(command_line, input = nil)
@@ -52,6 +58,9 @@ class Fig::ExternalProgram
           |handle|
 
           begin
+            # #readpartial() is busted in that it is returning a byte array in
+            # a String with a bogus Encoding, even though the bytes may not be
+            # valid in the Encoding.
             input_to_output[handle] << handle.readpartial(4096)
           rescue EOFError
             input_to_output.delete handle
@@ -60,13 +69,43 @@ class Fig::ExternalProgram
       end
     end
 
-    if ! output.nil?
-      output = output.string
+    output_string = string_io_byte_array_to_utf8_string output
+    errors_string = string_io_byte_array_to_utf8_string errors
+
+    return output_string, errors_string, result
+  end
+
+  private
+
+  # Stolen from open3.rb
+  def self.popen_run(cmd, opts, child_io, parent_io)
+    pid = spawn(*cmd, opts)
+    wait_thr = Process.detach(pid)
+    child_io.each {|io| io.close }
+    result = [*parent_io, wait_thr]
+    if defined? yield
+      begin
+        return yield(*result)
+      ensure
+        parent_io.each{|io| io.close unless io.closed?}
+        wait_thr.join
+      end
     end
-    if ! errors.nil?
-      errors = errors.string
+    result
+  end
+
+  # There appears to be no way to convert from a byte array to a UTF-8 string
+  # cleanly, with a report of where things are wrong.
+  def self.string_io_byte_array_to_utf8_string(string_io)
+    string = string_io.string
+    string.force_encoding(Encoding::UTF_8)
+    if ! string.valid_encoding?
+      # Seriously lame, uninformative error message, but, hopefully, this is
+      # rare and I don't think I can spend the time to gather the information
+      # to make this better right now.
+      raise UserInputError.new 'Got invalid UTF-8 input.'
     end
 
-    return output, errors, result
+    return string
   end
 end