ceph_storage 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f11517603a21b107977fee01ece18f2974dc0d98
-  data.tar.gz: 033f874f008ff2e9e30f658bb68a8ed195877dd4
+  metadata.gz: 0981d68ce0a4d2f0cb64f60f590e96cda49856a1
+  data.tar.gz: 831b926902b31f70ed7ccc1f2cc827949cd1625b
 SHA512:
-  metadata.gz: 79aa89777a93a9fa26d30e2db0886b6aa70ba0ab6ee008e7a3be6d0abf46597246fc56851cc3e9bda9921af26358e758eedea21237ebf26eaf754ecebe8e1506
-  data.tar.gz: dbe0c85a8d9739bc50f78ac44783341c8717ca13f7692d8fc0bfec40af556812a3c2bb1b2ba61ccdb26c2c07e46049d78e3574a543758a5879e07900dc1654c5
+  metadata.gz: e469f49a394e22242f78af65518f779beaa8678ec3c7e2fd0b7257d37ca7dccd557f1c3272c677e8edcaaff1e1701666875a0e817e575ebfbafa2c10b9ff48f2
+  data.tar.gz: 0be6ed488c1ff14c92c22eb3a5c611cfc3205dc1d19800ce8ac8368a9b0e4a1c522e3a8dd1af9e8aa3066ae43dfffea23051249f3733711e76decb780f1c1df7

data/lib/ceph_storage.rb

@@ -2,11 +2,11 @@ require 'thread'
 require 'ceph-ruby'
 require 'facets/multiton'
 require 'ceph_storage/cluster_wrapper'
-require 'ceph_storage/cluster_factory'
 require 'ceph_storage/cluster'
+require 'ceph_storage/cluster_factory'
 require 'ceph_storage/pool_wrapper'
-require 'ceph_storage/pool_factory'
 require 'ceph_storage/pool'
+require 'ceph_storage/pool_factory'
 require 'ceph_storage/pool_enumerator'
 require 'ceph_storage/storage_object'
 require 'ceph_storage/storage_object/rados_wrapper'

data/lib/ceph_storage/cluster.rb

@@ -1,7 +1,7 @@
 module CephStorage
   # Create a cluster object
   # Returns only a single cluster object for given settings
-  class Cluster < ClusterFactory
+  class Cluster < ::CephRuby::Cluster
     extend CephStorage::ClusterWrapper
     include Multiton
     # Configure default values for this object
@@ -11,6 +11,12 @@ module CephStorage
 
     private :connect, :setup_using_file
 
+    class << self
+      # Make this private otherwise the self.new {} returns a different
+      # Object to self.new {CONFIG_DIR, CLUSTER, USER}
+      protected :new
+    end
+
     # Create a new object
     def initialize(config_dir: CONFIG_DIR, cluster: CLUSTER,
                    user: USER, flags: FLAGS)

data/lib/ceph_storage/cluster_factory.rb

@@ -1,6 +1,6 @@
 module CephStorage
   # Factory Class to create a Cluster reference object
-  class ClusterFactory < ::CephRuby::Cluster
+  class ClusterFactory < ::CephStorage::Cluster
     # Defaults
     CONFIG_DIR = '/etc/ceph'.freeze
     CLUSTER = 'ceph'.freeze
@@ -15,10 +15,6 @@ module CephStorage
         yield(c) if block_given?
         c
       end
-
-      # Make this private otherwise the self.new {} returns a different
-      # Object to self.new {CONFIG_DIR, CLUSTER, USER}
-      private :new
     end
   end
 end

data/lib/ceph_storage/pool.rb

@@ -1,7 +1,7 @@
 module CephStorage
   # A reference to a Ceph pool
   # This is a collection of held open pool IOctx's for a given pool
-  class Pool < PoolFactory
+  class Pool < ::CephRuby::Pool
     extend CephStorage::PoolWrapper
     include Multiton
     attr_accessor :cartridges, :cluster, :name, :close_lock, :pop_lock
@@ -9,6 +9,10 @@ module CephStorage
     wrap_me :create, :exists?, :id, :auid=, :auid,
             :rados_block_device, :destroy, :stat, :flush_aio
 
+    class << self
+      protected :new
+    end
+
     def initialize(cluster, name)
       log("init #{name}")
       self.close_lock = Mutex.new

data/lib/ceph_storage/pool_factory.rb

@@ -1,15 +1,13 @@
 module CephStorage
   # Creates a Pool Object
   # Returns only a single pool object out of the cartridges available
-  class PoolFactory < ::CephRuby::Pool
+  class PoolFactory < ::CephStorage::Pool
     class << self
       def build(cluster, name)
         p = CephStorage::Pool.new(cluster, name)
         yield(p) if block_given?
         p
       end
-      # So behaviour is consistent with the cluster factory class
-      private :new
     end
   end
 end

data/lib/ceph_storage/version.rb

@@ -1,3 +1,3 @@
 module CephStorage
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.1'.freeze
 end

data/spec/ceph_storage_cluster_spec.rb

@@ -29,10 +29,6 @@ describe CephStorage::Cluster do
     expect(subject).to respond_to :ensure_open
   end
 
-  it 'should be a ClusterFactory' do
-    expect(subject).to be_a CephStorage::ClusterFactory
-  end
-
   it 'should be a ::CephRuby::Cluster' do
     expect(subject).to be_a ::CephRuby::Cluster
   end
@@ -58,7 +54,7 @@ describe CephStorage::Cluster do
     subject { pool }
 
     it 'should be a pool factory' do
-      expect(subject).to be_a CephStorage::PoolFactory
+      expect(subject).to be_a CephStorage::Pool
     end
   end
 

data/spec/ceph_storage_pool_spec.rb

@@ -9,10 +9,13 @@ describe CephStorage::Pool do
   let(:object_name) { spconfig[:pool][:object] }
   subject { pool }
 
-  it 'should be a PoolFactory' do
-    expect(subject).to be_a CephStorage::PoolFactory
+  it 'should be a Pool' do
+    expect(subject).to be_a ::CephStorage::Pool
   end
 
+  it 'should be a ::CephRuby::Pool' do
+    expect(subject).to be_a ::CephRuby::Pool
+  end
   it 'should respond to rados_pool' do
     expect(subject).to respond_to :rados_pool
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ceph_storage
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Livelink Technology LTD
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -260,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ceph-ruby provides an API, however this gem provides consistent connection
@@ -278,4 +278,3 @@ test_files:
 - spec/ceph_storage_xattr_enumerator_spec.rb
 - spec/ceph_storage_xattr_spec.rb
 - spec/spec_helper.rb
-has_rdoc: