photocopier 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a4af64e01f56fa3057db82d54e1502ff7f99464
-  data.tar.gz: 8742796dc560ff83d0daada91d963ee600470b84
+  metadata.gz: 9653d2b9d9c48cead649c2a9ce05db2b9620ed2f
+  data.tar.gz: 3bed95de37b30e22b05bd67eea32bb4d39032930
 SHA512:
-  metadata.gz: dcfc51df442ab4bc7725b6490cd8492fece4ed457caac96056253e4e8f1f5874122b2bb66b9f60c3d5e9362187a757b54aa552f86e19c4eb2eb980e0b5a176c2
-  data.tar.gz: 961c47c68b43a7122bb5dbb57d6450340c8946aa4a210ff6c3e8fc823fd5cd154bb325409c430c165275302af7b06dea4c0717994599c3ca9ff461cf8ce31bd0
+  metadata.gz: f3e37d9509d326bf57b4ec75d62a9e2ca918ae6218c0d8634f9dec892aca1e69e0464df7037f942e50eb35a3d7d18581162191a746618fde47af17a64fc20ee0
+  data.tar.gz: 54526e7532807c40184236d575338c03fa4b691910bc691d8285b319646f8128a76be3d0b24d2713beb58103b7d7785dfe8f03410937fb5dd8486fe5fca6b953

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    photocopier (0.0.9)
+    photocopier (0.0.10)
       activesupport
       escape
       i18n

data/lib/photocopier/ssh.rb

@@ -8,8 +8,12 @@ require 'photocopier/adapter'
 module Photocopier
   class SSH < Adapter
 
+    attr_reader :gateway_options, :rsync_options
+
     def initialize(options = {})
       @options = options
+      @gateway_options = options.delete(:gateway)
+      @rsync_options = options.delete(:rsync_options)
     end
 
     def options
@@ -41,8 +45,8 @@ module Photocopier
       opts = options
       host = opts.delete(:host)
       user = opts.delete(:user)
-      opts.delete(:gateway)
-      @session ||= if gateway_options.any?
+
+      @session ||= if gateway_options
                      gateway.ssh(host, user, opts)
                    else
                      Net::SSH.start(host, user, opts)
@@ -99,9 +103,7 @@ module Photocopier
 
     def rsh_arguments
       arguments = []
-      if gateway_options.any?
-        arguments << ssh_command(gateway_options)
-      end
+      arguments << ssh_command(gateway_options) if gateway_options
       arguments << ssh_command(options)
       arguments.join(" ")
     end
@@ -120,18 +122,13 @@ module Photocopier
     private
 
     def gateway
-      opts = gateway_options
+      return unless gateway_options
+
+      opts = gateway_options.clone
       host = opts.delete(:host)
       user = opts.delete(:user)
-      @gateway ||= Net::SSH::Gateway.new(host, user, opts)
-    end
-
-    def gateway_options
-      options[:gateway] || {}
-    end
 
-    def rsync_options
-      options[:rsync_options]
+      @gateway ||= Net::SSH::Gateway.new(host, user, opts)
     end
 
   end

data/lib/photocopier/version.rb

@@ -1,3 +1,3 @@
 module Photocopier
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photocopier
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Stefano Verna
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport