leofs_manager_client 0.2.7 → 0.2.8

data/lib/leofs_manager_client/leofs_manager_models.rb

@@ -121,6 +121,16 @@ module LeoFSManager
     end
   end
 
+  class User
+    attr_reader :user_id, :access_key_id, :created_at
+
+    def initialize(h)
+      @user_id = h[:user_id]
+      @access_key_id = h[:access_key_id]
+      @created_at = h[:created_at]
+    end
+  end
+
   # Endpoint
   class Endpoint
     # host of the endpoint

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.7"
+  VERSION = "0.2.8"
 
   class Client
     CMD_VERSION          = "version"
@@ -40,7 +40,8 @@ module LeoFSManager
     CMD_DU               = "du %s"
     CMD_COMPACT          = "compact %s"
     CMD_PURGE            = "purge %s"
-    CMD_S3_GEN_KEY       = "s3-gen-key %s"
+    CMD_S3_CRE_KEY       = "s3-create-key %s"
+    CMD_S3_GET_KEYS      = "s3-get-keys"
     CMD_S3_SET_ENDPOINT  = "s3-set-endpoint %s"
     CMD_S3_DEL_ENDPOINT  = "s3-delete-endpoint %s"
     CMD_S3_GET_ENDPOINTS = "s3-get-endpoints"
@@ -153,8 +154,14 @@ module LeoFSManager
     # Generate credential for LeoFS
     # Return::
     #   Credential
-    def s3_gen_key(user_id)
-      Credential.new(sender(CMD_S3_GEN_KEY % user_id))
+    def s3_create_key(user_id)
+      Credential.new(sender(CMD_S3_CRE_KEY % user_id))
+    end
+    alias s3_gen_key s3_create_key
+
+    def s3_get_keys
+      users = sender(CMD_S3_GET_KEYS)[:users]
+      users.map {|account| User.new(account) }
     end
 
     # Insert an endpoint in the system
@@ -269,7 +276,7 @@ module LeoFSManager
       response = nil
       begin
         @mutex.synchronize do
-          @socket.puts command
+          @socket.print "#{command}\r\n"
           response = JSON.parse(@socket.readline, symbolize_names: true)
         end
       rescue EOFError => ex
@@ -277,9 +284,10 @@ module LeoFSManager
         reconnect
       rescue => ex
         raise "An Error occured: #{ex.class} (server: #{@current_server})\n#{ex.message}"
+      else
+        raise response[:error] if response.has_key?(:error)
+        return response
       end
-      raise response[:error] if response.has_key?(:error)
-      return response
     end
   end
 end

data/spec/dummy_tcp_server.rb

@@ -0,0 +1,143 @@
+# ======================================================================
+# 
+#  LeoFS Manager Client
+# 
+#  Copyright (c) 2012 Rakuten, Inc.
+# 
+#  This file is provided to you under the Apache License,
+#  Version 2.0 (the "License"); you may not use this file
+#  except in compliance with the License.  You may obtain
+#  a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+# 
+# ======================================================================
+
+require "socket"
+
+module Dummy
+  module Response
+    Status = {
+      :system_info => {
+        :version => "0.10.1",
+        :n => "1",
+        :r => "1",
+        :w => "1",
+        :d => "1",
+        :ring_size => "128",
+        :ring_hash_cur => "2688134336",
+        :ring_hash_prev => "2688134336"},
+        :node_list => [
+          {
+            :type => "S",
+            :node => "storage_0@127.0.0.1",
+            :state => "running",
+            :ring_cur => "a039acc0",
+            :ring_prev => "a039acc0",
+            :when => "2012-09-21 15:08:22 +0900"
+          }, {
+            :type => "G",
+            :node => "gateway_0@127.0.0.1",
+            :state => "running",
+            :ring_cur => "a039acc0",
+            :ring_prev => "a039acc0",
+            :when => "2012-09-21 15:08:25 +0900"
+          }
+        ]
+    }.to_json
+
+    Whereis = {
+      :assigned_info => [
+        { 
+          :node => "storage_0@127.0.0.1",
+          :vnode_id => "",
+          :size => "",
+          :clock => "",
+          :checksum => "",
+          :timestamp => "",
+          :delete => 0,
+          :num_of_chunks => 0
+        }
+      ]
+    }.to_json
+
+    S3GetEndpoints = {
+      :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"},
+        {:endpoint => "foo", :created_at=>"2012-09-21 18:51:08 +0900"},
+        {:endpoint => "leofs.org", :created_at=>"2012-09-21 15:08:11 +0900"}
+      ]
+    }.to_json
+
+    S3GetBuckets = {
+      :buckets => [
+        {
+          :bucket => "test",
+          :owner => "test",
+          :created_at => "2012-09-24 15:38:49 +0900"
+        }
+      ]
+    }.to_json
+
+    S3GetKeys = {
+      :users => [
+        { :access_key_id => "05236", :user_id => "_test_leofs_", :created_at => "2012-11-20 15:13:20 +0900" }
+      ]
+    }.to_json
+  end
+
+  Argument = "arg" # passed to command which requires some arguments.
+
+  # dummy Manager
+  class Manager
+    def initialize
+      t = Thread.new do
+        TCPServer.open(Host, Port) do |server|
+          loop do
+            begin
+              socket = server.accept
+              while line = socket.readline.split.first
+                response = process_line(line)
+                socket.puts(response)
+              end
+            rescue EOFError
+            end
+          end
+        end
+      end
+      nil until t.stop? # wait server start
+    end
+
+    def process_line(line)
+      line.rstrip!
+      begin
+        case line
+        when "status"
+          Response::Status
+        when "s3-get-buckets"
+          Response::S3GetBuckets
+        when "whereis"
+          Response::Whereis
+        when "s3-get-endpoints"
+          Response::S3GetEndpoints
+        when "s3-get-buckets"
+          Response::S3GetBuckets
+        when "s3-get-keys"
+          Response::S3GetKeys
+        else
+          { :result => line }.to_json
+        end
+      rescue => ex
+        { :error => ex.message }.to_json
+      end
+    end
+  end
+end

data/spec/leofs_manager_client_spec.rb

@@ -20,121 +20,14 @@
 # 
 # ======================================================================
 
-require "socket"
 require "json"
+require_relative "dummy_tcp_server"
 require_relative "../lib/leofs_manager_client"
 
 Host = "localhost"
 Port = 50000
 
 $DEBUG = false
-Thread.abort_on_exception = true
-
-module Dummy
-  module Response
-    Status = {
-      :system_info => {
-        :version => "0.10.1",
-        :n => "1",
-        :r => "1",
-        :w => "1",
-        :d => "1",
-        :ring_size => "128",
-        :ring_hash_cur => "2688134336",
-        :ring_hash_prev => "2688134336"},
-        :node_list => [
-          {
-            :type => "S",
-            :node => "storage_0@127.0.0.1",
-            :state => "running",
-            :ring_cur => "a039acc0",
-            :ring_prev => "a039acc0",
-            :when => "2012-09-21 15:08:22 +0900"
-          }, {
-            :type => "G",
-            :node => "gateway_0@127.0.0.1",
-            :state => "running",
-            :ring_cur => "a039acc0",
-            :ring_prev => "a039acc0",
-            :when => "2012-09-21 15:08:25 +0900"
-          }
-        ]
-    }.to_json
-
-    Whereis = {
-      :assigned_info => [
-        { 
-          :node => "storage_0@127.0.0.1",
-          :vnode_id => "",
-          :size => "",
-          :clock => "",
-          :checksum => "",
-          :timestamp => "",
-          :delete => 0,
-          :num_of_chunks => 0
-        }
-      ]
-    }.to_json
-
-    S3GetEndpoints = {
-      :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"},
-        {:endpoint => "foo", :created_at=>"2012-09-21 18:51:08 +0900"},
-        {:endpoint => "leofs.org", :created_at=>"2012-09-21 15:08:11 +0900"}
-      ]
-    }.to_json
-
-    S3GetBuckets = {
-      :buckets => [
-        {
-          :bucket => "test",
-          :owner => "test",
-          :created_at => "2012-09-24 15:38:49 +0900"
-        }
-      ]
-    }.to_json
-  end
-
-  Argument = "hoge" # passed to command which requires some arguments.
-
-  # dummy Manager
-  class Manager
-    Thread.new do
-      TCPServer.open(Host, Port) do |server|
-        loop do
-          begin
-            socket = server.accept
-            while line = socket.readline.split.first
-              line.rstrip!
-              begin
-                case line
-                when "status"
-                  result = Response::Status
-                when "s3-get-buckets"
-                  result = Response::S3GetBuckets
-                when "whereis"
-                  result = Response::Whereis
-                when "s3-get-endpoints"
-                  result = Response::S3GetEndpoints
-                when "s3-get-buckets"
-                  result = Response::S3GetBuckets
-                else
-                  result = { :result => line }.to_json
-                end
-              rescue => ex
-                result = { :error => ex.message }.to_json
-              ensure
-                socket.puts(result)
-              end
-            end
-          rescue EOFError
-          end
-        end
-      end
-    end
-  end
-end
 
 # key: api_name, value: num of args
 NoResultAPIs = {
@@ -156,24 +49,19 @@ describe LeoFSManager do
       Dummy::Manager.new
       @manager = Client.new("#{Host}:#{Port}")
     end
+    subject { @manager }
 
     it "raises error when it is passed invalid params" do
       lambda { Client.new }.should raise_error
     end
 
     describe "#status" do
-      it "returns Status" do
-        @manager.status.should be_a Status
-      end
+      its(:status) { should be_a Status }
+      its("status.system_info") { should be_a Status::System }
 
-      it "returns SystemInfo" do
-        @manager.status.system_info.should be_a Status::System
-      end
-
-      it "returns Array of Node" do
-        node_list = @manager.status.node_list
-        node_list.should be_a Array
-        node_list.each do |node|
+      its("status.node_list") do
+        should be_a Array
+        subject.each do |node|
           node.should be_a Status::Node
         end
       end
@@ -181,7 +69,7 @@ describe LeoFSManager do
 
     describe "#whereis" do
       it "returns Array of WhereInfo" do
-        result = @manager.whereis("path")
+        result = subject.whereis("path")
         result.should be_a Array
         result.each do |where_info|
           where_info.should be_a AssignedFile
@@ -192,52 +80,53 @@ describe LeoFSManager do
 
     describe "#du" do
       it "returns DiskUsage" do
-        @manager.du("node").should be_a StorageStat
+        subject.du("node").should be_a StorageStat
       end
     end
 
-    describe "#s3_gen_key" do
+    describe "#s3_create_key" do
       it "returns Credential" do
-        @manager.s3_gen_key("user_id").should be_a Credential
+        subject.s3_create_key("user_id").should be_a Credential
       end 
     end
 
-    describe "#s3_get_endpoints" do
-      it "returns Arrany of Endpoint" do
-        result = @manager.s3_get_endpoints
-        result.should be_a Array
-        result.each do |endpoint|
-          endpoint.should be_a Endpoint
-        end
+    its(:s3_get_keys) do
+      should be_a Array
+      subject.each do |account|
+        account.should be_a User
       end
     end
 
-    describe "#s3_get_buckets" do
-      it "returns Array of Bucket" do
-        result = @manager.s3_get_buckets
-        result.should be_a Array
-        result.each do |buckets|
-          buckets.should be_a Bucket
-        end
+    its(:s3_get_endpoints) do
+      should be_a Array
+      subject.each do |endpoint|
+        endpoint.should be_a Endpoint
+      end
+    end
+
+    its(:s3_get_buckets) do
+      should be_a Array
+      subject.each do |buckets|
+        buckets.should be_a Bucket
       end
     end
 
     NoResultAPIs.each do |api, num_of_args|
       describe "##{api}" do
         it "returns nil" do
-          @manager.send(api, *(["argument"] * num_of_args)).should be_nil
+          subject.send(api, *(["argument"] * num_of_args)).should be_nil
         end
       end
     end
 
     describe "#disconnect!" do
       it "returns nil" do
-        @manager.disconnect!.should be_nil
+        subject.disconnect!.should be_nil
       end
 
       it "accepts no more requests" do
         lambda {
-          @manager.status
+          subject.status
         }.should raise_error
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leofs_manager_client
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies: []
 description: Client for LeoFS Manager
 email:
@@ -27,6 +27,7 @@ files:
 - leofs_manager_client.gemspec
 - lib/leofs_manager_client.rb
 - lib/leofs_manager_client/leofs_manager_models.rb
+- spec/dummy_tcp_server.rb
 - spec/leofs_manager_client_spec.rb
 homepage: ''
 licenses: []
@@ -53,4 +54,5 @@ signing_key:
 specification_version: 3
 summary: Client for LeoFS Manager
 test_files:
+- spec/dummy_tcp_server.rb
 - spec/leofs_manager_client_spec.rb