etcdv3 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f86e90b466cc1cf9999d8f9cbf08f5df1e2ac86
-  data.tar.gz: f8f237e1253a7218dfba6eae660e1553f54b07f6
+  metadata.gz: c30c373c3727bf2bf9fb11361e12c868f23b0c63
+  data.tar.gz: bf013c81510a227345e7cb8924a80ceb5549cf3e
 SHA512:
-  metadata.gz: 57d227117a3f8f82ae8d2a6691ed3468d7c8faf0a071d12182b2980c7784c456277315fb9945931ffa9c81882da7c748c188635d6dddf172ddbd9cc1aaf380e3
-  data.tar.gz: f53b3f71bb23e3961eaef3858f7cf22b69182835072fc1936146cd88b9d499cd6ed118538945a274e694e392f28ca57ae5bc1e29c73111a350a30afeaba9e59a
+  metadata.gz: 1f58b5adcdb86fafa2cbc5e924e1406d71d4e26988a5000211870e54b48dfa9a8f72cd663dcfc09dcfe9507b60cf8d6d337fe284e41bc85361486787407748ad
+  data.tar.gz: b6c432b3e2963cc7cb20b2c1151d27c55da1022094fb3047ff685b9de129ce8ffd16f8ee0dc35eec7942fdeaca454ddef986fe551e6f44bd57428ac1a75e927d

data/README.md

@@ -7,7 +7,7 @@ Ruby client for Etcd V3
 
 ## Getting Started
 
-[RubyDocs](http://www.rubydoc.info/gems/etcdv3/0.1.1/Etcd)
+[RubyDocs](http://www.rubydoc.info/gems/etcdv3)
 
 To install etcdv3, run the following command:
 ```ruby
@@ -53,10 +53,10 @@ conn = Etcdv3.new(url: 'https://hostname:port', user: "gary", password: "secret"
 ## User Management
 ```ruby
  # Add User
- conn.add_user('admin', 'secret')
+ conn.user_add('admin', 'secret')
 
 # Delete User
-conn.delete_user('admin')
+conn.user_delete('admin')
 
 # List users
 conn.user_list
@@ -65,13 +65,13 @@ conn.user_list
 ## Role Management
 ```ruby
 # Add Role
-conn.add_role('rolename')
+conn.role_add('rolename')
 
 # Grant Permission to Role
-conn.grant_permission_to_role('rolename', 'readwrite', 'a', 'z')
+conn.role_grant_permission('rolename', :readwrite, 'a', 'z')
 
 # Delete Role
-conn.delete_role('rolename')
+conn.role_delete('rolename')
 
 # List Roles
 conn.role_list
@@ -80,13 +80,13 @@ conn.role_list
 ## Authentication Management
 ```ruby
 # Configure a root user
-conn.add_user('root', 'mysecretpassword')
+conn.user_add('root', 'mysecretpassword')
 
 # Grant root user the root role
-conn.grant_role_to_user('root', 'root')
+conn.user_grant_role('root', 'root')
 
 # Enable Authentication
-conn.enable_auth
+conn.auth_enable
 ```
 After you enable authentication, you must authenticate.
 ```ruby
@@ -95,13 +95,13 @@ conn.authenticate('root', 'mysecretpassword')
 ```
 Disabling auth will clear the auth token and all previously attached user information
 ```
-conn.disable_auth
+conn.auth_disable
 ```
 
 ## Leases
 ```ruby
 # Grant a lease with a 100 second TTL
-conn.grant_lease(100)
+conn.lease_grant(100)
 
 # Attach key to lease
 conn.put("testkey", "testvalue", lease_id: 1234566789)
@@ -110,7 +110,7 @@ conn.put("testkey", "testvalue", lease_id: 1234566789)
 conn.lease_ttl(1234566789)
 
 # Revoke lease and delete all keys attached
-conn.revoke_lease(1234566789)
+conn.lease_revoke(1234566789)
 ```
 
 ## Watch
@@ -136,5 +136,5 @@ end
 conn.alarm_list
 
 # Deactivate ALL active Alarms
-conn.deactivate_alarms
+conn.alarm_deactivate
 ```

data/lib/etcdv3.rb

@@ -66,24 +66,44 @@ class Etcdv3
     request.handle(:maintenance, 'member_status').leader
   end
 
-  # Watches for changes on a specified key range.
-  def watch(key, range_end: '', &block)
-    request.handle(:watch, 'watch', [key, range_end, block])
-  end
-
   # List active alarms
   def alarm_list
     request.handle(:maintenance, 'alarms', [:get, leader_id])
   end
 
   # Disarm alarms on a specified member.
-  def deactivate_alarms
+  def alarm_deactivate
     request.handle(:maintenance, 'alarms', [:deactivate, leader_id])
   end
 
-  # Inserts a new key.
-  def put(key, value, lease_id: nil)
-    request.handle(:kv, 'put', [key, value, lease_id])
+  # Authenticate using specified user and password.
+  # On successful authentication, an auth token will be assigned to the instance.
+  def authenticate(user, password)
+    token = generate_token(user, password)
+    return false unless token
+    @metadata[:token] = token
+    @options[:user] = user
+    @options[:password] = password
+    @metacache = set_metacache
+    true
+  end
+
+  # Enables authentication.
+  def auth_enable
+    request.handle(:auth, 'auth_enable')
+  end
+
+  # Disables authentication.
+  # This will clear any active auth / token data.
+  def auth_disable
+    response = request.handle(:auth, 'auth_disable')
+    if response
+      @metadata.delete(:token)
+      @options[:user] = nil
+      @options[:password] = nil
+      @metacache = set_metacache
+    end
+    response
   end
 
   # key                           - string
@@ -103,19 +123,24 @@ class Etcdv3
     request.handle(:kv, 'get', [key, opts])
   end
 
+  # Inserts a new key.
+  def put(key, value, lease_id: nil)
+    request.handle(:kv, 'put', [key, value, lease_id])
+  end
+
   # Deletes a specified key
   def del(key, range_end: '')
     request.handle(:kv, 'del', [key, range_end])
   end
 
   # Grant a lease with a specified TTL
-  def grant_lease(ttl)
-    request.handle(:lease, 'grant_lease', [ttl])
+  def lease_grant(ttl)
+    request.handle(:lease, 'lease_grant', [ttl])
   end
 
   # Revokes lease and delete all attached keys
-  def revoke_lease(id)
-    request.handle(:lease, 'revoke_lease', [id])
+  def lease_revoke(id)
+    request.handle(:lease, 'lease_revoke', [id])
   end
 
   # Returns information regarding the current state of the lease
@@ -123,99 +148,73 @@ class Etcdv3
     request.handle(:lease, 'lease_ttl', [id])
   end
 
-  # Creates new user.
-  def add_user(user, password)
-    request.handle(:auth, 'add_user', [user, password])
-  end
-
-  # Fetch specified user
-  def get_user(user)
-    request.handle(:auth, 'get_user', [user])
-  end
-
-  # Delete specified user.
-  def delete_user(user)
-    request.handle(:auth, 'delete_user', [user])
-  end
-
-  # Changes the specified users password.
-  def change_user_password(user, new_password)
-    request.handle(:auth, 'change_user_password', [user, new_password])
-  end
-
-  # List all users.
-  def user_list
-    request.handle(:auth, 'user_list')
-  end
-
   # List all roles.
   def role_list
     request.handle(:auth, 'role_list')
   end
 
   # Add role with specified name.
-  def add_role(name)
-    request.handle(:auth, 'add_role', [name])
+  def role_add(name)
+    request.handle(:auth, 'role_add', [name])
   end
 
   # Fetches a specified role.
-  def get_role(name)
-    request.handle(:auth, 'get_role', [name])
+  def role_get(name)
+    request.handle(:auth, 'role_get', [name])
   end
 
   # Delete role.
-  def delete_role(name)
-    request.handle(:auth, 'delete_role', [name])
+  def role_delete(name)
+    request.handle(:auth, 'role_delete', [name])
   end
 
-  # Grants role to an existing user.
-  def grant_role_to_user(user, role)
-    request.handle(:auth, 'grant_role_to_user', [user, role])
+  # Grants a new permission to an existing role.
+  def role_grant_permission(name, permission, key, range_end='')
+    request.handle(:auth, 'role_grant_permission', [name, permission, key, range_end])
   end
 
-  # Revokes role from a specified user.
-  def revoke_role_from_user(user, role)
-    request.handle(:auth, 'revoke_role_from_user', [user, role])
+  def role_revoke_permission(name, permission, key, range_end='')
+    request.handle(:auth, 'role_revoke_permission', [name, permission, key, range_end])
   end
 
-  # Grants a new permission to an existing role.
-  def grant_permission_to_role(name, permission, key, range_end='')
-    request.handle(:auth, 'grant_permission_to_role', [name, permission, key, range_end])
+  # Fetch specified user
+  def user_get(user)
+    request.handle(:auth, 'user_get', [user])
   end
 
-  def revoke_permission_from_role(name, permission, key, range_end='')
-    request.handle(:auth, 'revoke_permission_from_role', [name, permission, key, range_end])
+  # Creates new user.
+  def user_add(user, password)
+    request.handle(:auth, 'user_add', [user, password])
   end
 
-  # Enables authentication.
-  def enable_auth
-    request.handle(:auth, 'enable_auth')
+  # Delete specified user.
+  def user_delete(user)
+    request.handle(:auth, 'user_delete', [user])
   end
 
-  # Disables authentication.
-  # This will clear any active auth / token data.
-  def disable_auth
-    response = request.handle(:auth, 'disable_auth')
-    if response
-      @metadata.delete(:token)
-      @options[:user] = nil
-      @options[:password] = nil
-      @metacache = set_metacache
-    end
-    response
+  # Changes the specified users password.
+  def user_change_password(user, new_password)
+    request.handle(:auth, 'user_change_password', [user, new_password])
   end
 
-  # Authenticate using specified user and password.
-  # On successful authentication, an auth token will be assigned to the instance.
-  def authenticate(user, password)
-    token = generate_token(user, password)
-    return false unless token
-    @metadata[:token] = token
-    @options[:user] = user
-    @options[:password] = password
-    @metacache = set_metacache
+  # List all users.
+  def user_list
+    request.handle(:auth, 'user_list')
+  end
 
-    true
+  # Grants role to an existing user.
+  def user_grant_role(user, role)
+    request.handle(:auth, 'user_grant_role', [user, role])
+  end
+
+  # Revokes role from a specified user.
+  def user_revoke_role(user, role)
+    request.handle(:auth, 'user_revoke_role', [user, role])
+  end
+
+  # Watches for changes on a specified key range.
+  def watch(key, range_end: '', &block)
+    request.handle(:watch, 'watch', [key, range_end, block])
   end
 
   private

data/lib/etcdv3/auth.rb

@@ -3,9 +3,9 @@ class Etcdv3
   class Auth
 
     PERMISSIONS = {
-      'read' => Authpb::Permission::Type::READ,
-      'write' => Authpb::Permission::Type::WRITE,
-      'readwrite' => Authpb::Permission::Type::READWRITE
+      :read => Authpb::Permission::Type::READ,
+      :write => Authpb::Permission::Type::WRITE,
+      :readwrite => Authpb::Permission::Type::READWRITE
     }
 
     def initialize(hostname, credentials, metadata = {})
@@ -13,71 +13,32 @@ class Etcdv3
       @metadata = metadata
     end
 
-    def generate_token(user, password)
-      request = Etcdserverpb::AuthenticateRequest.new(
-        name: user,
-        password: password
-      )
-      @stub.authenticate(request).token
-    end
-
-    def user_list
-      request = Etcdserverpb::AuthUserListRequest.new
-      @stub.user_list(request, metadata: @metadata)
-    end
-
-    def add_user(user, password)
-      request = Etcdserverpb::AuthUserAddRequest.new(
-        name: user,
-        password: password
-      )
-      @stub.user_add(request, metadata: @metadata)
-    end
-
-    def delete_user(user)
-      request = Etcdserverpb::AuthUserDeleteRequest.new(name: user)
-      @stub.user_delete(request)
-    end
-
-    def get_user(user)
-      request = Etcdserverpb::AuthUserGetRequest.new(name: user)
-      @stub.user_get(request)
+    def auth_enable
+      request = Etcdserverpb::AuthEnableRequest.new
+      @stub.auth_enable(request)
     end
 
-    def change_user_password(user, new_password)
-      request = Etcdserverpb::AuthUserChangePasswordRequest.new(
-        name: user,
-        password: new_password
-      )
-      @stub.user_change_password(request, metadata: @metadata)
+    def auth_disable
+      request = Etcdserverpb::AuthDisableRequest.new
+      @stub.auth_disable(request, metadata: @metadata)
     end
 
-    def add_role(name)
+    def role_add(name)
       request = Etcdserverpb::AuthRoleAddRequest.new(name: name)
       @stub.role_add(request, metadata: @metadata)
     end
 
-    def get_role(name)
+    def role_get(name)
       request = Etcdserverpb::AuthRoleGetRequest.new(role: name)
       @stub.role_get(request, metadata: @metadata)
     end
 
-    def delete_role(name)
+    def role_delete(name)
       request = Etcdserverpb::AuthRoleDeleteRequest.new(role: name)
       @stub.role_delete(request, metadata: @metadata)
     end
 
-    def grant_role_to_user(user, role)
-      request = Etcdserverpb::AuthUserGrantRoleRequest.new(user: user, role: role)
-      @stub.user_grant_role(request, metadata: @metadata)
-    end
-
-    def revoke_role_from_user(user, role)
-      request = Etcdserverpb::AuthUserRevokeRoleRequest.new(name: user, role: role)
-      @stub.user_revoke_role(request, metadata: @metadata)
-    end
-
-    def grant_permission_to_role(name, permission, key, range_end)
+    def role_grant_permission(name, permission, key, range_end)
       permission = Authpb::Permission.new(
         permType: Etcdv3::Auth::PERMISSIONS[permission], key: key, range_end: range_end
       )
@@ -90,7 +51,7 @@ class Etcdv3
       )
     end
 
-    def revoke_permission_from_role(name, permission, key, range_end)
+    def role_revoke_permission(name, permission, key, range_end)
       @stub.role_revoke_permission(
         Etcdserverpb::AuthRoleRevokePermissionRequest.new(
           role: name,
@@ -106,14 +67,53 @@ class Etcdv3
       @stub.role_list(request, metadata: @metadata)
     end
 
-    def enable_auth
-      request = Etcdserverpb::AuthEnableRequest.new
-      @stub.auth_enable(request)
+    def user_list
+      request = Etcdserverpb::AuthUserListRequest.new
+      @stub.user_list(request, metadata: @metadata)
     end
 
-    def disable_auth
-      request = Etcdserverpb::AuthDisableRequest.new
-      @stub.auth_disable(request, metadata: @metadata)
+    def user_add(user, password)
+      request = Etcdserverpb::AuthUserAddRequest.new(
+        name: user,
+        password: password
+      )
+      @stub.user_add(request, metadata: @metadata)
+    end
+
+    def user_delete(user)
+      request = Etcdserverpb::AuthUserDeleteRequest.new(name: user)
+      @stub.user_delete(request)
+    end
+
+    def user_get(user)
+      request = Etcdserverpb::AuthUserGetRequest.new(name: user)
+      @stub.user_get(request)
+    end
+
+    def user_change_password(user, new_password)
+      request = Etcdserverpb::AuthUserChangePasswordRequest.new(
+        name: user,
+        password: new_password
+      )
+      @stub.user_change_password(request, metadata: @metadata)
+    end
+
+    def user_grant_role(user, role)
+      request = Etcdserverpb::AuthUserGrantRoleRequest.new(user: user, role: role)
+      @stub.user_grant_role(request, metadata: @metadata)
+    end
+
+    def user_revoke_role(user, role)
+      request = Etcdserverpb::AuthUserRevokeRoleRequest.new(name: user, role: role)
+      @stub.user_revoke_role(request, metadata: @metadata)
+    end
+
+    def generate_token(user, password)
+      request = Etcdserverpb::AuthenticateRequest.new(
+        name: user,
+        password: password
+      )
+      @stub.authenticate(request).token
     end
 
   end

data/lib/etcdv3/kv.rb

@@ -21,12 +21,6 @@ class Etcdv3
       @metadata = metadata
     end
 
-    def put(key, value, lease=nil)
-      kv = Etcdserverpb::PutRequest.new(key: key, value: value)
-      kv.lease = lease if lease
-      @stub.put(kv, metadata: @metadata)
-    end
-
     def get(key, opts={})
       opts[:sort_order] = SORT_ORDER[opts[:sort_order]] \
         if opts[:sort_order]
@@ -44,5 +38,11 @@ class Etcdv3
       )
       @stub.delete_range(request, metadata: @metadata)
     end
+
+    def put(key, value, lease=nil)
+      kv = Etcdserverpb::PutRequest.new(key: key, value: value)
+      kv.lease = lease if lease
+      @stub.put(kv, metadata: @metadata)
+    end
   end
 end

data/lib/etcdv3/lease.rb

@@ -6,12 +6,12 @@ class Etcdv3
       @metadata = metadata
     end
 
-    def grant_lease(ttl)
+    def lease_grant(ttl)
       request = Etcdserverpb::LeaseGrantRequest.new(TTL: ttl)
       @stub.lease_grant(request, metadata: @metadata)
     end
 
-    def revoke_lease(id)
+    def lease_revoke(id)
       request = Etcdserverpb::LeaseRevokeRequest.new(ID: id)
       @stub.lease_revoke(request, metadata: @metadata)
     end
@@ -21,5 +21,7 @@ class Etcdv3
       @stub.lease_time_to_live(request, metadata: @metadata)
     end
 
+
+
   end
 end

data/lib/etcdv3/maintenance.rb

@@ -17,10 +17,6 @@ class Etcdv3
       @metadata = metadata
     end
 
-    def member_status
-      @stub.status(Etcdserverpb::StatusRequest.new, metadata: @metadata)
-    end
-
     def alarms(action, member_id, alarm=:NONE)
       alarm = ALARM_TYPES[alarm]
       request = Etcdserverpb::AlarmRequest.new(
@@ -30,5 +26,10 @@ class Etcdv3
       )
       @stub.alarm(request)
     end
+
+    def member_status
+      @stub.status(Etcdserverpb::StatusRequest.new, metadata: @metadata)
+    end
+
   end
 end

data/lib/etcdv3/request.rb

@@ -3,43 +3,33 @@ class Etcdv3
 
     attr_reader :metacache
 
-    def initialize(hostname, credentials, metadata, metacache)
-      @hostname = hostname
-      @credentials = credentials
-      @metadata = metadata
+    def initialize(hostname, credentials, metadata, metacache='')
+      @handlers ||= handler_map(hostname, credentials, metadata)
       @metacache = metacache
     end
 
-    def handle(interface, method, method_args=[])
-      interface = resolve_interface(interface)
-      interface.send(method, *method_args)
+    def handle(stub, method, method_args=[])
+      @handlers.fetch(stub).send(method, *method_args)
     end
 
     private
 
-    def resolve_interface(interface)
-      self.send(interface)
+    def handler_map(hostname, credentials, metadata)
+      Hash[
+        handler_constants.map do |key, klass|
+          [key, klass.new(hostname, credentials, metadata)]
+        end
+      ]
     end
 
-    def auth
-      @auth ||= Etcdv3::Auth.new(@hostname, @credentials, @metadata)
+    def handler_constants
+      {
+        auth: Etcdv3::Auth,
+        kv: Etcdv3::KV,
+        maintenance: Etcdv3::Maintenance,
+        lease: Etcdv3::Lease,
+        watch: Etcdv3::Watch
+      }
     end
-
-    def kv
-      @kv ||= Etcdv3::KV.new(@hostname, @credentials, @metadata)
-    end
-
-    def maintenance
-      @maintenance ||= Etcdv3::Maintenance.new(@hostname, @credentials, @metadata)
-    end
-
-    def lease
-      @lease ||= Etcdv3::Lease.new(@hostname, @credentials, @metadata)
-    end
-
-    def watch
-      @watch ||= Etcdv3::Watch.new(@hostname, @credentials, @metadata)
-    end
-
   end
 end

data/lib/etcdv3/version.rb

@@ -1,3 +1,3 @@
 class Etcdv3
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/lib/etcdv3/watch.rb

@@ -10,7 +10,7 @@ class Etcdv3
       create_req = Etcdserverpb::WatchCreateRequest.new(key: key, range_end: range_end)
       watch_req = Etcdserverpb::WatchRequest.new(create_request: create_req)
       events = nil
-      @stub.watch([watch_req]).each do |resp|
+      @stub.watch([watch_req], metadata: @metadata).each do |resp|
         next if resp.events.empty?
         if block
           block.call(resp.events)
@@ -21,6 +21,5 @@ class Etcdv3
       end
       events
     end
-
   end
 end

data/spec/etcdv3/auth_spec.rb

@@ -4,16 +4,16 @@ describe Etcdv3::Auth do
 
   let(:stub) { local_stub(Etcdv3::Auth) }
 
-  describe '#add_user' do
-    after { stub.delete_user('boom') }
-    subject { stub.add_user('boom', 'test') }
+  describe '#user_add' do
+    after { stub.user_delete('boom') }
+    subject { stub.user_add('boom', 'test') }
     it { is_expected.to be_an_instance_of(Etcdserverpb::AuthUserAddResponse) }
   end
 
-  describe '#get_user' do
-    before { stub.add_user('get_user', 'password') }
-    after { stub.delete_user('get_user') }
-    subject { stub.get_user('get_user') }
+  describe '#user_get' do
+    before { stub.user_add('user_get', 'password') }
+    after { stub.user_delete('user_get') }
+    subject { stub.user_get('user_get') }
     it { is_expected.to be_an_instance_of(Etcdserverpb::AuthUserGetResponse) }
   end
 
@@ -22,51 +22,51 @@ describe Etcdv3::Auth do
     it { is_expected.to be_an_instance_of(Etcdserverpb::AuthUserListResponse) }
   end
 
-  describe '#delete_user' do
-    before { stub.add_user('delete_user', 'test') }
-    subject { stub.delete_user('delete_user') }
+  describe '#user_delete' do
+    before { stub.user_add('user_delete', 'test') }
+    subject { stub.user_delete('user_delete') }
     it { is_expected.to be_an_instance_of(Etcdserverpb::AuthUserDeleteResponse) }
   end
 
-  describe '#grant_role_to_user' do
-    before { stub.add_user('grant_user', 'test') }
-    after { stub.delete_user('grant_user') }
-    subject { stub.grant_role_to_user('grant_user', 'root') }
+  describe '#user_grant_role' do
+    before { stub.user_add('grant_user', 'test') }
+    after { stub.user_delete('grant_user') }
+    subject { stub.user_grant_role('grant_user', 'root') }
     it { is_expected.to be_an_instance_of(Etcdserverpb::AuthUserGrantRoleResponse) }
   end
 
-  describe '#revoke_role_from_user' do
+  describe '#user_revoke_role' do
     before do
-      stub.add_user('revoke_user', 'password')
-      stub.grant_role_to_user('revoke_user', 'root')
+      stub.user_add('revoke_user', 'password')
+      stub.user_grant_role('revoke_user', 'root')
     end
-    after { stub.delete_user('revoke_user') }
-    subject { stub.revoke_role_from_user('revoke_user', 'root') }
+    after { stub.user_delete('revoke_user') }
+    subject { stub.user_revoke_role('revoke_user', 'root') }
     it { is_expected.to be_an_instance_of(Etcdserverpb::AuthUserRevokeRoleResponse) }
   end
 
-  describe '#add_role' do
-    after { stub.delete_role('add_role') }
-    subject { stub.add_role('add_role') }
+  describe '#role_add' do
+    after { stub.role_delete('role_add') }
+    subject { stub.role_add('role_add') }
     it 'adds a role' do
       expect(subject).to be_an_instance_of(Etcdserverpb::AuthRoleAddResponse)
-      expect(stub.role_list.roles).to include('add_role')
+      expect(stub.role_list.roles).to include('role_add')
     end
   end
 
-  describe '#get_role' do
-    before { stub.add_role('get_role') }
-    after { stub.delete_role('get_role') }
-    subject { stub.get_role('get_role') }
+  describe '#role_get' do
+    before { stub.role_add('role_get') }
+    after { stub.role_delete('role_get') }
+    subject { stub.role_get('role_get') }
     it { is_expected.to be_an_instance_of(Etcdserverpb::AuthRoleGetResponse) }
   end
 
-  describe '#delete_role' do
-    before { stub.add_role('delete_role') }
-    subject { stub.delete_role('delete_role') }
+  describe '#role_delete' do
+    before { stub.role_add('role_delete') }
+    subject { stub.role_delete('role_delete') }
     it 'deletes role' do
       expect(subject).to be_an_instance_of(Etcdserverpb::AuthRoleDeleteResponse)
-      expect(stub.role_list.roles).to_not include('delete_role')
+      expect(stub.role_list.roles).to_not include('role_delete')
     end
   end
 
@@ -75,10 +75,10 @@ describe Etcdv3::Auth do
     it { is_expected.to be_an_instance_of(Etcdserverpb::AuthRoleListResponse) }
   end
 
-  describe '#grant_permission_to_role' do
-    before { stub.add_role('grant_perm') }
-    after { stub.delete_role('grant_perm') }
-    subject { stub.grant_permission_to_role('grant_perm', 'write', 'c', 'cc') }
+  describe '#role_grant_permission' do
+    before { stub.role_add('grant_perm') }
+    after { stub.role_delete('grant_perm') }
+    subject { stub.role_grant_permission('grant_perm', :write, 'c', 'cc') }
     it 'sets permission' do
       expect(subject).to be_an_instance_of(Etcdserverpb::AuthRoleGrantPermissionResponse)
     end
@@ -86,21 +86,21 @@ describe Etcdv3::Auth do
 
   describe '#revoke_permission_from_role' do
     before do
-      stub.add_role('myrole')
-      stub.grant_permission_to_role('myrole', 'write', 'c', 'cc')
+      stub.role_add('myrole')
+      stub.role_grant_permission('myrole', :write, 'c', 'cc')
     end
-    after { stub.delete_role('myrole') }
-    subject { stub.revoke_permission_from_role('myrole', 'write', 'c', 'cc') }
+    after { stub.role_delete('myrole') }
+    subject { stub.role_revoke_permission('myrole', :write, 'c', 'cc') }
     it 'revokes permission' do
       expect(subject).to be_an_instance_of(Etcdserverpb::AuthRoleRevokePermissionResponse)
-      expect(stub.get_role('myrole').perm.size).to eq(0)
+      expect(stub.role_get('myrole').perm.size).to eq(0)
     end
   end
 
-  describe '#change_user_password' do
-    before { stub.add_user('myuser', 'test') }
-    after { stub.delete_user('myuser') }
-    subject { stub.change_user_password('myuser', 'boom') }
+  describe '#user_change_password' do
+    before { stub.user_add('myuser', 'test') }
+    after { stub.user_delete('myuser') }
+    subject { stub.user_change_password('myuser', 'boom') }
     it { is_expected.to be_an_instance_of(Etcdserverpb::AuthUserChangePasswordResponse) }
   end
 

data/spec/etcdv3/kv_spec.rb

@@ -11,7 +11,7 @@ describe Etcdv3::KV do
     end
 
     context 'with lease' do
-      let(:lease_id) { lease_stub.grant_lease(1)['ID'] }
+      let(:lease_id) { lease_stub.lease_grant(1)['ID'] }
       subject { stub.put('lease', 'test', lease_id) }
       it { is_expected.to be_an_instance_of(Etcdserverpb::PutResponse) }
     end

data/spec/etcdv3/lease_spec.rb

@@ -4,22 +4,22 @@ describe Etcdv3::Lease do
 
   let(:stub) { local_stub(Etcdv3::Lease) }
 
-  describe '#grant_lease' do
-    subject { stub.grant_lease(10) }
+  describe '#lease_grant' do
+    subject { stub.lease_grant(10) }
     it 'grants lease' do
       expect(subject).to be_an_instance_of(Etcdserverpb::LeaseGrantResponse)
       expect(subject['ID']).to_not be_nil
     end
   end
 
-  describe '#revoke_lease' do
-    let(:id) { stub.grant_lease(60)['ID'] }
-    subject { stub.revoke_lease(id) }
+  describe '#lease_revoke' do
+    let(:id) { stub.lease_grant(60)['ID'] }
+    subject { stub.lease_revoke(id) }
     it { is_expected.to be_an_instance_of(Etcdserverpb::LeaseRevokeResponse) }
   end
 
   describe '#lease_ttl' do
-    let(:id) { stub.grant_lease(10)['ID'] }
+    let(:id) { stub.lease_grant(10)['ID'] }
     subject { stub.lease_ttl(id) }
     it { is_expected.to be_an_instance_of(Etcdserverpb::LeaseTimeToLiveResponse) }
   end

data/spec/etcdv3/maintenance_spec.rb

@@ -15,7 +15,7 @@ describe Etcdv3::Maintenance do
     it { is_expected.to be_an_instance_of(Etcdserverpb::AlarmResponse) }
   end
 
-  describe '#deactivate_alarms' do
+  describe '#alarm_deactivate' do
     let(:leader_id) { stub.member_status.leader }
     subject { stub.alarms(:deactivate, leader_id, :NOSPACE) }
     it { is_expected.to be_an_instance_of(Etcdserverpb::AlarmResponse) }

data/spec/etcdv3_spec.rb

@@ -18,16 +18,16 @@ describe Etcdv3 do
       context 'with auth' do
         let(:auth_conn) { local_connection_with_auth('test', 'pass') }
         before do
-          conn.add_user('root', 'pass')
-          conn.grant_role_to_user('root', 'root')
-          conn.add_user('test', 'pass')
-          conn.enable_auth
+          conn.user_add('root', 'pass')
+          conn.user_grant_role('root', 'root')
+          conn.user_add('test', 'pass')
+          conn.auth_enable
         end
         after do
           conn.authenticate('root', 'pass')
-          conn.disable_auth
-          conn.delete_user('root')
-          conn.delete_user('test')
+          conn.auth_disable
+          conn.user_delete('root')
+          conn.user_delete('test')
         end
         it 'doesnt raise error' do
           expect{ auth_conn }.to_not raise_error
@@ -55,8 +55,8 @@ describe Etcdv3 do
       it { is_expected.to_not be_nil }
     end
 
-    describe '#deactivate_alarms' do
-      subject { conn.deactivate_alarms }
+    describe '#alarm_deactivate' do
+      subject { conn.alarm_deactivate }
       it { is_expected.to_not be_nil }
     end
 
@@ -113,39 +113,39 @@ describe Etcdv3 do
       end
     end
 
-    describe '#grant_lease' do
-      subject { conn.grant_lease(2) }
+    describe '#lease_grant' do
+      subject { conn.lease_grant(2) }
       it { is_expected.to_not be_nil }
     end
 
-    describe '#revoke_lease' do
-      let!(:lease_id) { conn.grant_lease(2)['ID'] }
-      subject { conn.revoke_lease(lease_id) }
+    describe '#lease_revoke' do
+      let!(:lease_id) { conn.lease_grant(2)['ID'] }
+      subject { conn.lease_revoke(lease_id) }
       it { is_expected.to_not be_nil }
     end
 
     describe '#lease_ttl' do
-      let!(:lease_id) { conn.grant_lease(2)['ID'] }
+      let!(:lease_id) { conn.lease_grant(2)['ID'] }
       subject { conn.lease_ttl(lease_id) }
       it { is_expected.to_not be_nil }
     end
 
-    describe '#add_user' do
-      after { conn.delete_user('test') }
-      subject { conn.add_user('test', 'user') }
+    describe '#user_add' do
+      after { conn.user_delete('test') }
+      subject { conn.user_add('test', 'user') }
       it { is_expected.to_not be_nil }
     end
 
-    describe '#delete_user' do
-      before { conn.add_user('test', 'user') }
-      subject { conn.delete_user('test') }
+    describe '#user_delete' do
+      before { conn.user_add('test', 'user') }
+      subject { conn.user_delete('test') }
       it { is_expected.to_not be_nil }
     end
 
-    describe '#change_user_password' do
-      before { conn.add_user('change_user', 'pass') }
-      after { conn.delete_user('change_user') }
-      subject { conn.change_user_password('change_user', 'new_pass') }
+    describe '#user_change_password' do
+      before { conn.user_add('change_user', 'pass') }
+      after { conn.user_delete('change_user') }
+      subject { conn.user_change_password('change_user', 'new_pass') }
       it { is_expected.to_not be_nil }
     end
 
@@ -159,76 +159,76 @@ describe Etcdv3 do
       it { is_expected.to_not be_nil }
     end
 
-    describe '#add_role' do
-      subject { conn.add_role('add_role') }
+    describe '#role_add' do
+      subject { conn.role_add('role_add') }
       it { is_expected.to_not be_nil }
     end
 
-    describe '#delete_role' do
-      before { conn.add_role('delete_role') }
-      subject { conn.delete_role('delete_role') }
+    describe '#role_delete' do
+      before { conn.role_add('role_delete') }
+      subject { conn.role_delete('role_delete') }
       it { is_expected.to_not be_nil }
     end
 
-    describe '#grant_role_to_user' do
-      before { conn.add_user('grant_me', 'pass') }
-      subject { conn.grant_role_to_user('grant_me', 'root') }
+    describe '#user_grant_role' do
+      before { conn.user_add('grant_me', 'pass') }
+      subject { conn.user_grant_role('grant_me', 'root') }
       it { is_expected.to_not be_nil }
     end
 
-    describe '#revoke_role_from_user' do
-      subject { conn.revoke_role_from_user('grant_me', 'root') }
+    describe '#user_revoke_role' do
+      subject { conn.user_revoke_role('grant_me', 'root') }
       it { is_expected.to_not be_nil }
     end
 
-    describe '#grant_permission_to_role' do
-      before { conn.add_role('grant') }
-      subject { conn.grant_permission_to_role('grant', 'readwrite', 'a', 'Z') }
+    describe '#role_grant_permission' do
+      before { conn.role_add('grant') }
+      subject { conn.role_grant_permission('grant', :readwrite, 'a', 'Z') }
       it { is_expected.to_not be_nil }
     end
 
     describe '#revoke_permission_to_role' do
-      subject { conn.revoke_permission_from_role('grant', 'readwrite', 'a', 'Z') }
+      subject { conn.role_revoke_permission('grant', :readwrite, 'a', 'Z') }
       it { is_expected.to_not be_nil }
     end
 
-    describe '#disable_auth' do
+    describe '#auth_disable' do
       before do
-        conn.add_user('root', 'test')
-        conn.grant_role_to_user('root', 'root')
-        conn.enable_auth
+        conn.user_add('root', 'test')
+        conn.user_grant_role('root', 'root')
+        conn.auth_enable
         conn.authenticate('root', 'test')
       end
-      after { conn.delete_user('root') }
-      subject { conn.disable_auth }
+      after { conn.user_delete('root') }
+      subject { conn.auth_disable }
       it { is_expected.to be_an_instance_of(Etcdserverpb::AuthDisableResponse) }
     end
 
-    describe '#enable_auth' do
+    describe '#auth_enable' do
       before do
-        conn.add_user('root', 'test')
-        conn.grant_role_to_user('root', 'root')
+        conn.user_add('root', 'test')
+        conn.user_grant_role('root', 'root')
       end
       after do
         conn.authenticate('root', 'test')
-        conn.disable_auth
-        conn.delete_user('root')
+        conn.auth_disable
+        conn.user_delete('root')
       end
-      subject { conn.enable_auth }
+      subject { conn.auth_enable }
       it { is_expected.to be_an_instance_of(Etcdserverpb::AuthEnableResponse) }
     end
 
     describe "#authenticate" do
       context "auth enabled" do
         before do
-          conn.add_user('root', 'test')
-          conn.grant_role_to_user('root', 'root')
-          conn.enable_auth
+          conn.user_add('root', 'test')
+          conn.user_grant_role('root', 'root')
+          conn.auth_enable
           conn.authenticate('root', 'test')
         end
         after do
-          conn.disable_auth
-          conn.delete_user('root')
+          conn.auth_disable
+          conn.user_delete('root')
         end
         it 'properly reconfigures auth and token' do
           expect(conn.token).to_not be_nil
@@ -247,24 +247,24 @@ describe Etcdv3 do
     describe '#metacache' do
       context 'uses cached request object' do
         let!(:object_id) { conn.send(:request).object_id }
-        before { conn.add_user('root', 'test') }
-        after { conn.delete_user('root') }
+        before { conn.user_add('root', 'test') }
+        after { conn.user_delete('root') }
         subject { conn.send(:request).object_id }
         it { is_expected.to eq(object_id) }
       end
       context 'resets cache on auth' do
         let!(:object_id) { conn.send(:request).object_id }
         before do
-          conn.add_user('root', 'test')
-          conn.grant_role_to_user('root', 'root')
-          conn.enable_auth
+          conn.user_add('root', 'test')
+          conn.user_grant_role('root', 'root')
+          conn.auth_enable
           conn.authenticate('root', 'test')
-          conn.add_user('boom', 'password')
+          conn.user_add('boom', 'password')
         end
         after do
-          conn.disable_auth
-          conn.delete_user('root')
-          conn.delete_user('boom')
+          conn.auth_disable
+          conn.user_delete('root')
+          conn.user_delete('boom')
         end
         subject { conn.send(:request).object_id }
         it { is_expected.to_not eq(object_id) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcdv3
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Shaun Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc