imagut 0.0.3 → 0.0.4

data/CHANGES

@@ -1,6 +1,14 @@
 = imagut Changelog
 
-== Master (for 0.0.3)
+== Master (for 0.0.5)
+
+== Version 0.0.4 [2014-09-02] released
+* add .jpeg to getimage
+* upgrade renphoto to deal with absolute path.
+* NefParser to Imagut::NefParser
+* UrlLogger to Imagut::UrlLogger
+
+== Version 0.0.3 [2013-04-18] released
 * Slightly change bin/importnef, dealing of unknown format file; report -> ignore.
 (setting file, inbox/image)
 * Add bin/orphanxmp

data/Gemfile

@@ -6,11 +6,11 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.3.5"
-  gem "jeweler", "~> 1.8.3"
+  gem "rdoc", "~> 4.0.1"
+  gem "bundler", "~> 1.7.2"
+  gem "jeweler", "~> 2.0.1"
   gem "simplecov", ">= 0"
   gem "nokogiri", ">= 1.5.4"
   gem "filerenamer", ">= 0.0.4"
-  gem "psych", ">= 0"
+  #gem "psych", ">= 0"
 end

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/getimage

@@ -1,5 +1,6 @@
 #! /usr/bin/env ruby
 # coding: utf-8
+#! /usr/bin/ruby1.9.3
 
 STORAGE_DIR = ENV["HOME"] + "/inbox/image"
 LOG_DIR = STORAGE_DIR + "/log"
@@ -13,21 +14,16 @@ require "nokogiri"
 require "open-uri"
 
 gem "imagut"
-require "imagut/urllogger.rb"
+require "imagut"
+#require "imagut/urllogger.rb"
 
 def anchored_images(url)
   doc = Nokogiri::HTML(open(url))
 
-  #pp doc
-  #pp doc.methods.sort
-  #pp doc.children
-  #pp doc.xpath("//a").each { |i| pp i }
-  #pp doc.xpath("//a")[10]
-  #pp doc.xpath("//a")[10].attributes["href"].value
   results = doc.xpath("//a").map{|a|
     next unless a.attributes.has_key?("href")
     a.attributes["href"].value
-  }.compact.select{|str| str =~ /(jpg|png|gif)$/}
+  }.compact.select{|str| str =~ /(jpg|jpeg|png|gif)$/}
   results
 end
 
@@ -47,7 +43,7 @@ end
 
 #anchors = anchored_images('/home/ippei/tmp/getimages/1457652.html')
 #doc = Nokogiri::HTML(open('http://blog.livedoor.jp/wakusoku/archives/1457652.html'))
-ul = UrlLogger.new(LOG_DIR)
+ul = Imagut::UrlLogger.new(LOG_DIR)
 
 ARGV.each do |url|
   if ul.include?(url)

data/bin/{importphoto → renphoto}

@@ -1,11 +1,13 @@
 #! /usr/local/bin/ruby
-# last-modified: 2012/09/01 00:00:56.
+# last-modified: 2014/07/04 09:44:01.
 
 # Nikon NEF ファイルの撮影日時をファイル名の先頭に付加する。
 
 
-NEF_DIR_PREFIX = "#{ENV["HOME"]}/image/photo/undone"
-
+#NEF_DIR_PREFIX = "#{ENV["HOME"]}/image/photo/undone"
+#NEF_DIR_PREFIX = "."
+#TIME_FORMAT = "%Y/%m/%d/%H%M%S_"
+TIME_FORMAT = "%Y__%m__%d__%H%M%S_"
 
 require "pp"
 require "rubygems"
@@ -25,16 +27,16 @@ op.parse!(ARGV)
 fr = FileRenamer::Commander.new(op.options, ARGV)
 np = NefParser.new
 fr.execute do |filename|
-  #pp filename
-  new_name = ""
-  #pp File.extname(filename)
-  #exit
+  #new_name = ""
+
+  dirname = File.dirname filename
+  basename = File.basename filename
 
   if File.extname(filename) =~ /^\.nef$/i
     begin
       str = File.open(filename, "r").read(391)
       date = np.taken_date(str)
-      new_name = (NEF_DIR_PREFIX + date.strftime("/%Y/%m/%d/%H%M%S_") + filename)
+      new_name = dirname + "/" + date.strftime(TIME_FORMAT) + basename
       new_name.sub!(/\.NEF$/, ".nef")
         #new_name = date.strftime("%Y/%m/%d/") + filename
         # 秒までだと、連写したときに重複ファイル名になりうる。
@@ -46,7 +48,8 @@ fr.execute do |filename|
     end
   elsif File.extname(filename) =~ /^\.jpg$/i
     date = EXIFR::JPEG.new(filename).date_time
-    new_name = (NEF_DIR_PREFIX + date.strftime("/%Y/%m/%d/%H%M%S_") + filename)
+    #new_name = (NEF_DIR_PREFIX + "/" + date.strftime(TIME_FORMAT) + filename)
+    new_name = dirname + "/" + date.strftime(TIME_FORMAT) + basename
     new_name.sub!(/\.JPG$/, ".jpg")
   else
     #puts "Unknown format. Next."

data/bin/resizeimage

@@ -1,7 +1,7 @@
 #! /usr/bin/ruby
 
-#IMAGEMAGIC_PATH = '/usr/local/bin/convert'
-IMAGEMAGIC_PATH = '/usr/bin/convert'
+#IMAGEMAGICK_PATH = '/usr/local/bin/convert'
+IMAGEMAGICK_PATH = '/usr/bin/convert'
 TARGET_SIZE =     '"1200x960>"' # '>' means to shrink but not to expand.
 
 oldFileNameAry = ARGV
@@ -11,7 +11,7 @@ oldFileNameAry.each do |oldFileName|
   #p newFileName = oldFileName.sub(/#{extention}$/, "-s#{extention}")
   newFileName = oldFileName
 
-  commandLine = IMAGEMAGIC_PATH + ' ' + oldFileName + ' -resize ' + TARGET_SIZE +
+  commandLine = IMAGEMAGICK_PATH + ' ' + oldFileName + ' -resize ' + TARGET_SIZE +
     ' ' + newFileName
   print commandLine + "\n"
   system(commandLine)

data/lib/imagut.rb

@@ -0,0 +1,4 @@
+module Imagut; end
+
+require "imagut/nefparser"
+require "imagut/urllogger"

data/lib/imagut/nefparser.rb

@@ -1,43 +1,55 @@
 #! /usr/bin/env ruby
 # coding: utf-8
 
-class NefParserNotNefError < StandardError; end
-class NefParserTypeError < StandardError; end
-
 #
 # Nikon NEF ファイルのなんちゃってパーサ。
 #
-class NefParser
-	#
-	def initialize
-	end
-
-	# 撮影日時を返す(つもり)。
-	#
-	# 頑張って解析はしてない。
-	# 日付と思われる部分だけ抽出している。
-	# 解析には 372+19 = 391 バイトあれば足りる。
-	# サンプル NEF ファイルに撮影日時と思しき文字列は 4つあるけど、
-	# 詳細が分かるまではとりあえず最初の1個のみ Time object にして返す。
-	# a19 の部分が時刻の文字列。
-	# 4つあるんだけど、それぞれの差異 or 冗長なのかが分からない。
-	# 引数 data は File.read で読まれるような文字列
-	def taken_date(data)
-		unless data.is_a?(String)
-			message = "Not string data. Use File#read, not File#readlines."
-			raise NefParserTypeError, message
-		end
-
-		datetime_str = data.unpack("a372a19a57a19a397a19a1a19")[1]
-		#p datetime_str
-		#p datetime_str.split(/[ :]/)
-		begin
-			@date = Time.mktime( * datetime_str.split(/[ :]/) )
-		rescue
-			raise NefParserNotNefError, "Cannot find taken time."
-		end
-		return @date
-	end
+class Imagut::NefParser
+    class NotNefError < StandardError; end
+    class TypeError < StandardError; end
+
+    #
+    def initialize
+    end
+
+    # 撮影日時を返す(つもり)。
+    #
+    # 頑張って解析はしてない。
+    # 日付と思われる部分だけ抽出している。
+    # 解析には 372+19 = 391 バイトあれば足りる。
+    # サンプル NEF ファイルに撮影日時と思しき文字列は 4つあるけど、
+    # 詳細が分かるまではとりあえず最初の1個のみ Time object にして返す。
+    # a19 の部分が時刻の文字列。
+    # 4つあるんだけど、それぞれの差異 or 冗長なのかが分からない。
+    # 引数 data は File.read で読まれるような文字列
+    def self.taken_date(data)
+        unless data.is_a?(String)
+            message = "Not string data. Use File#read, not File#readlines."
+            raise TypeError, message
+        end
+
+        datetime_str = data.unpack("a372a19a57a19a397a19a1a19")[1]
+        #p datetime_str
+        #p datetime_str.split(/[ :]/)
+        begin
+            @date = Time.mktime( * datetime_str.split(/[ :]/) )
+        rescue
+            raise NotNefError, "Cannot find taken time. (#{datetime_str})"
+        end
+        return @date
+    end
+
+    def self.read_taken_date(file)
+        data = File.read(file)
+        result = self.taken_date(data)
+        #pp result
+        result
+    end
+
+
+    def taken_date(data)
+        self.class.taken_date(data)
+    end
 
 end
 

data/lib/imagut/urllogger.rb

@@ -6,29 +6,29 @@ require "date"
 #
 #
 #
-class UrlLogger
-  #LOG_DIR = ENV["HOME"] + "/image/download/log"
+class Imagut::UrlLogger
+    #LOG_DIR = ENV["HOME"] + "/image/download/log"
 
-  class InitializeError < Exception; end
+    class InitializeError < Exception; end
 
-  # dir is a directory to storage logs.
-  def initialize(dir)
-    raise InitializeError, "#{dir} not exist" unless File.directory?(dir)
-    @dir = dir
-  end
+    # dir is a directory to storage logs.
+    def initialize(dir)
+        raise InitializeError, "#{dir} not exist" unless File.directory?(dir)
+        @dir = dir
+    end
 
-  # return true if entry is included in logdir.
-  def include?(entry)
-    Dir.glob(@dir + "/*.log").each do |file|
-      return true if File.open(file, "r").readlines.map{|i|i.chomp}.include?(entry)
+    # return true if entry is included in logdir.
+    def include?(entry)
+        Dir.glob(@dir + "/*.log").each do |file|
+            return true if File.open(file, "r").readlines.map{|i|i.chomp}.include?(entry)
+        end
+        return false
     end
-    return false
-  end
 
-  def write(entry,
-      filename = @dir + (DateTime.now.strftime("/%C%g%m%d.log")))
-    File.open(filename, "a") { |io| io.puts entry }
-  end
+    def write(entry,
+            filename = @dir + (DateTime.now.strftime("/%C%g%m%d.log")))
+        File.open(filename, "a") { |io| io.puts entry }
+    end
 
 end
 

data/test/test_nefparser.rb

@@ -3,29 +3,36 @@
 
 require 'helper'
 require "test/unit"
-require "imageutils/nefparser.rb"
+#require "imagut/nefparser.rb"
+require "imagut.rb"
 
 class TC_NefParser < Test::Unit::TestCase
-	def setup
-		@np00 = NefParser.new
-	end
+    def setup
+        @np00 = Imagut::NefParser.new
+    end
 
-	def test_taken_date
+    def test_self_read_taken_date
+        file = "test/001.nef"
+        assert_equal(Time.mktime(2011, 8, 12, 5, 50, 33),
+                     Imagut::NefParser.read_taken_date(file))
+    end
 
-		data = File.open("test/001.nef", "r").read
-		assert_equal(Time.mktime(2011, 8, 12, 5, 50, 33), @np00.taken_date(data))
+    def test_taken_date
 
-		data = File.open("test/001.nef", "r").read(372+19)
-		assert_equal(Time.mktime(2011, 8, 12, 5, 50, 33), @np00.taken_date(data))
+        data = File.open("test/001.nef", "r").read
+        assert_equal(Time.mktime(2011, 8, 12, 5, 50, 33), @np00.taken_date(data))
 
-		# String でないときに例外。
-		data = File.open("test/001.nef", "r").readlines
-		assert_raise(NefParserTypeError){@np00.taken_date(data)}
+        data = File.open("test/001.nef", "r").read(372+19)
+        assert_equal(Time.mktime(2011, 8, 12, 5, 50, 33), @np00.taken_date(data))
 
-		# NEF と異なるときに例外のテスト
-		assert_raise(NefParserNotNefError){@np00.taken_date("Not NEF data")}
+        # String でないときに例外。
+        data = File.open("test/001.nef", "r").readlines
+        assert_raise(Imagut::NefParser::TypeError){@np00.taken_date(data)}
 
-	end
+        # NEF と異なるときに例外のテスト
+        assert_raise(Imagut::NefParser::NotNefError){@np00.taken_date("Not NEF data")}
+
+    end
 
 end
 

data/test/test_urllogger.rb

@@ -4,15 +4,16 @@
 require 'helper'
 require "fileutils"
 require "test/unit"
-require "imageutils/urllogger.rb"
+#require "imagut/urllogger.rb"
+require "imagut.rb"
 
 class TC_UrlLogger < Test::Unit::TestCase
   def setup
-    @ul00 = UrlLogger.new("test/urllogger")
+    @ul00 = Imagut::UrlLogger.new("test/urllogger")
   end
 
   def test_initialize
-    assert_raises(UrlLogger::InitializeError){ UrlLogger.new("") }
+    assert_raises(Imagut::UrlLogger::InitializeError){ Imagut::UrlLogger.new("") }
   end
 
   def test_include?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagut
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,44 +9,59 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &84375670 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 4.0.1
   type: :development
   prerelease: false
-  version_requirements: *84375670
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &84375170 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.7.2
   type: :development
   prerelease: false
-  version_requirements: *84375170
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &84374030 !ruby/object:Gem::Requirement
+  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: *84374030
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &84452090 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84452090
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &84451550 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 1.5.4
   type: :development
   prerelease: false
-  version_requirements: *84451550
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: filerenamer
-  requirement: &84451310 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,25 +101,19 @@ dependencies:
         version: 0.0.4
   type: :development
   prerelease: false
-  version_requirements: *84451310
-- !ruby/object:Gem::Dependency
-  name: psych
-  requirement: &84450930 !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: *84450930
+        version: 0.0.4
 description: Library to deal image files. This includes file renamer with NIKON NEF
   file, downloader for images on a web page.
 email: ippei94da@gmail.com
 executables:
 - getimage
-- importphoto
 - orphanxmp
+- renphoto
 - resizeimage
 extensions: []
 extra_rdoc_files:
@@ -109,10 +128,9 @@ files:
 - Rakefile
 - VERSION
 - bin/getimage
-- bin/importphoto
 - bin/orphanxmp
+- bin/renphoto
 - bin/resizeimage
-- imagut.gemspec
 - lib/imagut.rb
 - lib/imagut/nefparser.rb
 - lib/imagut/urllogger.rb
@@ -137,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -473594477
+      hash: -1724885809078620764
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: IMAGe UTilities. File renamer, downloader, etc.

data/imagut.gemspec

@@ -1,79 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "imagut"
-  s.version = "0.0.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["ippei94da"]
-  s.date = "2013-04-18"
-  s.description = "Library to deal image files. This includes file renamer with NIKON NEF file, downloader for images on a web page."
-  s.email = "ippei94da@gmail.com"
-  s.executables = ["getimage", "importphoto", "orphanxmp", "resizeimage"]
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "CHANGES",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "bin/getimage",
-    "bin/importphoto",
-    "bin/orphanxmp",
-    "bin/resizeimage",
-    "imagut.gemspec",
-    "lib/imagut.rb",
-    "lib/imagut/nefparser.rb",
-    "lib/imagut/urllogger.rb",
-    "test/001.nef",
-    "test/helper.rb",
-    "test/test_nefparser.rb",
-    "test/test_urllogger.rb",
-    "test/urllogger/20120523.log",
-    "test/urllogger/20120524.log"
-  ]
-  s.homepage = "http://github.com/ippei94da/imagut"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
-  s.summary = "IMAGe UTilities. File renamer, downloader, etc."
-
-  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_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.3.5"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<nokogiri>, [">= 1.5.4"])
-      s.add_development_dependency(%q<filerenamer>, [">= 0.0.4"])
-      s.add_development_dependency(%q<psych>, [">= 0"])
-    else
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.3.5"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<nokogiri>, [">= 1.5.4"])
-      s.add_dependency(%q<filerenamer>, [">= 0.0.4"])
-      s.add_dependency(%q<psych>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.3.5"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<nokogiri>, [">= 1.5.4"])
-    s.add_dependency(%q<filerenamer>, [">= 0.0.4"])
-    s.add_dependency(%q<psych>, [">= 0"])
-  end
-end
-