filentory-cli 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e8f9a1009ee774281cd518697359ce73b90af49b
-  data.tar.gz: ea7368238fb810c1d1f63b48adbc489eed3b4829
+SHA256:
+  metadata.gz: 8025b30dc7c2e2477a598eae39b2b6f97b5c3d943e20c86ab91afc79dbf09da6
+  data.tar.gz: 96fe3c7a799792f9f9795d1422c305dbe4a982655278cdad3d0ef4f9b3124a10
 SHA512:
-  metadata.gz: 768e1102552618c60f91c7642cd84d396615c751f600b6b57961d3aed77da19efaddf793bf77c9d9815edead20697618b3636452b2e69c3aea75df7db33aac13
-  data.tar.gz: 20b651a104470a1f881dc15c783518430eb3fce2f5210ce0c06324df975131041254c5238411ec34af6caa184128f7378073125ba3d34556b7693bec463fd128
+  metadata.gz: 73acadfa4e80f30b1e8e09df60e9f0cdac59195cc97e32767f512852870f55864a6ae4407aa0586a4517eb2c4592d055cce958452460a3294465c084c853130b
+  data.tar.gz: c9daa0c46a00ecb055ab672cc419e1a756b688f6f474ad60ab38b473333f6b753e105b30f74ba518a2d29b759abd9be8efc0cface2ac1c2878d937b633595e08

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'] || '') + ' -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/exifextractor.rb

@@ -1,6 +1,5 @@
 require 'exifr'
 require 'xmp'
-require 'string-scrub'
 
 class ExifExtractor
 
@@ -30,22 +29,26 @@ 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
-      end
-    end
+      namespace = xmp.send(namespace_name)
+      extract_namespace_attributes(namespace_name, namespace, xmpValues)
+  end
   rescue => error
     #puts error
   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
+        #puts error
+      end
+    end
+  end
+
   def extract_exif_main_meta_data(img, xmpValues)
     xmpValues["exif.model"] = cleanup_description(img.model)
     xmpValues["exif.make"] =  cleanup_description(img.make)
@@ -68,18 +71,17 @@ class ExifExtractor
 
   def extract_gps_infos(img, xmpValues)
     if img.gps
+      assing_value_when_field_is_set(img.gps, :latitude, "exif.gps.latitude", xmpValues)
       
-      if !img.gps.latitude.nil? && !img.gps.latitude.nan? then
-        xmpValues["exif.gps.latitude"] = img.gps.latitude
-      end
-
-      if !img.gps.longitude.nil? && !img.gps.longitude.nan? then
-        xmpValues["exif.gps.longitude"] = img.gps.longitude
-      end
+      assing_value_when_field_is_set(img.gps, :longitude, "exif.gps.longitude", xmpValues)
       
-      if !img.gps.altitude.nil? && !img.gps.altitude.nan? then
-        xmpValues["exif.gps.altitude"] = img.gps.altitude
-      end
+      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
 

data/lib/filentory/version.rb

@@ -1,3 +1,3 @@
 module Filentory
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 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_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

data/test/test_helper.rb

@@ -1 +1,2 @@
-require 'simplecov'
+require 'simplecov'
+SimpleCov.command_name 'test:units'

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: filentory-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Johnny Graber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2019-01-26 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: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -72,84 +72,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 2.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        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
@@ -170,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
@@ -198,68 +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.10.0
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        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
-- filentory.yaml.template
 - lib/filentory.rb
 - lib/filentory/collector.rb
 - lib/filentory/datastore.rb
@@ -268,17 +238,11 @@ 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/integration/special/.gitignore
-- test/integration/special/exif.jpg
 - 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
@@ -287,7 +251,7 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/jgraber/filentory-cli
 licenses:
-- Apache License, Version 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -304,29 +268,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.1
 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/integration/special/.gitignore
-- test/integration/special/exif.jpg
 - 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