fig 0.1.62 → 0.1.64

data/lib/fig/workingdirectorymaintainer.rb

@@ -0,0 +1,197 @@
+require 'set'
+
+require 'fig/logging'
+require 'fig/logging/colorizable'
+require 'fig/packagedescriptor'
+require 'fig/workingdirectorymetadata'
+
+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
+# package/versions they came from, and deletes files as necessary to ensure
+# 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
+    @package_metadata_by_name = {}
+    @local_fig_data_directory = File.join(@base_dir, '.fig')
+    @metadata_file = File.join(@local_fig_data_directory, 'retrieve')
+
+    if File.exist?(@metadata_file)
+      load_metadata()
+    end
+  end
+
+  def switch_to_package_version(name, version)
+    @package_meta = @package_metadata_by_name[name]
+    if @package_meta && @package_meta.current_version != version
+      clean_up_package_files()
+      @package_meta = nil
+    end
+    if not @package_meta
+      @package_meta = reset_package_metadata_with_version(name, version)
+    end
+
+    return
+  end
+
+  def retrieve(source, relpath)
+    copy(source, relpath)
+
+    return
+  end
+
+  def prepare_for_shutdown(purged_unused_packages)
+    if purged_unused_packages
+      clean_up_unused_packages()
+    end
+
+    save_metadata()
+
+    return
+  end
+
+  private
+
+  def load_metadata()
+    File.open(@metadata_file).each_line do |line|
+      line.strip!()
+      if line =~ /^(.+)=(.+)\/(.+)$/
+        target          = $1
+        package_name    = $2
+        package_version = $3
+
+        package_meta = @package_metadata_by_name[package_name]
+        if package_meta
+          if package_meta.current_version != package_version
+            raise "Version mismatch for #{package_meta.package_name} in #{@metadata_file}."
+          end
+        else
+          package_meta =
+            reset_package_metadata_with_version(package_name, package_version)
+        end
+        package_meta.add_file(target)
+      else
+        raise "parse error in #{file}: #{line}"
+      end
+    end
+
+    return
+  end
+
+  def reset_package_metadata_with_version(name, version)
+    metadata = @package_metadata_by_name[name]
+    if not metadata
+      metadata = Fig::WorkingDirectoryMetadata.new(name, version)
+      @package_metadata_by_name[name] = metadata
+    else
+      metadata.reset_with_version(version)
+    end
+
+    return metadata
+  end
+
+  def copy(source, relpath)
+    target = File.join(@base_dir, relpath)
+    if File.directory?(source)
+      FileUtils.mkdir_p(target)
+      Fig::Logging.debug "Copying directory #{source} to #{target}."
+      Dir.foreach(source) do |child|
+        if child != '.' and child != '..'
+          source_file = File.join(source, child)
+          target_file = File.join(relpath, child)
+          copy(source_file, target_file)
+        end
+      end
+    else
+      if should_copy_file?(source, target)
+        if Fig::Logging.debug?
+          Fig::Logging.debug \
+            "Copying file from #{source} to #{target}."
+        else
+          Fig::Logging.info(
+            Fig::Logging::Colorizable.new(
+              "+ [#{formatted_meta()}] #{relpath}",
+              :green,
+              nil
+            )
+          )
+        end
+        FileUtils.mkdir_p(File.dirname(target))
+
+        # If the source is a dangling symlink, then there's no time, etc. to
+        # preserve.
+        preserve = File.exist?(source)
+
+        FileUtils.copy_entry(
+          source, target, preserve, false, :remove_destination
+        )
+      end
+      if @package_meta
+        @package_meta.add_file(relpath)
+        @package_meta.mark_as_retrieved()
+      end
+    end
+
+    return
+  end
+
+  def should_copy_file?(source, target)
+    if File.symlink?(target)
+      FileUtils.rm(target)
+      return true
+    end
+
+    return true if ! File.exist?(target)
+    return File.mtime(source) > File.mtime(target)
+  end
+
+  def clean_up_package_files(package_meta = @package_meta)
+    package_meta.each_file do |relpath|
+      Fig::Logging.info(
+        Fig::Logging::Colorizable.new(
+          "- [#{formatted_meta(package_meta)}] #{relpath}",
+          :magenta,
+          nil
+        )
+      )
+      FileUtils.rm_f(File.join(@base_dir, relpath))
+    end
+
+    return
+  end
+
+  def clean_up_unused_packages()
+    @package_metadata_by_name.each_value do
+      |metadata|
+
+      if not metadata.retrieved?
+        clean_up_package_files(metadata)
+        metadata.reset_with_version(nil)
+      end
+    end
+
+    return
+  end
+
+  def save_metadata()
+    FileUtils.mkdir_p(@local_fig_data_directory)
+    File.open(@metadata_file, 'w') do |file|
+      @package_metadata_by_name.each do |name, package_meta|
+        package_meta.each_file do |target|
+          file << target << '=' << formatted_meta(package_meta) << "\n"
+        end
+      end
+    end
+
+    return
+  end
+
+  def formatted_meta(package_meta = @package_meta)
+    return Fig::PackageDescriptor.format(
+      package_meta.package_name, package_meta.current_version, nil
+    )
+  end
+end

data/lib/fig/workingdirectorymetadata.rb

@@ -0,0 +1,45 @@
+require 'set'
+
+module Fig; end
+
+# Data about a package within the current working directory.
+class Fig::WorkingDirectoryMetadata
+  attr_reader   :package_name, :current_version
+
+  def initialize(package_name, current_version = nil)
+    @package_name    = package_name
+    @retrieved       = false
+
+    reset_with_version(current_version)
+  end
+
+  def reset_with_version(new_version)
+    @current_version = new_version
+    @files           = Set.new
+
+    return
+  end
+
+  def add_file(file)
+    @files << file
+
+    return
+  end
+
+  def mark_as_retrieved()
+    @retrieved = true
+
+    return
+  end
+
+  def retrieved?()
+    return @retrieved
+  end
+
+  # So we don't have to expose the files collection.
+  def each_file()
+    @files.each {|file| yield file}
+
+    return
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 0.1.62
+  version: 0.1.64
   prerelease: 
 platform: ruby
 authors:
@@ -9,66 +9,55 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sys-admin
-  requirement: &24220000 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.6
-  type: :runtime
-  prerelease: false
-  version_requirements: *24220000
-- !ruby/object:Gem::Dependency
-  name: libarchive-static
-  requirement: &24219520 !ruby/object:Gem::Requirement
+  name: colorize
+  requirement: &25095560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *24219520
+  version_requirements: *25095560
 - !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: &24219060 !ruby/object:Gem::Requirement
+  name: highline
+  requirement: &25095080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *24219060
+  version_requirements: *25095080
 - !ruby/object:Gem::Dependency
-  name: highline
-  requirement: &24218600 !ruby/object:Gem::Requirement
+  name: json
+  requirement: &25094620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *24218600
+  version_requirements: *25094620
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &24218140 !ruby/object:Gem::Requirement
+  name: libarchive-static
+  requirement: &25094160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *24218140
+  version_requirements: *25094160
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &24217680 !ruby/object:Gem::Requirement
+  requirement: &25093700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *24217680
+  version_requirements: *25093700
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &24217220 !ruby/object:Gem::Requirement
+  requirement: &25093240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +76,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *24217220
+  version_requirements: *25093240
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &24216740 !ruby/object:Gem::Requirement
+  requirement: &25092780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +87,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *24216740
+  version_requirements: *25092780
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &24216280 !ruby/object:Gem::Requirement
+  requirement: &25092300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +98,10 @@ dependencies:
         version: 2.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *24216280
+  version_requirements: *25092300
 - !ruby/object:Gem::Dependency
   name: polyglot
-  requirement: &24215820 !ruby/object:Gem::Requirement
+  requirement: &25091840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +109,10 @@ dependencies:
         version: 0.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *24215820
+  version_requirements: *25091840
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &24215360 !ruby/object:Gem::Requirement
+  requirement: &25091340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +120,21 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *24215360
+  version_requirements: *25091340
+- !ruby/object:Gem::Dependency
+  name: sys-admin
+  requirement: &25090880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.6
+  type: :runtime
+  prerelease: false
+  version_requirements: *25090880
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &24214900 !ruby/object:Gem::Requirement
+  requirement: &25090360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *24214900
+  version_requirements: *25090360
 description: Fig is a utility for configuring environments and managing dependencies
   across a team of developers. Given a list of packages and a command to run, Fig
   builds environment variables named in those packages (e.g., CLASSPATH), then executes
@@ -161,6 +161,8 @@ files:
 - bin/fig-debug
 - bin/fig.bat
 - lib/fig/logging/colorizable.rb
+- lib/fig/workingdirectorymetadata.rb
+- lib/fig/workingdirectorymaintainer.rb
 - lib/fig/environment.rb
 - lib/fig/configfileerror.rb
 - lib/fig/urlaccesserror.rb
@@ -171,35 +173,39 @@ files:
 - lib/fig/environmentvariables/caseinsensitive.rb
 - lib/fig/log4r/outputter.rb
 - lib/fig/packagecache.rb
-- lib/fig/retriever.rb
 - lib/fig/packageparseerror.rb
 - lib/fig/backtrace.rb
 - lib/fig/notfounderror.rb
 - lib/fig/applicationconfiguration.rb
 - lib/fig/logging.rb
 - lib/fig/userinputerror.rb
-- lib/fig/options.rb
 - lib/fig/nosuchpackageconfigerror.rb
 - lib/fig/networkerror.rb
 - lib/fig/log4rconfigerror.rb
 - lib/fig/statement/path.rb
 - lib/fig/statement/set.rb
+- lib/fig/statement/asset.rb
 - lib/fig/statement/retrieve.rb
-- lib/fig/statement/publish.rb
 - lib/fig/statement/include.rb
 - lib/fig/statement/override.rb
 - lib/fig/statement/configuration.rb
 - lib/fig/statement/resource.rb
 - lib/fig/statement/archive.rb
 - lib/fig/statement/command.rb
+- lib/fig/atexit.rb
 - lib/fig/grammar.treetop
+- lib/fig/packagedescriptorparseerror.rb
 - lib/fig/command/listing.rb
+- lib/fig/command/optionerror.rb
+- lib/fig/command/coveragesupport.rb
+- lib/fig/command/options.rb
 - lib/fig/command/packageload.rb
 - lib/fig/packagedescriptor.rb
 - lib/fig/environmentvariables.rb
 - lib/fig/operatingsystem.rb
 - lib/fig/repository.rb
 - lib/fig/figrc.rb
+- lib/fig/parserpackagebuildstate.rb
 - lib/fig/command.rb
 - lib/fig/statement.rb
 homepage: http://github.com/mfoemmel/fig