fig 0.1.23 → 0.1.25

data/lib/fig/environment.rb

@@ -11,6 +11,7 @@ module Fig
       @variables = variables
       @retrieve_vars = {}
       @packages = {}
+      @applied_configs = {}
     end
 
     # Returns the value of an envirionment variable
@@ -34,8 +35,12 @@ module Fig
     end
 
     def apply_config(package, config_name)
+      if (@applied_configs[package.package_name] ||= []).member?(config_name)
+        return
+      end
       config = package[config_name]
       config.statements.each { |stmt| apply_config_statement(package, stmt) }
+      @applied_configs[package.package_name] << config_name
     end
 
     def execute_shell(command)

data/lib/fig/os.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 # Must specify absolute path of ::Archive when using
 # this module to avoid conflicts with Fig::Package::Archive
-require 'libarchive_ruby'
+require 'libarchive_ruby' unless RUBY_PLATFORM == 'java'
 require 'uri'
 require 'net/http'
 require 'net/ssh'
@@ -198,20 +198,24 @@ module Fig
     end
     
     def log_info(msg)
-      puts msg
+      $stderr.puts msg
     end
 
     # Expects files_to_archive as an Array of filenames.
     def create_archive(archive_name, files_to_archive)
-      # TODO: Need to verify files_to_archive exists.
-      ::Archive.write_open_filename(archive_name, ::Archive::COMPRESSION_GZIP, ::Archive::FORMAT_TAR) do |ar|
-        files_to_archive.each do |fn|
-          ar.new_entry do |entry|
-            entry.copy_stat(fn)
-            entry.pathname = fn
-            ar.write_header(entry)
-            if !entry.directory?
-              ar.write_data(open(fn) {|f| f.binmode; f.read })
+      if OS.java?
+        `tar czvf #{archive_name} #{files_to_archive.join(' ')}`
+      else
+        # TODO: Need to verify files_to_archive exists.
+        ::Archive.write_open_filename(archive_name, ::Archive::COMPRESSION_GZIP, ::Archive::FORMAT_TAR) do |ar|
+          files_to_archive.each do |fn|
+            ar.new_entry do |entry|
+              entry.copy_stat(fn)
+              entry.pathname = fn
+              ar.write_header(entry)
+              if !entry.directory?
+                ar.write_data(open(fn) {|f| f.binmode; f.read })
+              end
             end
           end
         end
@@ -225,9 +229,13 @@ module Fig
     # .zip
     def unpack_archive(dir, file)
       Dir.chdir(dir) do
-        ::Archive.read_open_filename(file) do |ar|
-          while entry = ar.next_header
-            ar.extract(entry)
+        if OS.java?
+          `tar xzvf #{file}`
+        else
+          ::Archive.read_open_filename(file) do |ar|
+            while entry = ar.next_header
+              ar.extract(entry)
+            end
           end
         end
       end
@@ -237,6 +245,10 @@ module Fig
       Config::CONFIG['host_os'] =~ /mswin|mingw/
     end
 
+    def self.java?
+      RUBY_PLATFORM == 'java'
+    end
+
     def self.unix?
       !windows?
     end

data/spec/fig_spec.rb

@@ -2,6 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 require 'rubygems'
 require 'fig/os'
+require 'rake'
 require 'fileutils'
 
 class Popen
@@ -12,6 +13,13 @@ class Popen
         yield stdin, stdout, stderr
       }
     end
+  elsif Fig::OS.java?
+    require 'open3'
+    def self.popen(*cmd)
+      Open3.popen3(*cmd) { |stdin,stdout,stderr|
+        yield stdin, stdout, stderr
+      }
+    end
   else
     require 'open4'
     def self.popen(*cmd)
@@ -36,7 +44,7 @@ def fig(args, input=nil)
   args = "--file - #{args}" if input
   out = nil
   err = nil
-  Popen.popen("#{FIG_EXE} #{args}") do |stdin, stdout, stderr|
+  Popen.popen("#{RUBY} #{FIG_EXE} #{args}") do |stdin, stdout, stderr|
     if input
       stdin.puts input
       stdin.close

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fig
 version: !ruby/object:Gem::Version 
-  hash: 53
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 23
-  version: 0.1.23
+  version: 0.1.25
 platform: ruby
 authors: 
 - Matthew Foemmel
@@ -15,120 +9,79 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -06:00
+date: 2011-04-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libarchive
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
         version: 0.1.1
-  type: :runtime
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
   name: net-ssh
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 2
-        - 0
-        - 15
         version: 2.0.15
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: net-sftp
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 0
-        - 2
         version: 2.0.2
-  type: :runtime
-  version_requirements: *id003
+    version: 
 - !ruby/object:Gem::Dependency 
   name: polyglot
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 2
-        - 9
         version: 0.2.9
-  type: :runtime
-  version_requirements: *id004
+    version: 
 - !ruby/object:Gem::Dependency 
   name: treetop
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 4
-        - 2
         version: 1.4.2
-  type: :runtime
-  version_requirements: *id005
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
         version: "1.3"
-  type: :development
-  version_requirements: *id006
+    version: 
 - !ruby/object:Gem::Dependency 
   name: open4
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
         version: 1.0.1
-  type: :development
-  version_requirements: *id007
+    version: 
 description: Fig is a utility for configuring environments and managing dependencies across a team of developers. You give it a list of packages and a shell command to run; it creates an environment that includes those packages, then executes the shell command in it (the caller's environment is not affected).
 email: git@foemmel.com
 executables: 
@@ -153,40 +106,31 @@ files:
 - lib/fig/windows.rb
 - LICENSE
 - README.md
-- spec/fig_spec.rb
-- spec/spec_helper.rb
-- spec/win_spec.rb
 has_rdoc: true
 homepage: http://github.com/mfoemmel/fig
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Fig is a utility for configuring environments and managing dependencies across a team of developers..