movie_organizer 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7885aa1f3f8cb1095d8710d11f6bbfcb06ae97016b1d068a3380f56f5eea650
-  data.tar.gz: e234282cbc7fcc5bf81406f0f5705041023fa3d14960a46cd3f783a7e9c46f08
+  metadata.gz: 7f54c3650fd6f47604caa55e65e6849c3e205dbf56682c1a4e152992bde76ddd
+  data.tar.gz: 62dac5e6ffc9548d7f7560a3246bdd304d122c0bafd9a98e4f6a2d34b39ac769
 SHA512:
-  metadata.gz: bab5fc2431675860b49fb64fd32b4bc8b8dc31bc83a061c93ccfa398eb1423546cdf968dd66abb3a7132b1272be089161da5c13377daa468218a68f636633c93
-  data.tar.gz: a89986894a78352fa1135236b997b7832b3d28a0896c4c6e7a30f8a1dc4589c9d6413471b2617582758485d6e88cc31d6fa0ae14afe876647b85de854f010df8
+  metadata.gz: e3663b3c36305f0c5f8906c9273be61764dec2d1e57e5bc9d9b5e81fbf9427522c84b5f244a3b2282c0f045e283ac92d9856a8d75d97442498ca86e73646583c
+  data.tar.gz: 000717141ad377bf135acad6ba2b88a1abb14e9c6cc21c07d2d91cf9130182cb05beba1bcc9d6f1bc4607a8185d468d0062ea79eb30cef3127cfc2dd05276af5

data/CHANGELOG

@@ -1,3 +1,7 @@
+*0.1.9* (March 09, 2018)
+
+* Handle timeouts for remote SSH hosts
+
 *0.1.8* (March 03, 2018)
 
 * Prompt for movie directory setting if missing

data/lib/movie_organizer/file_copier.rb

@@ -3,12 +3,13 @@
 module MovieOrganizer
   class FileCopier
     attr_accessor :filename, :target_file, :options
-    attr_reader :username, :hostname, :remote_filename
+    attr_reader :username, :hostname, :remote_filename, :logger
 
     def initialize(filename, target_file, options)
       @filename = filename
       @target_file = target_file
       @options = options
+      @logger = Logger.instance
     end
 
     def copy
@@ -29,12 +30,8 @@ module MovieOrganizer
     def remote_copy
       parse_target
       return do_dry_run if options[:dry_run]
-      Net::SSH.start(hostname, username) do |ssh|
-        ssh.exec("mkdir -p '#{target_dir}'")
-      end
-      Net::SCP.start(hostname, username) do |scp|
-        scp.upload!(filename, remote_filename)
-      end
+      create_remote_dir
+      copy_file_to_remote
     end
 
     def do_dry_run
@@ -58,12 +55,28 @@ module MovieOrganizer
       @hostname = md[2]
       @remote_filename = md[3]
       if @username.nil? || @hostname.nil? || @remote_filename.nil?
-        fail 'SSH path not formatted properly. Use [ssh://username@hostname/absolute/path]'
+        raise 'SSH path not formatted properly. Use [ssh://username@hostname/absolute/path]'
       end
     end
 
     def ssh?
       target_file.match?(/^ssh:/)
     end
+
+    def create_remote_dir
+      Net::SSH.start(hostname, username, timeout: 5) do |ssh|
+        ssh.exec("mkdir -p '#{target_dir}'")
+      end
+    rescue Net::SSH::ConnectionTimeout, Errno::EHOSTUNREACH, Errno::EHOSTDOWN
+      logger.error("ConnectionTimeout: the host '#{hostname}' is unreachable.".red)
+    end
+
+    def copy_file_to_remote
+      Net::SCP.start(hostname, username) do |scp|
+        scp.upload!(filename, remote_filename)
+      end
+    rescue Net::SSH::ConnectionTimeout, Errno::EHOSTUNREACH, Errno::EHOSTDOWN
+      logger.error("ConnectionTimeout: the host '#{hostname}' is unreachable.".red)
+    end
   end
 end

data/lib/movie_organizer/movie.rb

@@ -12,7 +12,7 @@ module MovieOrganizer
     def process!
       target_dir = File.join(MovieOrganizer.movie_directory, "#{title} (#{year})")
       target_file = File.join(target_dir, processed_filename)
-      logger.info("    target dir: [#{target_dir}]")
+      # logger.info("    target dir: [#{target_dir}]")
       logger.info("    target file: [#{target_file.green.bold}]")
       fc = FileCopier.new(filename, target_file, options)
       fc.copy

data/lib/movie_organizer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MovieOrganizer
-  VERSION = '0.1.8'.freeze
+  VERSION = '0.1.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: movie_organizer
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Chris Blackburn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-03 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler