filentory-cli 0.4.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 53fe9ba1d8dec98d862e52f0c760eb0b70ff7c71
-  data.tar.gz: 611bd7719ad378bef60f4e367e7fcf98d89af444
+SHA256:
+  metadata.gz: 4ed7dd8e9a60fec6b134f91c79c37588820e273706146699dc36c4f889a36872
+  data.tar.gz: a6f103ef0d3c089b525a9f07c80496b7b97a887f21e9813975faeae104725be2
 SHA512:
-  metadata.gz: 69edf28c0a232d88d7ad86e08dcd1b04fe15daeb31a966028cb5123fac122580b29047fa697dcd0a0f804314cc18c0847b80c606dbb12da59460306f85509d9c
-  data.tar.gz: 8a1bfce969c4c435a4c8878b7e5650c280d3c0d563ee9310648cdc41996e9d53724b185acc140a4f1d6c235e08222c465f1d8f6afd6696ff80a1ae41af082fa7
+  metadata.gz: d9985d977d2ce8a777730b6009064e44a982343779cf419502802c92afdc1bc2ec82965c74da8a206af108cd4709f98d8e9f7764fc25b04c665ee34e1a89b773
+  data.tar.gz: 4215eed8324d228c8b598ba4894545c727b6fddc83e9d4402d3a1c1d11abb97248578996db46beb45e3b4041e44f9e9edbb308a980fbbbe11289f92b451a67bf

data/features/step_definitions/filentory-cli_steps.rb

@@ -34,7 +34,7 @@ end
 Then(/^the image file should have metadata$/) do
   steps %Q{
     And the JSON at "files/0/2/metadata" should be a hash
-    And the JSON at "files/0/2/metadata" should have 6 entries
+    And the JSON at "files/0/2/metadata" should have 7 entries
     And the JSON at "files/0/2/metadata/exif.artist" should be "Johnny Graber"
     And the JSON at "files/0/2/metadata/exif.date_time" should be "2013-11-02T18:10:43+00:00"
   }

data/features/support/env.rb

@@ -1,21 +1,28 @@
 require 'simplecov'
 require 'aruba/cucumber'
 require 'methadone/cucumber'
-require "json_spec/cucumber"
-require 'fakeweb'
-require 'rack/test'
-
-ENV['PATH'] = "#{File.expand_path(File.dirname(__FILE__) + '/../../bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
-LIB_DIR = File.join(File.expand_path(File.dirname(__FILE__)),'..','..','lib')
+require 'json_spec/cucumber'
 
+PROJECT_ROOT = File.join(File.dirname(__FILE__),'..','..')
+ENV['PATH'] = "#{File.join(PROJECT_ROOT,'bin')}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
+ARUBA_DIR = File.join(%w(tmp aruba))
 Before do
-  # Using "announce" causes massive warnings on 1.9.2
+  @dirs = [ARUBA_DIR]
   @puts = true
+  @aruba_timeout_seconds = 60
   @original_rubylib = ENV['RUBYLIB']
-  ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
+  @original_rubyopt = ENV['RUBYOPT']
+
+  # We want to use, hopefully, the methadone from this codebase and not
+  # the gem, so we put it in the RUBYLIB
+  ENV['RUBYLIB'] = File.join(PROJECT_ROOT,'lib') + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
 
+  # We need -rubygems here so that 1.8-style rubies work AND travis-ci doesn't barf with it in the shebang line
+  ENV['RUBYOPT'] = (ENV['RUBYOPT'] || '') + ' -r rubygems'
 end
 
 After do
- 	ENV['RUBYLIB'] = @original_rubylib
-end
+  # Put back how it was
+  ENV['RUBYLIB'] = @original_rubylib
+  ENV['RUBYOPT'] = @original_rubyopt
+end

data/lib/filentory/collector.rb

@@ -22,7 +22,7 @@ class Collector
         end
         result << extract_file_infos(file)
       rescue => file_error
-        error ("error with file '#{path}': #{file}")
+        error ("error with file '#{path}': #{file} => #{file_error}")
       end
     end
 
@@ -67,4 +67,4 @@ class Collector
     end
 
   end
-end
+end

data/lib/filentory/exifextractor.rb

@@ -1,8 +1,8 @@
-require 'exifr'
+require 'exifr/jpeg'
 require 'xmp'
-require 'string-scrub'
+require 'methadone'
 
-class ExifExtractor
+class ExifExtractor include Methadone::CLILogging
 
   # Extracts the metadata of a file at a given path in the file system.
   def metadata_for_file(file_path)
@@ -30,39 +30,59 @@ class ExifExtractor
   def extract_xmp_meta_data(img, xmpValues)
     xmp = XMP.parse(img)
     xmp.namespaces.each do |namespace_name|
-        namespace = xmp.send(namespace_name)
-        namespace.attributes.each do |attr|
-        begin
-          returnval = namespace.send(attr)#.inspect
-          #puts "returnval: #{returnval}"
-          answer = returnval.scrub("*")
-          xmpValues["#{namespace_name}.#{attr}"] = answer.strip.to_s[0..250]
-        rescue => error
-          #puts error
-        end
+      namespace = xmp.send(namespace_name)
+      extract_namespace_attributes(namespace_name, namespace, xmpValues)
+  end
+  rescue => error_message
+    error ("#{error_message}") 
+  end
+
+  def extract_namespace_attributes(namespace_name, namespace, xmpValues)
+    namespace.attributes.each do |attr|
+      begin
+        returnval = namespace.send(attr)#.inspect
+        #puts "returnval: #{returnval}"
+        answer = returnval.scrub("*")
+        xmpValues["#{namespace_name}.#{attr}"] = answer.strip.to_s[0...250]
+      rescue => error_message
+         error ("#{error_message}")
       end
     end
-  rescue => error
-    #puts error
   end
 
   def extract_exif_main_meta_data(img, xmpValues)
-    xmpValues["exif.model"] =  img.model.scrub("*").strip unless img.model.nil?
-    xmpValues["exif.artist"] = img.artist.force_encoding('UTF-8').scrub("*").strip.to_s[0..250]  unless img.artist.nil?
+    xmpValues["exif.model"] = cleanup_description(img.model)
+    xmpValues["exif.make"] =  cleanup_description(img.make)
+    xmpValues["exif.artist"] = cleanup_description(img.artist)
     xmpValues["exif.date_time"] = format_date(img.date_time)
     xmpValues["exif.date_time_original"] = format_date(img.date_time_original)
     xmpValues["exif.width"] = img.width
     xmpValues["exif.height"] = img.height 
-  rescue => error
-    #puts error
+  rescue => error_message
+     error ("#{error_message}")
   end
 
+  def cleanup_metadata(value)
+    value.scrub("*").strip unless value.nil?
+  end
+
+  def cleanup_description(value)
+    cleanup_metadata(value.force_encoding('UTF-8')).to_s[0...250]  unless value.nil?
+  end
 
   def extract_gps_infos(img, xmpValues)
     if img.gps
-      xmpValues["exif.gps.latitude"] = img.gps.latitude
-      xmpValues["exif.gps.longitude"] = img.gps.longitude
-      xmpValues["exif.gps.altitude"] = img.gps.altitude
+      assing_value_when_field_is_set(img.gps, :latitude, "exif.gps.latitude", xmpValues)
+      
+      assing_value_when_field_is_set(img.gps, :longitude, "exif.gps.longitude", xmpValues)
+      
+      assing_value_when_field_is_set(img.gps, :altitude, "exif.gps.altitude", xmpValues)
+    end
+  end
+
+  def assing_value_when_field_is_set(img, method, key_in_array, xmpValues)
+    if !img.send(method).nil? && !img.send(method).nan?
+      xmpValues[key_in_array] = img.send(method)
     end
   end
 
@@ -71,4 +91,4 @@ class ExifExtractor
   rescue
       nil
   end
-end
+end

data/lib/filentory/version.rb

@@ -1,3 +1,3 @@
 module Filentory
-  VERSION = "0.4.0"
+  VERSION = "0.6.2"
 end

data/test/tc_gps_info.rb

@@ -0,0 +1,32 @@
+require File.expand_path '../test_helper.rb', __FILE__
+require 'minitest/autorun'
+require 'filentory/collector'
+require 'filentory'
+require 'mkfifo'
+
+class TestGPSInfo < Minitest::Test
+
+  def test_latitude_is_set
+    result = fetch_gps_result()
+    assert_equal(36.98276, result[0].metadata["exif.gps.latitude"])
+  end
+
+  def test_longitude_is_set
+    result = fetch_gps_result()
+    assert_equal(-110.11164666666667, result[0].metadata["exif.gps.longitude"])
+  end
+
+  def test_altitude_is_set
+    result = fetch_gps_result()
+    assert_equal(1709.4, result[0].metadata["exif.gps.altitude"])
+  end
+
+  private
+  def fetch_gps_result()
+    col = Collector.new
+    result = col.collect(File.dirname(__FILE__)+"/integration/gps/")
+    #puts "The result is: #{result}"
+    assert_equal(1, result.length)
+    result
+  end
+end

data/test/tc_logging.rb

@@ -0,0 +1,45 @@
+require File.expand_path '../test_helper.rb', __FILE__
+require 'minitest/autorun'
+require 'filentory/collector'
+require 'filentory'
+require 'mkfifo'
+require 'methadone'
+require 'stringio'
+
+class TestLogging < Minitest::Test
+	def setup
+		@pipe_path = File.dirname(__FILE__)+"/integration/special/pipe"
+    @real_stderr = $stderr
+    @real_stdout = $stdout
+    $stderr = StringIO.new
+    $stderr.sync = true
+    $stdout = StringIO.new
+    $stdout.sync = true
+  end
+
+  def teardown
+    $stderr = @real_stderr
+    $stdout = @real_stdout
+
+    if(File.exist?(@pipe_path))
+  		FileUtils.rm(@pipe_path)
+  	end
+  end
+
+	def test_pipes_are_logged
+		File.mkfifo(@pipe_path) unless File.exist?(@pipe_path)
+
+  	col = Collector.new
+  	col.logger = Logger.new($stdout)
+  	col.logger.level = Logger::DEBUG
+    result = col.collect(File.dirname(__FILE__)+"/integration/special/")
+
+    assert_equal(2, result.length)
+
+    #assert_equal(Logger::DEBUG, col.logger.level)
+    #puts "STDERR: #{$stderr.string}"
+    #puts "STDOUT: #{$stdout.string}"
+ 		assert_includes($stdout.string, "skippking pipe")
+	end
+
+end

data/test/tc_special_cases.rb

@@ -0,0 +1,45 @@
+require File.expand_path '../test_helper.rb', __FILE__
+require 'minitest/autorun'
+require 'filentory/collector'
+require 'filentory'
+require 'mkfifo'
+
+class TestSpecialCases < Minitest::Test
+
+  def test_pipes_are_ignored
+  	cleanup()
+
+  	File.mkfifo(File.dirname(__FILE__)+"/integration/special/pipe")
+
+    col = Collector.new
+    result = col.collect(File.dirname(__FILE__)+"/integration/special/")
+    #puts "The result is: #{result}"
+    assert_equal(2, result.length)
+    assert_equal(".gitignore", result[0].name)
+  end
+
+  def test_exif_fields_are_filled_up
+    col = Collector.new
+    result = col.collect(File.dirname(__FILE__)+"/integration/special/")
+    #puts "The result is: #{result}"
+
+    assert_equal(2, result.length)
+    assert_equal("exif.jpg", result[1].name)
+    assert_equal(250, result[1].metadata['exif.artist'].length)
+    assert_equal(250, result[1].metadata['dc.description'].length)
+
+
+    assert_equal("Cannon", result[1].metadata['exif.make'])
+    assert_equal("EOS 6D", result[1].metadata['exif.model'])
+    assert_equal("2015-01-06T21:58:08+00:00", result[1].metadata['exif.date_time'])
+    assert_equal("2015-01-06T09:11:18+00:00", result[1].metadata['exif.date_time_original'])
+    assert_equal("Ipsach, Switzerland", result[1].metadata['Iptc4xmpCore.Location'])
+  end
+
+  def cleanup
+  	if(File.exist?(File.dirname(__FILE__)+"/integration/special/pipe"))
+  		FileUtils.rm(File.dirname(__FILE__)+"/integration/special/pipe")
+  	end
+  end
+
+end

