fig 0.1.69 → 0.1.71

data/lib/fig/statement/configuration.rb

@@ -44,7 +44,10 @@ class Fig::Statement::Configuration < Fig::Statement
   def unparse_statements(indent, prefix, statements, suffix)
     body =
       @statements.map {|statement| statement.unparse(indent + '  ') }.join("\n")
+    if body.length > 0
+      body << "\n"
+    end
 
-    return ["\n#{indent}#{prefix}", body, "#{indent}#{suffix}"].join("\n")
+    return "\n#{indent}#{prefix}\n#{body}#{indent}#{suffix}"
   end
 end

data/lib/fig/statement/path.rb

@@ -11,7 +11,7 @@ class Fig::Statement::Path < Fig::Statement
 
   # Yields on error.
   def self.parse_name_value(combined)
-    variable, value = combined.split("=")
+    variable, value = combined.split('=')
 
     if variable !~ ENVIRONMENT_VARIABLE_NAME_REGEX
       yield

data/lib/fig/statement/set.rb

@@ -6,11 +6,11 @@ module Fig; end
 class Fig::Statement::Set < Fig::Statement
   VALUE_REGEX          = %r< \A \S* \z >x
   ARGUMENT_DESCRIPTION =
-    %q<The value must look like "NAME=VALUE", though VALUE can be empty.>
+    %q<The value must look like "NAME=VALUE"; VALUE cannot contain whitespace though it can be empty.>
 
   # Yields on error.
   def self.parse_name_value(combined)
-    variable, value = combined.split("=")
+    variable, value = combined.split('=')
 
     if variable !~ ENVIRONMENT_VARIABLE_NAME_REGEX
       yield

data/lib/fig/update_lock.rb

@@ -20,6 +20,35 @@ class Fig::UpdateLock
   private
 
   def set_up_lock(lock_directory, response)
+    set_up_lock_file(lock_directory)
+
+    should_warn = response ? false : true
+    response ||= :wait
+
+    if response == :wait
+      if should_warn
+        if ! @lock.flock(File::LOCK_EX | File::LOCK_NB)
+          # Purposely ignoring standard logging setup so that this cannot be
+          # turned off by "--log-level error".
+          $stderr.puts(
+            %Q<It looks like another instance of Fig is attempting to update #{lock_directory}. Will wait until it is done. (To suppress this warning in the future, explicitly specify "--update-lock-response wait".)>
+          )
+
+          @lock.flock(File::LOCK_EX)
+        end
+      else
+        @lock.flock(File::LOCK_EX)
+      end
+    else
+      if ! @lock.flock(File::LOCK_EX | File::LOCK_NB)
+        raise_lock_usage_error(lock_directory)
+      end
+    end
+
+    return
+  end
+
+  def set_up_lock_file(lock_directory)
     FileUtils.mkdir_p(lock_directory)
 
     # Tried using the directory itself as the lock, but Windows is
@@ -41,14 +70,6 @@ class Fig::UpdateLock
       @lock.close_on_exec = true
     end
 
-    if response == :wait
-      @lock.flock(File::LOCK_EX)
-    else
-      if ! @lock.flock(File::LOCK_EX | File::LOCK_NB)
-        raise_lock_usage_error(lock_directory)
-      end
-    end
-
     return
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 0.1.69
+  version: 0.1.71
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &17879700 !ruby/object:Gem::Requirement
+  requirement: &17242720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *17879700
+  version_requirements: *17242720
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &17879240 !ruby/object:Gem::Requirement
+  requirement: &17263920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *17879240
+  version_requirements: *17263920
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &17878720 !ruby/object:Gem::Requirement
+  requirement: &17263440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *17878720
+  version_requirements: *17263440
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &17877940 !ruby/object:Gem::Requirement
+  requirement: &17262880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *17877940
+  version_requirements: *17262880
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &17877360 !ruby/object:Gem::Requirement
+  requirement: &17262360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *17877360
+  version_requirements: *17262360
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &17876880 !ruby/object:Gem::Requirement
+  requirement: &17261880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *17876880
+  version_requirements: *17261880
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &17876400 !ruby/object:Gem::Requirement
+  requirement: &17261400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *17876400
+  version_requirements: *17261400
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &17924940 !ruby/object:Gem::Requirement
+  requirement: &17260900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.0.15
   type: :runtime
   prerelease: false
-  version_requirements: *17924940
+  version_requirements: *17260900
 - !ruby/object:Gem::Dependency
   name: polyglot
-  requirement: &17924380 !ruby/object:Gem::Requirement
+  requirement: &17260380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *17924380
+  version_requirements: *17260380
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17923840 !ruby/object:Gem::Requirement
+  requirement: &17259920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *17923840
+  version_requirements: *17259920
 - !ruby/object:Gem::Dependency
   name: sys-admin
-  requirement: &17923380 !ruby/object:Gem::Requirement
+  requirement: &17259420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *17923380
+  version_requirements: *17259420
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &17922860 !ruby/object:Gem::Requirement
+  requirement: &17258960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *17922860
+  version_requirements: *17258960
 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
@@ -201,11 +201,13 @@ files:
 - lib/fig/command/action/list_dependencies/default.rb
 - lib/fig/command/action/list_dependencies/all_configs.rb
 - lib/fig/command/action/list_dependencies/tree.rb
+- lib/fig/command/action/dump_package_definition_text.rb
 - lib/fig/command/action/version.rb
 - lib/fig/command/action/list_variables/tree_all_configs.rb
 - lib/fig/command/action/list_variables/default.rb
 - lib/fig/command/action/list_variables/all_configs.rb
 - lib/fig/command/action/list_variables/tree.rb
+- lib/fig/command/action/help_long.rb
 - lib/fig/command/action/list_remote.rb
 - lib/fig/command/action/list_configs.rb
 - lib/fig/command/action/list_dependencies.rb
@@ -216,6 +218,7 @@ files:
 - lib/fig/command/action/run_command_line.rb
 - lib/fig/command/action/publish.rb
 - lib/fig/command/action/run_command_statement.rb
+- lib/fig/command/action/options.rb
 - lib/fig/command/action/role/list_base_config.rb
 - lib/fig/command/action/role/list_dependencies_in_a_tree.rb
 - lib/fig/command/action/role/list_walking_dependency_tree.rb
@@ -226,6 +229,7 @@ files:
 - lib/fig/command/action/role/publish.rb
 - lib/fig/command/action/role/has_no_sub_action.rb
 - lib/fig/command/action/role/list_all_configs.rb
+- lib/fig/command/action/dump_package_definition_parsed.rb
 - lib/fig/command/action/clean.rb
 - lib/fig/command/action/list_variables.rb
 - lib/fig/command/action/get.rb
@@ -245,6 +249,8 @@ files:
 - lib/fig/environment_variables/case_insensitive.rb
 - lib/fig/command.rb
 - lib/fig/statement.rb
+- LICENSE
+- README.md
 homepage: http://github.com/mfoemmel/fig
 licenses: []
 post_install_message: