ftpmvc 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79a923c8d12fec0e8aee16d6bcf75d15969c12b8
-  data.tar.gz: 1b2ab2266a73e6e1263b3e9f66456cc0d93393aa
+  metadata.gz: 2434536570e3300d6e307c591e223b856a958055
+  data.tar.gz: c4276813096a5a84479fcd73f0999d41bea5b670
 SHA512:
-  metadata.gz: 723985bcf387095631590083826bdb3013ba5c77b0b59707adea0989e31144eb3c1c20704eed44a10526dde9ed82b32bc79935091391197278aa920aa5e869a7
-  data.tar.gz: 6c159810a90943ea5417f1d53a0dc1ebab8557e1f0ea090535919f06c98ecf41757c2ab1bf6dc5c6d48c7c1d7cdc56429d22425ba8aefb68263d06bae7835299
+  metadata.gz: bb33c101552cb588f2737aa0bff98bbba406fdf535b57bfb5045ac066ead934c3e057c2a5ba81c1b5479217c8286013559b1a1b16b36bfb76462f86a5961483b
+  data.tar.gz: 3f728d964017765a085df53446276db3bb4becf9d48044c6de31cbeb83f33dd40a5cc4953358515f33045e54b6bf9e4a9fff0863254d953be17644e87e085338

data/ftpmvc.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "terminal-notifier-guard"
   spec.add_development_dependency "codeclimate-test-reporter"
-  spec.add_dependency "ftpd"
+  spec.add_dependency "investtools-ftpd"
   spec.add_dependency "activesupport"
 end

data/lib/ftpmvc/format/csv.rb

@@ -2,16 +2,12 @@ require 'active_support/concern'
 require 'csv'
 
 module FTPMVC
-  module Formats
+  module Format
     module CSV
       extend ActiveSupport::Concern
-      @@date_format = nil
 
-      def header
-      end
-
-      def name
-        "#{super}.csv"
+      def initialize(filename)
+        super "#{filename}.csv"
       end
 
       def data
@@ -20,6 +16,9 @@ module FTPMVC
 
       protected
 
+      def header
+      end
+
       def csv
         ::CSV.generate do |csv|
           csv << header if header.present?

data/lib/ftpmvc/ftpd/file_system.rb

@@ -1,31 +1,42 @@
+require 'ftpmvc/logger'
+
 module FTPMVC
   module Ftpd
     class FileSystem
+
+      include Logger
+
       def initialize(application)
         @application = application
       end
 
       def dir(path)
+        logger.debug { "FTPMVC::Ftpd::FileSystem#dir(#{path})" }
         @application.index(path.gsub('/*', '')).map { |node| ::File.join(path, node.name) }
       end
 
       def directory?(path)
+        logger.debug { "FTPMVC::Ftpd::FileSystem#directory?(#{path})" }
         @application.directory?(path.gsub('/*', ''))
       end
 
       def read(path)
+        logger.debug { "FTPMVC::Ftpd::FileSystem#read(#{path})" }
         yield @application.get(path)
       end
 
       def accessible?(path)
+        logger.debug { "FTPMVC::Ftpd::FileSystem#accessible?(#{path})" }
         true
       end
 
       def exists?(path)
+        logger.debug { "FTPMVC::Ftpd::FileSystem#exists?(#{path})" }
         @application.exists?(path)
       end
 
       def file_info(path)
+        logger.debug { "FTPMVC::Ftpd::FileSystem#file_info(#{path})" }
         ::Ftpd::FileInfo.new(
           :ftype => directory?(path) ? 'directory' : 'file',
           :group => 'nogroup',

data/lib/ftpmvc/logger.rb

@@ -0,0 +1,35 @@
+require 'active_support/concern'
+
+module FTPMVC
+
+  def self.logger=(logger)
+    @logger = logger
+  end
+
+  def self.logger
+    @logger ||= create_logger
+  end
+
+  module Logger
+
+    extend ActiveSupport::Concern
+
+    def logger
+      FTPMVC.logger
+    end
+
+    module ClassMethods
+      def logger
+        FTPMVC.logger
+      end
+    end
+  end
+
+  protected
+
+  def self.create_logger
+    ::Logger.new(STDERR).tap do |logger|
+      logger.level = ::Logger::INFO
+    end
+  end
+end

data/lib/ftpmvc/server.rb

@@ -14,6 +14,10 @@ module FTPMVC
       driver = Ftpd::Driver.new(application)
       @server = ::Ftpd::FtpServer.new(driver)
       @server.interface, @server.port = @address, @port
+      @server.on_exception do |e|
+        puts e
+        puts e.backtrace
+      end
       @server.start
       @port = @server.bound_port
       self
@@ -22,10 +26,7 @@ module FTPMVC
     def start(application)
       start_in_new_thread(application)
       yield self if block_given?
-      # Manter o instance_variable_get até o pull request #29 ser aprovado
-      # o uma nova versão ficar disponível.
-      @server.instance_variable_get(:@server_thread).join
-      # @server.join
+      @server.join
     end
     
     def stop

data/lib/ftpmvc/test_helpers.rb

@@ -18,12 +18,12 @@ module FTPMVC
       end
     end
 
-    def get(ftp, path)
+    def get(ftp, path, encoding=nil)
       ''.tap do |response|
         ftp.retrbinary("RETR #{path}", 1024) do |block|
-          response << block.force_encoding('UTF-8')
+          response << block
         end
-        response
+        response.force_encoding(encoding) unless encoding.nil?
       end
     end
   end

data/lib/ftpmvc/version.rb

@@ -1,3 +1,3 @@
 module FTPMVC
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/ftpmvc.rb

@@ -4,3 +4,4 @@ require 'ftpmvc/file'
 require 'ftpmvc/application'
 require 'ftpmvc/format'
 require 'ftpmvc/authenticator'
+require 'ftpmvc/logger'

data/spec/lib/ftpmvc/format/csv_spec.rb

@@ -3,10 +3,10 @@ require './spec/spec_helper'
 require 'ftpmvc/format/csv'
 require 'ftpmvc/file'
 
-describe FTPMVC::Formats::CSV do
+describe FTPMVC::Format::CSV do
   let(:csv_file_class) do
     Class.new(FTPMVC::File) do
-      include FTPMVC::Formats::CSV
+      include FTPMVC::Format::CSV
       def rows
         [['a', 'b', 'c'], ['d', 'e', 'f']]
       end
@@ -38,7 +38,7 @@ describe FTPMVC::Formats::CSV do
     context 'when date_format is defined' do
       let(:csv_file_class) do
         Class.new(FTPMVC::File) do
-          include FTPMVC::Formats::CSV
+          include FTPMVC::Format::CSV
           date_format '%m/%d/%y'
           def rows
             [[Date.parse('2011-01-01')]]

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: ftpmvc
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - André Aizim Kelmanson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ftpd
+  name: investtools-ftpd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: FTP MVC framework
@@ -115,9 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -142,6 +142,7 @@ files:
 - lib/ftpmvc/ftpd.rb
 - lib/ftpmvc/ftpd/driver.rb
 - lib/ftpmvc/ftpd/file_system.rb
+- lib/ftpmvc/logger.rb
 - lib/ftpmvc/server.rb
 - lib/ftpmvc/test_helpers.rb
 - lib/ftpmvc/version.rb
@@ -164,12 +165,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -188,4 +189,3 @@ test_files:
 - spec/lib/ftpmvc/format/csv_spec.rb
 - spec/lib/ftpmvc/server_spec.rb
 - spec/spec_helper.rb
-has_rdoc: