radosgw-s3 0.7 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 359cebe03279f2013ccf6867ded7ba76ba8ca83a
-  data.tar.gz: ec92ec54012013cc6e24d8d52e936388d6c5a737
+  metadata.gz: c656861081019bf06272ea5ebf0374e875a138c9
+  data.tar.gz: 994d3a34d1c5db3333d3916d5025b9aa84f40e51
 SHA512:
-  metadata.gz: 43df2d7b7e35a61b06a8742c671ac9a0d8d5063d76d063a9dc471b2bee9a332d6f7f0f4369040fed692ea76775bd14add12e6111ed62c17d5d1dea5f81d16c7b
-  data.tar.gz: 304cfb998921f373597e915b3d00ed19ea897b13e1f5fe1d9c5a73294c8e295c8dc58ae4a9349e59eb8057490a750aa809a1659464100002dae945bd1274a22a
+  metadata.gz: ac5ff07dfd50528e00a90499dd186743bb649645f05541256867f91383efc02a1f743ba15e9c43c0d351789ab30b15ea00ccabbe074b245a403c3ea3b16fd229
+  data.tar.gz: 9dbddb1c18a6fb51b5e57b0e7a4ba1ec25e98e4aae379789bee955894e873b08b10e54d8e9809b5a5e8da788170335b8f3e8ab808c3f6068e22afdfc66dd7185

data/.gitignore

@@ -5,3 +5,4 @@ rdoc
 pkg
 *.gem
 .bundle
+.project

data/README.rdoc

@@ -26,7 +26,7 @@ radosgw-admin guide to {create radosgw user}[http://docs.ceph.com/docs/master/ra
 
 === create user
 
-    service.user_create("UID_NAME")
+    service.user_create("UID_NAME", "DISPLAY_NAME")
 
 It will give you the access_key and secret_key in hash format
 

data/lib/ceph/radosgw.rb

@@ -5,8 +5,6 @@ module CEPH
   class Radosgw
 
     attr_reader :username, :ipaddress, :user_password, :uid
-
-
     def initialize(options)
       raise ArgumentError, "Missing :username." if !options[:username]
       raise ArgumentError, "Missing :ipaddress." if !options[:ipaddress]
@@ -17,34 +15,5 @@ module CEPH
       @user_password = options.fetch(:user_password)
     end
 
-
-
-    def user_create(uid)
-	ceph_user_json = ""
-	Net::SSH.start( @ipaddress, @username, :password => @user_password ) do|ssh| 
-		ceph_user_json = ssh.exec!("sudo radosgw-admin user create --uid='#{uid}'  --display-name='radosgw demo user from s3 gem'")
-	end
-
-
-    ceph_user_hash = JSON.parse(ceph_user_json)
-    secret_hash = {"access_key" => "#{ceph_user_hash['keys'][0]['access_key']}", "secret_key" => "#{ceph_user_hash['keys'][0]['secret_key']}" }
-    secret_hash
-    end
-
-    def user_usage(uid)
-	user_usage_json = ""
-	Net::SSH.start( @ipaddress, @username, :password => @user_password ) do|ssh| 
-		user_usage_json = ssh.exec!("sudo radosgw-admin user stats --uid='#{uid}'")
-	end
-
-    if user_usage_json.include? "ERROR: can't read user header: (2) No such file or directory"
-	usage_hash = {"total_objects" => "0", "total_bytes" => "0", "last_update" => "#{Time.now}" }
-    else
-    user_usage_hash = JSON.parse(user_usage_json)
-    usage_hash = {"total_objects" => "#{user_usage_hash['stats']['total_entries']}", "total_bytes" => "#{user_usage_hash['stats']['total_bytes_rounded']}", "last_update" => "#{user_usage_hash['last_stats_update']}" }
-    usage_hash
-    end
-    end
-
   end
 end

data/lib/ceph/user.rb

@@ -0,0 +1,66 @@
+module CEPH
+  class User < Radosgw
+    def execution(command)
+      radosgw_json =
+      begin
+        Net::SSH.start( @ipaddress, @username, :password => @user_password ) do|ssh|
+          radosgw_json = ssh.exec!(command)
+        end
+      rescue Timeout::Error
+        return "Timed out Error"
+      rescue Errno::EHOSTUNREACH
+        return "Host unreachable Error"
+      rescue Errno::ECONNREFUSED
+        return "Connection refused Error"
+      rescue Net::SSH::AuthenticationFailed
+        return "Authentication failure Error"
+      end
+      return radosgw_json
+    end
+
+    def exists(uid)
+      ceph_user_json = ""
+      ceph_user_json = execution("sudo radosgw-admin user info --uid='#{uid}'")
+      begin
+        JSON.parse(ceph_user_json)
+        return true
+      rescue JSON::ParserError => e
+      return false
+      end
+    end
+
+    def create(uid, display_name)
+      ceph_user_json = ""
+      ceph_user_json = execution("sudo radosgw-admin user create --uid='#{uid}'  --display-name='#{display_name}'")
+      begin
+        ceph_user_hash = JSON.parse(ceph_user_json)
+        secret_hash = {"access_key" => "#{ceph_user_hash['keys'][0]['access_key']}", "secret_key" => "#{ceph_user_hash['keys'][0]['secret_key']}" }
+        secret_hash
+      rescue JSON::ParserError => e
+      return ceph_user_json
+      end
+    end
+
+    def usage(uid)
+      user_usage_json = ""
+      if exists(uid)
+        user_usage_json = execution("sudo radosgw-admin user stats --uid='#{uid}'")
+
+        if user_usage_json.include? "ERROR: can't read user header: (2) No such file or directory"
+          usage_hash = {"total_objects" => "0", "total_bytes" => "0", "last_update" => "#{Time.now}" }
+        else
+          begin
+            user_usage_hash = JSON.parse(user_usage_json)
+            usage_hash = {"total_objects" => "#{user_usage_hash['stats']['total_entries']}", "total_bytes" => "#{user_usage_hash['stats']['total_bytes_rounded']}", "last_update" => "#{user_usage_hash['last_stats_update']}" }
+            usage_hash
+          rescue JSON::ParserError => e
+          return user_usage_json
+          end
+        end
+      else
+        return "could not fetch user info: no user info saved"
+      end
+    end
+
+  end
+end

data/lib/radosgw-s3.rb

@@ -7,7 +7,6 @@ require "net/https"
 require "openssl"
 require "rexml/document"
 require "time"
-
 require "proxies"
 require "s3/objects_extension"
 require "s3/buckets_extension"
@@ -20,8 +19,8 @@ require "s3/request"
 require "s3/service"
 require "s3/signature"
 require "s3/version"
-
 require "ceph/radosgw"
+require "ceph/user"
 
 module S3
   # Default (and only) host serving S3 stuff

data/lib/s3/version.rb

@@ -1,3 +1,3 @@
 module S3
-  VERSION = "0.7"
+  VERSION = "0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radosgw-s3
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Thomas Alrin, Kishorekumar Neelamegam, Rajthilak, Kuba Kuźma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: proxies
@@ -125,6 +125,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/ceph/radosgw.rb
+- lib/ceph/user.rb
 - lib/radosgw-s3.rb
 - lib/s3/bucket.rb
 - lib/s3/buckets_extension.rb
@@ -164,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: s3
-rubygems_version: 2.4.8
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Library for accessing ceph objects and buckets