img-sort 0.1.3 → 0.2.0

data/Gemfile

@@ -8,7 +8,6 @@ source "http://rubygems.org"
 gem 'rmagick'
 group :development do
   gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
+  gem "bundler" 
+  gem "jeweler"
 end

data/Gemfile.lock

@@ -1,14 +1,17 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
-    rcov (0.9.9)
+      rdoc
+    json (1.7.3)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
     rmagick (2.13.1)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
@@ -23,8 +26,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  rcov
+  bundler
+  jeweler
   rmagick
   rspec (~> 2.3.0)

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/img-sort.gemspec

@@ -4,15 +4,15 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{img-sort}
-  s.version = "0.1.3"
+  s.name = "img-sort"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Andrey Cherkashin}]
-  s.date = %q{2011-07-28}
-  s.description = %q{Sort images by their resolution and rename it if needed}
-  s.email = %q{with.out@me.com}
-  s.executables = [%q{img-sort}]
+  s.authors = ["Andrey Cherkashin"]
+  s.date = "2012-07-24"
+  s.description = "Sort images by their resolution and rename it if needed"
+  s.email = "with.out@me.com"
+  s.executables = ["img-sort"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -32,15 +32,11 @@ Gem::Specification.new do |s|
     "spec/img-sort_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/andoriyu/img-sort}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.3}
-  s.summary = %q{Image sorter}
-  s.test_files = [
-    "spec/img-sort_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.homepage = "http://github.com/andoriyu/img-sort"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "Image sorter"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -48,24 +44,21 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rmagick>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<rmagick>, [">= 0"])
     else
       s.add_dependency(%q<rmagick>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rmagick>, [">= 0"])
     end
   else
     s.add_dependency(%q<rmagick>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rmagick>, [">= 0"])
   end
 end

data/lib/img-sort.rb

@@ -9,7 +9,7 @@ require 'rmagick'
 class ImgSort
   attr_reader :options
 
-  VERSION="0.1.3"
+  VERSION="0.2.0"
 
   def initialize(arguments = {})
     @arguments = arguments
@@ -19,6 +19,9 @@ class ImgSort
     @options.quiet = false
     @options.rename = true
     @options.hash_function = 'md5'
+
+    @options.unsort = false
+    @options.copy = false
     # Init options parser
     @opt_parser = self.opts_parser
   end
@@ -32,8 +35,7 @@ class ImgSort
       puts "Start at #{@start_date}\n" if @options.verbose
       
       output_options if @options.verbose
-            
-      case sort!(@arguments[0], @arguments[1])
+      case set_path!(@arguments[0], @arguments[1])
         when 1
           puts "Source directory doesn't exists!"
           exit 1
@@ -41,6 +43,7 @@ class ImgSort
           puts "Source directory is empty!"
           exit 2
       end
+      unsort? ? unsort! : sort!
 
       @end_date = Time.now
       puts "Finished at #{@end_date}\n" if @options.verbose
@@ -57,15 +60,20 @@ class ImgSort
       opts = OptionParser.new do |x|
         x.banner= "img-sort [options] <source dir> <dst dir>"
         x.on('-v', '--version', 'Show version')  { output_version ; exit 0 }
-        x.on('-u', '--usage', 'Show usage')  { puts @opt_parser;  exit }
+        x.on('-u', '--usage', 'Show usage')  { puts @opt_parser;  exit 0 }
         x.on('-V', '--verbose', 'Be verbose')  { @options.verbose = true }  
         x.on('-q', '--quiet', 'Be quite')  { @options.quiet = true }
         x.on('-h', '--rename', 'Change file name to hash from that file (default)') {@options.rename = true}
-        x.on('-n', '--no-rename', 'Save original name') {@options.rename = false}        
+        x.on('-n', '--no-rename', 'Save original name') {@options.rename = false}
+        x.on('-U', '--unsort', 'Oposite of sort') { @options.unsort = true}
+        x.on('-c', '--copy', 'Copy instead of link (default on sorting operation)') { @options.copy = true if unsort? }
       end
       return opts
       
     end
+    def unsort?
+      @options.unsort
+    end
 
   
     def parsed_options?
@@ -111,12 +119,32 @@ class ImgSort
     def output_version
       puts "#{File.basename(__FILE__)} version #{VERSION}"
     end
-    
-    def sort!(from, to)
+    def set_path!(from, to)
       @from = File.expand_path(from)
       @to = File.expand_path(to)
       return 1 unless Dir.exists?(@from)
       return 2 if Dir.entries(@from).count <= 2
+    end
+    def unsort!
+      @files = Dir.glob("#{@from}/**/*.{png,jpg,jpeg,gif,tiff,bmp}")
+      puts "Found #{@files.count} files" unless @options.quite
+      return 2 if @files.empty?
+      FileUtils.mkdir @to unless Dir.exists?(@to)
+      count =  0
+      @total = @files.length
+      @files.each do |file|
+        count += 1
+        if @options.copy
+          FileUtils.cp file, "#{@to}/#{File.basename(file)}", :force => true
+          puts file ' copied' if @options.verbose
+        else
+          FileUtils.ln file, "#{@to}/#{File.basename(file)}", :force => true
+          puts file + ' linked' if @options.verbose
+        end
+      end
+    end
+
+    def sort!
       @files = Dir.glob("#{@from}/*.{png,jpg,jpeg,gif,tiff,bmp}")
       puts "Found #{@files.count} files" unless @options.quite     
       return 2 if @files.empty?
@@ -143,6 +171,5 @@ class ImgSort
         puts file + ' copied' if @options.verbose
       end
     end
-
 end
 

metadata

@@ -1,93 +1,105 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: img-sort
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Andrey Cherkashin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id006
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Sort images by their resolution and rename it if needed
 email: with.out@me.com
-executables: 
+executables:
 - img-sort
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -102,35 +114,31 @@ files:
 - spec/img-sort_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/andoriyu/img-sort
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 4211080693637194583
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4605182660146684131
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.3
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Image sorter
-test_files: 
-- spec/img-sort_spec.rb
-- spec/spec_helper.rb
+test_files: []