leofs_manager_client 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODBjNTNiNmU3MDRkZjc0NmI2MWFjNzk2Y2MyMzc0OTc0MGY1MGVjMg==
+    NTJiZmU4MmM1NDljYWMzZWZhNWM1ODc5Y2RjM2QzZjFkNDYyZTllYw==
   data.tar.gz: !binary |-
-    NjRkODI0YmJjNWZjNjFiMGMzOTkwMmIxZjEyNDEwOTQ5ODVkYjkxNA==
+    NmU3Zjg1MGYxMmEzYzE4NzM2YjM3ZDg4Nzc5MjZjMTAzNGMwNWJiZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWVhZWU3YmU3MTFiN2M1OWU4NzA0NjY1M2FlYzhiMDAxN2U3OTk1ZTg5ZTNk
-    YzI4Y2IyMWQwYTljNDQyMjM0YmY4MGMyZGUyYzAxY2MwYWJmZWI3NjdiMTU0
-    NDZiMWI5NWU3ZjRhYWM4M2FhOWRmNDFhNzdhNmI4OWNkZjkwOGY=
+    N2Q2ZjEzNjE2N2QwZDMwMmFkZWM2NzIyNjE4NTY1YTJhM2IwZDFkODY0ZmFj
+    MzlhODUyY2QyYzU2NjhkOTY4MjcwNDkxNTVmZjRhODcxMWVkMjk5Y2Y3MDAz
+    ZjdmNzA1MWEwZmJkYjkyNjMyMzQ3OTUwMDk2MjNkODFhYzc2NGM=
   data.tar.gz: !binary |-
-    NzQyMDI3NTA4YWQyNmU4NTEyMGQ4ODY2OTYwNDI5Yzc3YjE0ZTM0YzZjZWFl
-    MTk5MzcxNGE1ZGFhNTg1MDFmMTE5ZGY4MDFiMDk2YTU3YzllOTkzODk0NDEy
-    MTQ2ZGE5OTUyMGZlYTk3MDE5ZGY1YjQzMjhmMjMwMTZkOWY4ZmE=
+    MjQ1NzgzOTY3NWJiMzVhM2Y4OTdiN2EzNWJjMmZmNWI1YjBiOWFhM2U0Y2Ez
+    ZTQyNGU0MmUxZjdhZmUxNTIzMTZkNDc1ODA4MDkyNzhiNDYwMjgxMjYyMjBj
+    ZmYyNjQ1YzAwNzUyZTAzMDEzNmFkN2E5NjU2ZTgyYWNiMmZhNTM=

data/lib/leofs_manager_client/leofs_manager_models.rb

@@ -121,6 +121,7 @@ module LeoFSManager
   class StorageStat
     attr_reader :active_num_of_objects, :total_num_of_objects,
                 :active_size_of_objects, :total_size_of_objects,
+                :ratio_of_active_size,
                 :last_compaction_start, :last_compaction_end
 
     alias total_of_objects total_num_of_objects # for compatibility
@@ -131,8 +132,20 @@ module LeoFSManager
       @active_size_of_objects = h[:active_size_of_objects]
       @total_size_of_objects  = h[:total_size_of_objects]
       @ratio_of_active_size   = h[:ratio_of_active_size]
-      @last_compaction_start = h[:last_compaction_start]
-      @last_compaction_end = h[:last_compaction_end]
+
+      last_compaction_start = h[:last_compaction_start]
+      if last_compaction_start == "____-_-__- __:__:__"
+        @last_compaction_start = nil # you have never done compaction
+      else
+        @last_compaction_start = Time.parse(last_compaction_start)
+      end
+
+      last_compaction_end = h[:last_compaction_end]
+      if last_compaction_end == "____-_-__- __:__:__"
+        @last_compaction_end = nil
+      else
+        @last_compaction_end = Time.parse(last_compaction_end)
+      end
     end
 
     def file_size
@@ -237,20 +250,23 @@ module LeoFSManager
   # Compaction Status Model
   # ==========================
   class CompactionStatus
-    attr_reader :status
-    attr_reader :last_compaction_start
-    attr_reader :total_targets
-    attr_reader :num_of_pending_targets
-    attr_reader :num_of_ongoing_targets
-    attr_reader :num_of_out_of_targets
+    attr_reader :status, :last_compaction_start,
+                :total_targets, :num_of_pending_targets,
+                :num_of_ongoing_targets, :num_of_out_of_targets
 
     def initialize(h)
       @status                 = h[:status]
-      @last_compaction_start  = h[:last_compaction_start]
       @total_targets          = h[:total_targets]
       @num_of_pending_targets = h[:num_of_pending_targets]
       @num_of_ongoing_targets = h[:num_of_ongoing_targets]
       @num_of_out_of_targets  = h[:num_of_out_of_targets]
+
+      last_compaction_start = h[:last_compaction_start]
+      if last_compaction_start == "____-_-__- __:__:__"
+        @last_compaction_start = nil # you have never done compaction
+      else
+        @last_compaction_start = Time.parse(last_compaction_start)
+      end
     end
   end
 end

data/lib/leofs_manager_client.rb

@@ -26,7 +26,7 @@ require "time"
 require_relative "leofs_manager_client/leofs_manager_models"
 
 module LeoFSManager
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 
   class Client
     CMD_VERSION          = "version"

data/spec/dummy_tcp_server.rb

@@ -78,6 +78,16 @@ module Dummy
       ]
     }.to_json
 
+    StorageStat = {
+      :active_num_of_objects => 0,
+      :total_num_of_objects => 0,
+      :active_size_of_objects => 0,
+      :total_size_of_objects => 0,
+      :ratio_of_active_size => 0,
+      :last_compaction_start => "2013-03-13 09:11:04 +0900",
+      :last_compaction_end => "2013-03-13 09:11:04 +0900"
+    }.to_json
+
     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"},
                                    {:endpoint => "foo",              :created_at=>"2012-09-21 18:51:08 +0900"},
@@ -139,6 +149,8 @@ module Dummy
           Response::GetUsers
         when "create-user"
           Response::CreateUser
+        when /^du/
+          Response::StorageStat
         else
           { :result => line }.to_json
         end

data/spec/leofs_manager_client_spec.rb

@@ -34,7 +34,6 @@ NoResultAPIs = {
   :start => 0,
   :detach => 1,
   :rebalance => 0,
-  :compact => 1,
   :purge => 1,
   :set_endpoint => 1,
   :del_endpoint => 1,
@@ -58,7 +57,7 @@ describe LeoFSManager do
                         :total_num_of_objects => 0,
                         :active_size_of_objects => 0,
                         :total_size_of_objects => 0,
-                        :ratio_of_active_size => "0.0%"
+                        :ratio_of_active_size => "0.0%",
                         :last_compaction_start => "____-_-__- __:__:__",
                         :last_compaction_end => "____-_-__- __:__:__"
                         )
@@ -111,12 +110,9 @@ describe LeoFSManager do
     describe "#status" do
       its(:status) { should be_a Status }
       its("status.system_info") { should be_a Status::System }
-
       its("status.node_list") do
         should be_a Array
-        subject.each do |node|
-          node.should be_a Status::Node
-        end
+        should be_all {|node| node.is_a?(Status::Node) }
       end
     end
 
@@ -167,22 +163,22 @@ describe LeoFSManager do
 
     its(:get_users) do
       should be_a Array
-      subject.each do |account|
-        account.should be_a User
+      should be_all do |account|
+        account.is_a?(User)
       end
     end
 
     its(:get_endpoints) do
       should be_a Array
-      subject.each do |endpoint|
-        endpoint.should be_a Endpoint
+      should be_all do |endpoint|
+        endpoint.is_a?(Endpoint)
       end
     end
 
     its(:get_buckets) do
       should be_a Array
-      subject.each do |buckets|
-        buckets.should be_a Bucket
+      should be_all do |bucket|
+        bucket.is_a?(Bucket)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leofs_manager_client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Masaki Matsushita
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies: []
 description: Client for LeoFS Manager
 email:
@@ -47,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Client for LeoFS Manager