conjur-api 4.10.0 → 4.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 433c76ede7475ca9af07431734069c9692ace125
-  data.tar.gz: 842baac408d16a623dc0539dbb312d970040eafc
+  metadata.gz: 8082f753ddebe272f08498fb3e144dcd5477cc57
+  data.tar.gz: 1de7d39d363c091712b8d73add7cf7d87b952ce1
 SHA512:
-  metadata.gz: beb95d37603ab34b37f33e297d1c8ba5efb90d800432def027f110a895782d6e5eb730d220ac02430d95320ad684b0edb3d3ff76d0b04c799dc75ec309ad6458
-  data.tar.gz: 115862f1080d52472f0cae83359f86526d6166668af11fa603cc0b38170c0f23a6fe6646c90eb62965839f789b51aefa624111212403174c4304386191da3e21
+  metadata.gz: 28727a8a68e30751fc2234329ceee61857d02fc6fbb41d8f51e1997523b66b21146d740f2af6577160a4d8aebc2f4026994a03fb20542750bb299a251deb80d1
+  data.tar.gz: 93e98f2269bd14ac60e4e3cd7ff8b6453aca5b0f7e4c2cc77da8e2e5736ed035a2712c460874f2ec72f467fd844ccbf9a41ec9b1db9d141bfda4476dd470a5a5

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+#ruby-gemset=conjur-api
+
 # Specify your gem's dependencies in conjur-api.gemspec
 gemspec
 

data/conjur-api.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'spork'
   gem.add_development_dependency 'rspec', '>= 2.14', '< 3.0'
   gem.add_development_dependency 'webmock'
-  gem.add_development_dependency 'ci_reporter'
+  gem.add_development_dependency 'ci_reporter_rspec'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'io-grab'
   gem.add_development_dependency 'yard'

data/lib/conjur-api/version.rb

@@ -20,6 +20,6 @@
 #
 module Conjur
   class API
-    VERSION = "4.10.0"
+    VERSION = "4.10.1"
   end
 end

data/lib/conjur/configuration.rb

@@ -21,16 +21,38 @@
 module Conjur
   
   class << self
+    # Sets the Configuration for the current thread, yields the block, then resets the thread-local variable.
+    def with_configuration(config, &block)
+      oldvalue = Thread.current[:conjur_configuration]
+      Thread.current[:conjur_configuration] = config
+      yield
+    ensure
+      Thread.current[:conjur_configuration] = oldvalue
+    end
+    
+    # Gets the current thread-local or global configuration.
     def configuration
-      @config ||= Configuration.new
+      Thread.current[:conjur_configuration] || (@config ||= Configuration.new)
     end
     
+    # Sets the global configuration.
     def configuration=(config)
       @config = config
     end
   end
   
   class Configuration
+    # All explicit values.
+    attr_reader :explicit
+    
+    # All explicit and cached values.
+    attr_reader :supplied
+    
+    def initialize explicit = {}
+      @explicit = explicit.dup
+      @supplied = explicit.dup
+    end
+    
     class << self
       # @api private
       def accepted_options
@@ -94,9 +116,15 @@ module Conjur
         alias_method("#{name}?", name) if options[:boolean]
       end
     end
+    
+    # Copies the current configuration, except a set of overridden options.
+    def clone override_options
+      self.class.new self.explicit.dup.merge(override_options)
+    end
 
     def set(key, value)
       if self.class.accepted_options.include?(key.to_sym)
+        explicit[key.to_sym] = value
         supplied[key.to_sym] = value
       end
     end
@@ -176,9 +204,5 @@ module Conjur
     def herokuize name
       name.downcase.gsub(/[^a-z0-9\-]/, '-')
     end
-    
-    def supplied
-      @supplied ||= {}
-    end
   end
 end

data/lib/conjur/exists.rb

@@ -24,6 +24,8 @@ module Conjur
       begin
         self.head(options)
         true
+      rescue RestClient::Forbidden
+        true
       rescue RestClient::ResourceNotFound
         false
       end

data/spec/api/hosts_spec.rb

@@ -20,7 +20,6 @@ describe Conjur::API, api: :dummy do
       let(:invoke) { subject.create_host :options }
     end
   end
-
   describe '#host' do
     it_should_behave_like "standard_show with", :host, :id do
       let(:invoke) { subject.host :id }

data/spec/lib/configuration_spec.rb

@@ -4,7 +4,67 @@ describe Conjur::Configuration do
   before {
     Conjur.configuration = Conjur::Configuration.new
   }
-  subject { Conjur.configuration }
+  let(:configuration) { Conjur.configuration }
+  subject { configuration }
+  context "thread-local behavior" do
+    it "can swap the Configuration in a new thread" do
+      original = Conjur.configuration
+      c = Conjur::Configuration.new
+      Thread.new do
+        Thread.current[:conjur_configuration] = :foo
+        Conjur.with_configuration c do
+          Conjur.configuration.should == c
+        end
+        Thread.current[:conjur_configuration].should == :foo
+      end.join
+      Conjur.configuration.should == original
+    end
+  end
+  context "with various options" do
+    before {
+      configuration.account = "the-account"
+      configuration.appliance_url = "https://conjur/api"
+    }
+    it "core_url is not pre-cached" do
+      configuration.supplied[:core_url].should_not be
+    end
+    it "core_url is cached after use" do
+      configuration.core_url
+      configuration.supplied[:core_url].should == configuration.core_url
+    end
+    context "and core_url fetched" do
+      before { 
+        configuration.core_url 
+      }
+      context "and duplicated" do 
+        subject { configuration.clone override_options }
+        let(:override_options) { Hash.new }
+        its(:account) { should == configuration.account }
+        its(:appliance_url) { should == configuration.appliance_url }
+        its(:core_url) { should == configuration.appliance_url }
+        context "core_url fetched" do
+          it "is then cached in the original" do
+            configuration.supplied[:core_url].should be
+          end
+          it "is not cached in the copy" do
+            subject.supplied[:core_url].should_not be
+          end
+        end
+        context "appliance_url overridden" do
+          let(:override_options) {
+            { :appliance_url => "https://example/api" }
+          }
+          it "is ignored by the configuration core_url" do
+            configuration.core_url.should == "https://conjur/api"
+          end
+          it "is reflected in the copy core_url" do
+            subject.core_url.should == "https://example/api"
+          end
+        end
+      end
+    end
+  end
+    
   context "CONJUR_ENV unspecified" do
     before {
       ENV.delete('CONJUR_ENV')

data/spec/lib/exists_spec.rb

@@ -10,8 +10,8 @@ describe Conjur::Exists do
 
   context "when forbidden" do
     before { subject.stub(:head) { raise RestClient::Forbidden }}
-    it "propagates the error" do
-      lambda { subject.exists? }.should raise_error(RestClient::Forbidden)
+    it "returns true" do
+      subject.exists?.should be_truthy
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 4.10.0
+  version: 4.10.1
 platform: ruby
 authors:
 - Rafał Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -102,7 +102,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ci_reporter
+  name: ci_reporter_rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='