archiver 0.1.0 → 1.0.0

data/.travis.yml

@@ -1,2 +1,9 @@
-rvm: 
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
   - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode

data/Gemfile

@@ -2,7 +2,6 @@
 # Copyright (c) 2012. All rights reserved.
 
 source 'http://rubygems.org'
-gem 'thor', '~> 0.14.6'
 gem 'exifr', '~> 1.1.2'
 gem 'progressbar', '~> 0.10.0'
 

data/Rakefile

@@ -25,8 +25,8 @@ Jeweler::Tasks.new do |gem|
   gem.version = Archiver::Version::STRING
   gem.homepage = 'https://github.com/tbpro/archiver'
   gem.license = 'MIT'
-  gem.summary = %Q{Archiver is a simple gem to rename photos and videos}
-  gem.description = %Q{Archiver is a simple gem to rename photos and videos depending on creation date and exif informations and it sorts out duplicate files}
+  gem.summary = %Q{Archiver is a simple gem to rename photos and videos and archive them}
+  gem.description = %Q{Archiver is a simple gem to rename photos and videos depending on creation date and exif informations to archive directories in subfolders by year. It sorts out duplicate files to}
   gem.email = 'tboerger@tbpro.de'
   gem.authors = ['Thomas Boerger']
 end

data/archiver.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "archiver"
-  s.version = "0.1.0"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Boerger"]
-  s.date = "2012-03-18"
-  s.description = "Archiver is a simple gem to rename photos and videos depending on creation date and exif informations and it sorts out duplicate files"
+  s.date = "2012-11-02"
+  s.description = "Archiver is a simple gem to rename photos and videos depending on creation date and exif informations to archive directories in subfolders by year. It sorts out duplicate files to"
   s.email = "tboerger@tbpro.de"
   s.executables = ["archiver"]
   s.extra_rdoc_files = [
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
-    ".rvmrc",
     ".travis.yml",
     "Gemfile",
     "LICENSE.md",
@@ -27,34 +26,26 @@ Gem::Specification.new do |s|
     "archiver.gemspec",
     "bin/archiver",
     "lib/archiver.rb",
-    "lib/archiver/action.rb",
-    "lib/archiver/action/renaming.rb",
     "lib/archiver/cli.rb",
-    "lib/archiver/error.rb",
-    "lib/archiver/error/invalid_directory.rb",
-    "lib/archiver/output.rb",
-    "lib/archiver/output/cli.rb",
     "lib/archiver/record.rb",
     "lib/archiver/version.rb"
   ]
   s.homepage = "https://github.com/tbpro/archiver"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "Archiver is a simple gem to rename photos and videos"
