fig 1.13.0 → 1.14.0

data/Changes

@@ -1,3 +1,16 @@
+v1.14.0 - 2014/2/10
+
+  New features:
+
+  - The return of SSH support, thanks to Alexey Klimkin.  Note that this uses
+    external "ssh" and "scp" commands locally and expects to be able to run
+    "find", GNU "stat", and "mkdir" remotely.
+
+v1.13.1.beta.2 - 2014/1/31
+v1.13.1.beta.1 - 2014/1/30
+
+  - Test releases.
+
 v1.13.0 - 2013/12/3
 
   Bug fixes:

data/lib/fig.rb

@@ -1,3 +1,3 @@
 module Fig
-  VERSION = '1.13.0'
+  VERSION = '1.14.0'
 end

data/lib/fig/operating_system.rb

@@ -14,6 +14,7 @@ require 'fig/protocol/file'
 require 'fig/protocol/ftp'
 require 'fig/protocol/http'
 require 'fig/protocol/sftp'
+require 'fig/protocol/ssh'
 require 'fig/repository_error'
 require 'fig/url'
 require 'fig/user_input_error'
@@ -64,6 +65,7 @@ class Fig::OperatingSystem
     @protocols['ftp']  = Fig::Protocol::FTP.new login
     @protocols['http'] = Fig::Protocol::HTTP.new
     @protocols['sftp'] = Fig::Protocol::SFTP.new
+    @protocols['ssh']  = Fig::Protocol::SSH.new
   end
 
   def list(dir)

data/lib/fig/protocol/file.rb

@@ -19,7 +19,14 @@ class Fig::Protocol::File
     return packages if ! ::File.exist?(unescaped_path)
 
     ls = ''
-    Find.find(unescaped_path) { |file| ls << file.to_s; ls << "\n" }
+    Find.find(unescaped_path) {
+      |file|
+
+      if FileTest.directory? file
+        ls << file.to_s
+        ls << "\n"
+      end
+    }
 
     strip_paths_for_list(ls, packages, unescaped_path)
 

data/lib/fig/protocol/ssh.rb

@@ -0,0 +1,164 @@
+require 'cgi'
+
+require 'fig/logging'
+require 'fig/network_error'
+require 'fig/protocol'
+
+module Fig; end
+module Fig::Protocol; end
+
+# File transfers using external ssh and scp programs
+class Fig::Protocol::SSH
+  include Fig::Protocol
+
+  def download_list(uri)
+    packages = []
+    unescaped_path = CGI.unescape uri.path
+
+    ls = ssh(uri.host, 'find', unescaped_path, '-type', 'd') {
+      |error_message|
+
+      raise Fig::NetworkError.new error_message
+    }
+
+    strip_paths_for_list(ls, packages, unescaped_path)
+
+    return packages
+  end
+
+  # Determine whether we need to update something.  Returns nil to indicate
+  # "don't know".
+  def path_up_to_date?(uri, path, prompt_for_login)
+    unescaped_path = CGI.unescape uri.path
+
+    size_mtime = ssh(uri.host, 'stat', '--format="%s %Z"', unescaped_path) {
+      |error_message|
+
+      raise Fig::NetworkError.new(
+        "Unable to get size and modification time for remote path #{path}: #{error_message}",
+      )
+    }
+
+    remote_size, remote_mtime = size_mtime.split
+    remote_size  = remote_size.to_i
+    remote_mtime = remote_mtime.to_i
+
+    if remote_size != ::File.size(path)
+      return false
+    end
+
+    if remote_mtime <= ::File.mtime(path).to_i
+      return true
+    end
+
+    return false
+  end
+
+  # Returns whether the file was not downloaded because the file already
+  # exists and is already up-to-date.
+  def download(uri, path, prompt_for_login)
+    unescaped_path = CGI.unescape uri.path
+
+    exists = remote_path_exists(uri.host, unescaped_path) {
+      |error_message|
+
+      raise Fig::NetworkError.new(
+        "Unable to determine whether #{uri} exists: #{error_message}",
+      )
+    }
+    if not exists
+      raise Fig::FileNotFoundError.new "#{uri} doesn't exist.", uri
+    end
+
+    scp("#{uri.host}:#{unescaped_path}", path) {
+      |error_message|
+
+      raise Fig::NetworkError.new(
+        "Unable to copy remote file to #{path}: #{error_message}",
+      )
+    }
+
+    return true
+  end
+
+  def upload(local_file, uri)
+    unescaped_path = CGI.unescape uri.path
+
+    ssh(uri.host, 'mkdir', '-p', ::File.dirname(unescaped_path)) {
+      |error_message|
+
+      raise Fig::NetworkError.new(
+        "Unable to create directory on remote: #{error_message}",
+      )
+    }
+
+    scp(local_file, "#{uri.host}:#{unescaped_path}") {
+      |error_message|
+
+      raise Fig::NetworkError.new(
+        "Unable to copy #{local_file} to remote: #{error_message}",
+      )
+    }
+
+    return
+  end
+
+  private
+
+  # Execute command on remote host with external ssh program.
+  def ssh(host, *command, &error_block)
+    ssh_command = ['ssh', '-n', host, *command]
+    begin
+      output, errors, result = Fig::ExternalProgram.capture ssh_command
+    rescue Errno::ENOENT => error
+      yield %Q<Could not run "#{ssh_command.join ' '}": #{error.message}.>
+
+      return
+    end
+
+    if result && ! result.success?
+      yield %Q<Could not run "#{ssh_command.join ' '}": #{result}: #{errors}>
+
+      return
+    end
+
+    return output
+  end
+
+  def remote_path_exists(host, path, &error_block)
+    ssh_command = ['ssh', '-n', host, 'test', '-e', path]
+    begin
+      *, result = Fig::ExternalProgram.capture ssh_command
+    rescue Errno::ENOENT => error
+      yield %Q<Could not run "#{ssh_command.join ' '}": #{error.message}.>
+
+      return
+    end
+
+    if result && ! result.success?
+      return false
+    end
+
+    return true
+  end
+
+  # Use external scp program to copy a file.
+  def scp(from, to, &error_block)
+    command = ['scp', from, to]
+    begin
+      output, errors, result = Fig::ExternalProgram.capture command
+    rescue Errno::ENOENT => error
+      yield %Q<Could not run "#{command.join ' '}": #{error.message}.>
+
+      return
+    end
+
+    if result && ! result.success?
+      yield %Q<Could not run "#{command.join ' '}": #{result}: #{errors}>
+
+      return
+    end
+
+    return output
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fig
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &15094580 !ruby/object:Gem::Requirement
+  requirement: &24265280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *15094580
+  version_requirements: *24265280
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &15094120 !ruby/object:Gem::Requirement
+  requirement: &24264820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.19
   type: :runtime
   prerelease: false
-  version_requirements: *15094120
+  version_requirements: *24264820
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &15093660 !ruby/object:Gem::Requirement
+  requirement: &24264360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '1.8'
   type: :runtime
   prerelease: false
-  version_requirements: *15093660
+  version_requirements: *24264360
 - !ruby/object:Gem::Dependency
   name: libarchive-static
-  requirement: &15093200 !ruby/object:Gem::Requirement
+  requirement: &24263900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *15093200
+  version_requirements: *24263900
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &15092740 !ruby/object:Gem::Requirement
+  requirement: &24263440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *15092740
+  version_requirements: *24263440
 - !ruby/object:Gem::Dependency
   name: net-netrc
-  requirement: &15092280 !ruby/object:Gem::Requirement
+  requirement: &24262980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *15092280
+  version_requirements: *24262980
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &15091820 !ruby/object:Gem::Requirement
+  requirement: &24262520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *15091820
+  version_requirements: *24262520
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &15091360 !ruby/object:Gem::Requirement
+  requirement: &24262060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *15091360
+  version_requirements: *24262060
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &15090900 !ruby/object:Gem::Requirement
+  requirement: &24261600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *15090900
+  version_requirements: *24261600
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &15090440 !ruby/object:Gem::Requirement
+  requirement: &24261140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '4'
   type: :runtime
   prerelease: false
-  version_requirements: *15090440
+  version_requirements: *24261140
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &15089980 !ruby/object:Gem::Requirement
+  requirement: &24260680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.4.14
   type: :runtime
   prerelease: false
-  version_requirements: *15089980
+  version_requirements: *24260680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &15089520 !ruby/object:Gem::Requirement
+  requirement: &24260220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 1.0.15
   type: :development
   prerelease: false
-  version_requirements: *15089520
+  version_requirements: *24260220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &15089060 !ruby/object:Gem::Requirement
+  requirement: &24259760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *15089060
+  version_requirements: *24259760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15088600 !ruby/object:Gem::Requirement
+  requirement: &24259300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *15088600
+  version_requirements: *24259300
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &15128000 !ruby/object:Gem::Requirement
+  requirement: &24258840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *15128000
+  version_requirements: *24258840
 - !ruby/object:Gem::Dependency
   name: simplecov-html
-  requirement: &15127540 !ruby/object:Gem::Requirement
+  requirement: &24292180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *15127540
+  version_requirements: *24292180
 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
@@ -302,6 +302,7 @@ files:
 - lib/fig/protocol/http.rb
 - lib/fig/protocol/netrc_enabled.rb
 - lib/fig/protocol/sftp.rb
+- lib/fig/protocol/ssh.rb
 - lib/fig/repository.rb
 - lib/fig/repository_error.rb
 - lib/fig/repository_package_publisher.rb