archiver 1.0.0 → 1.0.1

data/Gemfile

@@ -6,7 +6,7 @@ gem 'exifr', '~> 1.1.2'
 gem 'progressbar', '~> 0.10.0'
 
 group :development do
-  gem 'redcarpet', '~> 2.1.0'
+  gem 'whitespace', '~> 2.0.4'
   gem 'yard', '~> 0.7.5'
   gem 'jeweler', '~> 1.8.3'
 end

data/archiver.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "archiver"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Boerger"]
@@ -42,20 +42,20 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<exifr>, ["~> 1.1.2"])
       s.add_runtime_dependency(%q<progressbar>, ["~> 0.10.0"])
-      s.add_development_dependency(%q<redcarpet>, ["~> 2.1.0"])
+      s.add_development_dependency(%q<whitespace>, ["~> 2.0.4"])
       s.add_development_dependency(%q<yard>, ["~> 0.7.5"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
     else
       s.add_dependency(%q<exifr>, ["~> 1.1.2"])
       s.add_dependency(%q<progressbar>, ["~> 0.10.0"])
-      s.add_dependency(%q<redcarpet>, ["~> 2.1.0"])
+      s.add_dependency(%q<whitespace>, ["~> 2.0.4"])
       s.add_dependency(%q<yard>, ["~> 0.7.5"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     end
   else
     s.add_dependency(%q<exifr>, ["~> 1.1.2"])
     s.add_dependency(%q<progressbar>, ["~> 0.10.0"])
-    s.add_dependency(%q<redcarpet>, ["~> 2.1.0"])
+    s.add_dependency(%q<whitespace>, ["~> 2.0.4"])
     s.add_dependency(%q<yard>, ["~> 0.7.5"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
   end

data/bin/archiver

@@ -6,8 +6,6 @@
 require 'rubygems'
 require 'bundler'
 
-Bundler.setup(:default)
-
 $:.push File.expand_path('../../lib', __FILE__)
 require 'archiver'
 

data/lib/archiver/cli.rb

@@ -12,78 +12,95 @@ module Archiver
     attr_accessor :stderr
     attr_accessor :config
     attr_accessor :parser
-    
+
     def initialize(argv, stdout, stderr)
       @stdout = stdout
       @stderr = stderr
-      
+
       @config = {
-        :verbose => false
+        :verbose => false,
+        :from => false,
+        :into => false
       }
-      
+
       @parser = OptionParser.new do |opt|
-        opt.banner = "Usage: archiver [options] <fromdir> <intodir>"
+        opt.banner = "Usage: archiver [options]"
+
+        opt.separator ""
+        opt.separator "Mandatory options:"
+
+        opt.on("-f", "--from DIR", "From directory name") do |dir|
+          @config[:from] = dir
+        end
+
+        opt.on("-i", "--into DIR", "Into directory name") do |dir|
+          @config[:into] = dir
+        end
+
+        opt.separator ""
+        opt.separator "Optional options:"
 
         opt.on("-V", "--verbose", "Verbose output format") do
           @config[:verbose] = true
         end
 
         opt.on("-h", "--help", "Show this help message") do
-          puts @parser
+          stdout.puts @parser
           exit 0
         end
-        
+
         opt.on("-v", "--version", "Show current version") do
-          puts "archiver v#{Version::STRING}"
+          stdout.puts "archiver v#{Version::STRING}"
           exit 0
         end
       end
 
-      unless argv.size == 2
+      @parser.parse!
+
+      unless @config[:from] or @config[:into]
         puts @parser
         exit 1
       end
-      
-      @config[:fromdir] = argv.shift
-      @config[:intodir] = argv.shift
 
-      @parser.parse!
-      
       checks
       process
     end
-    
+
     def checks
-      unless File.directory? config[:fromdir]
-        error "Fromdir does not exist"
+      unless File.directory? config[:from]
+        error "Fromdir #{config[:from]} does not exist"
       end
 
-      unless File.directory? config[:intodir]
-        error "Intodir does not exist"
+      unless File.directory? config[:into]
+        error "Intodir #{config[:into]} does not exist"
       end
 
-      config[:fromdir_real] = File.realpath config[:fromdir]
-      config[:intodir_real] = File.realpath config[:intodir]
+      config[:fromdir] = File.realpath config[:from]
+      config[:intodir] = File.realpath config[:into]
     end
-    
+
     def process
       unless config[:verbose]
-        progress = ProgressBar.new('Archiver', records.count)
+        progress = ProgressBar.new("Archiver", records.count, stdout)
       end
-      
+
       records.each do |record|
         next unless record.process?
-        record.move config[:intodir_real]
 
         if config[:verbose]
-          puts "#{record.path} -> #{record.filename}"
+          from = record.path.gsub(/^#{config[:fromdir]}\//, "")
+          into = File.join(record.segment, record.filename)
+
+          stdout.puts "#{from} -> #{into}"
         else
           progress.inc
         end
+
+        record.move config[:intodir]
       end
-      
+
       if config[:verbose]
-        puts "Processed #{records.count} records!"
+        stdout.puts "Processed #{records.count} records!"
       else
         progress.finish
       end
@@ -95,18 +112,18 @@ module Archiver
     def records
       @records ||= begin
         rows = []
-        Dir.glob(File.join(config[:fromdir_real], '**', '*')).each do |row|
+        Dir.glob(File.join(config[:fromdir], "**", "*")).each do |row|
           next if File.directory? row
           rows << Record.new(row)
         end
-        
+
         rows
       end
     end
-    
+
     def error(message)
-      puts "Error: #{message}"
-      puts @parser
+      stderr.puts "Error: #{message}"
+      stderr.puts @parser
       exit 1
     end
   end

data/lib/archiver/record.rb

@@ -45,6 +45,10 @@ module Archiver
         return '.mp4'
       end
 
+      if mime_type.match /^video\/quicktime$/i
+        return '.mov'
+      end
+
       File.extname(path).downcase
     end
 
@@ -76,11 +80,19 @@ module Archiver
     end
 
     def image?
-      !!(mime_type.match /^image\/.*/i)
+      if mime_type.match /^image\/.*/i
+        true
+      else
+        false
+      end
     end
 
     def video?
-      !!(mime_type.match /^video\/.*/i)
+      if mime_type.match /^video\/.*/i
+        true
+      else
+        false
+      end
     end
 
     def same?(other)
@@ -90,7 +102,7 @@ module Archiver
         checksum == Digest::MD5.hexdigest(File.read(other))
       end
     end
-    
+
     def move(directory, counter = 0)
       destination = File.join(directory, segment, filename(counter))
 
@@ -131,4 +143,4 @@ module Archiver
         nil
       end
   end
-end
+end

data/lib/archiver/version.rb

@@ -7,7 +7,7 @@ module Archiver
   module Version
     MAJOR = 1
     MINOR = 0
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: archiver
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -44,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: whitespace
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3630215323667943547
+      hash: -4308012420230902379
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: