ruby_clone 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+## 1.0.2
+
+### bug fix
+  * Fixed ssh input password
+  * Fixed dry-run mode to not delete files from backup folder
+
+## 1.0.1
+  * The Real first release. Just improved the README.
+
+## 1.0
+
+* First release.

data/lib/ruby_clone/rsync.rb

@@ -52,14 +52,12 @@ module RubyClone
       command = rsync_command(profile_name)
       @output.puts "\n#{command}\n\n" if @configurations[:show_command]
 
-      pty = @pty || PTY
+      run_with_pty command
 
-      pty.spawn(command) do |r, w, pid|
-        r.each { |line| print line } if @configurations[:show_output]
+      unless @dry_run
+        profile = @profiles[profile_name.to_s]
+        profile.to_folder.delete_files
       end
-
-      profile = @profiles[profile_name.to_s]
-      profile.to_folder.delete_files
     end
 
    private
@@ -90,5 +88,38 @@ module RubyClone
         "-e ssh"
       end
     end
+
+    def run_with_pty(command)
+      pty = @pty || PTY
+
+      pty.spawn(command) do |r, w, pid|
+        begin
+          loop {
+            buffer = ""
+
+            until r.eof? do
+              char = r.getc
+              buffer << char
+              @output.print char
+
+              break if buffer =~ /password:/i
+            end
+
+            if buffer =~ /password:/i
+              @output.print " "
+
+              `stty -echo`
+              w.printf(STDIN.gets)
+              `stty echo`
+            else
+              break
+            end
+          }
+        rescue Errno::EIO # GNU/Linux raises EIO.
+        end
+      end
+
+    end
+
   end
 end

data/lib/ruby_clone/version.rb

@@ -1,3 +1,3 @@
 module RubyClone
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/ruby_clone/rsync_spec.rb

@@ -203,6 +203,8 @@ module RubyClone
         end
 
         FakerPTY.r.stub(:each).and_yield(nil)
+        FakerPTY.r.stub(:eof?).and_return(false, true)
+        FakerPTY.r.stub(:getc).and_return('')
       end
 
       describe "profile of string type" do
@@ -246,7 +248,7 @@ module RubyClone
 
       describe "changing configurations" do
 
-        it "should change the rsync options when configurations has 'optionas' as '-a'" do
+        it "should change the rsync options when configurations has 'options' as '-a'" do
           @rsync.update_configurations options: "-a"
           @rsync.run 'test_profile'
 
@@ -270,12 +272,12 @@ module RubyClone
         end
 
         it "should as default output the rsync results in console" do
-          FakerPTY.r.should_receive(:each)
+          FakerPTY.r.stub(:getc).and_return('my result')
 
           @rsync.run 'test_profile'
 
           @output.seek 0
-          @output.read.should == "\n#{@rsync_command} #{@folders}\n\n"
+          @output.read.should == "\n#{@rsync_command} #{@folders}\n\nmy result"
         end
 
         it "should not output the rsync results in console when configurations has 'show_output' as false" do
@@ -289,19 +291,70 @@ module RubyClone
         end
       end
 
-      it "should not run when it's in dry-run mode" do
-        @rsync.dry_run = true
+      it "should allow the user to fill a password" do
+        FakerPTY.r.stub(:eof?).and_return(false, false, true)
+        FakerPTY.r.should_receive(:getc).and_return('Password:', 'my result')
+
+        FakerPTY.w.should_receive(:printf).with('my password')
+
+        STDIN.stub(:gets).and_return('my password')
+
+        @rsync.run 'test_profile'
+
+        @output.seek 0
+        @output.read.should == "\n#{@rsync_command} #{@folders}\n\nPassword: my result"
+      end
+
+      it "should keep allowing the user to fill a password if it's asked again" do
+        FakerPTY.r.stub(:eof?).and_return(false, false, false, false, true)
+        FakerPTY.r.should_receive(:getc).and_return('Password:', 'Password:', 'Password:', 'my result')
+
+        FakerPTY.w.stub(:printf).with('my password')
+
+        STDIN.stub(:gets).and_return('my password')
 
         @rsync.run 'test_profile'
 
         @output.seek 0
-        @output.read.should == "\n#{@rsync_command} -n #{@folders}\n\n"
+        @output.read.should == "\n#{@rsync_command} #{@folders}\n\nPassword: Password: Password: my result"
       end
 
-      it "should call profile#to_folder#delete_files" do
-        @to_folder.should_receive(:delete_files)
+      it "should quit the running program after throwing Errno::EIO" do
+        FakerPTY.r.stub(:eof?).and_raise(Errno::EIO)
+        FakerPTY.r.stub(:getc).and_return('my result')
 
         @rsync.run 'test_profile'
+
+        @output.seek 0
+        @output.read.should == "\n#{@rsync_command} #{@folders}\n\n"
+      end
+
+      describe "dry-run mode" do
+
+        it "should have the option '-n'" do
+          @rsync.dry_run = true
+
+          @rsync.run 'test_profile'
+
+          @output.seek 0
+          @output.read.should == "\n#{@rsync_command} -n #{@folders}\n\n"
+        end
+
+        it "should not delete files from backup folder if it's in dry-run mode" do
+          @rsync.dry_run = true
+          @to_folder.should_not_receive(:delete_files)
+
+          @rsync.run 'test_profile'
+
+          @output.seek 0
+          @output.read.should == "\n#{@rsync_command} -n #{@folders}\n\n"
+        end
+
+        it "should call profile#to_folder#delete_files if it's not in dry-run mode" do
+          @to_folder.should_receive(:delete_files)
+
+          @rsync.run 'test_profile'
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_clone
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70236612351040 !ruby/object:Gem::Requirement
+  requirement: &70344141036160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70236612351040
+  version_requirements: *70344141036160
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70236612350320 !ruby/object:Gem::Requirement
+  requirement: &70344141034220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.1
   type: :development
   prerelease: false
-  version_requirements: *70236612350320
+  version_requirements: *70344141034220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70236612349580 !ruby/object:Gem::Requirement
+  requirement: &70344141033540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70236612349580
+  version_requirements: *70344141033540
 description: Ruby clone is a command line tool to work with Rsync using DSL!
 email:
 - fredbene@gmail.com
@@ -53,6 +53,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE