lib/device.rb in narou-2.9.2 vs lib/device.rb in narou-2.9.3

@@ -58,10 +58,11 @@
   end
 
   class UnknownDevice < StandardError; end
   class SendFailure < StandardError; end
   class DontConneting < StandardError; end
+  class CantEject < StandardError; end
 
   def self.exists?(device)
     DEVICES.include?(device.downcase)
   end
 
@@ -88,10 +89,14 @@
     physical_support? && !!get_documents_path
   end
 
   def eject
     if ejectable?
-      Device.eject(@device_module::VOLUME_NAME)
+      begin
+        Device.eject(@device_module::VOLUME_NAME)
+      rescue CantEject => e
+        error e.message
+      end
     end
   end
 
   def self.support_eject?
     respond_to?(:eject)