cdb-crawlr 0.3.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dc1a671da9a5b09c242d1a25906519e69bcce90b
+  data.tar.gz: f05ee45348e7e6434bd79dd7d6dee7944f2c54ac
+SHA512:
+  metadata.gz: 6f58717c2a4ec8eb7e6189b3322a8c13d32aa2531335e24c011a9f951400372d4f0d3cecb9ae7b7635e10fae6628680908bb7fec4539b7e9147a498c5541e0b2
+  data.tar.gz: 6e4ffe3aa423706155968da23df50af18d2f3f76a49a592b941a9961a10d905bbb347e92203fccaa987adc4b1aba7e08e7197b92150b84b447e1329cbd5bdad2

data/bin/cdb

@@ -1,106 +1,106 @@
-#!/usr/bin/env ruby
-
-require 'cdb-crawlr'
-# load 'lib/cdb-crawlr.rb'
-require 'optparse'
-
-$cli = CDB::CLI.new
-
-def print_help(opt = @global, error=nil)
-  puts "cdb: #{error}\n" if error && !error.to_s.empty?
-  puts opt
-  exit 1
-end
-
-@global = OptionParser.new do |opts|
-  opts.banner = "Usage: cdb [-v|--version] <COMMAND> [<ARGS>]"
-
-  opts.on("-h", "--help", "Display this screen"){ print_help }
-  opts.on("-v", "--version", "Show version information") do
-    puts "cdb #{CDB::VERSION}"; exit
-  end
-
-  opts.separator "\nCOMMANDS:"
-  opts.separator "    rename      Rename a directory of comics according to series data"
-  opts.separator "    search      Search for entries of a given TYPE matching QUERY"
-  opts.separator "    show        Show details of an entry using a CDB_ID obtained from search"
-end
-
-@search = OptionParser.new do |opts|
-  opts.banner = "Usage: cdb search <TYPE> <QUERY>"
-
-  opts.on("-h", "--help", "Display this screen"){ print_help opts }
-
-  opts.separator "\nTYPES:"
-  opts.separator "    issue       Search comic issue names for given QUERY"
-  opts.separator "    series      Search comic series names for given QUERY"
-end
-
-@show = OptionParser.new do |opts|
-  opts.banner = "Usage: cdb show <TYPE> <CDB_ID>"
-
-  opts.on("-h", "--help", "Display this screen"){ print_help opts }
-
-  opts.separator "\nTYPES:"
-  opts.separator "    series      Get all available details of a comic series"
-end
-
-@rename = OptionParser.new do |opts|
-  opts.banner = "Usage: cdb rename [-f|--force] <PATH> <CDB_ID>"
-
-  opts.on("-h", "--help", "Display this screen"){ print_help opts }
-  opts.on("-f", "--force", "Perform the rename without any confirmations"){ $cli[:force] = true }
-  opts.on("-i", "--ignore", "Ignore warnings about unknown and misformatted issue numbers"){ $cli[:ignore] = true }
-end
-
-@command_opts = {
-  'search' => @search,
-  'show' => @show,
-  'rename' => @rename
-}
-
-# Parse global flags
-begin
-  @global.order!
-rescue OptionParser::InvalidOption => e
-  puts e; print_help
-end
-
-# Pop and verify command
-begin
-  command = ARGV.shift
-  $cli[:command] = command
-  command_opt = @command_opts[$cli[:command]]
-rescue
-  error = "invalid COMMAND: #{command}" unless command.to_s.empty?
-  print_help @global, error
-end
-
-# Parse command flags
-begin
-  command_opt.order!
-rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
-  print_help command_opt, e
-end
-
-# Pop and verify third argument
-begin
-  next_arg = ARGV.shift
-  case $cli[:command]
-  when 'search, show'
-    $cli[:type] = next_arg
-  when 'rename'
-    $cli[:path] = next_arg
-  end
-rescue => e
-  print_help command_opt, e
-end
-
-# Verify args
-begin
-  $cli[:args] = ARGV.join(' ')
-rescue => e
-  print_help command_opt, e
-end
-
-$cli.execute
+#!/usr/bin/env ruby
+
+require 'cdb-crawlr'
+# load 'lib/cdb-crawlr.rb'
+require 'optparse'
+
+$cli = CDB::CLI.new
+
+def print_help(opt = @global, error=nil)
+  puts "cdb: #{error}\n" if error && !error.to_s.empty?
+  puts opt
+  exit 1
+end
+
+@global = OptionParser.new do |opts|
+  opts.banner = "Usage: cdb [-v|--version] <COMMAND> [<ARGS>]"
+
+  opts.on("-h", "--help", "Display this screen"){ print_help }
+  opts.on("-v", "--version", "Show version information") do
+    puts "cdb #{CDB::VERSION}"; exit
+  end
+
+  opts.separator "\nCOMMANDS:"
+  opts.separator "    rename      Rename a directory of comics according to series data"
+  opts.separator "    search      Search for entries of a given TYPE matching QUERY"
+  opts.separator "    show        Show details of an entry using a CDB_ID obtained from search"
+end
+
+@search = OptionParser.new do |opts|
+  opts.banner = "Usage: cdb search <TYPE> <QUERY>"
+
+  opts.on("-h", "--help", "Display this screen"){ print_help opts }
+
+  opts.separator "\nTYPES:"
+  opts.separator "    issue       Search comic issue names for given QUERY"
+  opts.separator "    series      Search comic series names for given QUERY"
+end
+
+@show = OptionParser.new do |opts|
+  opts.banner = "Usage: cdb show <TYPE> <CDB_ID>"
+
+  opts.on("-h", "--help", "Display this screen"){ print_help opts }
+
+  opts.separator "\nTYPES:"
+  opts.separator "    series      Get all available details of a comic series"
+end
+
+@rename = OptionParser.new do |opts|
+  opts.banner = "Usage: cdb rename [-f|--force] <PATH> <CDB_ID>"
+
+  opts.on("-h", "--help", "Display this screen"){ print_help opts }
+  opts.on("-f", "--force", "Perform the rename without any confirmations"){ $cli[:force] = true }
+  opts.on("-i", "--ignore", "Ignore warnings about unknown and misformatted issue numbers"){ $cli[:ignore] = true }
+end
+
+@command_opts = {
+  'search' => @search,
+  'show' => @show,
+  'rename' => @rename
+}
+
+# Parse global flags
+begin
+  @global.order!
+rescue OptionParser::InvalidOption => e
+  puts e; print_help
+end
+
+# Pop and verify command
+begin
+  command = ARGV.shift
+  $cli[:command] = command
+  command_opt = @command_opts[$cli[:command]]
+rescue
+  error = "invalid COMMAND: #{command}" unless command.to_s.empty?
+  print_help @global, error
+end
+
+# Parse command flags
+begin
+  command_opt.order!
+rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
+  print_help command_opt, e
+end
+
+# Pop and verify third argument
+begin
+  next_arg = ARGV.shift
+  case $cli[:command]
+  when 'search', 'show'
+    $cli[:type] = next_arg
+  when 'rename'
+    $cli[:path] = next_arg
+  end
+rescue => e
+  print_help command_opt, e
+end
+
+# Verify args
+begin
+  $cli[:args] = ARGV.join(' ')
+rescue => e
+  print_help command_opt, e
+end
+
+$cli.execute

data/lib/cdb-crawlr.rb

@@ -1,52 +1,52 @@
-require 'json'
-require 'nokogiri'
-require 'open-uri'
-
-$:.unshift(File.dirname(__FILE__))
-
-require 'cdb/cli'
-require 'cdb/renamer'
-require 'cdb/struct'
-require 'cdb/issue'
-require 'cdb/series'
-
-module CDB
-  VERSION = '0.3.0'
-
-  BASE_URL = 'http://www.comicbookdb.com'
-  REQUEST_HEADERS = {'Connection' => 'keep-alive'}
-  SEARCH_PATH = 'search.php'
-
-  class << self; attr
-
-    def search(query, type='FullSite')
-      data = URI.encode_www_form(
-        form_searchtype: type,
-        form_search: query
-      )
-      url = "#{BASE_URL}/#{SEARCH_PATH}?#{data}"
-      doc = read_page(url)
-      node = doc.css('h2:contains("Search Results")').first.parent
-      {
-        :series => CDB::Series.parse_results(node),
-        :issues => CDB::Issue.parse_results(node)
-      }
-    end
-
-    def show(id, type)
-      data = URI.encode_www_form('ID' => id)
-      url = "#{BASE_URL}/#{type::WEB_PATH}?#{data}"
-      page = read_page(url)
-      type.parse_data(id, page)
-    end
-
-  private
-
-    def read_page(url)
-      content = open(url, REQUEST_HEADERS).read
-      content.force_encoding('ISO-8859-1').encode!('UTF-8')
-      Nokogiri::HTML(content)
-    end
-
-  end
-end
+require 'json'
+require 'nokogiri'
+require 'open-uri'
+
+$:.unshift(File.dirname(__FILE__))
+
+require 'cdb/cli'
+require 'cdb/renamer'
+require 'cdb/struct'
+require 'cdb/issue'
+require 'cdb/series'
+
+module CDB
+  VERSION = '0.3.1'
+
+  BASE_URL = 'http://www.comicbookdb.com'
+  REQUEST_HEADERS = {'Connection' => 'keep-alive'}
+  SEARCH_PATH = 'search.php'
+
+  class << self; attr
+
+    def search(query, type='FullSite')
+      data = URI.encode_www_form(
+        form_searchtype: type,
+        form_search: query
+      )
+      url = "#{BASE_URL}/#{SEARCH_PATH}?#{data}"
+      doc = read_page(url)
+      node = doc.css('h2:contains("Search Results")').first.parent
+      {
+        :series => CDB::Series.parse_results(node),
+        :issues => CDB::Issue.parse_results(node)
+      }
+    end
+
+    def show(id, type)
+      data = URI.encode_www_form('ID' => id)
+      url = "#{BASE_URL}/#{type::WEB_PATH}?#{data}"
+      page = read_page(url)
+      type.parse_data(id, page)
+    end
+
+  private
+
+    def read_page(url)
+      content = open(url, REQUEST_HEADERS).read
+      content.force_encoding('ISO-8859-1').encode!('UTF-8')
+      Nokogiri::HTML(content)
+    end
+
+  end
+end

data/lib/cdb/cli.rb

@@ -1,84 +1,84 @@
-require 'pp'
-
-module CDB
-  class CLI
-    COMMANDS = %w[search show rename]
-    TYPES = %w[series issue issues]
-
-    def initialize(options={})
-      @options = options
-    end
-
-    def [](k)
-      @options[k]
-    end
-
-    def []=(k, v)
-      v = v.to_s.strip
-      begin
-        send("#{k}=", v)
-      rescue NoMethodError
-        @options[k] = v
-      end
-    end
-
-    def execute
-      send self[:command]
-    end
-
-  private
-
-    def search
-      case self[:type]
-      when 'series'
-        CDB::Series.search(self[:args]).each{|r| puts r.to_json}
-      when 'issue', 'issues'
-        CDB::Issue.search(self[:args]).each{|r| puts r.to_json}
-      end
-    end
-
-    def show
-      case self[:type]
-      when 'series'
-        res = CDB::Series.show(self[:args])
-        res.issues.each{|i| i.series=nil}
-        puts res.to_json(array_nl:"\n", object_nl:"\n", indent:'  ')
-      end
-    end
-
-    def rename
-      renamer = CDB::Renamer.new(@options)
-      renamer.execute
-    end
-
-    def args=(v)
-      raise "invalid args" if v.empty?
-      @options[:args] = v
-    end
-
-    def command=(v)
-      v = v.downcase
-      raise unless COMMANDS.include?(v)
-      @options[:command] = v
-    end
-
-    def type=(v)
-      v = v.downcase
-      error = "invalid TYPE: #{v}" unless v.empty?
-      if @options[:command] == 'show'
-        # remove when "show issue" is supported
-        raise error.to_s unless v == 'series'
-      else
-        raise error.to_s unless TYPES.include?(v)
-      end
-      @options[:type] = v
-    end
-
-    def path=(v)
-      error = "#{v}: No such directory" unless v.empty?
-      raise error.to_s unless File.directory?(v)
-      @options[:path] = v
-    end
-
-  end
-end
+require 'pp'
+
+module CDB
+  class CLI
+    COMMANDS = %w[search show rename]
+    TYPES = %w[series issue issues]
+
+    def initialize(options={})
+      @options = options
+    end
+
+    def [](k)
+      @options[k]
+    end
+
+    def []=(k, v)
+      v = v.to_s.strip
+      begin
+        send("#{k}=", v)
+      rescue NoMethodError
+        @options[k] = v
+      end
+    end
+
+    def execute
+      send self[:command]
+    end
+
+  private
+
+    def search
+      case self[:type]
+      when 'series'
+        CDB::Series.search(self[:args]).each{|r| puts r.to_json}
+      when 'issue', 'issues'
+        CDB::Issue.search(self[:args]).each{|r| puts r.to_json}
+      end
+    end
+
+    def show
+      case self[:type]
+      when 'series'
+        res = CDB::Series.show(self[:args])
+        res.issues.each{|i| i.series=nil}
+        puts res.to_json(array_nl:"\n", object_nl:"\n", indent:'  ')
+      end
+    end
+
+    def rename
+      renamer = CDB::Renamer.new(@options)
+      renamer.execute
+    end
+
+    def args=(v)
+      raise "invalid args" if v.empty?
+      @options[:args] = v
+    end
+
+    def command=(v)
+      v = v.downcase
+      raise unless COMMANDS.include?(v)
+      @options[:command] = v
+    end
+
+    def type=(v)
+      v = v.downcase
+      error = "invalid TYPE: #{v}" unless v.empty?
+      if @options[:command] == 'show'
+        # remove when "show issue" is supported
+        raise error.to_s unless v == 'series'
+      else
+        raise error.to_s unless TYPES.include?(v)
+      end
+      @options[:type] = v
+    end
+
+    def path=(v)
+      error = "#{v}: No such directory" unless v.empty?
+      raise error.to_s unless File.directory?(v)
+      @options[:path] = v
+    end
+
+  end
+end

data/lib/cdb/renamer.rb

@@ -1,117 +1,122 @@
-module CDB
-  class Renamer
-    EXTENSIONS = %w[cbz cbr]
-    ISSUE_NUM = '[\d\.]+\w?'
-    INPUT_FORMAT = /#(#{ISSUE_NUM})/
-    OUTPUT_FORMAT  = "%{series} #%{padded_num} (%{cover_date})"
-
-    def initialize(options)
-      @path = options[:path]
-      @cdb_id = options[:args]
-      @force = options[:force]
-      @ignore = options[:ignore]
-    end
-
-    def execute
-      @rename_map =
-        files.each_with_object({}) do |filename, map|
-          map[filename]= transform(filename)
-        end.select{|k,v| v}
-
-      do_rename if verify_map
-    end
-
-  private
-
-    def do_rename
-      Dir.chdir(@path) do
-        @rename_map.each do |source, destination|
-          next if source == destination
-          puts "#{pad(source)} => #{destination}"
-          if @force
-            %x[ mv "#{source}" "#{destination}" ]
-          end
-        end
-      end
-    end
-
-    def verify_map
-      dups = @rename_map.select do |k,v|
-        @rename_map.values.count(v) > 1
-      end
-      dups.keys.uniq.each do |k|
-        padded = pad(k, dups.keys.map(&:length).max)
-        puts "ERROR: output name clash: #{padded} => #{dups[k]}"
-      end
-      dups.empty?
-    end
-
-    def transform(filename)
-      return unless num = parse_issue_num(filename)
-      if issue = issues[num]
-        generate_output(filename, issue)
-      else
-        puts "WARNING: #{filename}: unknown issue: #{num}"
-      end
-    end
-
-    def parse_issue_num(filename)
-      if match = filename.match(INPUT_FORMAT)
-        num = match[1].gsub(/^0+|\.$/,'')
-        num = '0' if num == ''
-        num
-      else
-        puts "WARNING: #{filename}: invalid input format" unless @ignore
-      end
-    end
-
-    def generate_output(filename, issue)
-      json = issue.as_json
-      json[:series] = issue.series.name
-      json[:padded_num] = pad_num(issue.num)
-      output = OUTPUT_FORMAT % json
-      sanitize(output + File.extname(filename))
-    end
-
-    def sanitize(filename)
-      filename.gsub(/[:]/, ' -')
-        .gsub(/[\/\\<>]/, '-')
-        .gsub(/[\?\*|"]/, '_')
-    end
-
-    def pad(file, max=nil)
-      max ||= files.map(&:length).max
-      file + (' '*(max-file.length))
-    end
-
-    def pad_num(num, max=nil)
-      max ||= max_num_length
-      '0'*(max-num.to_s.length)+num.to_s
-    end
-
-    def files
-      Dir.chdir(@path) do
-        @files ||= EXTENSIONS
-          .map{|e| Dir["*.#{e}"]}.flatten
-          .select{|f| File.file?(f)}.sort
-      end
-      @files
-    end
-
-    def max_num_length
-      @max_num ||= files.map{|f| parse_issue_num(f).length}.max
-    end
-
-    def series
-      @series ||= CDB::Series.show(@cdb_id)
-    end
-
-    def issues
-      # Only act on issues - not TPB, HC, or anything else
-      @issues ||= Hash[series.issues
-        .select{|i| i.num.match(/^#{ISSUE_NUM}$/)}
-        .map{|i| [i.num.to_s, i]}]
-    end
-
-  end
-end
+module CDB
+  class Renamer
+    EXTENSIONS = %w[cbz cbr]
+    ISSUE_NUM = '[\d\.]+[a-z]?'
+    INPUT_FORMAT = /#(#{ISSUE_NUM})/
+    OUTPUT_FORMAT  = "%{series} #%{padded_num} %{name} (%{cover_date})"
+
+    def initialize(options)
+      @path = options[:path]
+      @cdb_id = options[:args]
+      @force = options[:force]
+      @ignore = options[:ignore]
+    end
+
+    def execute
+      @rename_map =
+        files.each_with_object({}) do |filename, map|
+          map[filename]= transform(filename)
+        end.select{|k,v| v}
+
+      do_rename if verify_map
+    end
+
+  private
+
+    def do_rename
+      Dir.chdir(@path) do
+        @rename_map.each do |source, destination|
+          next if source == destination
+          puts "#{pad(source)} => #{destination}"
+          if @force
+            %x[ mv "#{source}" "#{destination}" ]
+          end
+        end
+      end
+    end
+
+    def verify_map
+      dups = @rename_map.select do |k,v|
+        @rename_map.values.count(v) > 1
+      end
+      dups.keys.uniq.each do |k|
+        padded = pad(k, dups.keys.map(&:length).max)
+        puts "ERROR: output name clash: #{padded} => #{dups[k]}"
+      end
+      dups.empty?
+    end
+
+    def transform(filename)
+      return unless num = parse_issue_num(filename)
+      if issue = issues[num]
+        generate_output(filename, issue)
+      else
+        puts "WARNING: #{filename}: unknown issue: #{num}"
+      end
+    end
+
+    def parse_issue_num(filename)
+      base = filename.chomp(File.extname(filename))
+      if match = base.match(INPUT_FORMAT)
+        num = match[1].gsub(/^0+|\.$/,'')
+        num = '0' if num.empty?
+        num
+      else
+        puts "WARNING: #{filename}: invalid input format" unless @ignore
+      end
+    end
+
+    def generate_output(filename, issue)
+      json = issue.as_json
+      json[:series] = issue.series.name
+      json[:padded_num] = pad_num(issue.num)
+      json[:name] = "- #{json[:name]}" if !json[:name].empty?
+      output = OUTPUT_FORMAT % json
+      sanitize(output + File.extname(filename))
+    end
+
+    def sanitize(filename)
+      filename.gsub(/[:]/, ' -')
+        .gsub(/[\/\\<>]/, '-')
+        .gsub(/[\?\*|"]/, '_')
+        .gsub(/\s+/, ' ')
+    end
+
+    def pad(file, max=nil)
+      max ||= files.map(&:length).max
+      file + (' '*(max-file.length))
+    end
+
+    def pad_num(num, max=nil)
+      max ||= max_num_length
+      '0'*(max-num.to_s.split(/[\.\-]/)[0].length)+num.to_s
+    end
+
+    def files
+      Dir.chdir(@path) do
+        @files ||= EXTENSIONS
+          .map{|e| Dir["*.#{e}"]}.flatten
+          .select{|f| File.file?(f)}.sort
+      end
+      @files
+    end
+
+    def max_num_length
+      @max_num ||= files.map{|f|
+        parse_issue_num(f).to_s.split(/[\.\-]/)[0].length
+      }.max
+    end
+
+    def series
+      @series ||= CDB::Series.show(@cdb_id)
+    end
+
+    def issues
+      # Only act on issues - not TPB, HC, or anything else
+      @issues ||= Hash[series.issues
+        .select{|i| i.num.match(/^#{ISSUE_NUM}$/i)}
+        .map{|i| [i.num.to_s, i]}]
+    end
+
+  end
+end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: cdb-crawlr
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Gabe Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: cdb-crawlr is a Ruby gem and command-line tool for querying ComicBookDB.com
@@ -35,35 +32,34 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/cdb
+- lib/cdb-crawlr.rb
 - lib/cdb/cli.rb
 - lib/cdb/issue.rb
 - lib/cdb/renamer.rb
 - lib/cdb/series.rb
 - lib/cdb/struct.rb
-- lib/cdb-crawlr.rb
-- bin/cdb
 homepage: https://github.com/sgtFloyd/cdb-crawlr
 licenses: []
+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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby gem and command-line tool for querying ComicBookDB.com
 test_files: []