multi_exiftool 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8ca8548908a3e26fbdea1a74a49af9dc597361a8
+  data.tar.gz: f0bfc40076a49f6c5bc71cc8b416cb9321fb2afb
+SHA512:
+  metadata.gz: 7a6ce9840e83312e0922373b2f485524b25ddbb9933e1a16f75d84f7e437cbc9637de32f17bae8174eea428d421592c62f626e4b67e321a9f9cf14a2fbc42879
+  data.tar.gz: 2f6ff90bcea1fc6852d0650a24258c70d9c710f9e6bc8d5ecccac5f338e40e1080b7afc0a605a2dd3639bc91456e3b7eea442530abfc6534fd47e46a5484a1d9

data/CHANGELOG

@@ -1,11 +1,23 @@
-v0.2.0 Support writing to specific group with hash hierarchy.
+0.3.0
+New functional api.
+Update documentation.
+Adding tests and new example for functional api.
+Switching to rim.
+
+0.2.0
+Support writing to specific group with hash hierarchy.
 Support array-like values for tags like keywords.
 
-v0.1.3 Improve README and adapt project url.
+0.1.3
+Improve README and adapt project url.
 
-v0.1.2 Preserve time zone in time objects (don't convert to local zone).
+0.1.2
+Preserve time zone in time objects (don't convert to local zone).
 Thanks to Bernard aka gittycat for the hint.
 
-v0.1.1 Parsing timestamps without value for seconds.  Thanks to gittycat for the hint.
+0.1.1
+Parsing timestamps without value for seconds.
+Thanks to gittycat for the hint.
 
-v0.1.0 First public release.
+0.1.0
+First public release.

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2009-2012 Jan Friedrich
+Copyright (c) 2009-2014 Jan Friedrich
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/{README → README.rdoc}

@@ -14,9 +14,22 @@ the results.
 
   require 'multi_exiftool'
 
+  # Object oriented approach
   reader = MultiExiftool::Reader.new
   reader.filenames = Dir['*.jpg']
   results = reader.read
+  unless reader.errors.empty?
+    $stderr.puts reader.errors
+  end
+  results.each do |values|
+   puts "#{values.file_name}: #{values.comment}"
+  end
+
+  # Functional approach
+  results, errors = MultiExiftool.read(Dir['*.jpg'])
+  unless reader.errors.empty?
+    $stderr.puts reader.errors
+  end
   results.each do |values|
    puts "#{values.file_name}: #{values.comment}"
   end
@@ -25,13 +38,22 @@ the results.
 
   require 'multi_exiftool'
 
+  # Object oriented approach
   writer = MultiExiftool::Writer.new
   writer.filenames = Dir['*.jpg']
   writer.values = {creator: 'Jan Friedrich', copyright: 'Public Domain'}
   if writer.write
     puts 'ok'
   else
-    puts writer.errors.join
+    puts writer.errors
+  end
+
+  # Functional approach
+  errors = MultiExiftool.write(Dir['*.jpg'],  {creator: 'Jan Friedrich', copyright: 'Public Domain'})
+  if errors.empty?
+    puts 'ok'
+  else
+    puts writer.errors
   end
 
 === Further Examples
@@ -68,7 +90,7 @@ Jan Friedrich (janfri26 AT gmail DOT com)
 
   The MIT License
 
-  Copyright (c) 2009-2012 Jan Friedrich
+  Copyright (c) 2009-2014 Jan Friedrich
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -1,12 +1,17 @@
-require 'echoe'
+require 'rim'
+require 'rim/check_version'
+require 'rim/gem'
+require 'rim/test'
 
-Echoe.new('multi_exiftool') do |p|
-  p.author = 'Jan Friedrich'
+Rim.setup do |p|
+  p.name = 'multi_exiftool'
+  p.version = '0.3.0'
+  p.authors = 'Jan Friedrich'
   p.email = 'janfri26@gmail.com'
   p.summary = 'This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool).'
   p.description = 'This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool) written by Phil Harvey. It is designed for dealing with multiple files at once by creating commands to call exiftool with various arguments, call it and parsing the results.'
   p.ruby_version = '>=1.9.1'
-  p.url = 'http://gitorious.org/multi_exiftool'
+  p.homepage = 'http://gitorious.org/multi_exiftool'
   p.install_message = %q{
 +-----------------------------------------------------------------------+
 | Please ensure you have installed exiftool version 7.65 or higher and  |
@@ -15,8 +20,6 @@ Echoe.new('multi_exiftool') do |p|
 | http://www.sno.phy.queensu.ca/~phil/exiftool/install.html             |
 +-----------------------------------------------------------------------+
   }
-  p.development_dependencies = ['contest']
-  p.eval = proc do
-    self.requirements << 'exiftool, version 7.65 or higher'
-  end
+  p.development_dependencies << 'contest'
+  p.requirements << 'exiftool, version 7.65 or higher'
 end

data/lib/multi_exiftool.rb

@@ -5,6 +5,45 @@ require_relative 'multi_exiftool/writer'
 
 module MultiExiftool
 
+  # Reading metadata
+  # Be aware: it returns an array of two elements:
+  # values, errors
+  #
+  # Example:
+  #   values, errors = MultiExiftool.read(Dir['*.jpg'])
+  #   if errors.empty?
+  #     values.each {|val| do_something_with(val) }
+  #   else
+  #     # error handling
+  #   end
+  def self.read(filenames, opts={})
+    reader = Reader.new
+    reader.filenames = filenames
+    if val = opts.delete(:tags)
+      reader.tags = val
+    end
+    reader.options = opts unless opts.empty?
+    values = reader.read
+    [values, reader.errors]
+  end
+
+  # Writing metadata
+  # Returns an array of the error messages
+  #
+  # Example:
+  #   errors = MultiExiftool.write(Dir['*.jpg'], {author: 'Jan Friedrich'})
+  #   unless errors.empty?
+  #     # do error handling
+  #   end
+  def self.write(filenames, values, opts={})
+    writer = Writer.new
+    writer.filenames = filenames
+    writer.values = values
+    writer.options = opts unless opts.empty?
+    writer.write
+    writer.errors
+  end
+
   class Error < ::StandardError; end
 
 end

data/lib/multi_exiftool/executable.rb

@@ -15,6 +15,7 @@ module MultiExiftool
       @exiftool_command = 'exiftool'
       @options = {}
       @filenames = []
+      @option_mapping = {numerical: :n}
     end
 
     def options
@@ -48,10 +49,11 @@ module MultiExiftool
       opts = options
       return [] if opts.empty?
       opts.map do |opt, val|
+        arg = @option_mapping[opt] || opt
         if val == true
-          "-#{opt}"
+          "-#{arg}"
         else
-          "-#{opt} #{val}"
+          "-#{arg} #{val}"
         end
       end
     end

data/lib/multi_exiftool/reader.rb

@@ -17,13 +17,14 @@ module MultiExiftool
 
     def initialize
       super
+      @option_mapping.merge! group: :g
     end
 
     # Options to use with the exiftool command.
     def options
       opts = super
       if @group
-        opts["g#{@group}"] = true
+        opts[:g] = @group
       end
       opts
     end
@@ -52,7 +53,8 @@ module MultiExiftool
 
     def parse_results
       stdout = @stdout.read
-      @errors = @stderr.readlines
+      error_string = @stderr.read.gsub(/^ .*$/, '')
+      @errors = error_string.split(/\n/)
       json = JSON.parse(stdout)
       json.map {|values| Values.new(values)}
     rescue JSON::ParserError

data/lib/multi_exiftool/writer.rb

@@ -60,7 +60,7 @@ module MultiExiftool
     end
 
     def parse_results
-      @errors = @stderr.readlines
+      @errors = @stderr.read.split(/\n/)
       @errors.empty?
     end
 

data/test/fixtures.yml

@@ -0,0 +1,72 @@
+# reading
+"exiftool -J non_existing_file":
+  stdout: ""
+  stderr: "File non_existing_file not found."
+"exiftool -J -fnumber -foo a.jpg xxx":
+  stdout: |
+    [{
+      "SourceFile": "a.jpg",
+      "FNumber": 9.5
+    }]
+  stderr: |
+    File not found: xxx
+        1 image files read
+        1 files could not be read
+"exiftool -J a.jpg b.tif c.bmp":
+  stdout: |
+    [{
+      "SourceFile": "a.jpg",
+      "FNumber": 11.0,
+      "ISO": 400
+    },
+    {
+      "SourceFile": "b.tif",
+      "FNumber": 9.0,
+      "ISO": 200
+    },
+    {
+      "SourceFile": "c.bmp",
+      "FNumber": 8.0,
+      "ISO": 100
+    }]
+  stderr: ""
+"exiftool -J -fnumber a.jpg b.tif c.bmp":
+  stdout: |
+    [{
+      "SourceFile": "a.jpg",
+      "FNumber": 11.0
+    },
+    {
+      "SourceFile": "b.tif",
+      "FNumber": 9.0
+    },
+    {
+      "SourceFile": "c.bmp",
+      "FNumber": 8.0
+    }]
+  stderr: ""
+"exiftool -J -g 0 -fnumber a.jpg":
+  stdout: |
+    [{
+      "SourceFile": "a.jpg",
+      "EXIF": {
+        "FNumber": 7.1
+      },
+      "MakerNotes": {
+        "FNumber": 7.0
+      }
+    }]
+  stderr: ""
+
+# writing
+"exiftool -author=janfri a.jpg b.tif c.bmp":
+  stdout: |2
+        1 image files updated
+  stderr: ""
+"exiftool -author=janfri -foo=x a.jpg xxx":
+  stdout: |2
+        1 image files updated
+        1 files weren't updated due to errors
+  stderr: |
+    Warning: Tag 'foo' does not exist
+    Error: File not found - xxx

data/test/helper.rb

@@ -4,13 +4,26 @@ require 'test/unit'
 require 'contest'
 require 'open3'
 require 'stringio'
+require 'yaml'
 
 module TestHelper
 
-  def mocking_open3(command, outstr, errstr)
+  @@fixtures = YAML.load_file('test/fixtures.yml')
+
+  def use_fixture(name, &block)
+    @fixture = @@fixtures[name]
+    if @fixture.nil?
+      assert false, "Fixture #{name} not found!\n" << caller.first
+    end
+    mocking_open3(name, @fixture['stdout'], @fixture['stderr'], &block)
+  end
+
+  def mocking_open3(command, outstr, errstr, &block)
+    executed = {exec: false}
     open3_eigenclass = class << Open3; self; end
-    open3_eigenclass.module_exec(command, outstr, errstr) do |cmd, out, err|
+    open3_eigenclass.module_exec(command, outstr, errstr, executed) do |cmd, out, err, exec|
       define_method :popen3 do |arg|
+        exec[:exec] = true
         if arg == cmd
           return [nil, StringIO.new(out), StringIO.new(err)]
         else
@@ -18,6 +31,12 @@ module TestHelper
         end
       end
     end
+    begin
+      yield
+    rescue ArgumentError => e
+      assert false, e.message
+    end
+    assert executed[:exec], "Open3.popen3 not executed!\n" << caller[0,2].inspect
   end
 
 end

data/test/test_functional_api.rb

@@ -0,0 +1,118 @@
+# coding: utf-8
+require_relative 'helper'
+
+class TestFunctionalApi < Test::Unit::TestCase
+
+  context 'reading' do
+
+    test 'successful reading only filenames' do
+      use_fixture 'exiftool -J a.jpg b.tif c.bmp' do
+        values, errors = MultiExiftool.read(%w(a.jpg b.tif c.bmp))
+        assert_kind_of Array, values
+        assert_equal [11.0, 9.0, 8.0], values.map {|e| e['FNumber']}
+        assert_equal [400, 200, 100], values.map {|e| e['ISO']}
+        assert_equal [], errors
+      end
+    end
+
+    test 'successful reading with one tag' do
+      use_fixture 'exiftool -J -fnumber a.jpg b.tif c.bmp' do
+        values, errors = MultiExiftool.read(%w(a.jpg b.tif c.bmp), tags: %w(fnumber))
+        assert_kind_of Array, values
+        assert_equal [11.0, 9.0, 8.0], values.map {|e| e['FNumber']}
+        assert_equal [], errors
+      end
+    end
+
+    test 'successful reading of hierarichal data' do
+      use_fixture 'exiftool -J -g 0 -fnumber a.jpg' do
+        values, errors = MultiExiftool.read(%w(a.jpg), tags: %w[fnumber], group: 0)
+        res = values.first
+        assert_equal 'a.jpg', res.source_file
+        assert_equal 7.1, res.exif.fnumber
+        assert_equal 7.0, res.maker_notes.fnumber
+        assert_equal [], errors
+      end
+    end
+
+    test 'generate correct command for numerical option' do
+      mocking_open3 'exiftool -J -n -orientation a.jpg', '', '' do
+        MultiExiftool.read(%w[a.jpg], tags: %w[orientation], numerical: true)
+      end
+    end
+
+    test 'options with boolean argument' do
+      mocking_open3 'exiftool -J -e a.jpg b.tif c.bmp', '', '' do
+        MultiExiftool.read(%w[a.jpg b.tif c.bmp], e: true)
+      end
+    end
+
+  end
+
+  context 'writing' do
+
+    setup do
+      @filenames = %w(a.jpg b.tif c.bmp)
+    end
+
+    test 'simple case' do
+      mocking_open3 'exiftool -author=janfri a.jpg b.tif c.bmp', '', '' do
+        values = {:author => 'janfri'}
+        MultiExiftool.write @filenames, values
+      end
+    end
+
+    test 'tags with spaces in values' do
+      mocking_open3 'exiftool -author=janfri -comment=some\ comment a.jpg b.tif c.bmp', '', '' do
+        values = {:author => 'janfri', :comment => 'some comment'}
+        MultiExiftool.write @filenames, values
+      end
+    end
+
+    test 'tags with rational value' do
+      mocking_open3 'exiftool -shutterspeed=1/125 a.jpg b.tif c.bmp', '', '' do
+        values ={shutterspeed: Rational(1, 125)}
+        MultiExiftool.write @filenames, values
+      end
+    end
+
+    test 'tags with array-like values' do
+      mocking_open3 'exiftool -keywords=one -keywords=two -keywords=and\ three a.jpg b.tif c.bmp', '', '' do
+        values = {keywords: ['one', 'two', 'and three']}
+        MultiExiftool.write @filenames, values
+      end
+    end
+
+    test 'options with boolean argument' do
+      mocking_open3 'exiftool -overwrite_original -author=janfri a.jpg b.tif c.bmp', '', '' do
+        values = {:author => 'janfri'}
+        options = {:overwrite_original => true}
+        MultiExiftool.write @filenames, values, options
+      end
+    end
+
+    test 'options with value argument' do
+      mocking_open3 'exiftool -out output_file -author=janfri a.jpg b.tif c.bmp', '', '' do
+        values = {:author => 'janfri'}
+        options = {:out => 'output_file'}
+        MultiExiftool.write @filenames, values, options
+      end
+    end
+
+    test 'numerical flag' do
+      mocking_open3 'exiftool -n -author=janfri a.jpg b.tif c.bmp', '', '' do
+        values = {:author => 'janfri'}
+        MultiExiftool.write @filenames, values, numerical: true
+      end
+    end
+
+    test 'overwrite_original flag' do
+      mocking_open3 'exiftool -overwrite_original -author=janfri a.jpg b.tif c.bmp', '', '' do
+        values = {author: 'janfri'}
+        MultiExiftool.write @filenames, values, overwrite_original: true
+      end
+    end
+
+  end
+
+end

data/test/test_reader.rb

@@ -68,10 +68,10 @@ class TestReader < Test::Unit::TestCase
     test 'group flag' do
       @reader.filenames = %w(a.jpg)
       @reader.group = 0
-      command = 'exiftool -J -g0 a.jpg'
+      command = 'exiftool -J -g 0 a.jpg'
       assert_equal command, @reader.command
       @reader.group = 1
-      command = 'exiftool -J -g1 a.jpg'
+      command = 'exiftool -J -g 1 a.jpg'
       assert_equal command, @reader.command
     end
 
@@ -80,60 +80,46 @@ class TestReader < Test::Unit::TestCase
   context 'read method' do
 
     test 'try to read a non-existing file' do
-      mocking_open3('exiftool -J non_existing_file', '', 'File non_existing_file not found.')
-      @reader.filenames = %w(non_existing_file)
-      res = @reader.read
-      assert_equal [], res
-      assert_equal ['File non_existing_file not found.'], @reader.errors
+      use_fixture('exiftool -J non_existing_file') do
+        @reader.filenames = %w(non_existing_file)
+        res = @reader.read
+        assert_equal [], res
+        assert_equal ['File non_existing_file not found.'], @reader.errors
+      end
+    end
+
+    test 'read from an existing and a non-existing file' do
+      use_fixture('exiftool -J -fnumber -foo a.jpg xxx') do
+        @reader.filenames = %w(a.jpg xxx)
+        @reader.tags = %w(fnumber foo)
+        res = @reader.read
+        assert_equal [9.5], res.map {|e| e['FNumber']}
+        assert_equal ['File not found: xxx'], @reader.errors
+      end
     end
 
     test 'successful reading with one tag' do
-      json = <<-EOS
-        [{
-          "SourceFile": "a.jpg",
-          "FNumber": 11.0
-        },
-        {
-          "SourceFile": "b.tif",
-          "FNumber": 9.0
-        },
-        {
-          "SourceFile": "c.bmp",
-          "FNumber": 8.0
-        }]
-      EOS
-      json.gsub!(/^ {8}/, '')
-      mocking_open3('exiftool -J -fnumber a.jpg b.tif c.bmp', json, '')
-      @reader.filenames = %w(a.jpg b.tif c.bmp)
-      @reader.tags = %w(fnumber)
-      res =  @reader.read
-      assert_kind_of Array, res
-      assert_equal [11.0, 9.0, 8.0], res.map {|e| e['FNumber']}
-      assert_equal [], @reader.errors
+      use_fixture('exiftool -J -fnumber a.jpg b.tif c.bmp') do
+        @reader.filenames = %w(a.jpg b.tif c.bmp)
+        @reader.tags = %w(fnumber)
+        res =  @reader.read
+        assert_kind_of Array, res
+        assert_equal [11.0, 9.0, 8.0], res.map {|e| e['FNumber']}
+        assert_equal [], @reader.errors
+      end
     end
 
     test 'successful reading of hierarichal data' do
-      json = <<-EOS
-        [{
-          "SourceFile": "a.jpg",
-          "EXIF": {
-            "FNumber": 7.1
-          },
-          "MakerNotes": {
-            "FNumber": 7.0
-          }
-        }]
-      EOS
-      json.gsub!(/^ {8}/, '')
-      mocking_open3('exiftool -J -g0 -fnumber a.jpg', json, '')
-      @reader.filenames = %w(a.jpg)
-      @reader.tags = %w(fnumber)
-      @reader.group = 0
-      res =  @reader.read.first
-      assert_equal 'a.jpg', res.source_file
-      assert_equal 7.1, res.exif.fnumber
-      assert_equal 7.0, res.maker_notes.fnumber
-      assert_equal [], @reader.errors
+      use_fixture('exiftool -J -g 0 -fnumber a.jpg') do
+        @reader.filenames = %w(a.jpg)
+        @reader.tags = %w(fnumber)
+        @reader.group = 0
+        res =  @reader.read.first
+        assert_equal 'a.jpg', res.source_file
+        assert_equal 7.1, res.exif.fnumber
+        assert_equal 7.0, res.maker_notes.fnumber
+        assert_equal [], @reader.errors
+      end
     end
 
   end

data/test/test_writer.rb

@@ -7,16 +7,9 @@ class TestWriter < Test::Unit::TestCase
     @writer = MultiExiftool::Writer.new
   end
 
-  context 'command method' do
+  context 'various filename combinations' do
 
-    test 'simple case' do
-      @writer.filenames = %w(a.jpg b.tif c.bmp)
-      @writer.values = {:author => 'janfri'}
-      command = 'exiftool -author=janfri a.jpg b.tif c.bmp'
-      assert_equal command, @writer.command
-    end
-
-    test 'no filenames set' do
+    test 'command method, no filenames set' do
       @writer.values = {:author => 'janfri'}
       assert_raises MultiExiftool::Error do
         @writer.command
@@ -34,8 +27,28 @@ class TestWriter < Test::Unit::TestCase
       assert_equal command, @writer.command
     end
 
-    test 'no values set' do
+    test 'filenames with spaces' do
+      @writer.filenames = ['one file with spaces.jpg', 'another file with spaces.tif']
+      @writer.values = {:author => 'janfri'}
+      command = 'exiftool -author=janfri one\ file\ with\ spaces.jpg another\ file\ with\ spaces.tif'
+      assert_equal command, @writer.command
+    end
+
+  end
+
+  context 'command method, various tags' do
+
+    setup do
       @writer.filenames = %w(a.jpg b.tif c.bmp)
+    end
+
+    test 'simple case' do
+      @writer.values = {:author => 'janfri'}
+      command = 'exiftool -author=janfri a.jpg b.tif c.bmp'
+      assert_equal command, @writer.command
+    end
+
+    test 'no values set' do
       assert_raises MultiExiftool::Error do
         @writer.command
       end
@@ -46,35 +59,24 @@ class TestWriter < Test::Unit::TestCase
     end
 
     test 'tags with spaces in values' do
-      @writer.filenames = %w(a.jpg b.tif c.bmp)
       @writer.values = {:author => 'janfri', :comment => 'some comment'}
       command = 'exiftool -author=janfri -comment=some\ comment a.jpg b.tif c.bmp'
       assert_equal command, @writer.command
     end
 
     test 'tags with rational value' do
-      @writer.filenames = %w(a.jpg b.tif c.bmp)
       @writer.values ={shutterspeed: Rational(1, 125)}
       command = 'exiftool -shutterspeed=1/125 a.jpg b.tif c.bmp'
       assert_equal command, @writer.command
     end
 
     test 'tags with array-like values' do
-      @writer.filenames = %w(a.jpg b.tif c.bmp)
       @writer.values = {keywords: ['one', 'two', 'and three']}
       command = 'exiftool -keywords=one -keywords=two -keywords=and\ three a.jpg b.tif c.bmp'
       assert_equal command, @writer.command
     end
 
-    test 'filenames with spaces' do
-      @writer.filenames = ['one file with spaces.jpg', 'another file with spaces.tif']
-      @writer.values = {:author => 'janfri'}
-      command = 'exiftool -author=janfri one\ file\ with\ spaces.jpg another\ file\ with\ spaces.tif'
-      assert_equal command, @writer.command
-    end
-
     test 'options with boolean argument' do
-      @writer.filenames = %w(a.jpg b.tif c.bmp)
       @writer.values = {:author => 'janfri'}
       @writer.options = {:overwrite_original => true}
       command = 'exiftool -overwrite_original -author=janfri a.jpg b.tif c.bmp'
@@ -82,7 +84,6 @@ class TestWriter < Test::Unit::TestCase
     end
 
     test 'options with value argument' do
-      @writer.filenames = %w(a.jpg b.tif c.bmp)
       @writer.values = {:author => 'janfri'}
       @writer.options = {:out => 'output_file'}
       command = 'exiftool -out output_file -author=janfri a.jpg b.tif c.bmp'
@@ -90,7 +91,6 @@ class TestWriter < Test::Unit::TestCase
     end
 
     test 'numerical flag' do
-      @writer.filenames = %w(a.jpg b.tif c.bmp)
       @writer.values = {:author => 'janfri'}
       @writer.numerical = true
       command = 'exiftool -n -author=janfri a.jpg b.tif c.bmp'
@@ -98,7 +98,6 @@ class TestWriter < Test::Unit::TestCase
     end
 
     test 'overwrite_original flag' do
-      @writer.filenames = %w(a.jpg b.tif c.bmp)
       @writer.values = {author: 'janfri'}
       @writer.overwrite_original = true
       command = 'exiftool -overwrite_original -author=janfri a.jpg b.tif c.bmp'
@@ -109,13 +108,24 @@ class TestWriter < Test::Unit::TestCase
 
   context 'write method' do
 
-    test 'succsessfull write' do
-      mocking_open3('exiftool -author=janfri a.jpg b.tif c.bmp', '', '')
-      @writer.filenames = %w(a.jpg b.tif c.bmp)
-      @writer.values = {:author => 'janfri'}
-      rc = @writer.write
-      assert_equal [], @writer.errors
-      assert_equal true, rc
+    test 'successful write' do
+      use_fixture('exiftool -author=janfri a.jpg b.tif c.bmp') do
+        @writer.filenames = %w(a.jpg b.tif c.bmp)
+        @writer.values = {:author => 'janfri'}
+        rc = @writer.write
+        assert_equal [], @writer.errors
+        assert_equal true, rc
+      end
+    end
+
+    test 'unsuccessful write' do
+      use_fixture('exiftool -author=janfri -foo=x a.jpg xxx') do
+        @writer.filenames = %w(a.jpg xxx)
+        @writer.values = {author: 'janfri', foo: 'x'}
+        rc = @writer.write
+        assert_equal @fixture['stderr'].chomp, @writer.errors.join("\n")
+        assert_equal false, rc
+      end
     end
 
   end

metadata

@@ -1,30 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: multi_exiftool
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Jan Friedrich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rim
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: contest
   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'
 description: This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool)
@@ -34,78 +45,53 @@ description: This library is wrapper for the Exiftool command-line application (
 email: janfri26@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- CHANGELOG
-- LICENSE
-- README
-- lib/multi_exiftool.rb
-- lib/multi_exiftool/executable.rb
-- lib/multi_exiftool/reader.rb
-- lib/multi_exiftool/values.rb
-- lib/multi_exiftool/writer.rb
+extra_rdoc_files: []
 files:
 - CHANGELOG
 - LICENSE
-- Manifest
-- README
+- README.rdoc
 - Rakefile
-- examples/01_simple_reading.rb
-- examples/02_simple_writing.rb
-- examples/03_reading_using_groups.rb
-- examples/04_writing_using_groups.rb
 - lib/multi_exiftool.rb
 - lib/multi_exiftool/executable.rb
 - lib/multi_exiftool/reader.rb
 - lib/multi_exiftool/values.rb
 - lib/multi_exiftool/writer.rb
+- test/fixtures.yml
 - test/helper.rb
 - test/test_executable.rb
+- test/test_functional_api.rb
 - test/test_reader.rb
 - test/test_values.rb
 - test/test_values_using_groups.rb
 - test/test_writer.rb
 - test/test_writer_groups.rb
-- multi_exiftool.gemspec
 homepage: http://gitorious.org/multi_exiftool
 licenses: []
-post_install_message: ! "\n+-----------------------------------------------------------------------+\n|
+metadata: {}
+post_install_message: "\n+-----------------------------------------------------------------------+\n|
   Please ensure you have installed exiftool version 7.65 or higher and  |\n| it's
   found in your PATH (Try \"exiftool -ver\" on your commandline).    |\n| For more
   details see                                                  |\n| http://www.sno.phy.queensu.ca/~phil/exiftool/install.html
   \            |\n+-----------------------------------------------------------------------+\n
   \ "
-rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
-- Multi_exiftool
-- --main
-- README
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '1.2'
+      version: '0'
 requirements:
 - exiftool, version 7.65 or higher
-rubyforge_project: multi_exiftool
-rubygems_version: 1.8.21
+rubyforge_project: 
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool).
-test_files:
-- test/test_executable.rb
-- test/test_reader.rb
-- test/test_values.rb
-- test/test_values_using_groups.rb
-- test/test_writer.rb
-- test/test_writer_groups.rb
+test_files: []

data/Manifest

@@ -1,21 +0,0 @@
-CHANGELOG
-LICENSE
-Manifest
-README
-Rakefile
-examples/01_simple_reading.rb
-examples/02_simple_writing.rb
-examples/03_reading_using_groups.rb
-examples/04_writing_using_groups.rb
-lib/multi_exiftool.rb
-lib/multi_exiftool/executable.rb
-lib/multi_exiftool/reader.rb
-lib/multi_exiftool/values.rb
-lib/multi_exiftool/writer.rb
-test/helper.rb
-test/test_executable.rb
-test/test_reader.rb
-test/test_values.rb
-test/test_values_using_groups.rb
-test/test_writer.rb
-test/test_writer_groups.rb

data/examples/01_simple_reading.rb

@@ -1,13 +0,0 @@
-require 'multi_exiftool'
-
-if ARGV.empty?
-  $stderr.puts 'No filenames given.'
-  exit -1
-end
-
-reader = MultiExiftool::Reader.new
-reader.filenames = ARGV
-results = reader.read
-results.each do |values|
- puts "#{values.file_name}: #{values.comment}"
-end

data/examples/02_simple_writing.rb

@@ -1,19 +0,0 @@
-require 'multi_exiftool'
-
-if ARGV.empty?
-  $stderr.puts 'No filenames given.'
-  exit -1
-end
-
-puts 'Please enter a comment for the given files:'
-comment = $stdin.gets.chomp
-
-writer = MultiExiftool::Writer.new
-writer.filenames = ARGV
-writer.overwrite_original = true
-writer.values = {comment: comment}
-if writer.write
-  puts 'ok'
-else
-  puts writer.errors.join
-end

data/examples/03_reading_using_groups.rb

@@ -1,28 +0,0 @@
-require 'multi_exiftool'
-
-if ARGV.empty?
-  $stderr.puts 'No filenames given.'
-  exit -1
-end
-
-reader = MultiExiftool::Reader.new
-reader.filenames = ARGV
-reader.group = 0
-results = reader.read
-results.each do |values|
-  # direct access
-  puts values.file.filename
-  # access via block without parameter
-  values.iptc do
-    self.keywords do
-      puts "  Keywords (IPCT): #{Array(self).join(', ')}"
-    end
-  end
-  # access via block with parameter
-  values.xmp do |xmp|
-    xmp.keywords do |kw|
-      puts "  Keywords (XMP): #{Array(kw).join(', ')}"
-    end
-  end
-end
-

data/examples/04_writing_using_groups.rb

@@ -1,33 +0,0 @@
-require 'multi_exiftool'
-require 'yaml'
-
-if ARGV.empty?
-  $stderr.puts 'No filenames given.'
-  exit -1
-end
-
-puts 'Please enter a description for the given files:'
-description = $stdin.gets.chomp
-
-puts 'Please enter a caption for the given files:'
-caption = $stdin.gets.chomp
-
-writer = MultiExiftool::Writer.new
-writer.filenames = ARGV
-
-# specifying group by prefix
-writer.values = {'exif:imagedescription' => description, 'xmp:description' => description}
-
-# specifying group hierarchical
-writer.values.merge! YAML.load <<-END
-iptc:
-  caption-abstract: #{caption}
-xmp:
-  caption: #{caption}
-END
-
-if writer.write
-  puts 'ok'
-else
-  puts writer.errors.join
-end

data/multi_exiftool.gemspec

@@ -1,36 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "multi_exiftool"
-  s.version = "0.2.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jan Friedrich"]
-  s.date = "2012-05-11"
-  s.description = "This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool) written by Phil Harvey. It is designed for dealing with multiple files at once by creating commands to call exiftool with various arguments, call it and parsing the results."
-  s.email = "janfri26@gmail.com"
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/multi_exiftool.rb", "lib/multi_exiftool/executable.rb", "lib/multi_exiftool/reader.rb", "lib/multi_exiftool/values.rb", "lib/multi_exiftool/writer.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "examples/01_simple_reading.rb", "examples/02_simple_writing.rb", "examples/03_reading_using_groups.rb", "examples/04_writing_using_groups.rb", "lib/multi_exiftool.rb", "lib/multi_exiftool/executable.rb", "lib/multi_exiftool/reader.rb", "lib/multi_exiftool/values.rb", "lib/multi_exiftool/writer.rb", "test/helper.rb", "test/test_executable.rb", "test/test_reader.rb", "test/test_values.rb", "test/test_values_using_groups.rb", "test/test_writer.rb", "test/test_writer_groups.rb", "multi_exiftool.gemspec"]
-  s.homepage = "http://gitorious.org/multi_exiftool"
-  s.post_install_message = "\n+-----------------------------------------------------------------------+\n| Please ensure you have installed exiftool version 7.65 or higher and  |\n| it's found in your PATH (Try \"exiftool -ver\" on your commandline).    |\n| For more details see                                                  |\n| http://www.sno.phy.queensu.ca/~phil/exiftool/install.html             |\n+-----------------------------------------------------------------------+\n  "
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Multi_exiftool", "--main", "README"]
-  s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
-  s.requirements = ["exiftool, version 7.65 or higher"]
-  s.rubyforge_project = "multi_exiftool"
-  s.rubygems_version = "1.8.21"
-  s.summary = "This library is wrapper for the Exiftool command-line application (http://www.sno.phy.queensu.ca/~phil/exiftool)."
-  s.test_files = ["test/test_executable.rb", "test/test_reader.rb", "test/test_values.rb", "test/test_values_using_groups.rb", "test/test_writer.rb", "test/test_writer_groups.rb"]
-
-  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<contest>, [">= 0"])
-    else
-      s.add_dependency(%q<contest>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<contest>, [">= 0"])
-  end
-end