diskid 0.1.1 → 0.1.2

data/README.md

@@ -4,15 +4,32 @@
 
     gem install diskid
 
+diskid needs curl and head commands available in your system.
+
+Internet access is also required, as diskid sends a few bytes to http://diskid.frameos.org to identify the disk.
+
 ## Usage
 
     diskid path-to-disk-file
     
 i.e.
 
-    diskid my-vm-disk.vmdk
+    $ diskid ubuntu64-1104.vmdk
+
+    diskid.frameos.org
+
+    file name: ubuntu64-1104.vmdk
+    file format: vmdk
+    virtual size: 9.0G (9663676416 bytes)
+    disk size: 319M (334364672 bytes)
 
 
+PROTIP: You don't need to install diskid to use the service
+
+    head -n 20 ubuntu64-1104.vmdk > /tmp/dchunk && curl -X POST -F chunk=@/tmp/dchunk http://diskid.frameos.org
+
+    
+
 Copyright (c) 2011 Sergio Rubio. See LICENSE.txt for
 further details.
 

data/bin/diskid-ws

@@ -3,7 +3,7 @@ require 'sinatra'
 require 'alchemist'
 
 DOCS = """
-<h1>FrameOS Virtual Disk Identification Service</h1>
+<h1>Virtual Disk Identification Service</h1>
 
 <h2>Installation:</h2>
 
@@ -23,7 +23,7 @@ class DiskIDWS < Sinatra::Base
 
   post '/' do
     tmpfile = params[:chunk][:tempfile] rescue nil
-    file_name = params[:file_name] rescue ''
+    file_name = (params[:file_name] || '') rescue ''
 
     if tmpfile.nil? 
       halt 400, "Couldn't understand the file you sent me dude."
@@ -36,12 +36,17 @@ class DiskIDWS < Sinatra::Base
 
     begin
       buf = ''
-      buf << "file name: #{file_name}\n"
+      if file_name.empty?
+        buf << "\nSome fields are being omitted and 'disk size:' won't be accurate.\n"
+        buf << "Use diskid command for better results\n\n"
+      else
+        buf << "file name: #{file_name}\n"
+      end
       out.each_line do |l|
         buf << l if l !~ /(image:|disk size:)/
       end
 
-      buf << "disk size: #{'%.0f' % file_size.to_i.bytes.to.megabytes.to_f}M (#{file_size} bytes)"
+      buf << "disk size: #{'%.0f' % file_size.to_i.bytes.to.megabytes.to_f}M (#{file_size} bytes)\n"
       tmpfile.close
       FileUtils.rm_f tmpfile.path
       buf
@@ -69,4 +74,5 @@ end
 DiskIDWS.set :bind => '127.0.0.1'
 #DiskIDWS.set :raise_errors => false
 DiskIDWS.set :show_exceptions => false
+DiskIDWS.set :logging => true
 DiskIDWS.run!

data/lib/diskid.rb

@@ -1,3 +1,3 @@
 module DiskID
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diskid
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &22399900 !ruby/object:Gem::Requirement
+  requirement: &11993400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22399900
+  version_requirements: *11993400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &22399340 !ruby/object:Gem::Requirement
+  requirement: &11992840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *22399340
+  version_requirements: *11992840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &22398800 !ruby/object:Gem::Requirement
+  requirement: &11992220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *22398800
+  version_requirements: *11992220
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &22414600 !ruby/object:Gem::Requirement
+  requirement: &11991640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22414600
+  version_requirements: *11991640
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &22414080 !ruby/object:Gem::Requirement
+  requirement: &11991000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22414080
+  version_requirements: *11991000
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &22413560 !ruby/object:Gem::Requirement
+  requirement: &11990400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22413560
+  version_requirements: *11990400
 - !ruby/object:Gem::Dependency
   name: alchemist
-  requirement: &22413020 !ruby/object:Gem::Requirement
+  requirement: &12006120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22413020
+  version_requirements: *12006120
 description: Virtual Disk Identification Service
 email: rubiojr@frameos.org
 executables: