etcdv3 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79843ce217e4f7209283fe46c64022d31e491586
-  data.tar.gz: 48d9410cc3f1e104b30807476156d65ee09c610b
+  metadata.gz: 443472175a4cc4232c56f54afac01f0ca3bd1ae8
+  data.tar.gz: 3e5a3264ddb63003b330133e1e2ed0bc4b51716e
 SHA512:
-  metadata.gz: 2c3f62df6f498ae227744f16eccd24de9939a6e4604dbcbb800b9befabdb45110ca6ae37777bafeb93e09237d29082a6f38a029f6b74e7b525b14bbc58919195
-  data.tar.gz: 1098a189e5b130f365090c1eea96869e2f735c77f6129f821c101077036fe95ce4e25d6f627bf5857ca28efad66a0288e62dcf79d812b79d8a8bbd45eb5ff42d
+  metadata.gz: 9d87445129496ab8919e580b652818a4f136f552e84215812a3a31348ae54f0eabe209bc09ce7a677fa9d8bb590e2c7657c324fb17158a1c84c950c55208bad2
+  data.tar.gz: bb48f8937f5edcaf62231a1ed46c17af1c1a1f5a95735b3db100660d3b93450850bebada9830ea75cc51ba5ca3e1c67220d5d3341ed4d6ce3cc1782d59ae5ea6

data/README.md

@@ -47,7 +47,7 @@ conn = Etcdv3.new(url: 'https://hostname:port', user: "gary", password: "secret"
  conn.del('my')
 
  # Delete Key Range
- conn.del('my', 'myyy')
+ conn.del('my', range_end: 'myyy')
  ```
 
 **User Management**

data/lib/etcdv3/version.rb

@@ -1,3 +1,3 @@
 class Etcdv3
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end

data/lib/etcdv3.rb

@@ -46,7 +46,7 @@ class Etcdv3
     @options = options
     @credentials = resolve_credentials
     @metadata = {}
-    @metadata[:token] = auth.generate_token(user, password) unless user.nil?
+    @metadata[:token] = generate_token(user, password) unless user.nil?
     @metacache = set_metacache
   end
 
@@ -202,7 +202,7 @@ class Etcdv3
   # Authenticate using specified user and password.
   # On successful authentication, an auth token will be assigned to the instance.
   def authenticate(user, password)
-    token = request.handle(:auth, 'generate_token', [user, password])
+    token = generate_token(user, password)
     return false unless token
     @metadata[:token] = token
     @options[:user] = user
@@ -225,6 +225,10 @@ class Etcdv3
     Base64.strict_encode64(@metadata.to_s)
   end
 
+  def generate_token(user, password)
+    request.handle(:auth, 'generate_token', [user, password])
+  end
+
   def resolve_credentials
     case scheme
     when 'http'

data/spec/etcdv3_spec.rb

@@ -6,13 +6,33 @@ describe Etcdv3 do
     let(:conn) { local_connection }
 
     describe '#initialize' do
-      subject { conn }
-      it { is_expected.to have_attributes(scheme: 'http') }
-      it { is_expected.to have_attributes(hostname: '127.0.0.1') }
-      it { is_expected.to have_attributes(credentials: :this_channel_is_insecure) }
-      it { is_expected.to have_attributes(token: nil) }
-      it { is_expected.to have_attributes(user: nil) }
-      it { is_expected.to have_attributes(password: nil) }
+      context 'without auth' do
+        subject { conn }
+        it { is_expected.to have_attributes(scheme: 'http') }
+        it { is_expected.to have_attributes(hostname: '127.0.0.1') }
+        it { is_expected.to have_attributes(credentials: :this_channel_is_insecure) }
+        it { is_expected.to have_attributes(token: nil) }
+        it { is_expected.to have_attributes(user: nil) }
+        it { is_expected.to have_attributes(password: nil) }
+      end
+      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
+        end
+        after do
+          conn.authenticate('root', 'pass')
+          conn.disable_auth
+          conn.delete_user('root')
+          conn.delete_user('test')
+        end
+        it 'doesnt raise error' do
+          expect{ auth_conn }.to_not raise_error
+        end
+      end
     end
 
     describe '#version' do

data/spec/helpers/connections.rb

@@ -1,6 +1,10 @@
 module Helpers
   module Connections
 
+    def local_connection_with_auth(user, password)
+      Etcdv3.new(url: "http://#{local_url}", user: user, password: password)
+    end
+
     def local_connection
       Etcdv3.new(url: "http://#{local_url}")
     end

metadata

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