leofs_manager_client 0.2.12 → 0.2.13

data/lib/leofs_manager_client.rb

@@ -26,7 +26,7 @@ require "time"
 require_relative "leofs_manager_client/leofs_manager_models"
 
 module LeoFSManager
-  VERSION = "0.2.12"
+  VERSION = "0.2.13"
 
   class Client
     CMD_VERSION          = "version"
@@ -41,16 +41,16 @@ module LeoFSManager
     CMD_DU               = "du %s"
     CMD_COMPACT          = "compact %s"
     CMD_PURGE            = "purge %s"
-    CMD_S3_CRE_USER      = "s3-create-user %s %s"
-    CMD_S3_UPD_USER_ROLE = "s3-update-user-role %s %s"
-    CMD_S3_UPD_USER_PASS = "s3-update-user-password %s %s"
-    CMD_S3_DEL_USER      = "s3-delete-user %s"
-    CMD_S3_GET_USERS     = "s3-get-users"
-    CMD_S3_SET_ENDPOINT  = "s3-set-endpoint %s"
-    CMD_S3_DEL_ENDPOINT  = "s3-delete-endpoint %s"
-    CMD_S3_GET_ENDPOINTS = "s3-get-endpoints"
-    CMD_S3_ADD_BUCKET    = "s3-add-bucket %s %s"
-    CMD_S3_GET_BUCKETS   = "s3-get-buckets"
+    CMD_CRE_USER         = "create-user %s %s"
+    CMD_UPD_USER_ROLE    = "update-user-role %s %s"
+    CMD_UPD_USER_PASS    = "update-user-password %s %s"
+    CMD_DEL_USER         = "delete-user %s"
+    CMD_GET_USERS        = "get-users"
+    CMD_SET_ENDPOINT     = "set-endpoint %s"
+    CMD_DEL_ENDPOINT     = "delete-endpoint %s"
+    CMD_GET_ENDPOINTS    = "get-endpoints"
+    CMD_ADD_BUCKET       = "add-bucket %s %s"
+    CMD_GET_BUCKETS      = "get-buckets"
 
     USER_ROLES = RoleDef.invert
 
@@ -167,79 +167,79 @@ module LeoFSManager
     # Generate credential for LeoFS
     # Return::
     #   Credential
-    def s3_create_user(user_id, password=nil)
-      Credential.new(sender(CMD_S3_CRE_USER % [user_id, password]))
+    def create_user(user_id, password=nil)
+      Credential.new(sender(CMD_CRE_USER % [user_id, password]))
     end
 
     # Update user role
     # Return ::
     #   _nil_
-    def s3_update_user_role(user_id, role)
+    def update_user_role(user_id, role)
       role = role.to_sym if role.is_a? String
       role = USER_ROLES[role] if role.is_a? Symbol
-      sender(CMD_S3_UPD_USER_ROLE % [user_id, role])
+      sender(CMD_UPD_USER_ROLE % [user_id, role])
       nil
     end
 
     # Update user password
     # Return::
     #   _nil_
-    def s3_update_user_password(user_id, new_password)
-      sender(CMD_S3_UPD_USER_PASS % [user_id, new_password])
+    def update_user_password(user_id, new_password)
+      sender(CMD_UPD_USER_PASS % [user_id, new_password])
       nil
     end
 
     # Delete user
     # Return::
     #   _nil_
-    def s3_delete_user(user_id)
-      sender(CMD_S3_DEL_USER % user_id)
+    def delete_user(user_id)
+      sender(CMD_DEL_USER % user_id)
       nil
     end
 
-    def s3_get_users
-      users = sender(CMD_S3_GET_USERS)[:users]
+    def get_users
+      users = sender(CMD_GET_USERS)[:users]
       users.map {|account| User.new(account) }
     end
 
     # Insert an endpoint in the system
     # Return::
     #   _nil_
-    def s3_set_endpoint(endpoint)
-      sender(CMD_S3_SET_ENDPOINT % endpoint)
+    def set_endpoint(endpoint)
+      sender(CMD_SET_ENDPOINT % endpoint)
       nil
     end
 
     # Remove an endpoint from the system
     # Return::
     #   _nil_
-    def s3_delete_endpoint(endpoint)
-      sender(CMD_S3_DEL_ENDPOINT % endpoint)
+    def delete_endpoint(endpoint)
+      sender(CMD_DEL_ENDPOINT % endpoint)
       nil
     end
-    alias :s3_del_endpoint :s3_delete_endpoint
+    alias :del_endpoint :delete_endpoint
 
     # Retrieve an endpoint in the system
     # Return::
     #   Array of Endpoint
-    def s3_get_endpoints
-      endpoints = sender(CMD_S3_GET_ENDPOINTS)[:endpoints]
+    def get_endpoints
+      endpoints = sender(CMD_GET_ENDPOINTS)[:endpoints]
       endpoints.map {|endpoint| Endpoint.new(endpoint) }
     end
 
     # Add an Bucket in the system
     # Return::
     #   _nil_
-    def s3_add_bucket(bucket_name, access_key_id)
-      sender(CMD_S3_ADD_BUCKET % [bucket_name, access_key_id])
+    def add_bucket(bucket_name, access_key_id)
+      sender(CMD_ADD_BUCKET % [bucket_name, access_key_id])
       nil
     end
 
     # Retrieve all buckets from the system
     # Return::
     #   Array of Bucket
-    def s3_get_buckets
-      buckets = sender(CMD_S3_GET_BUCKETS)[:buckets]
+    def get_buckets
+      buckets = sender(CMD_GET_BUCKETS)[:buckets]
       buckets.map {|bucket| Bucket.new(bucket) }
     end
 
@@ -339,6 +339,6 @@ if __FILE__ == $PROGRAM_NAME
   p m.version
   p m.status
   p m.status("storage_0@127.0.0.1")
-  p m.s3_get_buckets()
+  p m.get_buckets()
   p m.whereis("photo/hawaii-0.jpg")
 end

data/spec/dummy_tcp_server.rb

@@ -78,7 +78,7 @@ module Dummy
       ]
     }.to_json
 
-    S3GetEndpoints = {
+    GetEndpoints = {
       :endpoints => [
         {:endpoint => "s3.amazonaws.com", :created_at=>"2012-09-21 15:08:11 +0900"},
         {:endpoint => "localhost", :created_at=>"2012-09-21 15:08:11 +0900"},
@@ -87,7 +87,7 @@ module Dummy
       ]
     }.to_json
 
-    S3GetBuckets = {
+    GetBuckets = {
       :buckets => [
         {
           :bucket => "test",
@@ -97,13 +97,13 @@ module Dummy
       ]
     }.to_json
 
-    S3GetUsers = {
+    GetUsers = {
       :users => [
         { :access_key_id => "05236", :user_id => "_test_leofs_", :role_id => 1, :created_at => "2012-11-20 15:13:20 +0900" }
       ]
     }.to_json
 
-    S3CreateUser = {
+    CreateUser = {
       :access_key_id => "xxxxxxxxxxxxxxxxxxxx",
       :secret_access_key => "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
     }.to_json
@@ -139,18 +139,18 @@ module Dummy
           Response::Login
         when "status"
           Response::Status
-        when "s3-get-buckets"
-          Response::S3GetBuckets
+        when "get-buckets"
+          Response::GetBuckets
         when "whereis"
           Response::Whereis
-        when "s3-get-endpoints"
-          Response::S3GetEndpoints
-        when "s3-get-buckets"
-          Response::S3GetBuckets
-        when "s3-get-users"
-          Response::S3GetUsers
-        when "s3-create-user"
-          Response::S3CreateUser
+        when "get-endpoints"
+          Response::GetEndpoints
+        when "get-buckets"
+          Response::GetBuckets
+        when "get-users"
+          Response::GetUsers
+        when "create-user"
+          Response::CreateUser
         else
           { :result => line }.to_json
         end

data/spec/leofs_manager_client_spec.rb

@@ -36,9 +36,9 @@ NoResultAPIs = {
   :rebalance => 0, 
   :compact => 1, 
   :purge => 1,
-  :s3_set_endpoint => 1, 
-  :s3_del_endpoint => 1, 
-  :s3_add_bucket => 2
+  :set_endpoint => 1, 
+  :del_endpoint => 1, 
+  :add_bucket => 2
 }
 
 include LeoFSManager
@@ -90,49 +90,49 @@ describe LeoFSManager do
       end
     end
 
-    describe "#s3_create_user" do
+    describe "#create_user" do
       it "returns Credential" do
-        subject.s3_create_user("user_id", "password").should be_a Credential
+        subject.create_user("user_id", "password").should be_a Credential
       end 
 
       it "goes with only user_id" do
-        subject.s3_create_user("user_id").should be_a Credential
+        subject.create_user("user_id").should be_a Credential
       end
     end
 
-    describe "#s3_update_user_role" do
+    describe "#update_user_role" do
       it "returns nil" do
-        subject.s3_update_user_role("user_id", "admin").should be_nil
+        subject.update_user_role("user_id", "admin").should be_nil
       end
     end
 
-    describe "#s3_update_user_password" do
+    describe "#update_user_password" do
       it "returns nil" do
-        subject.s3_update_user_password("user_id", "new_password").should be_nil
+        subject.update_user_password("user_id", "new_password").should be_nil
       end
     end
 
-    describe "#s3_delete_user" do
+    describe "#delete_user" do
       it "returns nil" do
-        subject.s3_delete_user("user_id").should be_nil
+        subject.delete_user("user_id").should be_nil
       end
     end
 
-    its(:s3_get_users) do
+    its(:get_users) do
       should be_a Array
       subject.each do |account|
         account.should be_a User
       end
     end
 
-    its(:s3_get_endpoints) do
+    its(:get_endpoints) do
       should be_a Array
       subject.each do |endpoint|
         endpoint.should be_a Endpoint
       end
     end
 
-    its(:s3_get_buckets) do
+    its(:get_buckets) do
       should be_a Array
       subject.each do |buckets|
         buckets.should be_a Bucket

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leofs_manager_client
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies: []
 description: Client for LeoFS Manager
 email: