conjur-api 4.19.1 → 4.20.0

data/spec/lib/user_spec.rb

@@ -34,9 +34,13 @@ describe Conjur::User do
         subject { super().options }
         it { is_expected.to match(hash_including credentials) }
       end
-      specify {
-        expect { user.roleid }.to raise_error
-      }
+
+      describe '#roleid' do
+        it "gets account name from server info" do
+          allow(Conjur::Core::API).to receive_messages conjur_account: 'test-account'
+          expect(subject.roleid).to eq "test-account:user:#{login}"
+        end
+      end
     end
     it "connects to a Resource" do
       require 'conjur/resource'
@@ -59,4 +63,15 @@ describe Conjur::User do
       user.role
     end
   end
+
+  describe '#update', api: :dummy do
+    subject(:user) { api.user username }
+    it "calls set_cidr_restrictions if given CIDR" do
+      expect(user).to receive(:set_cidr_restrictions).with(['192.0.2.0/24'])
+      user.update cidr: ['192.0.2.0/24']
+
+      expect(user).to_not receive(:set_cidr_restrictions)
+      user.update foo: 42
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -102,11 +102,13 @@ shared_context api: :dummy do
   let(:api){ Conjur::API.new_from_key username, 'key' }
   let(:authz_host) { 'http://authz.example.com' }
   let(:audit_host) { 'http://audit.example.com' }
+  let(:authn_host) { 'http://authn.example.com' }
   let(:credentials) { { headers: { authorization: "Token token=\"stub\"" } } } #, username: username } }
   let(:core_host) { 'http://core.example.com' }
   let(:account) { 'the-account' }
 
   before do
+    allow(Conjur::Authn::API).to receive_messages host: authn_host
     allow(Conjur::Authz::API).to receive_messages host: authz_host
     allow(Conjur::Core::API).to receive_messages host: core_host
     allow(Conjur::Core::API).to receive_messages conjur_account: account

data/spec/standard_methods_helper.rb

@@ -1,15 +1,24 @@
 require 'helpers/request_helpers'
 shared_context api: :dummy do
   include RequestHelpers
+
+  RSpec::Matchers.define :call_standard_create_with do |type, id, options|
+    match do |block|
+      expect(subject).to receive(:standard_create).with(
+        core_host, type, id, options
+      ).and_return :response
+      expect(block[]).to eq(:response)
+    end
+
+    supports_block_expectations
+  end
+
   subject { api }
 end
 
 shared_examples_for 'standard_create with' do |type, id, options|
   it "calls through to standard_create" do
-    expect(subject).to receive(:standard_create).with(
-      core_host, type, id, options
-    ).and_return :response
-    expect(invoke).to eq(:response)
+    expect { invoke }.to call_standard_create_with type, id, options
   end
 end
 

data/spec/variable_spec.rb

@@ -45,4 +45,36 @@ describe Conjur::Variable do
       expect(subject.value(42)).to eq("the-value")
     end
   end
+
+  describe '#expire' do
+    context 'when duration is a number of seconds' do
+      let (:expiration) { 2.weeks }
+      it 'posts the expiration' do
+        expect_request(
+          :method => :post,
+          :url => "#{url}/expiration",
+          :payload => { :duration => "PT#{expiration.to_i}S" },
+          :headers => {}
+          ).and_return(double('response', :body => '{}'))
+        
+        subject.expires_in expiration
+      end
+    end
+
+    context 'when duration is an ISO8601 duration' do
+      let (:expiration) { "P2W" }
+      it 'posts the expiration' do
+        expect_request(
+          :method => :post,
+          :url => "#{url}/expiration",
+          :payload => { :duration => "P2W" },
+          :headers => {}
+          ).and_return(double('response', :body => '{}'))
+        
+        subject.expires_in expiration
+      end
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 4.19.1
+  version: 4.20.0
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -45,6 +45,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: semantic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +101,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +227,26 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: inch
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +274,7 @@ files:
 - .project
 - .yardopts
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - LICENSE
 - README.md
@@ -235,6 +284,7 @@ files:
 - features/login.feature
 - features/ping_as_server.feature
 - features/ping_as_user.feature
+- jenkins.sh
 - lib/conjur-api.rb
 - lib/conjur-api/version.rb
 - lib/conjur/acts_as_asset.rb
@@ -247,7 +297,9 @@ files:
 - lib/conjur/api/authn.rb
 - lib/conjur/api/deputies.rb
 - lib/conjur/api/groups.rb
+- lib/conjur/api/host_factories.rb
 - lib/conjur/api/hosts.rb
+- lib/conjur/api/info.rb
 - lib/conjur/api/layers.rb
 - lib/conjur/api/pubkeys.rb
 - lib/conjur/api/resources.rb
@@ -262,12 +314,14 @@ files:
 - lib/conjur/build_from_response.rb
 - lib/conjur/cast.rb
 - lib/conjur/cert_utils.rb
+- lib/conjur/cidr.rb
 - lib/conjur/configuration.rb
 - lib/conjur/core-api.rb
 - lib/conjur/deputy.rb
 - lib/conjur/env.rb
 - lib/conjur/escape.rb
 - lib/conjur/event_source.rb
+- lib/conjur/exceptions.rb
 - lib/conjur/exists.rb
 - lib/conjur/graph.rb
 - lib/conjur/group.rb
@@ -275,7 +329,10 @@ files:
 - lib/conjur/has_id.rb
 - lib/conjur/has_identifier.rb
 - lib/conjur/has_owner.rb
+- lib/conjur/host-factory-api.rb
 - lib/conjur/host.rb
+- lib/conjur/host_factory.rb
+- lib/conjur/host_factory_token.rb
 - lib/conjur/layer-api.rb
 - lib/conjur/layer.rb
 - lib/conjur/log.rb
@@ -294,6 +351,7 @@ files:
 - spec/api/graph_spec.rb
 - spec/api/groups_spec.rb
 - spec/api/hosts_spec.rb
+- spec/api/info_spec.rb
 - spec/api/layer_spec.rb
 - spec/api/pubkeys_spec.rb
 - spec/api/resources_spec.rb
@@ -302,14 +360,17 @@ files:
 - spec/api/users_spec.rb
 - spec/api/variables_spec.rb
 - spec/cas_rest_client.rb
+- spec/cidr_helper.rb
 - spec/helpers/errors_matcher.rb
 - spec/helpers/request_helpers.rb
+- spec/lib/acts_as_user_spec.rb
 - spec/lib/annotations_spec.rb
 - spec/lib/api_spec.rb
 - spec/lib/asset_spec.rb
 - spec/lib/audit_spec.rb
 - spec/lib/build_from_response_spec.rb
 - spec/lib/cert_utils_spec.rb
+- spec/lib/cidr_spec.rb
 - spec/lib/configuration_spec.rb
 - spec/lib/deputy_spec.rb
 - spec/lib/exists_spec.rb
@@ -350,7 +411,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Conjur API
@@ -363,6 +424,7 @@ test_files:
 - spec/api/graph_spec.rb
 - spec/api/groups_spec.rb
 - spec/api/hosts_spec.rb
+- spec/api/info_spec.rb
 - spec/api/layer_spec.rb
 - spec/api/pubkeys_spec.rb
 - spec/api/resources_spec.rb
@@ -371,14 +433,17 @@ test_files:
 - spec/api/users_spec.rb
 - spec/api/variables_spec.rb
 - spec/cas_rest_client.rb
+- spec/cidr_helper.rb
 - spec/helpers/errors_matcher.rb
 - spec/helpers/request_helpers.rb
+- spec/lib/acts_as_user_spec.rb
 - spec/lib/annotations_spec.rb
 - spec/lib/api_spec.rb
 - spec/lib/asset_spec.rb
 - spec/lib/audit_spec.rb
 - spec/lib/build_from_response_spec.rb
 - spec/lib/cert_utils_spec.rb
+- spec/lib/cidr_spec.rb
 - spec/lib/configuration_spec.rb
 - spec/lib/deputy_spec.rb
 - spec/lib/exists_spec.rb