filentory-cli 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ab404e63461f97450b949b1b6d33c2955cf16e92
+  data.tar.gz: 5bdd548e805d3190b15d391288cb9620f0664da6
+SHA512:
+  metadata.gz: 91763eecc66a891faf87e4298ca10c266e34685a7cc32caeac82338028e465a4e4dcc6b60d5a5c82ee3fe58fd49ac62bc79025aa647fe3c4e407fba07fdbe1a3
+  data.tar.gz: 48f94db9a4a29e243e8291b8725b5d672bc1040edd5b4dccb736727fb0633a95ef8b9fecc6022ab2042c5477f044029dfd64c17eb3c6af8174e31f71ab383513

data/.travis.yml

@@ -1,5 +1,7 @@
 language: ruby
-before_script: "sudo apt-get install -qq ffmpeg"
+before_script: 
+  - "sudo apt-get update && sudo apt-get install -qq ffmpeg"
+  - "bundle exec rackup features/support/config.ru &"
 rvm:
   - 2.0.0
   - 1.9.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    filentory-cli (0.2.0)
+    filentory-cli (0.3.0)
       exifr (~> 1.1.3)
       json_spec (~> 1.1.1)
       methadone (~> 1.3.1)
@@ -27,6 +27,7 @@ GEM
       multi_test (>= 0.0.2)
     diff-lcs (1.2.5)
     exifr (1.1.3)
+    fakeweb (1.3.0)
     ffi (1.9.3)
     gherkin (2.12.2)
       multi_json (~> 1.3)
@@ -40,6 +41,9 @@ GEM
     multi_test (0.0.3)
     nokogiri (1.5.6)
     oj (2.5.3)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
     rake (10.1.1)
     rdoc (4.1.0)
       json (~> 1.4)
@@ -50,7 +54,7 @@ GEM
     rspec-core (2.14.7)
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec-mocks (2.14.5)
     streamio-ffmpeg (1.0.0)
     xmp (0.2.0)
       nokogiri (~> 1.5.0)
@@ -60,6 +64,9 @@ PLATFORMS
 
 DEPENDENCIES
   aruba
+  fakeweb (~> 1.3)
   filentory-cli!
+  rack (~> 1.5.2)
+  rack-test (~> 0.6.2)
   rake (~> 10.1.1)
   rdoc

data/README.md

@@ -1,6 +1,6 @@
-# Filentory-cli [![Build Status](https://travis-ci.org/jgraber/filentory-cli.png?branch=master)](https://travis-ci.org/jgraber/filentory-cli) [![Code Climate](https://codeclimate.com/github/jgraber/filentory-cli.png)](https://codeclimate.com/github/jgraber/filentory-cli)
+# Filentory-cli [![Build Status](https://travis-ci.org/jgraber/filentory-cli.png?branch=master)](https://travis-ci.org/jgraber/filentory-cli) [![Code Climate](https://codeclimate.com/github/jgraber/filentory-cli.png)](https://codeclimate.com/github/jgraber/filentory-cli) [![Gem Version](https://badge.fury.io/rb/filentory-cli.png)](http://badge.fury.io/rb/filentory-cli)
 
-A tool to create an filentory-cli of a storage medium.
+A tool to create an inventory of a storage medium.
 
 ## Installation
 
@@ -18,7 +18,23 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+    $ filentory-cli --log-level fatal "demo" .
+     {
+     "^o":"Datastore",
+     "name":"demo",
+     "files":[
+       [
+         {
+           "^o":"FileEntry",
+           "path":".",
+           "name":"50quickideas.pdf",
+           "last_modified":"2014-01-01T18:06:12+01:00",
+           "size":49447,
+           "checksum":"348a5b72877dcb5e0354f8eef62e5ff4e546043881dd051b9f8c2dea6ab23bb7"
+         }
+       ]
+     }
+
 
 ## Contributing
 
@@ -27,3 +43,7 @@ TODO: Write usage instructions here
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Testing
+Start the minimal web service as a endpoint to send data with this command:
+    $rackup features/support/config.ru

data/README.rdoc

@@ -1,19 +1,44 @@
-= filentory-cli - DESCRIBE YOUR GEM
+= filentory-cli - A tool to create an inventory of a storage medium
 
-Author::  YOUR NAME (YOUR EMAIL)
-Copyright:: Copyright (c) 2014 YOUR NAME
+Author::  Johnny Graber (JG@JGraber.ch)
+Copyright:: Copyright (c) 2014 Johnny Graber
 
-
-DESCRIBE YOUR GEM HERE
+A tool to create an inventory of a storage medium.
 
 == Links
 
-* {Source on Github}[LINK TO GITHUB]
-* RDoc[LINK TO RDOC.INFO]
+* {Source on Github}[https://github.com/jgraber/filentory-cli]
+* RDoc[http://rdoc.info/github/jgraber/filentory-cli/frames]
 
 == Install
+    $ gem install filentory-cli
 
 == Examples
+ $ filentory-cli --log-level fatal "demo" .
+ {
+ "^o":"Datastore",
+ "name":"demo",
+ "files":[
+   [
+     {
+       "^o":"FileEntry",
+       "path":".",
+       "name":"50quickideas.pdf",
+       "last_modified":"2014-01-01T18:06:12+01:00",
+       "size":49447,
+       "checksum":"348a5b72877dcb5e0354f8eef62e5ff4e546043881dd051b9f8c2dea6ab23bb7"
+     }
+   ]
+ }
 
 == Contributing
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
 
+== Testing
+Start the minimal web service as a endpoint to send data with this command:
+    $rackup features/support/config.ru

data/bin/filentory-cli

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
-
+require 'yaml'
 require 'optparse'
 require 'methadone'
 require 'filentory.rb'
+#require 'filentory/sender.rb'
+#require 'uri'
 
 class App
   include Methadone::Main
@@ -13,17 +15,40 @@ class App
     info("name: #{name}")
     info "path: #{absolute_path}"
     info "server: #{server}"
-    info "type: #{options[:type]}"
+    info "mediatype: #{options[:type]}"
 
     data_store = Datastore.new (name)
-    data_store.type = options[:type]
+    data_store.mediatype = options[:type]
     collector = Collector.new
     data_store.files << collector.collect(absolute_path)
+    
+    begin
+    if server.nil?
+      puts data_store.to_json
+    else
+
+      begin
+        config_path = options[:auth] || File.join(ENV['HOME'], '.filentory.yaml')
+        auth_data = YAML.load_file(config_path)
+        auth_data.keys.each {|key| puts "will send #{key}"}
+      rescue
+        auth_data = nil
+      end
+
+      sender = Sender.new(server)
+      sender.additional_fields = auth_data
+      response = sender.post(data_store.to_json)
+
+      if(sender.failed?)
+        puts "ERROR: sending to '#{server}' failed: #{response.code} - #{response.message}"
+      else
+        puts "Sending '#{name}' to '#{server}' was successfull."
+      end
+    end
 
-    puts data_store.to_json
-    # your program code here
-    # You can access CLI options via
-    # the options Hash
+    rescue => exeption_detected
+      puts "Error: #{exeption_detected}"
+    end
   end
 
   # supplemental methods here
@@ -34,6 +59,7 @@ class App
   
   # Options:
   on("-t TYPE", "--type TYPE", "The type of the media to add to the filentory-cli")
+  on("-a FILE", "--auth FILE", "A path to a YAML file with authentication information")
 
   # Arguments of Filentory-cli
   arg :name # required argument

data/features/filentory-cli.feature

@@ -1,8 +1,5 @@
-Feature: My bootstrapped app kinda works
-  In order to get going on coding my awesome app
-  I want to have aruba and cucumber setup
-  So I don't have to do it myself
-
+Feature: Filentory-cli works
+  
   Scenario: App just runs
     When I get help for "filentory-cli"
     Then the exit status should be 0
@@ -12,6 +9,7 @@ Feature: My bootstrapped app kinda works
     And the following options should be documented:
       |--version|
       |--type|
+      |--auth|
     And the banner should document that this app's arguments are:
       |name||
       |path||
@@ -21,10 +19,22 @@ Feature: My bootstrapped app kinda works
     When I run "filentory-cli" for the test data
     Then I should get JSON as output
     And the "name" should be "testrun"
-    And the "type" should be "DVD"
+    And the "mediatype" should be "DVD"
     And there should be 4 entries in "files"
     And the first file should be placed in the root folder
     And the second file should be in the "folder"
     And the image file should have metadata
     And the video file should have metadata
     
+  Scenario: Sending data to server
+    When I run "filentory-cli" with a server parameter
+    Then I should get a message that the data was send successfully
+
+  Scenario: YAML file present while sending data to server
+    When I run "filentory-cli" with a server parameter and a yaml file
+    Then I should get a message that the data was send successfully
+    And I should get a message that "mykey" was send with the JSON data
+
+  Scenario: Server does not exist
+    When I run "filentory-cli" with the wrong server parameter
+    Then I should get a message that the data could not be sent

data/features/step_definitions/filentory-cli_steps.rb

@@ -6,7 +6,7 @@ end
 Then(/^I should get JSON as output$/) do
   @output.should have_json_path("name")
   @output.should have_json_path("files")
-  @output.should have_json_path("type")
+  @output.should have_json_path("mediatype")
 end
 
 Then(/^the "(.*?)" should be "(.*?)"$/) do |key, value|
@@ -48,7 +48,29 @@ Then(/^the video file should have metadata$/) do
   }
 end
 
-    
+When(/^I run "(.*?)" with a server parameter$/) do |arg1|
+  @output_send_ok = `filentory-cli "testrun" test/integration/data http://localhost:9292/ok -t DVD --log-level fatal`
+end
+
+Then(/^I should get a message that the data was send successfully$/) do
+  @output_send_ok.should include "successfull"
+end
+
+When(/^I run "(.*?)" with the wrong server parameter$/) do |arg1|
+  @output_send_ok = `filentory-cli "testrun" test/integration/data http://localhost:5555 -t DVD --log-level fatal`
+end
+
+Then(/^I should get a message that the data could not be sent$/) do
+  @output_send_ok.should include "failed"
+end
+
+When(/^I run "(.*?)" with a server parameter and a yaml file$/) do |arg1|
+  @output_send_ok = `filentory-cli "testrun" test/integration/data http://localhost:9292/ok -t DVD --log-level fatal --auth features/support/auth.yaml`
+end
+
+Then(/^I should get a message that "(.*?)" was send with the JSON data$/) do |value|
+  @output_send_ok.should include value
+end
 
 def last_json
   @output

data/features/support/auth.yaml

@@ -0,0 +1,2 @@
+---
+mykey: myValue

data/features/support/config.ru

@@ -0,0 +1,2 @@
+require File.expand_path("../demoserver.rb", __FILE__)
+run DemoServer.new

data/features/support/demoserver.rb

@@ -0,0 +1,20 @@
+class DemoServer
+  def call(env)
+    req = Rack::Request.new(env)
+    Rack::Response.new.finish do |res|
+      res['Content-Type'] = 'text/plain'
+
+      if req.path.start_with? "/ok"
+      	res.status = 200
+      	keys = []
+      	req.params.each_key {|key| keys << key }
+      	str = keys.join(" ")
+        puts keys
+      	res.write str
+      else
+      	res.status = 404
+      	res.write "ERROR"
+    	end
+    end
+  end
+end

data/features/support/env.rb

@@ -1,6 +1,8 @@
 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')
@@ -10,8 +12,9 @@ Before do
   @puts = true
   @original_rubylib = ENV['RUBYLIB']
   ENV['RUBYLIB'] = LIB_DIR + File::PATH_SEPARATOR + ENV['RUBYLIB'].to_s
+
 end
 
 After do
-  ENV['RUBYLIB'] = @original_rubylib
+ 	ENV['RUBYLIB'] = @original_rubylib
 end

data/filentory-cli.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.version       = Filentory::VERSION
   gem.authors       = ["Johnny Graber"]
   gem.email         = ["jg@jgraber.ch"]
-  gem.description   = "A tool to create an filentory-cli of a storage medium"
+  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"
 
@@ -19,6 +19,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rdoc')
   gem.add_development_dependency('aruba')
   gem.add_development_dependency('rake', '~> 10.1.1')
+  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_dependency('methadone', '~> 1.3.1')
   gem.add_dependency('oj', '~> 2.5.3')
   gem.add_dependency('json_spec', '~> 1.1.1')

data/lib/filentory.rb

@@ -4,6 +4,7 @@ require "filentory/collector"
 require "filentory/fileentry"
 require "filentory/exifextractor"
 require "filentory/videoextractor"
+require "filentory/sender"
 
 module Filentory
   # Your code goes here...

data/lib/filentory/datastore.rb

@@ -1,7 +1,7 @@
 require 'oj'
 
 class Datastore
-  attr_accessor :name, :type, :files
+  attr_accessor :name, :mediatype, :files
 
   def initialize(name)
     @name = name

data/lib/filentory/exifextractor.rb

@@ -3,6 +3,7 @@ require 'xmp'
 
 class ExifExtractor
 
+  # Extracts the metadata of a file at a given path in the file system.
   def metadata_for_file(file_path)
     img = EXIFR::JPEG.new(file_path)
 
@@ -17,6 +18,8 @@ class ExifExtractor
     Hash.new
   end
 
+  # Check if ExifExtractor handles the file extension.
+  # Example: ExifExtractor.handles? ".jpg" => returns true
   def self.handles?(file_extension)
     [".jpg", ".jpeg", ".tiff"].include? file_extension
   end

data/lib/filentory/fileentry.rb

@@ -1,3 +1,5 @@
+# FileEntry is used as a simple container to store information 
+# about the file like metadata, size or checksum.
 class FileEntry
   attr_accessor :path, :name, :checksum, :size, :metadata
 
@@ -6,14 +8,18 @@ class FileEntry
     @name = name
   end
 
+  # Set the last_modified date. It uses the date.strftime method 
+  # to convert it in a ISO 8601 format to be radable in JSON.
   def last_modified=(date)
     @last_modified = date.strftime("%FT%T%:z")
   end
 
+  # Get the last_modified date 
   def last_modified
     DateTime.iso8601(@last_modified)
   end
 
+  # Overrides to_s to get a human readable output.
   def to_s
     @path + @name + " (" + @size.to_s + ") - " + @last_modified
   end

data/lib/filentory/sender.rb

@@ -0,0 +1,31 @@
+require 'uri'
+require 'net/http'
+
+class Sender
+  attr_accessor :url, :datafield_name, :additional_fields
+
+  def initialize(url)
+    @url = URI.parse(url)
+    @failed = nil
+    @datafield_name = "data"
+  end
+
+  def post(message)
+  	begin
+			params = {@datafield_name => message}
+			if not @additional_fields.nil?
+				params.merge!(@additional_fields)
+			end
+			response = Net::HTTP.post_form(@url, params)
+			@failed = !response.code.to_s.start_with?("2")
+		rescue => error_message
+			response = Net::HTTPResponse.new "ERROR", "400", error_message
+			@failed = true
+		end	
+			response
+	end
+
+	def failed?
+		@failed
+	end
+end

data/lib/filentory/version.rb

@@ -1,3 +1,3 @@
 module Filentory
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/filentory/videoextractor.rb

@@ -2,6 +2,7 @@ require 'streamio-ffmpeg'
 
 class VideoExtractor
 
+  # Extracts the metadata of a file at a given path in the file system.
   def metadata_for_file(file_path)
     movie = FFMPEG::Movie.new(file_path)
     
@@ -14,6 +15,8 @@ class VideoExtractor
     result.delete_if { |k, v| v.nil? || v.to_s.empty?}
   end
 
+  # Check if VideoExtractor handles the file extension.
+  # Example: VideoExtractor.handles? ".mov" => returns true
   def self.handles?(file_extension)
     [".avi", ".mpeg", ".mov", ".mp4", ".flv"].include? file_extension
   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 16--><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: My bootstrapped app kinda works</span></h2><p class="narrative">In order to get going on coding my awesome app<br/>I want to have aruba and cucumber setup<br/>So I don't have to do it myself<br/></p><div class='scenario'><span class="scenario_file">features/filentory-cli.feature:6</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_7' 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.3.1/lib/methadone/cucumber.rb:58</span></div></li> <script type="text/javascript">moveProgressBar('6.2');</script><li id='features_filentory-cli_feature_8' 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.5.4/lib/aruba/cucumber.rb:188</span></div></li> <script type="text/javascript">moveProgressBar('12.5');</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 banner should be present</span></div><div class="step_file"><span>methadone-1.3.1/lib/methadone/cucumber.rb:78</span></div></li> <script type="text/javascript">moveProgressBar('18.7');</script><li id='features_filentory-cli_feature_10' 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.3.1/lib/methadone/cucumber.rb:109</span></div></li> <script type="text/javascript">moveProgressBar('25.0');</script><li id='features_filentory-cli_feature_11' 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.3.1/lib/methadone/cucumber.rb:82</span></div></li> <script type="text/javascript">moveProgressBar('31.2');</script><li id='features_filentory-cli_feature_12' 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.3.1/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('43.7');</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('50.0');</script></table></li> <script type="text/javascript">moveProgressBar('50.0');</script><li id='features_filentory-cli_feature_15' class='step passed'><div class="step_name"><span class="keyword">And </span><span class="step val">the banner should document that this app's arguments are:</span></div><div class="step_file"><span>methadone-1.3.1/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('62.5');</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('68.7');</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('75.0');</script></table></li> <script type="text/javascript">moveProgressBar('75.0');</script></ol></div><div class='scenario'><span class="scenario_file">features/filentory-cli.feature:20</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_21' 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('81.2');</script><li id='features_filentory-cli_feature_22' 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('87.5');</script><li id='features_filentory-cli_feature_23' 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('93.7');</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 &quot;<span class="param">type</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('100.0');</script><li id='features_filentory-cli_feature_25' 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('106.2');</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 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('112.5');</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 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('118.7');</script><li id='features_filentory-cli_feature_28' 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('125.0');</script><li id='features_filentory-cli_feature_29' 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('131.2');</script></ol></div></div><script type="text/javascript">document.getElementById('duration').innerHTML = "Finished in <strong>0m0.836s seconds</strong>";</script><script type="text/javascript">document.getElementById('totals').innerHTML = "2 scenarios (2 passed)<br />16 steps (16 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.3.1/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.5.3/lib/aruba/cucumber.rb:154</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.3.1/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.3.1/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.3.1/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.3.1/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.3.1/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>0m1.145s 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/tc_datastore.rb

@@ -10,9 +10,9 @@ class TestDatastore < Test::Unit::TestCase
 
   def test_can_set_a_type
     ds = Datastore.new("")
-    ds.type= "DVD"
+    ds.mediatype= "DVD"
 
-    assert_equal("DVD", ds.type)
+    assert_equal("DVD", ds.mediatype)
   end
 
   def test_can_add_array_of_files

data/test/tc_sender.rb

@@ -0,0 +1,95 @@
+require 'test/unit'
+require 'uri'
+require 'fakeweb'
+require 'filentory/sender'
+
+class TestSender < Test::Unit::TestCase
+
+  def setup
+  end
+
+  def teardown
+    FakeWeb.clean_registry
+  end
+
+  def test_initialisation_with_a_url 
+    sender = Sender.new("http://localhost")
+
+    assert_equal(URI.parse("http://localhost"), sender.url)
+  end
+
+  def test_can_send_message
+    url = prepare("http://localhost/board", "send back")
+
+    sender = Sender.new(url)
+    sender.post("a small message.")
+
+    request = FakeWeb.last_request 
+    assert_equal("POST", request.method)
+    assert_equal("data=a small message.".gsub(" ", "+"), request.body)
+    assert_equal(false, sender.failed?)
+  end
+
+  def test_correct_error_when_page_is_missing
+    url = prepare_fail("http://localhost/not_there", 404, "Not Found", "Missing page")
+
+    sender = Sender.new(url)
+    answer = sender.post("a small message.")
+    
+    assert_equal("404", answer.code)
+    assert_equal("Not Found", answer.message)
+  end
+
+  def test_correct_error_when_unauthorized
+    url = prepare_fail("http://localhost/auth_required", 401, "Unauthorized", "Missing page")
+
+    sender = Sender.new(url)
+    answer = sender.post("a small message.")
+    
+    assert_equal("401", answer.code)
+    assert_equal("Unauthorized", answer.message)
+  end
+
+  def test_detects_error
+    url = prepare_fail("http://localhost/auth_required", 401, "Unauthorized", "Missing page")
+
+    sender = Sender.new(url)
+    answer = sender.post("a small message.")
+
+    assert_equal(true, sender.failed?)
+  end
+
+  def test_other_name_for_datafield
+    url = prepare("http://localhost/board", "send back")
+
+    sender = Sender.new(url)
+    sender.datafield_name = "my_own_fieldname"
+    sender.post("a small message.")
+
+    request = FakeWeb.last_request 
+    assert_equal("my_own_fieldname=a small message.".gsub(" ", "+"), request.body)
+  end
+
+  def test_add_other_fields
+    url = prepare("http://localhost/board", "send back")
+
+    sender = Sender.new(url)
+    sender.additional_fields = {"a" => "JG"}
+    sender.post("a small message.")
+
+    request = FakeWeb.last_request 
+    assert_equal("data=a small message.&a=JG".gsub(" ", "+"), request.body)
+  end
+
+  private
+  def prepare(url, response)
+    FakeWeb.register_uri(:post, url, :body => response)
+    url
+  end
+
+  def prepare_fail(url, status_code, response, body)
+    FakeWeb.register_uri(:post, url, :body => "Nothing to be found 'round here",
+                          :status => [status_code.to_s, response])
+    url
+  end
+end

metadata

@@ -1,161 +1,184 @@
 --- !ruby/object:Gem::Specification
 name: filentory-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Johnny Graber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   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'
 - !ruby/object:Gem::Dependency
   name: aruba
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.1.1
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.3
 - !ruby/object:Gem::Dependency
   name: json_spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: exifr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: xmp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: A tool to create an filentory-cli of a storage medium
+description: A tool to create an inventory of a storage medium
 email:
 - jg@jgraber.ch
 executables:
@@ -163,8 +186,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -174,6 +197,9 @@ files:
 - 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
@@ -181,6 +207,7 @@ files:
 - lib/filentory/datastore.rb
 - lib/filentory/exifextractor.rb
 - lib/filentory/fileentry.rb
+- lib/filentory/sender.rb
 - lib/filentory/version.rb
 - lib/filentory/videoextractor.rb
 - results.html
@@ -192,36 +219,39 @@ files:
 - test/tc_datastore.rb
 - test/tc_exifextractor.rb
 - test/tc_fileentry.rb
+- test/tc_sender.rb
 - test/tc_something.rb
 - test/tc_videoextractor.rb
 homepage: https://github.com/jgraber/filentory-cli
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+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
@@ -231,5 +261,6 @@ test_files:
 - test/tc_datastore.rb
 - test/tc_exifextractor.rb
 - test/tc_fileentry.rb
+- test/tc_sender.rb
 - test/tc_something.rb
 - test/tc_videoextractor.rb