fig 1.23.0 → 1.23.1.beta.1

data/lib/fig/figrc.rb

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

data/lib/fig/file_not_found_error.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module Fig
   # A (possibly remote) file that was looked for was not found.  This may or
   # may not actually be a problem; i.e. this may be the result of an existence

data/lib/fig/grammar/base.rb

@@ -1,8 +1,10 @@
-# Treetop (http://treetop.rubyforge.org/) grammar for common definitions.
+# coding: utf-8
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 
 
+# Treetop (http://treetop.rubyforge.org/) grammar for common definitions.
+
 require 'treetop'
 
 module Fig

data/lib/fig/grammar/base.treetop

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 # Treetop (http://treetop.rubyforge.org/) grammar for common definitions.
 
 require 'treetop'

data/lib/fig/grammar/v0.rb

@@ -1,7 +1,9 @@
-# Treetop (http://treetop.rubyforge.org/) grammar for package definitions from
+# coding: utf-8
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 
+
+# Treetop (http://treetop.rubyforge.org/) grammar for package definitions from
 # the early days.
 
 # Some aspects of this grammar are significantly dumber than they could be

data/lib/fig/grammar/v0.treetop

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 # Treetop (http://treetop.rubyforge.org/) grammar for package definitions from
 # the early days.
 

data/lib/fig/grammar/v1.rb

@@ -1,7 +1,9 @@
-# Treetop (http://treetop.rubyforge.org/) grammar for package definitions in v1
+# coding: utf-8
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 
+
+# Treetop (http://treetop.rubyforge.org/) grammar for package definitions in v1
 # format.
 
 require 'treetop'

data/lib/fig/grammar/v1.treetop

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 # Treetop (http://treetop.rubyforge.org/) grammar for package definitions in v1
 # format.
 

data/lib/fig/grammar/v1_base.rb

@@ -1,7 +1,9 @@
-# Reusable parts of Treetop (http://treetop.rubyforge.org/) grammar for package
+# coding: utf-8
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 
+
+# Reusable parts of Treetop (http://treetop.rubyforge.org/) grammar for package
 # definitions in v1 format.
 
 # Some aspects of this grammar are significantly dumber than they could be

data/lib/fig/grammar/v1_base.treetop

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 # Reusable parts of Treetop (http://treetop.rubyforge.org/) grammar for package
 # definitions in v1 format.
 

data/lib/fig/grammar/v2.rb

@@ -1,7 +1,9 @@
-# Treetop (http://treetop.rubyforge.org/) grammar for package definitions in v2
+# coding: utf-8
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 
+
+# Treetop (http://treetop.rubyforge.org/) grammar for package definitions in v2
 # format.
 
 require 'treetop'

data/lib/fig/grammar/v2.treetop

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 # Treetop (http://treetop.rubyforge.org/) grammar for package definitions in v2
 # format.
 

data/lib/fig/grammar/version.rb

@@ -1,7 +1,9 @@
-# Treetop (http://treetop.rubyforge.org/) grammar for statement for declaring
+# coding: utf-8
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 
+
+# Treetop (http://treetop.rubyforge.org/) grammar for statement for declaring
 # package definition versions.
 #
 # Needs to be mixed in with Fig::Grammar::Base.

data/lib/fig/grammar/version.treetop

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 # Treetop (http://treetop.rubyforge.org/) grammar for statement for declaring
 # package definition versions.
 #

data/lib/fig/grammar/version_identification.rb

@@ -1,7 +1,9 @@
-# Treetop (http://treetop.rubyforge.org/) grammar for determining package
+# coding: utf-8
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 
+
+# Treetop (http://treetop.rubyforge.org/) grammar for determining package
 # definition versions.
 
 require 'treetop'

data/lib/fig/grammar/version_identification.treetop

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 # Treetop (http://treetop.rubyforge.org/) grammar for determining package
 # definition versions.
 

data/lib/fig/grammar_monkey_patches.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 # The existence of this &!#%)(*!&% file makes me want to hurl, but it's the
 # simplest way to modify the classes generated by Treetop: the Treetop grammar
 # doesn't allow extensions at the grammar level, only the rule level.

data/lib/fig/include_backtrace.rb

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

data/lib/fig/log4r/outputter.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'colorize'
 require 'log4r/logger'
 require 'log4r/outputter/iooutputter'

data/lib/fig/log4r_config_error.rb

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

data/lib/fig/logging.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'log4r'
 require 'log4r/configurator'
 require 'log4r/yamlconfigurator'

data/lib/fig/logging/colorizable.rb

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

data/lib/fig/network_error.rb

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

data/lib/fig/no_such_package_config_error.rb

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

data/lib/fig/not_yet_parsed_package.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module Fig; end
 
 # Metadata about a package definition file that hasn't been read yet.

data/lib/fig/operating_system.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'cgi'
 require 'fileutils'
 # Must specify absolute path of ::Archive when using

data/lib/fig/package.rb

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

data/lib/fig/package_cache.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module Fig; end
 
 # Simple double-level (name, version) cache of Packages.

data/lib/fig/package_definition_text_assembler.rb

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

data/lib/fig/package_descriptor.rb

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

data/lib/fig/package_descriptor_parse_error.rb

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

data/lib/fig/package_parse_error.rb

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

data/lib/fig/parser.rb

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

data/lib/fig/parser_package_build_state.rb

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

data/lib/fig/protocol.rb

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

data/lib/fig/protocol/file.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'cgi'
 require 'fileutils'
 require 'find'

data/lib/fig/protocol/ftp.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'net/ftp'
 
 require 'fig/file_not_found_error'

data/lib/fig/protocol/http.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'net/http'
 require 'uri'
 

data/lib/fig/protocol/netrc_enabled.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'highline'
 require 'net/netrc'
 

data/lib/fig/protocol/sftp.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'net/sftp'
 
 require 'fig/logging'

data/lib/fig/protocol/ssh.rb

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

data/lib/fig/repository.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fileutils'
 require 'set'
 require 'socket'

data/lib/fig/repository_error.rb

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

data/lib/fig/repository_package_publisher.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fileutils'
 require 'etc'
 require 'set'
@@ -22,7 +24,6 @@ require 'fig/statement/grammar_version'
 require 'fig/statement/resource'
 require 'fig/statement/synthetic_raw_text'
 require 'fig/url'
-require 'fig/user_input_error'
 
 module Fig; end
 
@@ -166,11 +167,36 @@ class Fig::RepositoryPackagePublisher
   end
 
   def add_publish_comment
-    return if ! @options.publish_comment
+    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# ")
+      @text_assembler.add_header %Q<# #{comment}>
+      @text_assembler.add_header %q<#>
+    end
+
+    if @options.publish_comment_path
+      begin
+        comment = IO.read(
+          @options.publish_comment_path, :external_encoding => Encoding::UTF_8,
+        )
+        comment = comment.strip.gsub(/[ \t]*\n/, "\n# ")
+      rescue Errno::ENOENT
+        Fig::Logging.fatal(
+          %Q<Comment file "#{@options.publish_comment_path}" does not exist.>
+        )
+        raise Fig::RepositoryError.new
+      rescue Errno::EACCES
+        Fig::Logging.fatal(
+          %Q<Could not read comment file "#{@options.publish_comment_path}".>
+        )
+        raise Fig::RepositoryError.new
+      end
+
+      @text_assembler.add_header %Q<# #{comment}>
+      @text_assembler.add_header %q<#>
+    end
 
-    comment = @options.publish_comment.strip.gsub(/[ \t]*\n/, "\n# ")
-    @text_assembler.add_header %Q<# #{comment}>
-    @text_assembler.add_header %q<#>
     @text_assembler.add_header %q<#>
 
     return

data/lib/fig/runtime_environment.rb

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

data/lib/fig/statement/archive.rb

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

data/lib/fig/statement/asset.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/statement'
 require 'fig/string_tokenizer'
 require 'fig/url'

data/lib/fig/statement/command.rb

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

data/lib/fig/statement/configuration.rb

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

data/lib/fig/statement/environment_variable.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'fig/statement'
 require 'fig/string_tokenizer'
 require 'fig/tokenized_string/token'