filerenamer 0.0.7 → 0.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 99ca95ef5325360cc3bf6420b62cfccc647bada4
+  data.tar.gz: d3661cc6539b33a852a48aeb47ca8cedf6b60483
+SHA512:
+  metadata.gz: 645303f1932727adf0bdbfc85dbc5f536a149cb52f57aac4b43404c5021178a8f9300522fa5d95552900f709a153febc890ae52bd61044a553867e3b85fcf0b0
+  data.tar.gz: 59320c483c0bf804b48d02f65aa4aea92911e672f38ae6286a74a3ffbad627c0b1ee0bcfd852f1c856cae4f30f4255777f02fc80828d9da4143be145a82673cd

data/CHANGES

@@ -1,6 +1,15 @@
 = filerenamer Changelog
 
-== Master (for 0.0.7)
+== Master (for 0.0.9)
+
+== Version 0.0.8 [2015-07-23] released
+* Add --preserve option to bin/rentime.
+* Small change of --help of bin/classify.
+* renreg: '/' to '／' is ignored.
+* Add automatic detection zero-padding width to bin/rennum.
+* Add --random option to bin/rennum.
+
+== Version 0.0.7 [2013-12-20] released
 * classify -u to lowercase.
 * classify -4 to 2chars and 2layer-directoriess.
 * renhash -C to use various hash commmands not sha256sum.

data/Gemfile

@@ -6,9 +6,10 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "test-unit", "~> 3.1.2"
   gem "rdoc", "~> 4.0.1"
-  gem "bundler", "~> 1.3.5"
-  gem "jeweler", "~> 1.8.3"
+  gem "bundler", "~> 1.10.5"
+  gem "jeweler", "~> 2.0.1"
   gem "simplecov", ">= 0"
   gem "builtinextension", "~> 0.1.0"
   gem "capture_stdout", "~> 0.0"

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/bin/classify

@@ -92,7 +92,7 @@ require "filerenamer.rb"
 OPTIONS = {}
 op = FileRenamer::OptionParser.new
 op.on("-k"       , "--kakasi" , "Japanese yomi dirname. (Using kakasi)"){ OPTIONS[:kakasi] = true}
-op.on("-u"       , "--unite"  , "Unite group of chars. E.g., t -> T."){   OPTIONS[:unite] = true}
+op.on("-u"       , "--unite"  , "Unite group of chars. E.g., T -> t."){   OPTIONS[:unite] = true}
 op.on("-l number", "--length=number", "Indicate length of initial characters. Default number = 1."){|v| OPTIONS[:length] = v.to_i}
 op.on("-a number", "--auto-length=number", "Automatically decided length for each filename. 'number' is identificatio length."){|v| OPTIONS[:auto] = v.to_i}
 op.on("-s"       , "--shorten", "Shorten filename, duplicated part with the dirname."){ OPTIONS[:shorten] = true}

data/bin/rennum

@@ -1,11 +1,13 @@
 #! /usr/bin/ruby -w
 # coding: utf-8
 
+# rename using serial number.
 # 拡張子は保存
 # -i オプションで開始番号を指定
 # -p : preserve old name 元のファイル名を残す。foo.txt -> 001-foo.txt
-require "filerenamer/commander.rb"
-require "filerenamer/optionparser.rb"
+require 'pp'
+require 'filerenamer/commander.rb'
+require 'filerenamer/optionparser.rb'
 
 
 OPTIONS = {}
@@ -16,18 +18,28 @@ op.on("-i num", "--initial", "Indicate initial number."){ |val|
 op.on("-p", "--preserve", "Preserve old name."){
   OPTIONS[:preserve] = true
 }
+op.on("-r", "--random", "Random number."){
+  OPTIONS[:random] = true
+}
 op.parse!(ARGV)
 
 OPTIONS[:init] ||= 0
 
-fr = FileRenamer::Commander.new(op.options, ARGV)
+files = FileRenamer::Commander.files(ARGV)
+last_number = OPTIONS[:init].to_i +  files.size - 1
+width = last_number.to_s.size
+
+files.shuffle!  if OPTIONS[:random]
+
+fr = FileRenamer::Commander.new(op.options, files)
+
 fr.execute do |filename|
   @counter ||= OPTIONS[:init]
   if (OPTIONS[:preserve])
-    new_name = sprintf("%03d-%s", @counter, filename)
+    new_name = sprintf("%0#{width}d-%s", @counter, filename)
   else 
     extention = File.extname(filename)
-    new_name = sprintf("%03d%s", @counter, extention)
+    new_name = sprintf("%0#{width}d%s", @counter, extention)
   end
   @counter += 1
   new_name

data/bin/renreg

@@ -39,17 +39,21 @@ fr.execute do |filename|
   new_name.gsub!('$', '＄'); new_name.gsub!('%', '％'); new_name.gsub!('&', '＆');
   new_name.gsub!("'", '’'); new_name.gsub!('(', '（'); new_name.gsub!(')', '）');
   new_name.gsub!('*', '＊'); new_name.gsub!('+', '＋'); new_name.gsub!(',', '，');
-  new_name.gsub!('-', '-'); new_name.gsub!('/', '／');
+  new_name.gsub!('-', '-');
   new_name.gsub!(':', '：'); new_name.gsub!(';', '；'); new_name.gsub!('<', '＜');
   new_name.gsub!('=', '＝'); new_name.gsub!('>', '＞'); new_name.gsub!('?', '？');
   new_name.gsub!('@', '＠'); new_name.gsub!('[', '［'); new_name.gsub!("\\", '＼');
   new_name.gsub!(']', '］'); new_name.gsub!('^', '＾'); new_name.gsub!('_', '_');
   new_name.gsub!('`', '｀'); new_name.gsub!('{', '｛'); new_name.gsub!('|', '｜');
   new_name.gsub!('}', '｝'); new_name.gsub!('~', '〜');
+  #new_name.gsub!('/', '／');
   #new_name.gsub!('.', '．'); 
   #
   new_name.gsub!(' ', '_'); new_name.gsub!('　', '_');
   #
+  new_name.gsub!('～', '〜');
+  new_name.gsub!('－', '-');
+  #
   # 年号変換
   while (/平成(\d\d)年/ =~ new_name)
     new_name.sub!( /平成(\d\d)年/, (1988 + ($1.to_i)).to_s + "年")

data/bin/rentime

@@ -3,6 +3,16 @@
 
 require "pp"
 require "filerenamer.rb"
+require "optparse"
+
+## option analysis
+OPTIONS = {}
+op = OptionParser.new
+#op.banner = [
+#    "Usage: #{File.basename("#{__FILE__}")}",
+#].join("\n")
+op.on("-p"    , "--preserve"    , "Preserve old name"){OPTIONS[:preserve] = true}
+op.parse!(ARGV)
 
 op = FileRenamer::OptionParser.new
 op.parse!(ARGV)
@@ -10,9 +20,12 @@ op.parse!(ARGV)
 fr = FileRenamer::Commander.new(op.options, ARGV)
 fr.execute do |filename|
   extname = File.extname filename
+  old_base = filename.sub(/#{extname}$/, "")
   dirname = File.dirname filename
   date = File.mtime(filename)
 
-  newname = dirname + date.strftime("/%Y%m%d-%H%M%S") + extname
+  new_basename = dirname + date.strftime("/%Y%m%d-%H%M%S")
+  new_basename += "-#{old_base}" if OPTIONS[:preserve]
+  newname = new_basename + extname
   newname
 end

data/filerenamer.gemspec

@@ -0,0 +1,126 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: filerenamer 0.0.8 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "filerenamer"
+  s.version = "0.0.8"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
+  s.authors = ["ippei94da"]
+  s.date = "2015-07-23"
+  s.description = "This library provide common dealing to rename many files with safe method. Automatically mkdir if need and rmdir when empty."
+  s.email = "ippei94da@gmail.com"
+  s.executables = ["classify", "classify_greed", "renhash", "rennum", "renpad", "renpar", "renreg", "rensub", "rentime"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "CHANGES",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/classify",
+    "bin/classify_greed",
+    "bin/renhash",
+    "bin/rennum",
+    "bin/renpad",
+    "bin/renpar",
+    "bin/renreg",
+    "bin/rensub",
+    "bin/rentime",
+    "filerenamer.gemspec",
+    "lib/filerenamer.rb",
+    "lib/filerenamer/commander.rb",
+    "lib/filerenamer/optionparser.rb",
+    "test/classify/123",
+    "test/classify/abc",
+    "test/classify/abcd",
+    "test/classify/abcdefghij",
+    "test/classify/def",
+    "test/classify/がぎぐ",
+    "test/classify/ゃゅょ",
+    "test/classify/月火水",
+    "test/filerenamer/a0.txt",
+    "test/filerenamer/dummy.txt",
+    "test/filetreesimulator/00",
+    "test/filetreesimulator/dir00/01",
+    "test/filetreesimulator/dir00/02",
+    "test/filetreesimulator/test_file.rb",
+    "test/helper.rb",
+    "test/renhash/)(.txt",
+    "test/renhash/0.txt",
+    "test/rennum/a",
+    "test/rennum/b",
+    "test/rennum/c",
+    "test/rennum/d",
+    "test/renpad/1",
+    "test/renpad/10",
+    "test/renpad/100",
+    "test/renpad/100b",
+    "test/renpad/10b",
+    "test/renpad/1b",
+    "test/renpad/a1",
+    "test/renpad/a10",
+    "test/renpad/a100",
+    "test/renpad/a100b",
+    "test/renpad/a10b",
+    "test/renpad/a1b",
+    "test/renpar/((ab)(cd(ef))gh(ij)kl(mn).txt",
+    "test/renpar/(ab)(cd(ef)))gh(ij)kl(mn).txt",
+    "test/renpar/(ab)(cd(ef))gh(ij)kl(mn).txt",
+    "test/renpar/(ab)(cd).txt",
+    "test/renreg/a(b)",
+    "test/renreg/１",
+    "test/renreg/ａ",
+    "test/rensub/a0",
+    "test/rensub/a1",
+    "test/rensub/b0",
+    "test/rensub/b1",
+    "test/test_commander.rb",
+    "test/test_filetreesimulator.rb",
+    "test/test_optionparser.rb"
+  ]
+  s.homepage = "http://github.com/ippei94da/filerenamer"
+  s.licenses = ["MIT"]
+  s.rubygems_version = "2.2.2"
+  s.summary = "Library to rename filenames."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<test-unit>, ["~> 3.1.2"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4.0.1"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.10.5"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<builtinextension>, ["~> 0.1.0"])
+      s.add_development_dependency(%q<capture_stdout>, ["~> 0.0"])
+    else
+      s.add_dependency(%q<test-unit>, ["~> 3.1.2"])
+      s.add_dependency(%q<rdoc>, ["~> 4.0.1"])
+      s.add_dependency(%q<bundler>, ["~> 1.10.5"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<builtinextension>, ["~> 0.1.0"])
+      s.add_dependency(%q<capture_stdout>, ["~> 0.0"])
+    end
+  else
+    s.add_dependency(%q<test-unit>, ["~> 3.1.2"])
+    s.add_dependency(%q<rdoc>, ["~> 4.0.1"])
+    s.add_dependency(%q<bundler>, ["~> 1.10.5"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<builtinextension>, ["~> 0.1.0"])
+    s.add_dependency(%q<capture_stdout>, ["~> 0.0"])
+  end
+end
+

data/lib/filerenamer/commander.rb

@@ -44,6 +44,14 @@ module FileRenamer
     class NoRenameRuleError < Exception; end
     class OptionError < Exception; end
 
+    def self.files(strs)
+      if strs.empty?
+        return Dir::glob("*").sort
+      else
+        return strs
+      end
+    end
+
     #:yes と :no が両方 true ならば例外。
     #:copy, :move, :hardlink, :symlink のうち、1つ以下が true。
     #全て nil ならば :move が true になる。
@@ -82,8 +90,7 @@ module FileRenamer
           "Conflict options: --quiet and --no"
       end
 
-      @files = files
-      @files = Dir::glob("*").sort if files.empty?
+      @files = self.class.files(files)
     end
 
     # 変更される名前のリストを表示し、ユーザの指示に従って実行する。

data/test/test_commander.rb

@@ -3,6 +3,7 @@
 
 require 'helper'
 
+require "pp"
 require "test/unit"
 require "filerenamer/commander.rb"
 require "stringio"
@@ -35,6 +36,11 @@ class TC_Commander < Test::Unit::TestCase
     @fr01 = FileRenamer::Commander.new(options, [])
   end
 
+  def test_self_files
+    #pp FileRenamer::Commander.files([])
+    #pp FileRenamer::Commander.files(['a', 'b'])
+  end
+
   def test_initialize
     # yes and no
     options = {
@@ -106,7 +112,6 @@ class TC_Commander < Test::Unit::TestCase
     assert_equal(true, FileTest.exist?(A_0))
     assert_equal(true, FileTest.exist?(A_1))
     FileUtils.rm(A_1)
-    #
     correct = 
       "Enable files:\n" +
       "  cp -r #{A_0} #{A_1}\n" +

metadata

@@ -1,110 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: filerenamer
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.0.8
 platform: ruby
 authors:
 - ippei94da
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.10.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.10.5
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: builtinextension
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: capture_stdout
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
 description: This library provide common dealing to rename many files with safe method.
@@ -125,7 +126,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
+- ".document"
 - CHANGES
 - Gemfile
 - LICENSE.txt
@@ -141,6 +142,7 @@ files:
 - bin/renreg
 - bin/rensub
 - bin/rentime
+- filerenamer.gemspec
 - lib/filerenamer.rb
 - lib/filerenamer/commander.rb
 - lib/filerenamer/optionparser.rb
@@ -194,29 +196,25 @@ files:
 homepage: http://github.com/ippei94da/filerenamer
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 651762127
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Library to rename filenames.
 test_files: []