fig 1.9.0 → 1.10.0

data/Changes

@@ -1,3 +1,20 @@
+v1.10.0 - 2013/09/25
+
+  Bug fixes:
+
+  - Command statements were not being correctly published if they contained "@"
+    signs.
+
+  Miscellaneous:
+
+  - Resource statements that refer to directories will now pull in the full
+    directory contents instead of just the directory itself.
+
+v1.9.1.beta.2 - 2013/09/20
+v1.9.1.beta.1 - 2013/09/19
+
+  - Test releases.
+
 v1.9.0 - 2013/09/19
 
   Bug fixes:

data/lib/fig.rb

@@ -1,3 +1,3 @@
 module Fig
-  VERSION = '1.9.0'
+  VERSION = '1.10.0'
 end

data/lib/fig/operating_system.rb

@@ -180,26 +180,14 @@ class Fig::OperatingSystem
     Dir.chdir(directory) { FileUtils.mv(from, to, :force => true) }
   end
 
-  # Expects files_to_archive as an Array of filenames.
-  def create_archive(archive_name, files_to_archive)
+  # Expects paths_to_archive as an Array of paths.
+  def create_archive(archive_name, paths_to_archive)
     # TODO: Need to verify files_to_archive exists.
     ::Archive.write_open_filename(
       archive_name, ::Archive::COMPRESSION_GZIP, ::Archive::FORMAT_TAR
     ) do |writer|
-      files_to_archive.each do |file_name|
-        writer.new_entry do |entry|
-          entry.copy_lstat(file_name)
-          entry.pathname = file_name
-          if entry.symbolic_link?
-            linked = File.readlink(file_name)
-            entry.symlink = linked
-          end
-          writer.write_header(entry)
-
-          if entry.regular?
-            writer.write_data(open(file_name) {|f| f.binmode; f.read })
-          end
-        end
+      paths_to_archive.each do |path|
+        add_path_to_archive(path, writer)
       end
     end
   end
@@ -284,6 +272,32 @@ class Fig::OperatingSystem
     return protocol, uri
   end
 
+  def add_path_to_archive(path, archive_writer)
+    children = []
+    archive_writer.new_entry do |entry|
+      entry.copy_lstat(path)
+      entry.pathname = path
+      if entry.symbolic_link?
+        linked = File.readlink(path)
+        entry.symlink = linked
+      end
+      archive_writer.write_header(entry)
+
+      if entry.regular?
+        archive_writer.write_data(open(path) {|f| f.binmode; f.read })
+      elsif entry.directory?
+        children = Dir.entries(path) - ['.', '..']
+      end
+    end
+
+    children.each do
+      |child|
+      add_path_to_archive(File.join(path, child), archive_writer)
+    end
+
+    return
+  end
+
   def check_archive_entry_for_windows(entry, archive_path)
     bad_type = nil
     if entry.symbolic_link?

data/lib/fig/runtime_environment.rb

@@ -521,7 +521,7 @@ class Fig::RuntimeEnvironment
     return argument.to_expanded_string() do
       |token|
 
-      package_name = token.raw_value
+      package_name = token.raw_value[1..-1]
       package = nil
       if package_name.empty?
         package = starting_package

data/lib/fig/statement/command.rb

@@ -7,7 +7,6 @@ module Fig; end
 class Fig::Statement::Command < Fig::Statement
   attr_reader :command
 
-
   def self.validate_and_process_escapes_in_argument(
     command_line_argument, &block
   )
@@ -67,7 +66,7 @@ class Fig::Statement::Command < Fig::Statement
         lambda {
           |subexpression, error_block|
 
-          Fig::TokenizedString::Token.new :package_path, subexpression[1..-1]
+          Fig::TokenizedString::Token.new :package_path, subexpression
         }
     }
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &18877160 !ruby/object:Gem::Requirement
+  requirement: &18966000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *18877160
+  version_requirements: *18966000
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &18876700 !ruby/object:Gem::Requirement
+  requirement: &18965540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.19
   type: :runtime
   prerelease: false
-  version_requirements: *18876700
+  version_requirements: *18965540
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &18876240 !ruby/object:Gem::Requirement
+  requirement: &18965080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '1.8'
   type: :runtime
   prerelease: false
-  version_requirements: *18876240
+  version_requirements: *18965080
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &18875780 !ruby/object:Gem::Requirement
+  requirement: &18964620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *18875780
+  version_requirements: *18964620
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &18875320 !ruby/object:Gem::Requirement
+  requirement: &18964160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *18875320
+  version_requirements: *18964160
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &18874860 !ruby/object:Gem::Requirement
+  requirement: &18963700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *18874860
+  version_requirements: *18963700
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &18874400 !ruby/object:Gem::Requirement
+  requirement: &18963240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *18874400
+  version_requirements: *18963240
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &18873940 !ruby/object:Gem::Requirement
+  requirement: &18962780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *18873940
+  version_requirements: *18962780
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &18873480 !ruby/object:Gem::Requirement
+  requirement: &18962320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *18873480
+  version_requirements: *18962320
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &18873020 !ruby/object:Gem::Requirement
+  requirement: &18961860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '4'
   type: :runtime
   prerelease: false
-  version_requirements: *18873020
+  version_requirements: *18961860
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &18872560 !ruby/object:Gem::Requirement
+  requirement: &18961400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.4.14
   type: :runtime
   prerelease: false
-  version_requirements: *18872560
+  version_requirements: *18961400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18872100 !ruby/object:Gem::Requirement
+  requirement: &18960940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 1.0.15
   type: :development
   prerelease: false
-  version_requirements: *18872100
+  version_requirements: *18960940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18871640 !ruby/object:Gem::Requirement
+  requirement: &18960480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *18871640
+  version_requirements: *18960480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18871180 !ruby/object:Gem::Requirement
+  requirement: &18960020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *18871180
+  version_requirements: *18960020
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &18870720 !ruby/object:Gem::Requirement
+  requirement: &19001480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *18870720
+  version_requirements: *19001480
 - !ruby/object:Gem::Dependency
   name: simplecov-html
-  requirement: &18904140 !ruby/object:Gem::Requirement
+  requirement: &19001020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *18904140
+  version_requirements: *19001020
 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
@@ -271,12 +271,19 @@ files:
 - lib/fig/external_program.rb
 - lib/fig/figrc.rb
 - lib/fig/file_not_found_error.rb
+- lib/fig/grammar/base.rb
 - lib/fig/grammar/base.treetop
+- lib/fig/grammar/v0.rb
 - lib/fig/grammar/v0.treetop
+- lib/fig/grammar/v1.rb
 - lib/fig/grammar/v1.treetop
+- lib/fig/grammar/v1_base.rb
 - lib/fig/grammar/v1_base.treetop
+- lib/fig/grammar/v2.rb
 - lib/fig/grammar/v2.treetop
+- lib/fig/grammar/version.rb
 - lib/fig/grammar/version.treetop
+- lib/fig/grammar/version_identification.rb
 - lib/fig/grammar/version_identification.treetop
 - lib/fig/grammar_monkey_patches.rb
 - lib/fig/include_backtrace.rb
@@ -333,13 +340,6 @@ files:
 - lib/fig/working_directory_metadata.rb
 - LICENSE
 - README.md
-- lib/fig/grammar/base.rb
-- lib/fig/grammar/v0.rb
-- lib/fig/grammar/v1.rb
-- lib/fig/grammar/v1_base.rb
-- lib/fig/grammar/v2.rb
-- lib/fig/grammar/version.rb
-- lib/fig/grammar/version_identification.rb
 homepage: http://github.com/mfoemmel/fig
 licenses: []
 post_install_message: