configuration_service-provider-vault 2.0.16 → 2.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff0c8bd868446027b30e5c7aa25b3c9012f32570
-  data.tar.gz: 5af983e4dfadd54b08309c65d8efa6301f8a2265
+  metadata.gz: 058fc4e59ce0de10cbe65d7e1fa01c9fc7f5d3cd
+  data.tar.gz: 64f97bf254370a8c2e231c4cf993390e2425a7bd
 SHA512:
-  metadata.gz: d72f61d9117108728412ca995fa4e0e1c92245d10665d47fc581e67cc71bbabb46b443010bf23ba5f26fc903614c1fca1e10f8c4d2c880ce70c5fe6d35568429
-  data.tar.gz: 308f9c41934d3966caf1b26f9635a013ed274424a94ff7895bcb11d5a6bb4b6d61f45eb82e93453f4b53dc9c6b89de4fa58da4db36bb922e4c0bf8adc8ba0d0d
+  metadata.gz: bc2ccdfc0af60f58e5ec41f721c292c53682c0b5c71f8df482d96c46ff134f3864e5b727202edbce95ec4c9a41a995939ddd2038cd8b7c77435c5f9c83d1db80
+  data.tar.gz: 44fdbc51e11a4cec9e91997dc7a50c6b98b89d9a667dc4996da3cd23ddea4cecff7db4dd604448f067b7bcd58f35d4a4da0bbcdb73cdbb1ccae4616d6271001d

data/.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0'
 
-  spec.add_dependency "vault", "~> 0.2"
-  spec.add_dependency "configuration_service", "~> 2.1.0"
+  spec.add_dependency "vault", "~> 0.4"
+  spec.add_dependency "configuration_service", "~> 2.2.0"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "cucumber", "~> 2.0"

data/README.md

@@ -41,12 +41,10 @@ do not be surprised when you find no feature files in the `features` subdirector
 
 The recommended approach to creating a configuration service client is to use a factory
 from the [configuration_service](https://rubygems.org/gems/configuration_service) gem.
-See the documentation for the ConfigurationService::Factory package for a list of
-available factories.
+See the documentation for ConfigurationService::Factory.
 
-For example, we can use the ConfigurationService::Factory::EnvironmentContext factory
-to create and configure a configuration service client backed by the vault provider as
-follows.
+For example, we can use the factory to create and configure a configuration service client
+backed by the vault provider as follows.
 
 Our `main.rb` (or `config.ru` or whatever) is simple:
 
@@ -54,7 +52,7 @@ Our `main.rb` (or `config.ru` or whatever) is simple:
 require 'bundler'
 Bundler.require(:default)
 
-service = ConfigurationService::Factory::EnvironmentContext.create
+service = ConfigurationService::Factory.create_client
 configuraton = service.request_configuration
 AcmeApplication.new(configuration.data).run
 ```
@@ -69,7 +67,7 @@ gem 'configuration_service-provider-vault'
 gem 'acme_application'
 ```
 
-Now we use the process environment to configure the EnvironmentContext factory:
+Now we use the process environment to configure the EnvironmentContext used by the factory:
 
 ```shell
   CFGSRV_IDENTIFIER="acme" \

data/README.rdoc

@@ -20,7 +20,7 @@ Our +main.rb+ (or +config.ru+ or whatever) is simple:
   require 'bundler'
   Bundler.require(:default)
 
-  config_service = ConfigurationService::Factory::EnvironmentContext.create
+  config_service = ConfigurationService::Factory.create_client
   config = config_service.request_configuration
 
   $stderr.puts "Using configuration #{config.identifier} #{config.metadata}..."

data/contrib/authorize.rb

@@ -5,11 +5,34 @@ require "configuration_service/test/vault_admin_client"
 
 require "yaml"
 
-if ARGV.size != 1
-  $stderr.puts "usage: #{PROGNAME} identifier"
+def usage
+  $stderr.puts "usage: #{PROGNAME} [{-j|-y}] identifier"
+  $stderr.puts
+  $stderr.puts "  -j presents the authorization as JSON"
+  $stderr.puts "  -y presents the authorization as YAML (default)"
   exit(1)
 end
 
+if ARGV.size < 1 or ARGV.size > 2
+  usage
+end
+
+json_formatter = ->(data) { JSON.pretty_generate(data) }
+yaml_formatter = ->(data) { YAML.dump(data) }
+
+case
+when ARGV[0] == '-j'
+  formatter = json_formatter
+  ARGV.shift
+when ARGV[0] == '-y'
+  formatter = yaml_formatter
+  ARGV.shift
+when ARGV[0].start_with?('-')
+  usage
+else
+  formatter = yaml_formatter
+end
+
 %w[VAULT_TOKEN VAULT_ADDR].each do |e|
   unless ENV[e]
     $stderr.puts "#{PROGNAME}: error: missing environment variable #{e}"
@@ -27,4 +50,5 @@ response = {
   "CFGSRV_PROVIDER" => "vault",
   "CFGSRV_PROVIDER_ADDRESS" => ENV["VAULT_ADDR"],
 }
-puts response.to_yaml
+$stderr.puts "# Partial token: #{token[0,3]}...#{token[-3,3]}"
+puts formatter[response]

data/contrib/publish.rb

@@ -4,9 +4,14 @@ PROGNAME = File.basename(__FILE__)
 require "configuration_service/provider/vault"
 
 require "yaml"
+require "json"
 
-if ARGV.size != 2
-  $stderr.puts "usage: #{PROGNAME} identifier yaml_file"
+if ARGV.size < 1 or ARGV.size > 2
+  $stderr.puts "usage: #{PROGNAME} identifier [{json_file|yaml_file}]"
+  $stderr.puts
+  $stderr.puts "  The file should contain the configuration data dictionary."
+  $stderr.puts "  If a file is not specified, YAML or JSON data will be read from stdin."
+  $stderr.puts "  Providing metadata is currently not supported."
   exit(1)
 end
 
@@ -18,7 +23,19 @@ end
 end
 
 identifier = ARGV[0]
-data = YAML.load_file(ARGV[1])
+
+if ARGV.size < 2
+  raw_data = $stdin.read
+else
+  raw_data = File.read(ARGV[1])
+end
+
+data = begin
+         YAML.load(raw_data)
+       rescue
+         JSON.parse(raw_data)
+       end
+
 service = ConfigurationService::Base.new(
   identifier,
   ENV["VAULT_TOKEN"],

data/contrib/request.rb

@@ -5,11 +5,34 @@ require "configuration_service/provider/vault"
 
 require "yaml"
 
-if ARGV.size != 1
-  $stderr.puts "usage: #{PROGNAME} identifier"
+def usage
+  $stderr.puts "usage: #{PROGNAME} [{-j|-y}] identifier"
+  $stderr.puts
+  $stderr.puts "  -j presents the data as JSON"
+  $stderr.puts "  -y presents the data as YAML (default)"
   exit(1)
 end
 
+if ARGV.size < 1 or ARGV.size > 2
+  usage
+end
+
+json_formatter = ->(data) { JSON.pretty_generate(data) }
+yaml_formatter = ->(data) { YAML.dump(data) }
+
+case
+when ARGV[0] == '-j'
+  formatter = json_formatter
+  ARGV.shift
+when ARGV[0] == '-y'
+  formatter = yaml_formatter
+  ARGV.shift
+when ARGV[0].start_with?('-')
+  usage
+else
+  formatter = yaml_formatter
+end
+
 %w[VAULT_TOKEN VAULT_ADDR].each do |e|
   unless ENV[e]
     $stderr.puts "#{PROGNAME}: error: missing environment variable #{e}"
@@ -27,4 +50,4 @@ service = ConfigurationService::Base.new(
 )
 
 configuration = service.request_configuration
-puts configuration.data.to_yaml
+puts formatter[configuration.data]

data/lib/configuration_service/provider/vault/version.rb

@@ -4,7 +4,7 @@ module ConfigurationService
 
     class Vault
 
-      VERSION = "2.0.16"
+      VERSION = "2.0.18"
 
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: configuration_service-provider-vault
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.0.18
 platform: ruby
 authors:
 - Sheldon Hearn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vault
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: configuration_service
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -152,4 +152,3 @@ signing_key:
 specification_version: 4
 summary: Vault provider for Configuration Service
 test_files: []
-has_rdoc: