loft-harmony 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a787fc1aa34315a42462695d17d3a0acb1a52fe1
-  data.tar.gz: 41a7edff4216a52c3818a61df9d34b15bad31698
+  metadata.gz: da2f7c4085dda85b1769c604bc1e17777a7dbca8
+  data.tar.gz: da5c724aea1fd7e80ecdb5e1ce750d22995636c1
 SHA512:
-  metadata.gz: c7274be884f2c6f0f87a525300560dd8869796e7527ce4366d2d03b17537346692f77a892d2d2c4b3f96c1f12ff4e6c7359ba2a6ec795c2c00f8144a4bbac6c8
-  data.tar.gz: 3f804e9eab4c49689d7a5c9a5a0c0b19e56f176c88dcc5ed7262175d04c26ce75057beff2c72f69d53164f8ce427287befae60c6d7bccc62734833c7682c829e
+  metadata.gz: 4346d7331a6f37f6eaddd0e6ef6d48ed25cb2c203d928accdfd151824020393de86e41551cb749a119fdc53262bbb722464e32637d73ad72d9c8e5b03cd7af0d
+  data.tar.gz: 4dfefa76e263737a95901c8e7f8ae0891f0025a3704a22b18519f40e9ff000b9c0ad78d0b6a611e2243dacc1890a04f3b87d03b8efd38c41a2f96357bd1bbe34

data/bin/harmony

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 require 'net/ftp'
+require 'net/sftp'
 require 'terrun'
 require 'timeout'
 require 'fileutils'
+require 'byebug'
 
 class Harmony < TerminalRunner
   name "Harmony"
@@ -21,6 +23,7 @@ class Harmony < TerminalRunner
   option "--passive", 0, "", "Use FTP in passive mode."
   option "--vanilla_ftp", 0, "", "Use Vanilla ruby Net::FTP. Disables automatica directory creation."
   option "--local", 0, "", "Use a local copy instead of an FTP transfer."
+  option "--sftp", 1, "port", "Use SFTP instead of standard FTP"
 
   help ""
 
@@ -42,6 +45,8 @@ class Harmony < TerminalRunner
     @compile_coffeescript = @@options.include?("--coffee") ? @@options["--coffee"][0] : nil
     @passive_mode = @@options.include?("--passive")
     @use_vanilla_ftp = @@options.include?("--vanilla_ftp")
+    @use_sftp = @@options.include?("--sftp")
+    @sftp_port = @@options["--sftp"][0]
     @use_local = @@options.include?("--local")
     @ignored = []
 
@@ -92,8 +97,9 @@ class Harmony < TerminalRunner
         break if self.get_command
       end
     rescue => e
-      puts e.to_s.red
       puts " ## FATAL ERROR OCCURRED. SHUTTING DOWN.".red
+      puts "#{e.class.name}: #{e.to_s} (#{e.message})".red
+      puts e.backtrace
     end
     @thread.kill if @thread
     self.close_connection
@@ -181,7 +187,7 @@ class Harmony < TerminalRunner
         rescue Timeout::Error
           failed = true
           puts " ## [ FAIL  ] #{file} timed out while syncing".red
-        rescue Net::FTPError => e
+        rescue Net::FTPError, Net::SFTP::Exception, Net::SSH::Exception => e
           failed = true
           puts " ## [ FAIL  ] #{file} failed to sync".red
           puts e.message
@@ -234,7 +240,7 @@ class Harmony < TerminalRunner
       if @ftp
         begin
           @ftp.list
-        rescue Net::FTPError
+        rescue Net::FTPError, Net::SFTP::Exception, Net::SSH::Exception
           puts " ## Connection was closed by server".pink
           @ftp.close
         end
@@ -248,7 +254,11 @@ class Harmony < TerminalRunner
         elsif @use_local
           puts "(Using Local non-FTP)".pink
           @ftp = LocalCopyFTP.new
+        elsif @use_sftp
+          puts "(Using SFTP)".pink
+          @ftp = SFTP.new(@server, @user, @password, @sftp_port)
         else
+          puts "(Using FTP)".pink
           @ftp = BetterFTP.new(@server, @user, @password)
         end
         @ftp.passive = @passive_mode
@@ -299,6 +309,88 @@ class String
   end
 end
 
+# Wrapper interface for SFTP to make it confirm to the same API
+class SFTP
+  @dir = '/'
+
+  def initialize(server, user, password, port)
+    @server = server
+    @user = user
+    @password = password
+    @port = port
+    @netsftp = Net::SFTP.start(@server, @user, password: @password, port: @port)
+    @closed = false
+    @created_paths_cache = []
+  end
+
+  def chdir(path)
+    @dir = path
+  end
+
+  def puttextfile(file)
+    @netsftp.upload!(file, @dir + '/' + file.split('/').last)
+  end
+
+  def putbinaryfile(file)
+    puttextfile(file)
+  end
+
+  def list
+    l = []
+    @netsftp.dir.foreach(@dir) { |e| l << e }
+    l
+  end
+
+  def closed?
+    @netsftp.closed? || @closed
+  end
+
+  def close
+    @netsftp.close_channel
+  rescue Net::SSH::Exception
+  ensure
+    @closed = true
+  end
+
+  def mkdir_p(dir)
+    made_path = false
+
+    parts = dir.split("/")
+    if parts.first == "~"
+      growing_path = ""
+    else
+      growing_path = "/"
+    end
+    for part in parts
+      next if part == ""
+      if growing_path == ""
+        growing_path = part
+      else
+        growing_path = File.join(growing_path, part)
+      end
+      unless @created_paths_cache.include?(growing_path)
+        begin
+          mkdir(growing_path)
+          chdir(growing_path)
+          made_path = true
+        rescue Net::SFTP::StatusException
+        end
+        @created_paths_cache << growing_path
+      else
+      end
+    end
+
+    made_path
+  end
+
+  def mkdir(path)
+    @netsftp.mkdir!(path)
+  end
+
+  def passive=(_)
+  end
+end
+
 # Only performs a local copy, instead of using an FTP connection
 class LocalCopyFTP
   @dir = '/'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loft-harmony
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Caleb Simpson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies: []
 description: Watches a directory for changes to upload to a server via FTP
 email: caleb@simpson.center