filentory-cli 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53fe9ba1d8dec98d862e52f0c760eb0b70ff7c71
-  data.tar.gz: 611bd7719ad378bef60f4e367e7fcf98d89af444
+  metadata.gz: e8f9a1009ee774281cd518697359ce73b90af49b
+  data.tar.gz: ea7368238fb810c1d1f63b48adbc489eed3b4829
 SHA512:
-  metadata.gz: 69edf28c0a232d88d7ad86e08dcd1b04fe15daeb31a966028cb5123fac122580b29047fa697dcd0a0f804314cc18c0847b80c606dbb12da59460306f85509d9c
-  data.tar.gz: 8a1bfce969c4c435a4c8878b7e5650c280d3c0d563ee9310648cdc41996e9d53724b185acc140a4f1d6c235e08222c465f1d8f6afd6696ff80a1ae41af082fa7
+  metadata.gz: 768e1102552618c60f91c7642cd84d396615c751f600b6b57961d3aed77da19efaddf793bf77c9d9815edead20697618b3636452b2e69c3aea75df7db33aac13
+  data.tar.gz: 20b651a104470a1f881dc15c783518430eb3fce2f5210ce0c06324df975131041254c5238411ec34af6caa184128f7378073125ba3d34556b7693bec463fd128

data/.travis.yml

@@ -6,13 +6,8 @@ before_script:
 rvm:
   - 2.0.0
   - 1.9.3
-  - 2.1.2
-  - jruby-head
-  - jruby-19mode
-  - rbx-2.2.3
+  - 2.1.5
+  - 2.2.3
 matrix:
   allow_failures:
-    - rvm: jruby-head
-    - rvm: jruby-19mode
-    - rvm: rbx-2.2.3
     - rvm: 1.9.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    filentory-cli (0.4.0)
+    filentory-cli (0.5.0)
       exifr (~> 1.2.0)
       json_spec (~> 1.1.1)
       methadone (~> 1.7)
@@ -13,62 +13,72 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aruba (0.6.1)
-      childprocess (>= 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
+    aruba (0.11.2)
+      childprocess (~> 0.5.6)
+      contracts (~> 0.9)
+      cucumber (>= 1.3.19)
+      event-bus (~> 0.2)
+      ffi (~> 1.9.10)
+      rspec-expectations (>= 2.99)
+      thor (~> 0.19)
     builder (3.2.2)
-    childprocess (0.5.5)
+    childprocess (0.5.8)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.3.17)
+    contracts (0.12.0)
+    cucumber (2.1.0)
       builder (>= 2.1.2)
+      cucumber-core (~> 1.3.0)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
+      gherkin3 (~> 3.1.0)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.1)
+      multi_test (>= 0.1.2)
+    cucumber-core (1.3.0)
+      gherkin3 (~> 3.1.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    exifr (1.2.0)
+    event-bus (0.2.1)
+    exifr (1.2.3.1)
     fakeweb (1.3.0)
-    ffi (1.9.6)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    json (1.8.1)
+    ffi (1.9.10)
+    gherkin3 (3.1.2)
+    json (1.8.3)
     json_spec (1.1.4)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    methadone (1.8.0)
+    methadone (1.9.2)
       bundler
-    minitest (5.4.3)
-    multi_json (1.10.1)
-    multi_test (0.1.1)
+    minitest (5.8.3)
+    mkfifo (0.1.1)
+    multi_json (1.11.2)
+    multi_test (0.1.2)
     nokogiri (1.5.11)
-    oj (2.11.1)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    oj (2.14.0)
+    rack (1.6.4)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rake (10.3.2)
-    rdoc (4.1.2)
-      json (~> 1.4)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rake (10.4.2)
+    rdoc (4.2.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    simplecov (0.9.1)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     streamio-ffmpeg (1.0.0)
     string-scrub (0.0.5)
+    thor (0.19.1)
     xmp (0.2.0)
       nokogiri (~> 1.5.0)
 
@@ -80,8 +90,12 @@ DEPENDENCIES
   fakeweb (~> 1.3)
   filentory-cli!
   minitest
-  rack (~> 1.5.2)
-  rack-test (~> 0.6.2)
+  mkfifo
+  rack (~> 1.6.1)
+  rack-test (~> 0.6)
   rake (~> 10.3)
   rdoc
-  simplecov (~> 0.9.1)
+  simplecov (~> 0.10.0)
+
+BUNDLED WITH
+   1.10.6

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/filentory-cli.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = "A tool to create an inventory of a storage medium"
   gem.summary       = "Filentory-cli is a first step to get order in a chaotic collection of storage medias."
   gem.homepage      = "https://github.com/jgraber/filentory-cli"
+  gem.license       = 'Apache License, Version 2.0'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -20,9 +21,10 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('aruba')
   gem.add_development_dependency('rake', '~> 10.3')
   gem.add_development_dependency('fakeweb', '~> 1.3')
-  gem.add_development_dependency('rack', '~>1.5.2')
-  gem.add_development_dependency('rack-test', '~> 0.6.2')
+  gem.add_development_dependency('rack', '~>1.6.1')
+  gem.add_development_dependency('rack-test', '~> 0.6')
   gem.add_development_dependency('minitest')
+  gem.add_development_dependency('mkfifo')
   gem.add_dependency('methadone', '~> 1.7')
   gem.add_dependency('oj', '~> 2.11')
   gem.add_dependency('json_spec', '~> 1.1.1')
@@ -30,5 +32,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency('xmp', '~> 0.2.0')
   gem.add_dependency('streamio-ffmpeg', '~> 1.0.0')
   gem.add_dependency('string-scrub')
-  gem.add_development_dependency('simplecov', '~> 0.9.1')
+  gem.add_development_dependency('simplecov', '~> 0.10.0')
 end

data/filentory.yaml.template

@@ -0,0 +1,4 @@
+#replace the values and save this file as .filentory.yaml in your home directory
+
+token: <Your devise authentication token>
+user_email: <Your email address>

data/lib/filentory/exifextractor.rb

@@ -36,7 +36,7 @@ class ExifExtractor
           returnval = namespace.send(attr)#.inspect
           #puts "returnval: #{returnval}"
           answer = returnval.scrub("*")
-          xmpValues["#{namespace_name}.#{attr}"] = answer.strip.to_s[0..250]
+          xmpValues["#{namespace_name}.#{attr}"] = answer.strip.to_s[0...250]
         rescue => error
           #puts error
         end
@@ -47,8 +47,9 @@ class ExifExtractor
   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
@@ -57,12 +58,28 @@ class ExifExtractor
     #puts error
   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
+      
+      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
+      
+      if !img.gps.altitude.nil? && !img.gps.altitude.nan? then
+        xmpValues["exif.gps.altitude"] = img.gps.altitude
+      end
     end
   end
 

data/lib/filentory/version.rb

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

data/results.html

@@ -469,4 +469,4 @@ e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["
     $('#'+element_id).css('color', '#000000');
   }
 
-</script></head><body><!-- Step count 23--><div class="cucumber"><div id="cucumber-header"><div id="label"><h1>Cucumber Features</h1></div><div id="summary"><p id="totals"></p><p id="duration"></p><div id="expand-collapse"><p id="expander">Expand All</p><p id="collapser">Collapse All</p></div></div></div><div class="feature"><h2><span class="val">Feature: Filentory-cli works</span></h2><p class="narrative"></p><div class='scenario'><span class="scenario_file">features/filentory-cli.feature:3</span><h3 id="scenario_1"><span class="keyword">Scenario:</span> <span class="val">App just runs</span></h3><ol><li id='features_filentory-cli_feature_4' class='step passed'><div class="step_name"><span class="keyword">When </span><span class="step val">I get help for &quot;<span class="param">filentory-cli</span>&quot;</span></div><div class="step_file"><span>methadone-1.8.0/lib/methadone/cucumber.rb:58</span></div></li> <script type="text/javascript">moveProgressBar('4.3');</script><li id='features_filentory-cli_feature_5' class='step passed'><div class="step_name"><span class="keyword">Then </span><span class="step val">the exit status should be <span class="param">0</span></span></div><div class="step_file"><span>aruba-0.6.1/lib/aruba/cucumber.rb:197</span></div></li> <script type="text/javascript">moveProgressBar('8.6');</script><li id='features_filentory-cli_feature_6' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the banner should be present</span></div><div class="step_file"><span>methadone-1.8.0/lib/methadone/cucumber.rb:78</span></div></li> <script type="text/javascript">moveProgressBar('13.0');</script><li id='features_filentory-cli_feature_7' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">there should be a one line summary of what the app does</span></div><div class="step_file"><span>methadone-1.8.0/lib/methadone/cucumber.rb:109</span></div></li> <script type="text/javascript">moveProgressBar('17.3');</script><li id='features_filentory-cli_feature_8' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the banner should document that this app takes options</span></div><div class="step_file"><span>methadone-1.8.0/lib/methadone/cucumber.rb:82</span></div></li> <script type="text/javascript">moveProgressBar('21.7');</script><li id='features_filentory-cli_feature_9' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the following options should be documented:</span></div><div class="step_file"><span>methadone-1.8.0/lib/methadone/cucumber.rb:63</span></div><table><tr class='step' id='row_-1'><td class="step" id="row_-1_0"><div><span class="step param">--version</span></div></td></tr> <script type="text/javascript">moveProgressBar('30.4');</script><tr class='step' id='row_-1'><td class="step" id="row_-1_0"><div><span class="step param">--type</span></div></td></tr> <script type="text/javascript">moveProgressBar('34.7');</script><tr class='step' id='row_-1'><td class="step" id="row_-1_0"><div><span class="step param">--auth</span></div></td></tr> <script type="text/javascript">moveProgressBar('39.1');</script></table></li> <script type="text/javascript">moveProgressBar('39.1');</script><li id='features_filentory-cli_feature_13' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the banner should document that this app&#39;s arguments are:</span></div><div class="step_file"><span>methadone-1.8.0/lib/methadone/cucumber.rb:87</span></div><table><tr class='step' id='row_-1'><td class="step" id="row_-1_0"><div><span class="step param">name</span></div></td><td class="step" id="row_-1_1"><div><span class="step param"></span></div></td></tr> <script type="text/javascript">moveProgressBar('47.8');</script><tr class='step' id='row_-1'><td class="step" id="row_-1_0"><div><span class="step param">path</span></div></td><td class="step" id="row_-1_1"><div><span class="step param"></span></div></td></tr> <script type="text/javascript">moveProgressBar('52.1');</script><tr class='step' id='row_-1'><td class="step" id="row_-1_0"><div><span class="step param">server</span></div></td><td class="step" id="row_-1_1"><div><span class="step param">optional</span></div></td></tr> <script type="text/javascript">moveProgressBar('56.5');</script></table></li> <script type="text/javascript">moveProgressBar('56.5');</script></ol></div><div class='scenario'><span class="scenario_file">features/filentory-cli.feature:18</span><h3 id="scenario_2"><span class="keyword">Scenario:</span> <span class="val">App prints JSON</span></h3><ol><li id='features_filentory-cli_feature_19' class='step passed'><div class="step_name"><span class="keyword">When </span><span class="step val">I run &quot;<span class="param">filentory-cli</span>&quot; for the test data</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:2</span></div></li> <script type="text/javascript">moveProgressBar('60.8');</script><li id='features_filentory-cli_feature_20' class='step passed'><div class="step_name"><span class="keyword">Then </span><span class="step val">I should get JSON as output</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:6</span></div></li> <script type="text/javascript">moveProgressBar('65.2');</script><li id='features_filentory-cli_feature_21' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the &quot;<span class="param">name</span>&quot; should be &quot;<span class="param">testrun</span>&quot;</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:12</span></div></li> <script type="text/javascript">moveProgressBar('69.5');</script><li id='features_filentory-cli_feature_22' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the &quot;<span class="param">mediatype</span>&quot; should be &quot;<span class="param">DVD</span>&quot;</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:12</span></div></li> <script type="text/javascript">moveProgressBar('73.9');</script><li id='features_filentory-cli_feature_23' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">there should be <span class="param">4</span> entries in &quot;<span class="param">files</span>&quot;</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:16</span></div></li> <script type="text/javascript">moveProgressBar('78.2');</script><li id='features_filentory-cli_feature_24' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the first file should be placed in the root folder</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:20</span></div></li> <script type="text/javascript">moveProgressBar('82.6');</script><li id='features_filentory-cli_feature_25' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the second file should be in the &quot;<span class="param">folder</span>&quot;</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:27</span></div></li> <script type="text/javascript">moveProgressBar('86.9');</script><li id='features_filentory-cli_feature_26' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the image file should have metadata</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:34</span></div></li> <script type="text/javascript">moveProgressBar('91.3');</script><li id='features_filentory-cli_feature_27' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the video file should have metadata</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:43</span></div></li> <script type="text/javascript">moveProgressBar('95.6');</script></ol></div><div class='scenario'><span class="scenario_file">features/filentory-cli.feature:29</span><h3 id="scenario_3"><span class="keyword">Scenario:</span> <span class="val">Sending data to server</span></h3><ol><li id='features_filentory-cli_feature_30' class='step passed'><div class="step_name"><span class="keyword">When </span><span class="step val">I run &quot;<span class="param">filentory-cli</span>&quot; with a server parameter</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:51</span></div></li> <script type="text/javascript">moveProgressBar('100.0');</script><li id='features_filentory-cli_feature_31' class='step passed'><div class="step_name"><span class="keyword">Then </span><span class="step val">I should get a message that the data was send successfully</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:55</span></div></li> <script type="text/javascript">moveProgressBar('104.3');</script></ol></div><div class='scenario'><span class="scenario_file">features/filentory-cli.feature:33</span><h3 id="scenario_4"><span class="keyword">Scenario:</span> <span class="val">YAML file present while sending data to server</span></h3><ol><li id='features_filentory-cli_feature_34' class='step passed'><div class="step_name"><span class="keyword">When </span><span class="step val">I run &quot;<span class="param">filentory-cli</span>&quot; with a server parameter and a yaml file</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:67</span></div></li> <script type="text/javascript">moveProgressBar('108.6');</script><li id='features_filentory-cli_feature_35' class='step passed'><div class="step_name"><span class="keyword">Then </span><span class="step val">I should get a message that the data was send successfully</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:55</span></div></li> <script type="text/javascript">moveProgressBar('113.0');</script><li id='features_filentory-cli_feature_36' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">I should get a message that &quot;<span class="param">mykey</span>&quot; was send with the JSON data</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:71</span></div></li> <script type="text/javascript">moveProgressBar('117.3');</script></ol></div><div class='scenario'><span class="scenario_file">features/filentory-cli.feature:38</span><h3 id="scenario_5"><span class="keyword">Scenario:</span> <span class="val">Server does not exist</span></h3><ol><li id='features_filentory-cli_feature_39' class='step passed'><div class="step_name"><span class="keyword">When </span><span class="step val">I run &quot;<span class="param">filentory-cli</span>&quot; with the wrong server parameter</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:59</span></div></li> <script type="text/javascript">moveProgressBar('121.7');</script><li id='features_filentory-cli_feature_40' class='step passed'><div class="step_name"><span class="keyword">Then </span><span class="step val">I should get a message that the data could not be sent</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:63</span></div></li> <script type="text/javascript">moveProgressBar('126.0');</script></ol></div></div><script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>0m0.855s seconds</strong>";</script><script type="text/javascript">document.getElementById('totals').innerHTML = "5 scenarios (5 passed)<br />23 steps (23 passed)";</script></div></body></html>
+</script></head><body><!-- Step count 23--><div class="cucumber"><div id="cucumber-header"><div id="label"><h1>Cucumber Features</h1></div><div id="summary"><p id="totals"></p><p id="duration"></p><div id="expand-collapse"><p id="expander">Expand All</p><p id="collapser">Collapse All</p></div></div></div><div class="feature"><h2><span class="val">Feature: Filentory-cli works</span></h2><p class="narrative"></p><div class='scenario'><span class="scenario_file">features/filentory-cli.feature:3</span><h3 id="scenario_1"><span class="keyword">Scenario:</span> <span class="val">App just runs</span></h3><ol><li id='features_filentory-cli_feature_4' class='step passed'><div class="step_name"><span class="keyword">When </span><span class="step val">I get help for &quot;<span class="param">filentory-cli</span>&quot;</span></div><div class="step_file"><span>methadone-1.8.0/lib/methadone/cucumber.rb:58</span></div></li> <script type="text/javascript">moveProgressBar('4.3');</script><li id='features_filentory-cli_feature_5' class='step passed'><div class="step_name"><span class="keyword">Then </span><span class="step val">the exit status should be <span class="param">0</span></span></div><div class="step_file"><span>aruba-0.6.1/lib/aruba/cucumber.rb:197</span></div></li> <script type="text/javascript">moveProgressBar('8.6');</script><li id='features_filentory-cli_feature_6' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the banner should be present</span></div><div class="step_file"><span>methadone-1.8.0/lib/methadone/cucumber.rb:78</span></div></li> <script type="text/javascript">moveProgressBar('13.0');</script><li id='features_filentory-cli_feature_7' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">there should be a one line summary of what the app does</span></div><div class="step_file"><span>methadone-1.8.0/lib/methadone/cucumber.rb:109</span></div></li> <script type="text/javascript">moveProgressBar('17.3');</script><li id='features_filentory-cli_feature_8' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the banner should document that this app takes options</span></div><div class="step_file"><span>methadone-1.8.0/lib/methadone/cucumber.rb:82</span></div></li> <script type="text/javascript">moveProgressBar('21.7');</script><li id='features_filentory-cli_feature_9' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the following options should be documented:</span></div><div class="step_file"><span>methadone-1.8.0/lib/methadone/cucumber.rb:63</span></div><table><tr class='step' id='row_-1'><td class="step" id="row_-1_0"><div><span class="step param">--version</span></div></td></tr> <script type="text/javascript">moveProgressBar('30.4');</script><tr class='step' id='row_-1'><td class="step" id="row_-1_0"><div><span class="step param">--type</span></div></td></tr> <script type="text/javascript">moveProgressBar('34.7');</script><tr class='step' id='row_-1'><td class="step" id="row_-1_0"><div><span class="step param">--auth</span></div></td></tr> <script type="text/javascript">moveProgressBar('39.1');</script></table></li> <script type="text/javascript">moveProgressBar('39.1');</script><li id='features_filentory-cli_feature_13' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the banner should document that this app&#39;s arguments are:</span></div><div class="step_file"><span>methadone-1.8.0/lib/methadone/cucumber.rb:87</span></div><table><tr class='step' id='row_-1'><td class="step" id="row_-1_0"><div><span class="step param">name</span></div></td><td class="step" id="row_-1_1"><div><span class="step param"></span></div></td></tr> <script type="text/javascript">moveProgressBar('47.8');</script><tr class='step' id='row_-1'><td class="step" id="row_-1_0"><div><span class="step param">path</span></div></td><td class="step" id="row_-1_1"><div><span class="step param"></span></div></td></tr> <script type="text/javascript">moveProgressBar('52.1');</script><tr class='step' id='row_-1'><td class="step" id="row_-1_0"><div><span class="step param">server</span></div></td><td class="step" id="row_-1_1"><div><span class="step param">optional</span></div></td></tr> <script type="text/javascript">moveProgressBar('56.5');</script></table></li> <script type="text/javascript">moveProgressBar('56.5');</script></ol></div><div class='scenario'><span class="scenario_file">features/filentory-cli.feature:18</span><h3 id="scenario_2"><span class="keyword">Scenario:</span> <span class="val">App prints JSON</span></h3><ol><li id='features_filentory-cli_feature_19' class='step passed'><div class="step_name"><span class="keyword">When </span><span class="step val">I run &quot;<span class="param">filentory-cli</span>&quot; for the test data</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:2</span></div></li> <script type="text/javascript">moveProgressBar('60.8');</script><li id='features_filentory-cli_feature_20' class='step passed'><div class="step_name"><span class="keyword">Then </span><span class="step val">I should get JSON as output</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:6</span></div></li> <script type="text/javascript">moveProgressBar('65.2');</script><li id='features_filentory-cli_feature_21' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the &quot;<span class="param">name</span>&quot; should be &quot;<span class="param">testrun</span>&quot;</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:12</span></div></li> <script type="text/javascript">moveProgressBar('69.5');</script><li id='features_filentory-cli_feature_22' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the &quot;<span class="param">mediatype</span>&quot; should be &quot;<span class="param">DVD</span>&quot;</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:12</span></div></li> <script type="text/javascript">moveProgressBar('73.9');</script><li id='features_filentory-cli_feature_23' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">there should be <span class="param">4</span> entries in &quot;<span class="param">files</span>&quot;</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:16</span></div></li> <script type="text/javascript">moveProgressBar('78.2');</script><li id='features_filentory-cli_feature_24' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the first file should be placed in the root folder</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:20</span></div></li> <script type="text/javascript">moveProgressBar('82.6');</script><li id='features_filentory-cli_feature_25' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the second file should be in the &quot;<span class="param">folder</span>&quot;</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:27</span></div></li> <script type="text/javascript">moveProgressBar('86.9');</script><li id='features_filentory-cli_feature_26' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the image file should have metadata</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:34</span></div></li> <script type="text/javascript">moveProgressBar('91.3');</script><li id='features_filentory-cli_feature_27' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the video file should have metadata</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:43</span></div></li> <script type="text/javascript">moveProgressBar('95.6');</script></ol></div><div class='scenario'><span class="scenario_file">features/filentory-cli.feature:29</span><h3 id="scenario_3"><span class="keyword">Scenario:</span> <span class="val">Sending data to server</span></h3><ol><li id='features_filentory-cli_feature_30' class='step passed'><div class="step_name"><span class="keyword">When </span><span class="step val">I run &quot;<span class="param">filentory-cli</span>&quot; with a server parameter</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:51</span></div></li> <script type="text/javascript">moveProgressBar('100.0');</script><li id='features_filentory-cli_feature_31' class='step passed'><div class="step_name"><span class="keyword">Then </span><span class="step val">I should get a message that the data was send successfully</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:55</span></div></li> <script type="text/javascript">moveProgressBar('104.3');</script></ol></div><div class='scenario'><span class="scenario_file">features/filentory-cli.feature:33</span><h3 id="scenario_4"><span class="keyword">Scenario:</span> <span class="val">YAML file present while sending data to server</span></h3><ol><li id='features_filentory-cli_feature_34' class='step passed'><div class="step_name"><span class="keyword">When </span><span class="step val">I run &quot;<span class="param">filentory-cli</span>&quot; with a server parameter and a yaml file</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:67</span></div></li> <script type="text/javascript">moveProgressBar('108.6');</script><li id='features_filentory-cli_feature_35' class='step passed'><div class="step_name"><span class="keyword">Then </span><span class="step val">I should get a message that the data was send successfully</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:55</span></div></li> <script type="text/javascript">moveProgressBar('113.0');</script><li id='features_filentory-cli_feature_36' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">I should get a message that &quot;<span class="param">mykey</span>&quot; was send with the JSON data</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:71</span></div></li> <script type="text/javascript">moveProgressBar('117.3');</script></ol></div><div class='scenario'><span class="scenario_file">features/filentory-cli.feature:38</span><h3 id="scenario_5"><span class="keyword">Scenario:</span> <span class="val">Server does not exist</span></h3><ol><li id='features_filentory-cli_feature_39' class='step passed'><div class="step_name"><span class="keyword">When </span><span class="step val">I run &quot;<span class="param">filentory-cli</span>&quot; with the wrong server parameter</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:59</span></div></li> <script type="text/javascript">moveProgressBar('121.7');</script><li id='features_filentory-cli_feature_40' class='step passed'><div class="step_name"><span class="keyword">Then </span><span class="step val">I should get a message that the data could not be sent</span></div><div class="step_file"><span>features/step_definitions/filentory-cli_steps.rb:63</span></div></li> <script type="text/javascript">moveProgressBar('126.0');</script></ol></div></div><script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>0m0.852s seconds</strong>";</script><script type="text/javascript">document.getElementById('totals').innerHTML = "5 scenarios (5 passed)<br />23 steps (23 passed)";</script></div></body></html>

data/test/integration/special/.gitignore

@@ -0,0 +1 @@
+# for tests only

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filentory-cli
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Johnny Graber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mkfifo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.10.0
 description: A tool to create an inventory of a storage medium
 email:
 - jg@jgraber.ch
@@ -245,6 +259,7 @@ files:
 - 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
@@ -258,16 +273,21 @@ files:
 - 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_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 License, Version 2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -285,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Filentory-cli is a first step to get order in a chaotic collection of storage
@@ -301,11 +321,15 @@ test_files:
 - 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_logging.rb
 - test/tc_sender.rb
 - test/tc_something.rb
+- test/tc_special_cases.rb
 - test/tc_videoextractor.rb
 - test/test_helper.rb