ebook_renamer 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 313909194fe3114ca7d424b52eb470113f9bd89a
-  data.tar.gz: ed04e84bf1ee591f4230bca25b7b08da6bed5100
+  metadata.gz: b0e4104daed6e556eb3241169fba5746f4feabcc
+  data.tar.gz: 9fa908281368c84281e7d71e66ba7e7bf8586f73
 SHA512:
-  metadata.gz: d33738026713f6e14a0d3616936757fe533cdddd96305ff610905bfd6b62d5e833a7cc85ae1c2a29bfa49a6e310641389db928e76831fe4bd3491d74f166596d
-  data.tar.gz: a63ccf502342673b44d707b19f0bf95f4e2efe9b3e8dc43a98e1163a1a2f2a694a046282ef97eff641e5ff7daedc542c092481a6903dd4b02e4b7647e2907971
+  metadata.gz: a2733518e944cb0a833715fe645556a807b7f36a26340eb1a6f8df0be6d053e0412a81becd752c8dbdba8eb4c0049f06bbc6272545726f0bbb21ccbcfb5faff2
+  data.tar.gz: 7c5694af153aead28f0a82857a4fda073d2b6a4f87a8a18b2328aff47830a0175f81199c826399a80949e6b7641c2a187d53d8623c940979c0b8b59f84e3c11b

data/Guardfile

@@ -1,6 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 guard 'minitest' do
+
   # with Minitest::Unit
   watch(%r|^test/(.*)\/?test_(.*)\.rb|)
   watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
@@ -11,13 +12,4 @@ guard 'minitest' do
   # watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
   # watch(%r|^spec/spec_helper\.rb|)    { "spec" }
 
-  # Rails 3.2
-  # watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/controllers/#{m[1]}_test.rb" }
-  # watch(%r|^app/helpers/(.*)\.rb|)     { |m| "test/helpers/#{m[1]}_test.rb" }
-  # watch(%r|^app/models/(.*)\.rb|)      { |m| "test/unit/#{m[1]}_test.rb" }
-
-  # Rails
-  # watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/functional/#{m[1]}_test.rb" }
-  # watch(%r|^app/helpers/(.*)\.rb|)     { |m| "test/helpers/#{m[1]}_test.rb" }
-  # watch(%r|^app/models/(.*)\.rb|)      { |m| "test/unit/#{m[1]}_test.rb" }
 end

data/README.md

@@ -142,14 +142,17 @@ the output will be something like `Start.with.Why.How.Great.Leader.Inspire.Every
                     --commit
 
   6) $ebook_renamer --base-dir ~/Dropbox/ebooks
-                    --meta-binary ebook-meta
                     --recursive
                     --commit
 
+  7) $ebook_renamer --base-dir ~/Dropbox/ebooks
+                    --recursive
+                    --sep-string '_'
+                    --commit
  Options:
 
     -b, --base-dir directory         Starting directory [default - current directory]
-    -m, --meta-binary path           The ebook-meta executable [default - 'ebook-meta']
+    -s, --sep-string string          Separator string [default - '.']
     -r, --recursive                  Process the files recursively [default - false]
     -c, --commit                     Perform the actual rename [default - false]
     -v, --version                    Display version number
@@ -158,6 +161,10 @@ the output will be something like `Start.with.Why.How.Great.Leader.Inspire.Every
 
 ### Changelog
 
+#### 0.0.7
+
+- More improvement and code cleanup
+
 #### 0.0.6
 
 - Fix and update README.md

data/bin/ebook_renamer

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 begin
-  require 'pry'
   require 'ebook_renamer'
 rescue LoadError
   $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
@@ -13,12 +12,14 @@ require 'ostruct'
 
 begin
   options = parse_options()
-  EbookRenamer.logger.info "Your options: #{options}"
-  meta_binary = options.delete(:meta_binary)
+  EbookRenamer.logger.debug "Your options: #{options}"
+
+  #meta_binary = options.delete(:meta_binary)
+  sep_string  = options.delete(:sep_string)
 
-  # Note: if we need to adjust the path to the executable
   EbookRenamer.configure do |config|
-    config.meta_binary = meta_binary if meta_binary
+    #config.meta_binary = meta_binary if meta_binary
+    config.sep_string  = sep_string  if sep_string
   end
 
   cli = EbookRenamer::CLI.new(EbookRenamer.configuration)

data/ebook_renamer.gemspec

@@ -16,10 +16,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  # Generated dependencies
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  # additional dependencies
+
   spec.add_development_dependency "minitest-spec-context", "~> 0.0.3"
   spec.add_development_dependency "guard-minitest", "~> 2.2"
   spec.add_development_dependency "minitest", "~> 4.2"

data/lib/ebook_renamer.rb

@@ -1,6 +1,5 @@
 require 'ebook_renamer/version'
 require 'ebook_renamer/logger'
-require 'ebook_renamer/constant'
 require 'ebook_renamer/helpers'
 require 'ebook_renamer/configuration'
 require 'ebook_renamer/options'

data/lib/ebook_renamer/cli.rb

@@ -15,6 +15,7 @@ module EbookRenamer
     #   :recursive - perform the rename recursively (true|false)
     #   :commit    - make the rename permanent (true|false)
     #   :exts      - list of extensions to be processed default to ['epub,mobi,pdf']
+    #
     # @param base_dir [String] base directory default to current directory
     # @param args [Hash<Symbol, Object>] options argument
     def rename(base_dir = Dir.pwd, args = {})
@@ -26,23 +27,28 @@ module EbookRenamer
 
       input_files = Helpers.files(base_dir, options).sort
 
+      unless options[:commit]
+        puts "Changes will not be applied without the --commit option."
+      end
+
       input_files.each do |file|
-        puts "Input :#{file}"
         extension = File.extname(file)
         begin
           hash = Helpers.meta_to_hash(Helpers.meta(file, config.meta_binary))
           formatted_name = Helpers.formatted_name(hash, sep_char: " by ")
           formatted_name = "#{formatted_name}#{extension}"
-          new_name = "#{File.dirname(file)}/#{Helpers.sanitize_filename(formatted_name, '.')}"
-          puts "Output:#{new_name}"
+          new_name = "#{File.dirname(file)}/#{Helpers.sanitize_filename(formatted_name, config.sep_string)}"
+          puts "[#{file}] -> [#{new_name}]"
+
+          # TODO: handle this properly!
           # skip if the filename is too long '228'
           # see: https://github.com/rails/rails/commit/ad95a61b62e70b839567c2e91e127fc2a1acb113
-          # @todo find out the max file size
           max_allowed_file_size = 220
           if new_name && new_name.size > max_allowed_file_size
             puts "FYI: skip file name too long [#{new_name.size}] : #{new_name}"
             next
           end
+
           FileUtils.mv(file,new_name) if options[:commit] && file != new_name && new_name.size < max_allowed_file_size
         rescue RuntimeError => e
           puts e.backtrace

data/lib/ebook_renamer/configuration.rb

@@ -1,16 +1,14 @@
 module EbookRenamer
   class Configuration
-
+    # the separator char for each word in the file name
     attr_accessor :meta_binary
 
-    def initialize
-      @meta_binary = '/usr/bin/ebook-meta'
-    end
+    # the separator char for each word in the file name
+    attr_accessor :sep_string
 
-    def to_s
-      <<-END.gsub(/^\s+\|/, '')
-       | ebook-meta : #{meta_binary}
-      END
+    def initialize
+      @meta_binary = 'ebook-meta'
+      @sep_string  = '.'
     end
   end
 

data/lib/ebook_renamer/options.rb

@@ -27,7 +27,6 @@ module EbookRenamer::Options
         |                    --commit
         |
         |  6) $ebook_renamer --base-dir ~/Dropbox/ebooks
-        |                    --meta-binary ebook-meta
         |                    --recursive
         |                    --commit
         |
@@ -40,9 +39,9 @@ module EbookRenamer::Options
         options[:base_dir] = base_dir
       end
 
-      options[:meta_binary] ||= 'ebook-meta'
-      opts.on('-m', '--meta-binary path', "The ebook-meta executable [default - 'ebook-meta']") do |binary|
-        options[:meta_binary] = binary
+      options[:sep_string] ||= '.'
+      opts.on('-s', '--sep-string string', "Separator string [default - '.']") do |sep_string|
+        options[:sep_string] = sep_string
       end
 
       options[:recursive] = false

data/lib/ebook_renamer/version.rb

@@ -1,3 +1,3 @@
 module EbookRenamer
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/lib/ebook_renamer/configuration_test.rb

@@ -3,7 +3,7 @@ describe EbookRenamer do
 
   before :each do
     EbookRenamer.configure do |config|
-      config.meta_binary = '/usr/bin/ebook-meta'
+      config.meta_binary = 'ebook-meta'
     end
   end
 
@@ -12,11 +12,11 @@ describe EbookRenamer do
   end
 
   it "uses the updated configuration" do
-    EbookRenamer.configuration.meta_binary.must_equal '/usr/bin/ebook-meta'
+    EbookRenamer.configuration.meta_binary.must_equal 'ebook-meta'
     config = EbookRenamer.configure do |config|
-      config.meta_binary = "ebook-meta"
+      config.meta_binary = "new-ebook-meta"
     end
-    EbookRenamer.configuration.meta_binary.must_equal 'ebook-meta'
+    EbookRenamer.configuration.meta_binary.must_equal 'new-ebook-meta'
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebook_renamer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Burin Choomnuan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -172,7 +172,6 @@ files:
 - lib/ebook_renamer.rb
 - lib/ebook_renamer/cli.rb
 - lib/ebook_renamer/configuration.rb
-- lib/ebook_renamer/constant.rb
 - lib/ebook_renamer/helpers.rb
 - lib/ebook_renamer/logger.rb
 - lib/ebook_renamer/options.rb

data/lib/ebook_renamer/constant.rb

@@ -1,13 +0,0 @@
-module EbookRenamer
-  # The Calibre metadata extraction tool (epub, mobi, pdf)
-  CALIBRE_CLI_BINARY = '/usr/bin/ebook-meta'
-
-  # The Calibre metadata extraction tool
-  CALIBRE_META_CLI = '/usr/bin/ebook-meta'
-
-  # Support URL for Calibre's CLI tool
-  CALIBRE_CLI_URL = 'http://manual.calibre-ebook.com/cli/cli-index.html'
-
-  # Attribute keys
-  META_KEYS = %w[title authors(s) publisher languages published rights identifiers]
-end