+  s.rubygems_version = "1.8.24"
+  s.summary = "Archiver is a simple gem to rename photos and videos and archive them"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thor>, ["~> 0.14.6"])
       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<yard>, ["~> 0.7.5"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
     else
-      s.add_dependency(%q<thor>, ["~> 0.14.6"])
       s.add_dependency(%q<exifr>, ["~> 1.1.2"])
       s.add_dependency(%q<progressbar>, ["~> 0.10.0"])
       s.add_dependency(%q<redcarpet>, ["~> 2.1.0"])
@@ -62,7 +53,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     end
   else
-    s.add_dependency(%q<thor>, ["~> 0.14.6"])
     s.add_dependency(%q<exifr>, ["~> 1.1.2"])
     s.add_dependency(%q<progressbar>, ["~> 0.10.0"])
     s.add_dependency(%q<redcarpet>, ["~> 2.1.0"])

data/bin/archiver

@@ -3,11 +3,12 @@
 # Created by Thomas Boerger on 2012-03-16.
 # Copyright (c) 2012. All rights reserved.
 
-$:.push File.expand_path('../../lib', __FILE__)
-
 require 'rubygems'
-require 'archiver'
+require 'bundler'
 
-trap('INT') { exit 0 }
+Bundler.setup(:default)
+
+$:.push File.expand_path('../../lib', __FILE__)
+require 'archiver'
 
-Archiver::Cli.start
+Archiver::Cli.new(ARGV, STDOUT, STDERR)

data/lib/archiver/cli.rb

@@ -3,40 +3,111 @@
 # Created by Thomas Boerger on 2012-03-16.
 # Copyright (c) 2012. All rights reserved.
 
-require 'thor'
+require 'optparse'
 require 'progressbar'
 
 module Archiver
-  class Cli < Thor
-    include Thor::Actions
+  class Cli
+    attr_accessor :stdout
+    attr_accessor :stderr
+    attr_accessor :config
+    attr_accessor :parser
+    
+    def initialize(argv, stdout, stderr)
+      @stdout = stdout
+      @stderr = stderr
+      
+      @config = {
+        :verbose => false
+      }
+      
+      @parser = OptionParser.new do |opt|
+        opt.banner = "Usage: archiver [options] <fromdir> <intodir>"
+
+        opt.on("-V", "--verbose", "Verbose output format") do
+          @config[:verbose] = true
+        end
+
+        opt.on("-h", "--help", "Show this help message") do
+          puts @parser
+          exit 0
+        end
+        
+        opt.on("-v", "--version", "Show current version") do
+          puts "archiver v#{Version::STRING}"
+          exit 0
+        end
+      end
+
+      unless argv.size == 2
+        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"
+      end
 
-    method_option :verbose, :type => :boolean, :aliases => '-V', :default => false
-    method_option :source, :type => :string, :aliases => '-s', :default => '.'
+      unless File.directory? config[:intodir]
+        error "Intodir does not exist"
+      end
 
-    desc 'renaming [DESTINATION]', 'Rename all files in the defined directory'
-    def renaming(destination)
-      source = options['source']
-      verbose = options['verbose']
+      config[:fromdir_real] = File.realpath config[:fromdir]
+      config[:intodir_real] = File.realpath config[:intodir]
+    end
+    
+    def process
+      unless config[:verbose]
+        progress = ProgressBar.new('Archiver', records.count)
+      end
       
-      output = Archiver::Output::Cli.new(verbose)
-
-      begin
-        action = Archiver::Action::Renaming.new(
-          source,
-          destination,
-          output
-        )
-
-        action.process
-      rescue Archiver::Error::InvalidDirectory => e
-        raise Thor::Error.new 'Directories does not exist!'
-      rescue => e
-        if verbose
-          raise Thor::Error.new "Some action failed: #{e.message}"
+      records.each do |record|
+        next unless record.process?
+        record.move config[:intodir_real]
+
+        if config[:verbose]
+          puts "#{record.path} -> #{record.filename}"
         else
-          raise Thor::Error.new 'Some action failed!'
+          progress.inc
         end
       end
+      
+      if config[:verbose]
+        puts "Processed #{records.count} records!"
+      else
+        progress.finish
+      end
+    rescue SystemExit, Interrupt
+      progress.finish if progress
+      exit 1
+    end
+
+    def records
+      @records ||= begin
+        rows = []
+        Dir.glob(File.join(config[:fromdir_real], '**', '*')).each do |row|
+          next if File.directory? row
+          rows << Record.new(row)
+        end
+        
+        rows
+      end
+    end
+    
+    def error(message)
+      puts "Error: #{message}"
+      puts @parser
+      exit 1
     end
   end
 end

data/lib/archiver/record.rb

@@ -1,126 +1,134 @@
-# -*- encoding : utf-8 -*-
-
-# Created by Thomas Boerger on 2012-03-16.
-# Copyright (c) 2012. All rights reserved.
-
-require 'exifr'
-require 'digest/md5'
-
-module Archiver
-  class Record
-    attr_accessor :path
-
-    def initialize(path)
-      @path = path
-    end
-
-    def filename(counter = 0)
-      append = if counter > 0
-        sprintf('-%03d', counter)
-      else
-        nil
-      end
-
-      [
-        created.strftime('%Y%m%d-%H%M%S'),
-        append,
-        extension
-      ].compact.join
-    end
-
-    def extension
-      if mime_type.match /^image\/jpeg$/i
-        return '.jpg'
-      end
-
-      if mime_type.match /^image\/gif$/i
-        return '.gif'
-      end
-
-      if mime_type.match /^image\/png$/i
-        return '.png'
-      end
-
-      if mime_type.match /^video\/3gpp$/i
-        return '.mp4'
-      end
-
-      File.extname(path).downcase
-    end
-
-    def created
-      if exif_data and exif_data.date_time_original
-        exif_data.date_time_original
-      else
-        File.mtime(path)
-      end
-    end
-
-    def checksum
-      @checksum ||= Digest::MD5.hexdigest(File.read(path))
-    end
-
-    def mime_type
-      @mime_type ||= mime_detect
-        .split(';')
-        .first
-        .strip
-    end
-
-    def exif_data
-      @exif_data ||= exif_detect
-    end
-
-    def process?
-      image? or video?
-    end
-
-    def image?
-      !!(mime_type.match /^image\/.*/i)
-    end
-
-    def video?
-      !!(mime_type.match /^video\/.*/i)
-    end
-
-    def same?(other)
-      if other.is_a? Record
-        checksum == other.checksum
-      else
-        checksum == Digest::MD5.hexdigest(File.read(other))
-      end
-    end
-    
-    def move(directory, counter = 0)
-      destination = File.join(directory, filename(counter))
-
-      if File.exists? destination
-        if same? destination
-          FileUtils.rm_rf path
-        else
-          move(directory, counter + 1)
-        end
-      else
-        FileUtils.cp path, destination
-        FileUtils.rm_rf path
-      end
-    end
-
-    protected
-      def mime_detect
-        `/usr/bin/env file --brief --mime "#{path}"`
-      end
-
-      def exif_detect
-        if mime_type.match(/^image\/jpeg/i)
-          return EXIFR::JPEG.new(path)
-        end
-
-        if mime_type.match(/^image\/tiff/i)
-          return EXIFR::TIFF.new(path)
-        end
-
-        nil
-      end
-  end
+# -*- encoding : utf-8 -*-
+
+# Created by Thomas Boerger on 2012-03-16.
+# Copyright (c) 2012. All rights reserved.
+
+require 'exifr'
+require 'digest/md5'
+
+module Archiver
+  class Record
+    attr_accessor :path
+
+    def initialize(path)
+      @path = path
+    end
+
+    def filename(counter = 0)
+      append = if counter > 0
+        sprintf('-%03d', counter)
+      else
+        nil
+      end
+
+      [
+        created.strftime('%Y%m%d-%H%M%S'),
+        append,
+        extension
+      ].compact.join
+    end
+
+    def extension
+      if mime_type.match /^image\/jpeg$/i
+        return '.jpg'
+      end
+
+      if mime_type.match /^image\/gif$/i
+        return '.gif'
+      end
+
+      if mime_type.match /^image\/png$/i
+        return '.png'
+      end
+
+      if mime_type.match /^video\/3gpp$/i
+        return '.mp4'
+      end
+
+      File.extname(path).downcase
+    end
+
+    def created
+      if exif_data and exif_data.date_time_original
+        exif_data.date_time_original
+      else
+        File.mtime(path)
+      end
+    end
+
+    def checksum
+      @checksum ||= Digest::MD5.hexdigest(File.read(path))
+    end
+
+    def mime_type
+      @mime_type ||= mime_detect
+        .split(';')
+        .first
+        .strip
+    end
+
+    def exif_data
+      @exif_data ||= exif_detect
+    end
+
+    def process?
+      image? or video?
+    end
+
+    def image?
+      !!(mime_type.match /^image\/.*/i)
+    end
+
+    def video?
+      !!(mime_type.match /^video\/.*/i)
+    end
+
+    def same?(other)
+      if other.is_a? Record
+        checksum == other.checksum
+      else
+        checksum == Digest::MD5.hexdigest(File.read(other))
+      end
+    end
+    
+    def move(directory, counter = 0)
+      destination = File.join(directory, segment, filename(counter))
+
+      unless File.directory? File.dirname(destination)
+        FileUtils.mkdir_p File.dirname(destination)
+      end
+
+      if File.exists? destination
+        if same? destination
+          FileUtils.rm_rf path
+        else
+          move(directory, counter + 1)
+        end
+      else
+        FileUtils.cp path, destination
+        FileUtils.rm_rf path
+      end
+    end
+
+    def segment
+      created.strftime('%Y')
+    end
+
+    protected
+      def mime_detect
+        `/usr/bin/env file --brief --mime "#{path}"`
+      end
+
+      def exif_detect
+        if mime_type.match(/^image\/jpeg/i)
+          return EXIFR::JPEG.new(path)
+        end
+
+        if mime_type.match(/^image\/tiff/i)
+          return EXIFR::TIFF.new(path)
+        end
+
+        nil
+      end
+  end
 end

data/lib/archiver/version.rb

@@ -5,8 +5,8 @@
 
 module Archiver
   module Version
-    MAJOR = 0
-    MINOR = 1
+    MAJOR = 1
+    MINOR = 0
     PATCH = 0
     BUILD = nil
 

data/lib/archiver.rb

@@ -6,8 +6,5 @@
 module Archiver
   autoload :Version, 'archiver/version'
   autoload :Cli, 'archiver/cli'
-  autoload :Error, 'archiver/error'
-  autoload :Action, 'archiver/action'
   autoload :Record, 'archiver/record'
-  autoload :Output, 'archiver/output'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: archiver
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-18 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
-  requirement: &70302533002720 !ruby/object:Gem::Requirement
+  name: exifr
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70302533002720
-- !ruby/object:Gem::Dependency
-  name: exifr
-  requirement: &70302533001980 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *70302533001980
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70302533000800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +37,15 @@ dependencies:
         version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70302533000800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70302532999960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +53,15 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *70302532999960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70302532999420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +69,15 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *70302532999420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.5
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70302532998880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,9 +85,15 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70302532998880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 description: Archiver is a simple gem to rename photos and videos depending on creation
-  date and exif informations and it sorts out duplicate files
+  date and exif informations to archive directories in subfolders by year. It sorts
+  out duplicate files to
 email: tboerger@tbpro.de
 executables:
 - archiver
@@ -87,7 +102,6 @@ extra_rdoc_files:
 - LICENSE.md
 - README.md
 files:
-- .rvmrc
 - .travis.yml
 - Gemfile
 - LICENSE.md
@@ -96,13 +110,7 @@ files:
 - archiver.gemspec
 - bin/archiver
 - lib/archiver.rb
-- lib/archiver/action.rb
-- lib/archiver/action/renaming.rb
 - lib/archiver/cli.rb
-- lib/archiver/error.rb
-- lib/archiver/error/invalid_directory.rb
-- lib/archiver/output.rb
-- lib/archiver/output/cli.rb
 - lib/archiver/record.rb
 - lib/archiver/version.rb
 homepage: https://github.com/tbpro/archiver
@@ -120,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -885210058386209972
+      hash: 3630215323667943547
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,8 +137,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Archiver is a simple gem to rename photos and videos
+summary: Archiver is a simple gem to rename photos and videos and archive them
 test_files: []

data/.rvmrc

@@ -1 +0,0 @@
-rvm use ruby-1.9.3-head@archiver --create

data/lib/archiver/action/renaming.rb

@@ -1,61 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-# Created by Thomas Boerger on 2012-03-16.
-# Copyright (c) 2012. All rights reserved.
-
-module Archiver
-  module Action
-    class Renaming
-      attr_accessor :source
-      attr_accessor :destination
-      attr_accessor :output
-
-      attr_accessor :records
-
-      def initialize(source, destination, output)
-        @source = source
-        @destination = destination
-        @output = output
-
-        @records = []
-
-        check_directories
-        load_records
-      end
-
-      def process
-        records.each do |record|
-          next unless record.process?
-          
-          record.move destination
-          output.process record
-        end
-        
-        output.finish!
-      end
-
-      protected
-        def check_directories
-          unless File.directory? source
-            raise Archiver::Error::InvalidDirectory
-          end
-
-          unless File.directory? destination
-            raise Archiver::Error::InvalidDirectory
-          end
-
-          @source = File.realpath source
-          @destination = File.realpath destination
-        end
-
-        def load_records
-          Dir.glob([source, '**', '*'].join('/')).each do |record|
-            next if File.directory? record
-            @records << Archiver::Record.new(record)
-          end
-
-          output.count = records.count
-        end
-    end
-  end
-end

data/lib/archiver/action.rb

@@ -1,10 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-# Created by Thomas Boerger on 2012-03-16.
-# Copyright (c) 2012. All rights reserved.
-
-module Archiver
-  module Action
-    autoload :Renaming, 'archiver/action/renaming'
-  end
-end

data/lib/archiver/error/invalid_directory.rb

@@ -1,11 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-# Created by Thomas Boerger on 2012-03-16.
-# Copyright (c) 2012. All rights reserved.
-
-module Archiver
-  module Error
-    class InvalidDirectory < StandardError
-    end
-  end
-end

data/lib/archiver/error.rb

@@ -1,10 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-# Created by Thomas Boerger on 2012-03-16.
-# Copyright (c) 2012. All rights reserved.
-
-module Archiver
-  module Error
-    autoload :InvalidDirectory, 'archiver/error/invalid_directory'
-  end
-end

data/lib/archiver/output/cli.rb

@@ -1,46 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-# Created by Thomas Boerger on 2012-03-16.
-# Copyright (c) 2012. All rights reserved.
-
-require 'progressbar'
-
-module Archiver
-  class Output
-    class Cli
-      attr_accessor :verbose
-      attr_accessor :count
-      attr_accessor :working
-      attr_accessor :progress
-
-      def initialize(verbose)
-        @verbose = verbose
-        @count = 0
-        @working = 0
-      end
-      
-      def count=(value)
-        @progress = ProgressBar.new('Archiver', value) unless verbose
-        @count = value
-      end
-      
-      def process(record)
-        @working += 1
-        
-        if verbose
-          puts "#{sprintf('%05d', @working)}/#{sprintf('%05d', count)}: #{record.path} -> #{record.filename}"
-        else
-          progress.inc
-        end
-      end
-      
-      def finish!
-        if verbose
-          puts "Processed #{count} records!"
-        else
-          progress.finish
-        end
-      end
-    end
-  end
-end

data/lib/archiver/output.rb

@@ -1,10 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-# Created by Thomas Boerger on 2012-03-16.
-# Copyright (c) 2012. All rights reserved.
-
-module Archiver
-  class Output
-    autoload :Cli, 'archiver/output/cli'
-  end
-end