file_copy 0.0.2 → 1.0.0

data/lib/file_copy/copy.rb

@@ -1,66 +1,68 @@
 require 'net/ssh'
 require 'net/sftp'
 
-module BBFS
-  module FileCopy
+require 'log'
+require 'params'
 
-    # Creates ssh connection, assumes username and password
-    # or without password but with ssh keys.
-    def ssh_connect(username, password, server)
-      username = (username and username.length > 0) ? username : ENV['USER']
-      password = (password and password.length > 0) ? password : nil
-      port = 22 # 22 is a standart SSH port
-      raise "Undefined server" unless server
-      p "Trying to connect(ssh): #{username}, #{password}, #{server}."
-      if (username and password)
-        Net::SSH.start(server, username,
-                       :password => password,
-                       :port => port)
-      elsif (username)
-        Net::SSH.start(server, username,
-                       :port => port)
-      else
-        raise "Undefined username"
-      end
-    end
-    module_function :ssh_connect
-
-    # Simply copy map files using sftp server on dest_server.
-    # Note: stfp.upload support parallel uploads - default is 2.
-    # TODO(kolman): packing files, all, not all, determine by part of file.
-    def sftp_copy(username, password, server, files_map)
-      ssh = FileCopy.ssh_connect(username, password, server)
-      ssh.sftp.connect do |sftp|
-        uploads = files_map.map { |from,to|
-          remote_dir = File.dirname(to)
-          sftp_mkdir_recursive(sftp, File.dirname(to))
-          p "Copying #{from} to #{to}"
-          sftp.upload(from, to)
-        }
-        uploads.each { |u| u.wait }
-        p "Done."
-      end # ssh.sftp.connect
-    end # def initialize
-    module_function :sftp_copy
+module FileCopy
 
-    def sftp_mkdir_recursive(sftp, path)
-      dir_stat = nil
-      begin
-        p "Stat remote dir: #{path}."
-        dir_stat = sftp.stat!(path).directory?
-        p "Stat result #{dir_stat}."
-      rescue Net::SFTP::StatusException
-      end
-      if !dir_stat
-        p "Directory does not exists: #{path}."
-        sftp_mkdir_recursive sftp, File.dirname(path)
-        sftp.mkdir!(path)
-      end
+  # Creates ssh connection, assumes username and password
+  # or without password but with ssh keys.
+  def ssh_connect(username, password, server)
+    username = (username and username.length > 0) ? username : ENV['USER']
+    password = (password and password.length > 0) ? password : nil
+    port = 22 # 22 is a standart SSH port
+    raise "Undefined server" unless server
+    Log.info "Trying to connect(ssh): #{username}, #{password}, #{server}, #{port}."
+    if (username and password)
+      Net::SSH.start(server, username,
+                     :password => password,
+                     :port => port)
+    elsif (username)
+      Net::SSH.start(server, username,
+                     :port => port)
+    else
+      raise "Undefined username"
     end
-    module_function :sftp_mkdir_recursive
-
+  end
+  module_function :ssh_connect
 
+  # Simply copy map files using sftp server on dest_server.
+  # Note: stfp.upload support parallel uploads - default is 2.
+  # TODO(kolman): packing files, all, not all, determine by part of file.
+  def sftp_copy(username, password, server, files_map)
+    ssh = FileCopy.ssh_connect(username, password, server)
+    ssh.sftp.connect do |sftp|
+      uploads = files_map.map { |from,to|
+        remote_dir = File.dirname(to)
+        sftp_mkdir_recursive(sftp, File.dirname(to))
+        Log.info "Copying #{from} to #{to}"
+        sftp.upload(from, to)
+      }
+      uploads.each { |u| u.wait }
+      Log.info "Done."
+    end # ssh.sftp.connect
+  end # def initialize
+  module_function :sftp_copy
 
+  def sftp_mkdir_recursive(sftp, path)
+    dir_stat = nil
+    begin
+      Log.info "Stat remote dir: #{path}."
+      dir_stat = sftp.stat!(path).directory?
+      Log.info "Stat result #{dir_stat}."
+    rescue Net::SFTP::StatusException
+    end
+    if !dir_stat
+      Log.info "Directory does not exists: #{path}."
+      sftp_mkdir_recursive sftp, File.dirname(path)
+      Log.info "Making dir #{path}."
+      response = sftp.mkdir!(path)
+      Log.info "Making dir ok:#{response.ok?}."
+    end
   end
+  module_function :sftp_mkdir_recursive
+
 end
 
+

data/lib/file_copy/version.rb

@@ -0,0 +1,4 @@
+module FileCopy
+  VERSION = "1.0.0"
+end
+

data/lib/file_copy.rb

@@ -1,7 +1,4 @@
-require_relative 'file_copy/copy'
+require 'file_copy/copy'
 
-module BBFS
-  module FileCopy
-    VERSION = "0.0.1"
-  end
+module FileCopy
 end

data/spec/file_copy/copy_spec.rb

@@ -0,0 +1,54 @@
+require 'rspec'
+
+require_relative '../../lib/file_copy/copy.rb'
+
+module FileCopy
+  module Spec
+
+    describe 'FileCopy::ssh_connect' do
+      it 'should raise error when username not specified' do
+        ENV.stub(:[]).with(any_args()).and_return(nil)
+        expect { FileCopy::ssh_connect(nil, nil, 'a server') }.to raise_error "Undefined username"
+      end
+
+      it 'should raise error when server not specified' do
+        expect { FileCopy::ssh_connect('kuku', nil, nil) }.to raise_error "Undefined server"
+      end
+
+      it 'should try to connect if username is set explicitly' do
+        Net::SSH.should_receive(:start).with(any_args())
+        FileCopy::ssh_connect('kuku', nil, 'a server')
+      end
+      it 'should try to connect if username is set via ENV variable' do
+        Net::SSH.should_receive(:start).with(any_args())
+        ENV.stub(:[]).with("USER").and_return('kuku')
+        FileCopy::ssh_connect(nil, nil, 'a server')
+      end
+    end
+
+    # TODO(kolman): Bad test, should rewrite and understand how to write test correctly.
+    describe 'FileCopy::sftp_copy' do
+      it 'call upload with correct files' do
+        ssh_connection = double('Net::SSH::Connection')
+        sftp_session = double('Net::SFTP::Session')
+        uploader = double('Operations::Upload')
+        sftp_attributes = double('Attributes')
+
+        # Stubbing sftp.
+        FileCopy.stub(:ssh_connect).and_return(ssh_connection)
+        ssh_connection.stub(:sftp).and_return(sftp_session)
+        sftp_session.stub(:connect).and_yield(sftp_session)
+        sftp_session.stub(:stat!).and_return(sftp_attributes)
+        sftp_attributes.stub(:directory?).and_return(true)
+        uploader.stub(:wait).and_return(true, true)
+
+        # Test file uploaded
+        sftp_session.should_receive(:upload).with('a', 'b').and_return(uploader)
+        sftp_session.should_receive(:upload).with('c', 'd').and_return(uploader)
+        FileCopy::sftp_copy(nil, nil, nil, { 'a' => 'b', 'c' => 'd' })
+      end
+    end
+
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: file_copy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,18 +9,51 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000Z
-dependencies: []
+date: 2013-05-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: log
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: params
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Library for copying files to remote servers.
-email: kolmanv@gmail.com
+email: bbfsdev@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/file_copy.rb
 - lib/file_copy/copy.rb
-- test/file_copy/copy_spec.rb
-homepage: http://github.com/kolmanv/bbfs
+- lib/file_copy/version.rb
+- spec/file_copy/copy_spec.rb
+homepage: http://github.com/bbfsdev/bbfs
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -40,9 +73,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Library for copying files remotely.
 test_files:
-- test/file_copy/copy_spec.rb
+- spec/file_copy/copy_spec.rb

data/test/file_copy/copy_spec.rb

@@ -1,47 +0,0 @@
-require_relative '../../lib/file_copy/copy.rb'
-
-module BBFS
-  module FileCopy
-    module Spec
-
-      describe 'FileCopy::ssh_connect' do
-        it 'should raise error when username not specified' do
-          ENV.stub(:[]).with(any_args()).and_return(nil)
-          expect { FileCopy::ssh_connect(nil, nil, 'a server') }.should raise_error "Undefined username"
-        end
-
-        it 'should raise error when server not specified' do
-          expect { FileCopy::ssh_connect('kuku', nil, nil) }.should raise_error "Undefined server"
-        end
-
-        it 'should try to connect if username is set explicitly' do
-          Net::SSH.should_receive(:start).with(any_args())
-          FileCopy::ssh_connect('kuku', nil, 'a server')
-        end
-        it 'should try to connect if username is set via ENV variable' do
-          Net::SSH.should_receive(:start).with(any_args())
-          ENV.stub(:[]).with("USER").and_return('kuku')
-          FileCopy::ssh_connect(nil, nil, 'a server')
-        end
-      end
-
-      # TODO(kolman): Very bad test, should rewrite and understand how to
-      # write test correctly.
-      describe 'FileCopy::sftp_copy' do
-        it 'should copy files' do
-          ssh_connection = double('Net::SSH::Connection')
-          FileCopy.should_receive(:ssh_connect).with(any_args()).and_return(ssh_connection)
-          sftp_session = double('Net::SFTP::Session')
-          ssh_connection.should_receive(:sftp).with(any_args()).and_return(sftp_session)
-          sftp_session.should_receive(:connect).with(any_args()).and_yield(sftp_session)
-          uploader = double('Operations::Upload')
-          uploader.should_receive(:wait).with(any_args()).and_return(true, true)
-          sftp_session.should_receive(:upload).with('a', 'b').and_return(uploader)
-          sftp_session.should_receive(:upload).with('c', 'd').and_return(uploader)
-          FileCopy::sftp_copy(nil, nil, nil, { 'a' => 'b', 'c' => 'd' })
-        end
-      end
-
-    end
-  end
-end