data/test/tc_videoextractor.rb

@@ -10,7 +10,7 @@ class TestVideoExtractor < Minitest::Test
     metadata = extractor.metadata_for_file(File.dirname(__FILE__)+"/integration/data/video.mov")
     
     assert_in_delta(2.18, metadata["duration"], 0.05)
-    assert_equal("568x320", metadata["resolution"])
+    assert_equal("320x568", metadata["resolution"])
   end
 
   def test_can_handle_avi

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: filentory-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Johnny Graber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -72,70 +72,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.11'
+- !ruby/object:Gem::Dependency
+  name: mkfifo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: json_spec
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: xmp
   requirement: !ruby/object:Gem::Requirement
@@ -184,67 +198,38 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: string-scrub
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.16'
 description: A tool to create an inventory of a storage medium
 email:
 - jg@jgraber.ch
-executables:
-- filentory-cli
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".simplecov"
-- ".travis.yml"
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.md
-- README.rdoc
-- Rakefile
-- bin/filentory-cli
-- features/filentory-cli.feature
 - features/step_definitions/filentory-cli_steps.rb
-- features/support/auth.yaml
-- features/support/config.ru
 - features/support/demoserver.rb
 - features/support/env.rb
-- filentory-cli.gemspec
 - lib/filentory.rb
 - lib/filentory/collector.rb
 - lib/filentory/datastore.rb
@@ -253,21 +238,20 @@ files:
 - lib/filentory/sender.rb
 - lib/filentory/version.rb
 - lib/filentory/videoextractor.rb
-- results.html
-- test/integration/data/fileA.txt
-- test/integration/data/folder/fileB.txt
-- test/integration/data/image_with_exif_and_xmp_infos.jpg
-- test/integration/data/video.mov
 - test/tc_collector.rb
 - test/tc_datastore.rb
 - test/tc_exifextractor.rb
 - test/tc_fileentry.rb
+- test/tc_gps_info.rb
+- test/tc_logging.rb
 - test/tc_sender.rb
 - test/tc_something.rb
+- test/tc_special_cases.rb
 - test/tc_videoextractor.rb
 - test/test_helper.rb
 homepage: https://github.com/jgraber/filentory-cli
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -284,28 +268,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Filentory-cli is a first step to get order in a chaotic collection of storage
   medias.
 test_files:
-- features/filentory-cli.feature
 - features/step_definitions/filentory-cli_steps.rb
-- features/support/auth.yaml
-- features/support/config.ru
 - features/support/demoserver.rb
 - features/support/env.rb
-- test/integration/data/fileA.txt
-- test/integration/data/folder/fileB.txt
-- test/integration/data/image_with_exif_and_xmp_infos.jpg
-- test/integration/data/video.mov
 - test/tc_collector.rb
 - test/tc_datastore.rb
 - test/tc_exifextractor.rb
 - test/tc_fileentry.rb
+- test/tc_gps_info.rb
+- test/tc_logging.rb
 - test/tc_sender.rb
 - test/tc_something.rb
+- test/tc_special_cases.rb
 - test/tc_videoextractor.rb
 - test/test_helper.rb

data/.gitignore

@@ -1,18 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/

data/.simplecov

@@ -1,4 +0,0 @@
-SimpleCov.start do
- add_filter "/test/"
- add_filter "/features/"
-end

data/.travis.yml

@@ -1,18 +0,0 @@
-language: ruby
-before_script: 
-  - "sudo apt-get update && sudo apt-get install -qq ffmpeg"
-# Ubuntu 14.4:  - "sudo apt-get install -qq libav-tools && sudo ln /usr/bin/avconv /usr/bin/ffmpeg"
-  - "bundle exec rackup features/support/config.ru &"
-rvm:
-  - 2.0.0
-  - 1.9.3
-  - 2.1.2
-  - jruby-head
-  - jruby-19mode
-  - rbx-2.2.3
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: jruby-19mode
-    - rvm: rbx-2.2.3
-    - rvm: 1.9.3

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in filentory-cli.gemspec
-gemspec