photocopier 0.0.6 → 0.0.7

data/.rspec

@@ -0,0 +1 @@
+--colour

data/lib/photocopier/ssh.rb

@@ -42,7 +42,6 @@ module Photocopier
       host = opts.delete(:host)
       user = opts.delete(:user)
       opts.delete(:gateway)
-      opts.delete(:sshpass)
       @session ||= if gateway_options.any?
                      gateway.ssh(host, user, opts)
                    else
@@ -75,7 +74,7 @@ module Photocopier
 
     def rsync(source, destination, exclude = [])
       command = [
-        "rsync", "--progress", "-e", rsh_arguments, "--archive", "--compress",
+        "rsync", "--progress", "-e", rsh_arguments, "-rlpt", "--compress",
         "--omit-dir-times", "--delete"
       ]
 
@@ -93,18 +92,18 @@ module Photocopier
     def rsh_arguments
       arguments = []
       if gateway_options.any?
-        arguments << ssh_command(gateway_options, options[:sshpass])
+        arguments << ssh_command(gateway_options)
       end
-      arguments << ssh_command(options, gateway_options[:sshpass])
+      arguments << ssh_command(options)
       arguments.join(" ")
     end
 
-    def ssh_command(opts, use_sshpass=true)
+    def ssh_command(opts)
       command = "ssh "
       command << "-p #{opts[:port]} " if opts[:port].present?
       command << "#{opts[:user]}@" if opts[:user].present?
       command << opts[:host]
-      if opts[:password] && use_sshpass
+      if opts[:password]
         command = "sshpass -p #{opts[:password]} #{command}"
       end
       command
@@ -114,7 +113,6 @@ module Photocopier
       opts = gateway_options
       host = opts.delete(:host)
       user = opts.delete(:user)
-      opts.delete(:sshpass)
       @gateway ||= Net::SSH::Gateway.new(host, user, opts)
     end
 

data/lib/photocopier/version.rb

@@ -1,3 +1,3 @@
 module Photocopier
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/ssh_spec.rb

@@ -57,31 +57,23 @@ describe Photocopier::SSH do
     context "given a password" do
       let(:options) do { :host => "host", :password => "password" } end
 
-      context "sshpass is enabled" do
-        it "should be added to the command" do
-          ssh.send(:ssh_command, options, true).should == "sshpass -p password ssh host"
-        end
-      end
-
-      context "sshpass is disabled" do
-        it "should not change the command" do
-          ssh.send(:ssh_command, options, false).should == "ssh host"
-        end
+      it "sshpass should be added to the command" do
+        ssh.send(:ssh_command, options).should == "sshpass -p password ssh host"
       end
     end
   end
 
   context "#rsh_arguments" do
     it "should build arguments for rsync" do
-      ssh.should_receive(:ssh_command).with(options, anything)
+      ssh.should_receive(:ssh_command).with(options)
       ssh.send(:rsh_arguments)
     end
 
     context "given a gateway" do
       let(:options) { options_with_gateway }
       it "should include gateway options" do
-        ssh.should_receive(:ssh_command).with(gateway_config, anything)
-        ssh.should_receive(:ssh_command).with(options, anything)
+        ssh.should_receive(:ssh_command).with(gateway_config)
+        ssh.should_receive(:ssh_command).with(options)
         ssh.send(:rsh_arguments)
       end
     end
@@ -98,7 +90,7 @@ describe Photocopier::SSH do
         --progress
         -e
         rsh_arguments
-        --archive
+        -rlpt
         --compress
         --omit-dir-times
         --delete

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photocopier
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,6 +132,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .rvmrc
 - Gemfile
 - Gemfile.lock
@@ -178,4 +179,3 @@ test_files:
 - spec/ftp_spec.rb
 - spec/shared_examples_for_adapter.rb
 - spec/ssh_spec.rb
-has_rdoc: