carrierwave-scp 0.0.0 → 0.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTljODUxMTJjNjFhOGIzYTg2NTcyYmMwMjM0YmEzOTAwYzU4ZTRkYg==
+    NTNhNzM1YTYyZDBlOTE5MDNiNTE0MzZlMTBlZDhhZjY3NWRkN2M4Yg==
   data.tar.gz: !binary |-
-    OTQ5NmYyMGM5YTlkNzUzNTY4NTM0ZjQwMGNhYmU4ZGM2YTU2OGExZA==
+    Y2EwNDVlZDg2NGFjZWYyZjk5MWIxZDFhYWU4N2Y4ZWVhNmFkNGU5YQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTQzM2RlZmE1ODQxYjNmZDQ0MDAyZWMwZjc0ODYzYjY3ZGU4YmUyYmI0MDg4
-    NDc3ZTNiMGFiMDNmZDY0Y2M1YjU4MjZiNjQxZTM2MjU0NDY4NmExNjVkNDIx
-    NjdmYzliYjdhMDQ4NGZhMDMyZTZlZmQzZGYxODM1NzVhMjZiNDI=
+    MmE0MjZkZTIwZWQ2Y2I4YzdjOWNiNDQ1NzU4MGQyODM5MDBjYzQwYzczNGQ0
+    NzM2ZmI5YmQwYzYyMGEwNDRlOGY4N2MyMTRjYTljYzJiZDFhZTNhNDRjOGQx
+    YjgwYjczZTU2NjRjMDMwMzUyMjhjYjE3MWQ4MTE3NmNkMGJhNTA=
   data.tar.gz: !binary |-
-    ZjI2ZDMwYTc1NDY5ZDNkNmEzOWM3YTY5Y2FlYTYzZmZlYmNkMTg5NDJmYmI2
-    NTEzMzdmZjJkYzEzNDA0OWI3MDgwMTNkZGExYThjZGNlYzU4NWEwZmE5ODQ3
-    NGI0YWVmOTRkYzMzZDQ1YzZhYzY0Y2U5N2I2OTRmZmM2ODIyMDI=
+    ZTBlZWZhN2QzNmIxNjZlYjk0MzAzYWU4Yjk2MjhhYzc4YzRhMGU3NjBkZDc4
+    YmM3MjhjNjc0YWJhZjRjODNjMzAwNjAzYTM2MWJkZDQzN2I5MGE1YmFjYWFi
+    MjM4NTZmODZlMDY4M2Y2Nzg1MTIyMzNlMWU2YmI2NjEzMDYyZjU=

data/lib/carrierwave-scp.rb

@@ -7,7 +7,7 @@ require 'carrierwave-scp/version'
 class CarrierWave::Uploader::Base
   add_config :scp_host
   add_config :scp_user
-  add_config :scp_passwd
+  add_config :scp_options
   add_config :scp_folder
 
   configure do |config|

data/lib/carrierwave-scp/version.rb

@@ -1,3 +1,3 @@
 module CarrierwaveScp
-  VERSION = "0.0.0"
+  VERSION = "0.0.1"
 end

data/lib/carrierwave/storage/scp.rb

@@ -24,7 +24,7 @@ module CarrierWave
         end
 
         def read
-          file.read
+          file
         end
 
         def size
@@ -32,15 +32,24 @@ module CarrierWave
         end
 
         def store(new_file)
-          Net::SCP.upload!(@uploader.scp_host, @uploader.scp_user,
-            StringIO.new(new_file.read), "#{@uploader.scp_folder}/#{path}",
-            :password => @uploader.scp_passwd, :recursive => true)
+          Net::SSH.start(@uploader.scp_host, @uploader.scp_user, @uploader.scp_options) do |session|
+            new_dir = path.split('/')
+            new_dir.delete(new_dir[-1])
+            new_dir = new_dir.join('/')
+            session.exec! "mkdir #{@uploader.scp_folder}/#{new_dir}"
+            session.scp.upload! new_file.path, "#{@uploader.scp_folder}/#{path}", :recursive => true
+          end
         end
 
       private
 
         def file
-          @file ||= open("scp://#{@uploader.scp_user}:#{@uploader.scp_passwd}@#{@uploader.scp_host}#{@uploader.scp_folder}/#{path}")
+          remote_file = nil
+          Net::SSH.start(@uploader.scp_host, @uploader.scp_user, @uploader.scp_options) do |session|
+            remote_file = session.scp.download!("#{@uploader.scp_folder}/#{path}", nil)
+          end
+          remote_file
+          #@file ||= open("scp://#{@uploader.scp_user}:#{@uploader.scp_options[:password]}@#{@uploader.scp_host}#{@uploader.scp_folder}/#{path}", options)
         end
 
       end #end File

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-scp
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - Rodrigo Batista da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-25 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave