fig 1.27.10 → 2.0.0.pre.alpha.2

data/lib/fig/protocol/http.rb

@@ -32,6 +32,8 @@ class Fig::Protocol::HTTP
         raise Fig::FileNotFoundError.new error.message, uri
       end
     end
+
+    return true
   end
 
   private

data/lib/fig/protocol.rb

@@ -14,7 +14,7 @@ module Fig::Protocol
 
   # Determine whether we need to update something.  Returns nil to indicate
   # "don't know".
-  def path_up_to_date?(uri, path)
+  def path_up_to_date?(uri, path, prompt_for_login)
     return nil # Not implemented
   end
 

data/lib/fig/repository.rb

@@ -5,7 +5,6 @@ require 'set'
 require 'socket'
 require 'tmpdir'
 
-require 'fig'
 require 'fig/at_exit'
 require 'fig/file_not_found_error'
 require 'fig/logging'
@@ -354,7 +353,7 @@ class Fig::Repository
     FileUtils.mv temporary_package, package_directory
 
     runtime_directory = package.runtime_directory
-    if File.exists? temporary_runtime
+    if File.exist? temporary_runtime
       FileUtils.mkdir_p File.dirname(runtime_directory)
       FileUtils.mv temporary_runtime, runtime_directory
     else

data/lib/fig/repository_package_publisher.rb

@@ -6,7 +6,7 @@ require 'set'
 require 'socket'
 require 'tmpdir'
 
-require 'fig'
+require 'fig/version'
 require 'fig/at_exit'
 require 'fig/external_program'
 require 'fig/file_not_found_error'
@@ -671,7 +671,7 @@ class Fig::RepositoryPackagePublisher
           expansion_happened = true; published_package.runtime_directory
         }
 
-        if expansion_happened && ! File.exists?(expanded_value) && ! File.symlink?(expanded_value)
+        if expansion_happened && ! File.exist?(expanded_value) && ! File.symlink?(expanded_value)
           Fig::Logging.warn(
             %Q<The #{statement.name} variable points to a path that does not exist (#{expanded_value}); retrieve statements that are active when this package is included may fail.>
           )

data/lib/fig/runtime_environment.rb

@@ -58,7 +58,7 @@ class Fig::RuntimeEnvironment
     name = retrieve_statement.variable
     if @retrieves.has_key?(name)
       Fig::Logging.warn \
-        %Q<About to overwrite "#{name}" retrieve path of "#{@retrieves[name].path}" with "#{retrieve_statement.path}".>
+        %Q<About to overwrite "#{name}" retrieve path of "#{@retrieves[name].tokenized_path.to_escaped_string}" with "#{retrieve_statement.tokenized_path.to_escaped_string}".>
     end
 
     @retrieves[name] = retrieve_statement
@@ -89,13 +89,13 @@ class Fig::RuntimeEnvironment
     return @named_packages[name]
   end
 
-  def apply_config(package, config_name, backtrace)
+  def apply_config(package, config_name, backtrace, current_package_depth = 0)
     if package.applied_config_names.member?(config_name)
       return
     end
 
     Fig::Logging.debug(
-      "Applying #{package.to_descriptive_string_with_config config_name}."
+      "Applying #{package.to_descriptive_string_with_config config_name}, package depth #{current_package_depth}."
     )
 
     new_backtrace = backtrace ||
@@ -120,7 +120,7 @@ class Fig::RuntimeEnvironment
     package.add_applied_config_name(config_name)
     config.statements.each do
       |statement|
-      apply_config_statement(package, statement, new_backtrace)
+      apply_config_statement(package, statement, new_backtrace, current_package_depth)
     end
 
     return
@@ -161,16 +161,16 @@ class Fig::RuntimeEnvironment
   # In order for this to work correctly, any Overrides need to be processed
   # before any other kind of Statement.  The Statement::Configuration class
   # guarantees that those come first in its set of Statements.
-  def apply_config_statement(package, statement, backtrace)
+  def apply_config_statement(package, statement, backtrace, current_package_depth)
     case statement
     when Fig::Statement::Path
       prepend_variable(package, statement, backtrace)
     when Fig::Statement::Set
       set_variable(package, statement, backtrace)
     when Fig::Statement::Include
-      include_config(package, statement, backtrace)
+      include_config(package, statement, backtrace, current_package_depth)
     when Fig::Statement::IncludeFile
-      include_file_config(package, statement, backtrace)
+      include_file_config(package, statement, backtrace, current_package_depth)
     when Fig::Statement::Override
       backtrace.add_override(statement)
     end
@@ -195,7 +195,9 @@ class Fig::RuntimeEnvironment
 
   private
 
-  def include_config(starting_package, include_statement, backtrace)
+  def include_config(
+    starting_package, include_statement, backtrace, current_package_depth
+  )
     # Because package application starts with the synthetic package for the
     # command-line, we can't really disable includes, full stop.  Instead, we
     # use the fact that the synthetic package hands the Statement::Include the
@@ -211,10 +213,19 @@ class Fig::RuntimeEnvironment
       &&  package != starting_package          \
       &&  package != include_statement.included_package
 
+    if package != starting_package
+      next_package_depth = current_package_depth + 1
+
+      return if @suppress_includes.is_a? Integer and next_package_depth > @suppress_includes
+    else
+      next_package_depth = current_package_depth
+    end
+
     apply_config(
       package,
       resolved_descriptor.config || Fig::Package::DEFAULT_CONFIG,
-      new_backtrace
+      new_backtrace,
+      next_package_depth,
     )
 
     return
@@ -261,8 +272,10 @@ class Fig::RuntimeEnvironment
     return package, resolved_descriptor, new_backtrace
   end
 
-  def include_file_config(including_package, include_file_statement, backtrace)
-    return if @suppress_includes
+  def include_file_config(
+    including_package, include_file_statement, backtrace, current_package_depth
+  )
+    return if @suppress_includes.is_a? Symbol
 
     full_path = include_file_statement.full_path_relative_to including_package
 
@@ -273,8 +286,19 @@ class Fig::RuntimeEnvironment
     package       = package_for_file(including_package, full_path, backtrace)
     config_name   = include_file_statement.config_name
 
+    if package != including_package
+      next_package_depth = current_package_depth + 1
+
+      return if @suppress_includes and next_package_depth > @suppress_includes
+    else
+      next_package_depth = current_package_depth
+    end
+
     apply_config(
-      package, config_name || Fig::Package::DEFAULT_CONFIG, new_backtrace
+      package,
+      config_name || Fig::Package::DEFAULT_CONFIG,
+      new_backtrace,
+      next_package_depth,
     )
 
     return
@@ -479,7 +503,7 @@ class Fig::RuntimeEnvironment
   def check_source_existence(
     variable_name, variable_value, package, backtrace
   )
-    return if File.exists?(variable_value) || File.symlink?(variable_value)
+    return if File.exist?(variable_value) || File.symlink?(variable_value)
 
     raise_repository_error(
       %Q<In #{package}, the #{variable_name} variable points to a path that does not exist ("#{variable_value}", after expansion).>,

data/lib/fig/update_lock.rb

@@ -63,7 +63,7 @@ class Fig::UpdateLock
 
     # Yes, there's a race condition here, but with the way Windows file locking
     # works, it's better than a boot to the head.
-    if ! File.exists? lock_file
+    if ! File.exist? lock_file
       created_file = File.new(lock_file, 'w')
       created_file.close
     end

data/lib/fig/version.rb

@@ -0,0 +1,5 @@
+# coding: utf-8
+
+module Fig
+  VERSION = '2.0.0-alpha.2'.freeze
+end

data/lib/fig/working_directory_maintainer.rb

@@ -4,12 +4,12 @@ require 'set'
 
 require 'fig/logging'
 require 'fig/logging/colorizable'
+require 'fig/operating_system'
 require 'fig/package_descriptor'
 require 'fig/repository_error'
-require 'fig/working_directory_metadata'
 require 'fig/user_input_error'
+require 'fig/working_directory_metadata'
 
-module Fig; end
 
 # Copies files from the project directories in FIG_HOME to the user's working
 # directory. It keeps track of which files have already been copied, and which
@@ -17,8 +17,9 @@ module Fig; end
 # that we never have files from two different versions of the same package in
 # the user's working directory.
 class Fig::WorkingDirectoryMaintainer
-  def initialize(base_dir)
-    @base_dir = base_dir
+  def initialize(base_dir, usec_mtime_comparisons)
+    @base_dir                 = base_dir
+    @usec_mtime_comparisons   = usec_mtime_comparisons
     @package_metadata_by_name = {}
     @local_fig_data_directory = File.join(@base_dir, '.fig')
 
@@ -217,17 +218,17 @@ class Fig::WorkingDirectoryMaintainer
       end
       FileUtils.mkdir_p(File.dirname(target))
 
+      is_symlink = File.symlink?(source)
+
       # If the source is a dangling symlink, then there's no time, etc. to
       # preserve.
-      preserve = File.exist?(source) && ! File.symlink?(source)
+      preserve = File.exist?(source) && ! is_symlink
 
       if File.exist?(target)
         Fig::Logging.info("Overwriting #{target}.")
       end
 
-      FileUtils.copy_entry(
-        source, target, preserve, false, :remove_destination
-      )
+      FileUtils.copy_entry source, target, preserve, false, :remove_destination
     end
 
     if @package_meta
@@ -251,6 +252,21 @@ class Fig::WorkingDirectoryMaintainer
     end
 
     return true if ! File.exist?(target)
+
+    return true if File.size(source) != File.size(target)
+
+    if @usec_mtime_comparisons
+      source_time = File.mtime(source)
+      target_time = File.mtime(target)
+
+      return true if source_time.to_i > target_time.to_i
+
+      source_subsecond = source_time.nsec / 1000
+      target_subsecond = target_time.nsec / 1000
+
+      return source_subsecond > target_subsecond
+    end
+
     return File.mtime(source) > File.mtime(target)
   end
 

data/lib/fig.rb

@@ -1,5 +1,5 @@
-# coding: utf-8
+require 'bundler/setup'
+require 'fig/version'
+require 'fig/command'
 
-module Fig
-  VERSION = '1.27.10'
-end
+Fig::Command.new.run_fig_with_exception_handling ARGV

data/lib/git_helper.rb

@@ -0,0 +1,17 @@
+# TODO spec test for this
+
+module GitHelper
+  def self.sha1(commitish = 'HEAD', opts = [ '--short '])
+    sha = `git rev-parse #{opts.join(' ')} #{commitish}`.chomp
+
+    # add "-dirty" if commitish is 'HEAD' and the workspace has changes
+    sha += '-dirty' if commitish == 'HEAD' && self.dirty?
+
+    sha.empty? ? nil : sha
+  end
+
+  def self.dirty?
+    changes = `git status --porcelain -uno`
+    !changes.empty?
+  end
+end