xftp 0.2.1.pre.alpha → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d82f44266494fe12bc8cf104135f043b3689e2c1
-  data.tar.gz: 5f5ccac9192ec65a366bc958ee625b31fc582602
+  metadata.gz: 94b5dbf5e21b39d3b835ee82e7c5052e2d91b9cd
+  data.tar.gz: c8603e1ea11916ebd88643d40f0193058a904639
 SHA512:
-  metadata.gz: 1b8ed8dffdf2737832b99cb3849f3bf3c1340da21eb5b49f3385cacae2d0ade0cf3cfdb2e6dc387323d7a11bb40e6768aa8d80ff4b2e963c750e30576d55bbd9
-  data.tar.gz: 49778fb1e45dc2468e49de0ef63e410b5fe180764f24953631afc5a73ffcef2b37d1ff359e18e8fdaa6e024edd261df828ef033d5436e1603bf162bf5c7203a2
+  metadata.gz: 9b8f0d40ae542fece17fa93997d0ed5240c596377a2014e9dc11f36d454618cd9023a13cf23b99c6b2ab23666c184ab1475e531e548a1e7330a3c180f1a04925
+  data.tar.gz: e88abe3a98469dfb68b6d95641f0111decba2c0ed33c8a6ec475677a6fbe12a914bbfe9fa9f80c013bea679867ceb0d2e235540724ffdc23332b8bd4a460a5aa

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/vyorkin/xftp.svg)](https://travis-ci.org/vyorkin/xftp)
+
 # xftp
 
 Unified interface for ftp/sftp.

data/lib/configuration.rb

@@ -23,20 +23,8 @@ module XFTP
       end
     end
 
-    config_accessor :logging do
-      default_logger = lambda do
-        logger = Logger.new(STDERR)
-        logger.level = Logger::ERROR
-      end
-
-      rails_logger = -> { Rails.logger || default_logger.call }
-      logger = defined?(Rails) ? rails_logger.call : default_logger.call
-
-      {
-        logger: logger,
-        verbose: false,
-        colorize: true
-      }
+    config_accessor :logger do
+      defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
     end
 
     config_accessor :ftp do

data/lib/xftp/helpers/logging.rb

@@ -0,0 +1,19 @@
+require 'colorize'
+
+module XFTP
+  module Helpers
+    # Provides logging helper methods
+    # @api private
+    module Logging
+      # Appends message to log
+      # @param [String] message the log message
+      # @param [Symbol] severity the message severity
+      # @param [Symbol] color
+      # :reek:UtilityFunction:
+      def log(message, severity: :info, color: :white)
+        text = message.colorize(color)
+        XFTP.config.logger.public_send(severity, text)
+      end
+    end
+  end
+end

data/lib/xftp/session/base.rb

@@ -1,3 +1,4 @@
+require 'xftp/helpers/logging'
 require 'xftp/dsl/block_evaluator'
 
 module XFTP
@@ -6,6 +7,7 @@ module XFTP
     # @api private
     class Base
       include DSL::BlockEvaluator
+      include Helpers::Logging
 
       attr_reader :uri, :credentials, :settings
 
@@ -21,9 +23,11 @@ module XFTP
       # Opens a new connection, evaluates the given block and closes the connection
       # @param [Proc] callback the callback to operate on a connection session
       def start(&callback)
+        log 'starting'
         open
         evaluate(&callback)
         close
+        log 'done'
       end
     end
   end

data/lib/xftp/session/ftp.rb

@@ -13,7 +13,7 @@ module XFTP
 
       # Delegate methods which have the same method signature
       # directly to Net::FTP session
-      def_delegators :@ftp, :chdir, :mkdir, :rmdir, :close
+      def_delegators :@ftp, :chdir, :mkdir, :rmdir
 
       # Creates an FTP session adapter instance
       # @param [URI] uri the remote uri
@@ -54,6 +54,7 @@ module XFTP
       # @param [String] from the path to move from
       # @param [String] to the new path to move to
       def move(from, to:)
+        log "moving from #{from} to #{to}..."
         @ftp.rename(from, to)
       end
 
@@ -74,6 +75,7 @@ module XFTP
       # @param [Integer] block_size the size of file chunk
       # @see Net::FTP#get
       def download(from, to: File.basename(from), block_size: Net::FTP::DEFAULT_BLOCKSIZE)
+        log "downloading file from #{from} to #{to}..."
         @ftp.get(from, to, block_size)
       end
 
@@ -93,8 +95,17 @@ module XFTP
 
       # Opens a new FTP connection and authenticates on the remote server
       def open
+        log 'opening connection...'
         @ftp.connect(@uri.host, @port)
+        log 'connected'
         @ftp.login(@credentials[:login], @credentials[:password])
+        log 'logging in...'
+      end
+
+      # Closes FTP connection
+      def close
+        log 'closing connection'
+        @ftp.close
       end
     end
   end

data/lib/xftp/session/sftp.rb

@@ -66,6 +66,7 @@ module XFTP
       # @param [String] from the path to move from
       # @param [String] to the path to move to
       def move(from, to:, flags: RENAME_OPERATION_FLAGS)
+        log "moving from #{from} to #{to}..."
         @sftp.rename!(remote_path(from), remote_path(to), flags)
       end
 
@@ -93,6 +94,7 @@ module XFTP
       # @param [Hash] options the download operation options
       # @see Net::SFTP::Operations::Download
       def download(from, to: File.basename(from), **options)
+        log "downloading file from #{from} to #{to}..."
         remote = remote_path(from)
         local = (Pathname.pwd + to).to_s
         @sftp.download!(remote, local, options)
@@ -126,15 +128,18 @@ module XFTP
 
       # Closes SFTP (SSH) connection
       def close
+        log 'closing connection'
         @ssh.close
       end
 
       private
 
       def connect
+        log 'opening connection...'
         @ssh = Net::SSH.start(@uri.host, @credentials[:login], @ssh_options)
         @sftp = Net::SFTP::Session.new @ssh
         @sftp.connect!
+        log 'connected'
       end
 
       # @return [String] a path name relative to the current working directory

data/lib/xftp/version.rb

@@ -2,11 +2,11 @@ module XFTP
   # Gem version builder module
   module VERSION
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
     PATCH = 1
-    SUFFIX = 'alpha'
+    SUFFIX = ''
 
     NUMBER = [MAJOR, MINOR, PATCH].compact.join('.')
-    STRING =  "#{NUMBER}-#{SUFFIX}"
+    STRING =  "#{NUMBER}#{SUFFIX}"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xftp
 version: !ruby/object:Gem::Version
-  version: 0.2.1.pre.alpha
+  version: 0.3.1
 platform: ruby
 authors:
 - Vasiliy Yorkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -172,6 +172,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.21
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.7
 description: Unified interface for ftp/sftp protocols, specific protocol is selected
   by uri scheme
 email:
@@ -188,6 +208,7 @@ files:
 - lib/xftp/client.rb
 - lib/xftp/dsl/block_evaluator.rb
 - lib/xftp/errors.rb
+- lib/xftp/helpers/logging.rb
 - lib/xftp/locale/en.yml
 - lib/xftp/locale/ru.yml
 - lib/xftp/operations/ftp/glob.rb
@@ -210,14 +231,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: xftp-0.2.1-alpha
+summary: xftp-0.3.1
 test_files: []
 has_rdoc: