boatman 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/boatman.gemspec

@@ -0,0 +1,88 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{boatman}
+  s.version = "0.1.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Bruz Marzolf"]
+  s.date = %q{2011-04-19}
+  s.default_executable = %q{boatman}
+  s.description = %q{}
+  s.email = %q{bmarzolf@systemsbiology.org}
+  s.executables = ["boatman"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/boatman",
+    "lib/boatman.rb",
+    "lib/boatman/copyable.rb",
+    "lib/boatman/ext/class.rb",
+    "lib/boatman/ext/fixnum.rb",
+    "lib/boatman/ext/string.rb",
+    "lib/boatman/monitored_directory.rb",
+    "lib/boatman/monitored_file.rb",
+    "spec/boatman_spec.rb",
+    "spec/data/copy_exception.rb",
+    "spec/data/copy_exception.yml",
+    "spec/data/filename_ending.rb",
+    "spec/data/filename_ending.yml",
+    "spec/data/filename_ending_regexp.rb",
+    "spec/data/filename_ending_regexp.yml",
+    "spec/data/filename_regexp.rb",
+    "spec/data/filename_regexp.yml",
+    "spec/data/folder.rb",
+    "spec/data/folder.yml",
+    "spec/data/invalid_directory.rb",
+    "spec/data/invalid_directory.yml",
+    "spec/data/modify.rb",
+    "spec/data/modify.yml",
+    "spec/data/no_destination_folder.rb",
+    "spec/data/no_destination_folder.yml",
+    "spec/data/rename.rb",
+    "spec/data/rename.yml",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/bmarzolf/boatman}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Ruby DSL for ferrying around and manipulating files}
+  s.test_files = [
+    "spec/boatman_spec.rb",
+    "spec/data/copy_exception.rb",
+    "spec/data/filename_ending.rb",
+    "spec/data/filename_ending_regexp.rb",
+    "spec/data/filename_regexp.rb",
+    "spec/data/folder.rb",
+    "spec/data/invalid_directory.rb",
+    "spec/data/modify.rb",
+    "spec/data/no_destination_folder.rb",
+    "spec/data/rename.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+  end
+end
+

data/lib/boatman.rb

@@ -1,3 +1,10 @@
+begin
+  require "ftputils"
+rescue LoadError
+  require "rubygems"
+  require "ftputils"
+end
+
 require "yaml"
 require "digest/md5"
 
@@ -68,9 +75,19 @@ class Boatman
 
       tasks.each do |task|
         if task[:last_run].nil? || Time.now - task[:last_run] > task[:time_interval]
-          # do everything in the context of the working directory
-          Dir.chdir(@working_directory) do
-            task[:directory].instance_eval &task[:block]
+          begin
+            # do everything in the context of the working directory
+            puts "Going to check #{task[:directory].path} at #{Time.now}" if $DEBUG
+            Dir.chdir(@working_directory) do
+              task[:directory].instance_eval &task[:block]
+            end
+            puts "Leaving #{task[:directory].path} at #{Time.now}" if $DEBUG
+          rescue Exception => e
+            Boatman.logger.error "Task monitoring #{task[:directory].path} had an error: #{e.message}" rescue nil
+            Boatman.logger.error "Backtrace: #{e.backtrace.join("\n")}" if $DEBUG
+
+            # clear the FTP connection cache for good luck
+            FTPUtils::FTPConnection.clear_connection_cache
           end
 
           task[:last_run] = Time.now

data/lib/boatman/copyable.rb

@@ -2,20 +2,20 @@ class Boatman
   module Copyable
     def copy(file, params, remove_original=false, &block)
       source_path = file.path
-      base_name = params[:rename] || File.basename(source_path)
+      base_name = params[:rename] || FTPUtils::FTPFile.basename(source_path)
 
-      destination_path = File.expand_path(params[:to] + "/" + base_name) 
+      destination_path = FTPUtils::FTPFile.expand_path(params[:to] + "/" + base_name) 
 
-      return if File.exists?(destination_path)
+      return if FTPUtils::FTPFile.exists?(destination_path)
 
       begin
         copy_entry(source_path, destination_path, &block)
-        FileUtils.rm_r source_path if remove_original
+        FTPUtils.rm_r source_path if remove_original
 
         Boatman.logger.info "Successfully copied #{source_path} to #{destination_path}"
       rescue Exception => e
-        # remove the possible incorrect destination file 
-        FileUtils.rm_r "#{destination_path}"
+        # remove the possibly incorrect destination file 
+        FTPUtils.rm_r "#{destination_path}" rescue nil
         Boatman.logger.error "#{e.message} at #{e.backtrace[0]}"
       end
     end

data/lib/boatman/monitored_directory.rb

@@ -25,20 +25,20 @@ class Boatman
       @minimum_age ||= false
       @maximum_age ||= false
 
-      entry_paths = Dir.entries(@path).grep(/#{entry_pattern}/).collect do |name|
+      entry_paths = FTPUtils.ls(@path).grep(/#{entry_pattern}/).collect do |name|
         "#{@path}/#{name}"
       end
 
       Boatman.logger.debug "Found #{entry_paths.size} entries in #{@path}"
       entry_paths.each do |entry_path|
-        next if type == :file && !File.file?(entry_path)
-        next if type == :directory && !File.directory?(entry_path)
+        next if type == :file && !FTPUtils::FTPFile.file?(entry_path)
+        next if type == :directory && !FTPUtils::FTPFile.directory?(entry_path)
 
-        age = Time.now - File.mtime(entry_path)
+        age = Time.now - FTPUtils::FTPFile.mtime(entry_path)
         next if @minimum_age && age < @minimum_age
         next if @maximum_age && age > @maximum_age
 
-        match_data = File.basename(entry_path).match(entry_pattern) if entry_pattern.is_a?(Regexp)
+        match_data = FTPUtils::FTPFile.basename(entry_path).match(entry_pattern) if entry_pattern.is_a?(Regexp)
         case type
         when :file
           entry = MonitoredFile.new(entry_path, match_data)
@@ -69,13 +69,14 @@ class Boatman
     private
 
     def copy_entry(source_path, destination_path, &block)
-      FileUtils.mkdir_p File.dirname(destination_path)
-      FileUtils.cp_r source_path, destination_path
+      FTPUtils.mkdir_p FTPUtils::FTPFile.dirname(destination_path)
       
       if block_given?
-        yield destination_path, "#{destination_path}.tmp"
-        FileUtils.cp_r "#{destination_path}.tmp", destination_path
-        FileUtils.rm_r "#{destination_path}.tmp"
+        yield source_path, "#{destination_path}.tmp"
+        FTPUtils.cp_r "#{destination_path}.tmp", destination_path
+        FTPUtils.rm_r "#{destination_path}.tmp"
+      else
+        FTPUtils.cp_r source_path, destination_path
       end
     end
 

data/lib/boatman/monitored_file.rb

@@ -17,24 +17,38 @@ class Boatman
     private
 
     def copy_entry(source_path, destination_path, &block)
-      FileUtils.mkdir_p File.dirname(destination_path)
-      FileUtils.cp source_path, destination_path
-      
-      unless @checksum_verification_disabled
-        verify_checksum_matches(source_path, destination_path, &block)
-      end
+      FTPUtils.mkdir_p FTPUtils::FTPFile.dirname(destination_path)
 
       if block_given?
-        yield destination_path, "#{destination_path}.tmp"
-        FileUtils.cp "#{destination_path}.tmp", destination_path
-        FileUtils.rm "#{destination_path}.tmp"
+        yield source_path, "#{destination_path}.tmp"
+        FTPUtils.cp "#{destination_path}.tmp", destination_path
+        FTPUtils.rm "#{destination_path}.tmp"
+      else
+        FTPUtils.cp source_path, destination_path
+        
+        unless @checksum_verification_disabled
+          verify_checksum_matches(source_path, destination_path)
+        end
       end
     end
 
     def verify_checksum_matches(file_1, file_2)
-      file_1_digest = Digest::MD5.hexdigest( File.read(file_1) )
-      file_2_digest = Digest::MD5.hexdigest( File.read(file_2) )
+      file_1_digest = incremental_digest(file_1)
+      file_2_digest = incremental_digest(file_2)
       raise "Checksum verification failed when copying #{base_name}" unless  file_1_digest == file_2_digest
     end
+
+    def incremental_digest(file_name)
+      file = open(file_name, "r")
+
+      digester = Digest::MD5.new
+      file.each_line do |line|
+        digester << line
+      end
+
+      file.close
+
+      return digester.hexdigest
+    end
   end
 end

data/spec/boatman_spec.rb

@@ -9,11 +9,11 @@ describe "Moving new files from one location to another" do
   end
 
   def run_boatman
-    thread = Thread.new do
+    @thread = Thread.new do
       Boatman.run
     end
     sleep 2
-    thread.exit
+    @thread.exit
   end
 
   it "should move based on filename ending" do
@@ -96,6 +96,16 @@ describe "Moving new files from one location to another" do
     File.exist?(@working_directory + '/tmp/destination/datafile.txt').should be_false
   end
 
+  it "should not raise and exception (and crash boatman) when a task raises and exception" do
+    FileUtils.touch(@working_directory + '/tmp/source/datafile.txt')
+
+    boatman = Boatman.load(["#{@working_directory}/invalid_directory.yml", @working_directory])
+    run_boatman
+
+    # nil status indicates an exception was thrown
+    @thread.status.should_not be_nil
+  end
+
   after(:each) do
     FileUtils.rm_rf(@working_directory + '/tmp')
   end

data/spec/data/invalid_directory.rb

@@ -0,0 +1,7 @@
+source_folder.check_every 1.second do
+  age :greater_than => 0.minutes
+
+  files_ending_with "txt" do |file|
+    copy file, :to => destination_folder
+  end
+end

data/spec/data/invalid_directory.yml

@@ -0,0 +1,5 @@
+tasks:
+- invalid_directory.rb
+directories:
+  source_folder: tmp/nonexistent_source
+  destination_folder: tmp/destination

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: boatman
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Bruz Marzolf
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 -08:00
+date: 2011-04-19 00:00:00 -07:00
 default_executable: boatman
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 description: ""
 email: bmarzolf@systemsbiology.org
 executables: 
@@ -33,12 +42,12 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - bin/boatman
+- boatman.gemspec
 - lib/boatman.rb
 - lib/boatman/copyable.rb
 - lib/boatman/ext/class.rb
@@ -57,6 +66,8 @@ files:
 - spec/data/filename_regexp.yml
 - spec/data/folder.rb
 - spec/data/folder.yml
+- spec/data/invalid_directory.rb
+- spec/data/invalid_directory.yml
 - spec/data/modify.rb
 - spec/data/modify.yml
 - spec/data/no_destination_folder.rb
@@ -70,37 +81,40 @@ homepage: http://github.com/bmarzolf/boatman
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby DSL for ferrying around and manipulating files
 test_files: 
-- spec/spec_helper.rb
 - spec/boatman_spec.rb
-- spec/data/rename.rb
+- spec/data/copy_exception.rb
 - spec/data/filename_ending.rb
-- spec/data/no_destination_folder.rb
-- spec/data/filename_regexp.rb
-- spec/data/modify.rb
 - spec/data/filename_ending_regexp.rb
+- spec/data/filename_regexp.rb
 - spec/data/folder.rb
-- spec/data/copy_exception.rb
+- spec/data/invalid_directory.rb
+- spec/data/modify.rb
+- spec/data/no_destination_folder.rb
+- spec/data/rename.rb
+- spec/spec_helper.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC