conjur-api 4.10.2 → 4.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 430af90880bc80ca4db9982fc99c0d670f17aa6f
-  data.tar.gz: 67be43db258ef8acfbae41801534aa615675da0a
+  metadata.gz: e054378922433060af0dadcc8c2abb3ceabb3054
+  data.tar.gz: 0b023d98362297b31c29cce5136c5de77aefde1d
 SHA512:
-  metadata.gz: 727e9688efb27f47f99c2e06ee02ef96cbfae03bda9ce177bd31200a8d52577c410166ba08de06b4cb11546c6c109fe52bd7a68804d14e34026e3700b7860e88
-  data.tar.gz: c94276c5d61ac5571f2da98b7d472cf56db274d396cffda3da34dff190f1fcd1b7804e693d472737472066263eab36ed58d7f4723b2519bc6fc7fab4dee900a0
+  metadata.gz: a8d2c6a4ef70523dfb251ffc539d023aff3220469524baa029c1d277bc3619b1350e0480d9583b14356541f62c8ec9dae8f2ce4b681d616ef7021d33056a81ce
+  data.tar.gz: e96fd20bf4a8c08e9eb184baa5d11413aed385d27dbee962bfda971d341082b7c9420c6503eb31ab9722dbafdd76c4c2bbe92db2aed1d20fcc60f6dde5fde95b

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v4.11.0
+
+* Fixed bug retrieving `Variable#version_count`
+* Include CONJUR_ENV in `Conjur.configuration`
+* Add `cert_file` option to `Conjur.configuration`
+
+
 # v.4.10.2
 * Authn token is refetched before the expiration
 * Support for configuration `sticky` option is discarded

data/README.md

@@ -18,17 +18,41 @@ Or install it yourself as:
 
 ## Usage
 
-To instantiate the API, using configuration stored stored in `~/.conjurrc`:
+### Programmatic configuration
+
+To configure the API to connect to Conjur, specify the account and appliance_url (both of which are required) like this:
+
+```ruby
+Conjur.configuration.account = 'my-account'
+Conjur.configuration.appliance_url = 'https://conjur.mydomain.com/api'
+```
+
+You can also specify these values in environment variables, which is often a bit more convenient.  Environment variables are mapped to configuration variables by prepending CONJUR_ to the all-caps name of the configuration variable, for example, `appliance_url` is `CONJUR_APPLIANCE_URL`, `account` is `CONJUR_ACCOUNT`, etc.
+
+In either case, if you are using Conjur's self-signed cert, you will also need to configure certificate trust:
+
+```ruby
+OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE.add_file "/path/to/conjur-youraccount.pem"
+```
+
+### Using Conjur system configuraiton
+
+To instantiate the API using configuration stored stored in `/etc/conjur.conf` and/or `~/.conjurrc`:
 
 ```ruby
 require 'conjur/cli'
 Conjur::Config.load
+Conjur::Config.apply
 conjur = Conjur::API.new_from_key username, api_key
 ```
 
-You can find the username and api_key in ~/.netrc after you've logged in.
+`username` and `api_key` can also be provided by environment variables: `CONJUR_AUTHN_LOGIN` and `CONJUR_AUTHN_API_KEY`. If the login is a host, the `CONJUR_AUTHN_LOGIN` should be prefixed with `host/`. For example: `host/myhost.example.com`.
 
-Fancier/different init scenarios are possible but this should be a good start!
+If the login and API key are provided by `netrc` or by the environment, you can construct an API client using:
+
+```ruby
+conjur = Conjur::Authn.connect
+```
 
 ## Contributing
 

data/conjur-api.gemspec

@@ -2,7 +2,7 @@
 require File.expand_path('../lib/conjur-api/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Rafa\305\202 Rzepecki","Kevin Gilpin"]
+  gem.authors       = ["Rafal Rzepecki","Kevin Gilpin"]
   gem.email         = ["rafal@conjur.net","kgilpin@conjur.net"]
   gem.description   = %q{Conjur API}
   gem.summary       = %q{Conjur API}

data/lib/conjur-api/version.rb

@@ -20,6 +20,6 @@
 #
 module Conjur
   class API
-    VERSION = "4.10.2"
+    VERSION = "4.11.0"
   end
 end

data/lib/conjur/configuration.rb

@@ -147,7 +147,7 @@ module Conjur
     add_option :account, required: true
     
     add_option :env do
-      ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "production"
+      ENV['CONJUR_ENV'] || ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "production"
     end
     
     add_option :stack do
@@ -158,7 +158,9 @@ module Conjur
         env
       end
     end
-    
+
+    add_option :cert_file
+
     private
 
     def global_service_url(service_name, service_port_offset)

data/lib/conjur/variable.rb

@@ -35,7 +35,7 @@ module Conjur
     end
     
     def version_count
-      self.attributes['versions']
+      self.attributes['version_count']
     end
     
     def value(version = nil)

data/spec/api/layer_spec.rb

@@ -8,7 +8,9 @@ describe Conjur::Layer do
     it "casts Host to roleid" do
       host = double(:host)
       expect(host).to receive(:roleid).and_return "the-hostid"
-      stub_request(:post, "http://example.com/layers/my%2Flayername/hosts").with(hostid: "the-hostid")
+      stub_request(:post, "http://example.com/layers/my%2Flayername/hosts")
+        .with(body: {hostid: 'the-hostid' })
+
 
       subject.add_host host
     end

data/spec/variable_spec.rb

@@ -4,7 +4,7 @@ describe Conjur::Variable do
   let(:url) { "http://example.com/variable" }
   subject(:variable) { Conjur::Variable.new url }
 
-  before { subject.attributes = {'versions' => 42} }
+  before { subject.attributes = {'version_count' => 42} }
 
   describe '#version_count' do
     it "is read from the attributes" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 4.10.2
+  version: 4.11.0
 platform: ruby
 authors:
-- Rafał Rzepecki
+- Rafal Rzepecki
 - Kevin Gilpin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -318,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Conjur API