hubic 0.0.2 → 0.0.3

data/README.md

@@ -17,7 +17,9 @@ From the commande line:
 HUBIC_USER=foo@bar.com                  # Set the user on which we will act
 hubic client   config                   # Configure the client API key
 hubic auth                              # Authenticate the user
+hubic mkdir    cloud                    # Create directory
 hubic upload   file.txt cloud/file.txt  # Upload file
+hubic md5      cloud/file.txt           # Retrieve MD5
 hubic download cloud/file.txt           # Download file
 hubic delete   cloud/file.txt           # Remove file
 ```

data/bin/hubic

@@ -128,4 +128,13 @@ when 'upload'   # local / hubic
     src = ARGV[0]
     obj = ARGV[1]
     Hubic.for_user(user).upload(src, obj)
+when 'mkdir'
+    obj = ARGV[0]
+    Hubic.for_user(user).mkdir(obj, parents: false)
+when 'mkdir_p'
+    obj = ARGV[0]
+    Hubic.for_user(user).mkdir(obj, parents: true)
+when 'md5'
+    obj = ARGV[0]
+    puts Hubic.for_user(user).md5(obj)
 end

data/lib/hubic.rb

@@ -30,6 +30,9 @@ class Hubic
         end
         class NotFound < Error
         end
+        class Exists < Error
+        end
+
     end
 
     # Set the default client Id to use

data/lib/hubic/file_ops.rb

@@ -1,6 +1,35 @@
 require 'mime/types'
 
 class Hubic
+    # Create directory
+    # @param obj 
+    # @param parents [true, false] 
+    def mkdir(obj, parents: false)
+        container, path, = normalize_object(obj)
+
+        # Check for parents (create or raise error)
+        parent = File.dirname(path) 
+        if ! %w[. /].include?(parent)
+            if (meta = get_metadata([container, parent])).nil?
+                if parents
+                    mkdir([container, parent], parents: parents)
+                else
+                    raise Error, "parent doesn't exist"
+                end
+            elsif meta[:type] != TYPE_DIRECTORY
+                raise Error, "parent is not a directory"
+            end
+        end
+
+        # Check if place is already taken before creating directory
+        if (meta = get_metadata(obj)).nil?
+            put_object(obj, nil, TYPE_DIRECTORY)
+        elsif meta[:type] != TYPE_DIRECTORY
+            raise Error::Exists, "a file already exists"
+        elsif !parents
+            raise Error::Exists, "the directory already exists"
+        end
+    end
 
     def download(obj, dst=nil, size: nil, offset: 0, &block)
         # Handle file name or nil as a posible destination
@@ -30,11 +59,11 @@ class Hubic
         io.close unless io.nil?
     end
 
-    def upload(src, obj, type='application/octet-stream', &block)
+    def upload(src, obj, type=TYPE_OCTET_STREAM, &block)
         case src
         when String, Pathname
             type = (MIME::Types.of(src).first ||
-                    MIME::Types['application/octet-stream'].first).content_type
+                    MIME::Types[TYPE_OCTET_STREAM].first).content_type
         end
         put_object(obj, src, type, &block)
     end
@@ -51,8 +80,9 @@ class Hubic
         raise "not implemented yet"
     end
 
-    def checksum(src)
-        raise "not implemented yet"
+    def md5(obj)
+        meta = get_metadata(obj)
+        meta[:etag]
     end
 
 

data/lib/hubic/openstack.rb

@@ -5,6 +5,9 @@ require 'json'
 
 
 class Hubic
+    TYPE_OCTET_STREAM = 'application/octet-stream'
+    TYPE_DIRECTORY    = 'application/directory'
+
     class Container
         attr_reader :name, :count, :bytes, :metadata
         def initialize(hubic, name)
@@ -49,6 +52,50 @@ class Hubic
         end
     end
 
+    def parse_response_for_meta(response)
+        { :lastmod => (Time.parse(response['last-modified']) rescue nil),
+          :length  => response.content_length,
+          :type    => response['content-type'],
+          :etag    => response['etag']
+        }
+    end
+
+
+    def get_metadata(obj)
+        container, path, uri = normalize_object(obj)
+        meta = {}
+
+
+        hdrs = {}
+        hdrs['X-Auth-Token'] = @os[:token]
+
+        http = Net::HTTP.new(uri.host, uri.port)
+        if uri.scheme == 'https'
+            http.use_ssl = true
+            # http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+        http.start
+
+        http.request_head(uri.request_uri, hdrs) {|response|
+            case response
+            when Net::HTTPSuccess
+                meta = parse_response_for_meta(response)
+            when Net::HTTPNotFound
+                meta = nil
+            when Net::HTTPRedirection
+                fail "http redirect is not currently handled"
+            when Net::HTTPUnauthorized
+                # TODO: Need to refresh token
+            else
+                fail "resource unavailable: #{uri} (#{response.class})"
+            end
+        }            
+
+        meta
+    ensure
+        http.finish unless http.nil?
+    end
+
     def get_object(obj, dst=nil, size: nil, offset: 0, &block)
         container, path, uri = normalize_object(obj)
 
@@ -85,13 +132,7 @@ class Hubic
                 fail "resource unavailable: #{uri} (#{response.class})"
             end
 
-            lastmod = Time.parse(response['last-modified']) rescue nil
-            length  = response.content_length
-            type    = response['content-type']
-            meta    = { :lastmod => lastmod, 
-                        :length  => length, 
-                        :type    => type 
-                      }
+            meta    = parse_response_for_meta(response)
             
             if block
                 block.call(meta)
@@ -118,9 +159,16 @@ class Hubic
         http.finish unless http.nil?
     end
 
-    def put_object(obj, src, type='application/octet-stream', &block)
+    def put_object(obj, src, type = TYPE_OCTET_STREAM, &block)
         container, path, uri = normalize_object(obj)
-        io = File.open(src)
+        case src
+        when String
+            io = File.open(src)
+        when NilClass
+            io = StringIO.new('')
+        else
+            raise ArgumentError, 'Not Implemented Yet'
+        end
 
         hdrs = {}
         hdrs['X-Auth-Token'     ] = @os[:token]
@@ -235,7 +283,7 @@ class Hubic
     end
 
     def normalize_object(obj)
-        openstack_setup_refresh
+        openstack_setup_refresh # TODO: no need to refresh just get the endpoint
 
         c, p = case obj
                when String 

data/lib/hubic/version.rb

@@ -1,3 +1,3 @@
 class Hubic
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubic
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -141,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 254901150746708933
+      hash: 1807576899535075838
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 254901150746708933
+      hash: 1807576899535075838
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.29