chamber 2.13.1 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f29fb224fb009c2d3cda5c3429024a2246fb9ab1893def95a984b087fe77849
-  data.tar.gz: 281ad1fe8607f1b0c887cfcbd2bb736a82d6d51fd075bbef1e9204bd2d0bb00e
+  metadata.gz: 5bf2d68260ae1fa27b7a2befdc5ff274c34477ff3bf584027d39747fbcd5a489
+  data.tar.gz: 63f97b11849eb6e800b5f4e4f0ae49ad57d1e92cd942f114d417dc8c980a40a4
 SHA512:
-  metadata.gz: 4ac5037eb08def3e9bb7304ebd485917246f83ce9d1db7a605425f4f015f70cb908ac8b3544c1b28cbff2445478be1764a34b05e76a2a33f93cadfcedffd6398
-  data.tar.gz: 8be1ebdd092c55a5c8a40e7de6320db810728c13411b842f2a060b38c770835e34c763b3220ddc1dd5e614d53b4cd52f7d26725a805861756783dbfe7f780b23
+  metadata.gz: 8a8f5f026bee9a0380410ee6ed8c4e563f0c465b56a0d111d10f8ef35eb986f4e3cfeb7acfaa283cfcc7380135026d63f4edbfd3649ea4bfc543b91410f1b155
+  data.tar.gz: 9d012efb86e89a1a78cd39f0bd54200d0508394b46a7b66b2144b645bcd86f17d25f1f2ad3d2df8c3cab355f1669903b17d8dc8de024d520b854022a6e32d892

data/README.md

@@ -1,5 +1,33 @@
-# Chamber
-[![Gem Version](https://img.shields.io/gem/v/chamber.svg)](https://rubygems.org/gems/chamber) ![Rubygems Rank Overall](https://img.shields.io/gem/rt/chamber.svg) ![Rubygems Rank Daily](https://img.shields.io/gem/rd/chamber.svg) ![Rubygems Downloads](https://img.shields.io/gem/dv/chamber/stable.svg) [![Build Status](https://img.shields.io/travis/thekompanee/chamber/master.svg)](http://travis-ci.org/thekompanee/chamber) [![Code Climate](https://codeclimate.com/github/thekompanee/chamber.svg)](https://codeclimate.com/github/thekompanee/chamber) [![Code Climate](https://codeclimate.com/github/thekompanee/chamber/coverage.svg)](https://codeclimate.com/github/thekompanee/chamber)
+Chamber
+================================================================================
+
+<div align="center">
+  <a href="https://rubygems.org/gems/chamber" alt="RubyGems Version">
+    <img src="https://img.shields.io/gem/v/chamber.svg?style=flat-square&label=current-version" alt="RubyGems Version" />
+  </a>
+
+  <a href="https://rubygems.org/gems/chamber" alt="RubyGems Rank Overall">
+    <img src="https://img.shields.io/gem/rt/chamber.svg?style=flat-square&label=total-rank" alt="RubyGems Rank Overall" />
+  </a>
+
+  <a href="https://rubygems.org/gems/chamber" alt="RubyGems Rank Daily">
+    <img src="https://img.shields.io/gem/rd/chamber.svg?style=flat-square&label=daily-rank" alt="RubyGems Rank Daily" />
+  </a>
+
+  <a href="https://rubygems.org/gems/chamber" alt="RubyGems Downloads">
+    <img src="https://img.shields.io/gem/dt/chamber.svg?style=flat-square&label=total-downloads" alt="RubyGems Downloads" />
+  </a>
+
+  <a href="https://github.com/thekompanee/chamber/actions?query=workflow%3ABuild" alt="Build Status">
+    <img src="https://img.shields.io/github/workflow/status/thekompanee/chamber/Build?label=CI&style=flat-square&logo=github" alt="Build Status" />
+  </a>
+
+  <a href="#" alt="Maintainability">
+    <img src="https://img.shields.io/codeclimate/maintainability/thekompanee/chamber?style=flat-square&label=grade" alt="Maintainability" />
+  </a>
+</div>
+
+<br>
 
 Chamber is the auto-encrypting, extremely organizable, Heroku-loving,
 CLI-having, non-extra-repo-needing, non-Rails-specific-ing, CI-serving
@@ -9,17 +37,73 @@ We looked at all of the options out there and thought something was still
 missing, so we wrote Chamber.  We made it with lots of ❤ and we hope you like it
 as much as we do.
 
-## What Sets Chamber Apart?
+What Sets Chamber Apart
+--------------------------------------------------------------------------------
 
 For an idea of how Chamber compares to other popular libraries, check out our
 [Gem Comparison][comparison].
 
-## Basic Usage
+Basic Usage
+--------------------------------------------------------------------------------
+
+Before starting this guide, make sure you [install chamber][installation].
+
+Once your app is initialized, you should have a `settings.yml` file somewhere.
+A lot of times it's the root of your project and sometimes it's in a framework
+specific location.
+
+Inside of here you can define any settings you'd like like so:
+
+```yaml
+# settings.yml
+
+smtp_username: 'my_username'
+smtp_password: 'my_password'
+```
+
+From there you can access your settings by using the special `Chamber.env`
+constant.
+
+```ruby
+Chamber.env.smtp_password
+# => 'my_password'
+```
+
+If you want to encrypt a setting, prefix the setting name with `_secure_` like
+so:
+
+```ruby
+# settings.yml
+
+smtp_username:         'my_username'
+_secure_smtp_password: 'my_password'
+```
+
+And then run `chamber secure`.  Your settings file will have an encrypted value:
+
+```ruby
+# settings.yml
+
+smtp_username:         'my_username'
+_secure_smtp_password: JL5hAVux4tERpv49QPWxy9H0VC2Rnk7V8/e8+1XOwPcXcoH/a7Lh253UY/v9m8nI/Onb+ZG9nZ082J4M/BmLa+f7jwMEwufIqbUhUah9eKIW8xcxlppBYpl7JVGf2HJF5TfCN44gMQNgGNzboCQXKqRyeGFm4u772Sg9V2gEx/q7qJ6F4jg7v/cltCFLmJfXA2SHA5Dai4p9L4IvMVVJGm34k5j7KOegNqpVWs2RY99cagjPuzc9VM2XSUsXgqcUJdmH8YtPW8Kqkyg0oYlRh6VQWABlWXwTZz74QjTTjqtqfoELIoFTMBDh+cCvuUTAE5m06LhlqauVrB4UnBsd5g==
+```
+
+which you still access the same way because Chamber handles the decryption for
+you:
+
+```ruby
+Chamber.env.smtp_password
+# => 'my_password'
+```
+
+Full Reference
+--------------------------------------------------------------------------------
 
-You can view our Basic Usage Guide [here][basic-usage].  Otherwise, for the full
+There's so much to Chamber, we couldn't put it all in the README.  For the full
 Chamber guide, visit the [wiki][wiki].
 
-## Credits
+Credits
+--------------------------------------------------------------------------------
 
 Chamber was written by [Jeff Felchner][jeff-profile] and
 [Mark McEahern][mark-profile]
@@ -30,27 +114,18 @@ Chamber is maintained and funded by [The Kompanee, Ltd.][kompanee-site]
 
 The names and logos for The Kompanee are trademarks of The Kompanee, Ltd.
 
-## License
+License
+--------------------------------------------------------------------------------
 
-Chamber is Copyright © 2014-2019 Jeff Felchner and Mark McEahern. It is free
+Chamber is Copyright © 2014-2021 Jeff Felchner and Mark McEahern. It is free
 software, and may be redistributed under the terms specified in the
 [LICENSE][license] file.
 
-[accessing]:      https://github.com/thekompanee/chamber/wiki/Accessing-Settings
-[basic-usage]:    https://github.com/thekompanee/chamber/wiki/Basic-Usage
-[cli]:            https://github.com/thekompanee/chamber/wiki/CLI-Overview
-[commit-hook]:    https://github.com/thekompanee/chamber/wiki/Git-Commit-Hooks
-[comparison]:     https://github.com/thekompanee/chamber/wiki/Gem-Comparison
-[encryption]:     https://github.com/thekompanee/chamber/wiki/Encryption-Basics
-[env-vars]:       https://github.com/thekompanee/chamber/wiki/Environment-Variables
-[heroku]:         https://github.com/thekompanee/chamber/wiki/Heroku
-[inch]:           https://inch-ci.org/github/thekompanee/chamber
-[jeff-profile]:   https://github.com/jfelchner
-[kompanee-logo]:  https://kompanee-public-assets.s3.amazonaws.com/readmes/kompanee-horizontal-black.png
-[kompanee-site]:  http://www.thekompanee.com
-[license]:        https://github.com/thekompanee/chamber/blob/master/LICENSE.txt
-[mark-profile]:   https://github.com/m5rk
-[namespace-keys]: https://github.com/thekompanee/chamber/wiki/Namespaced-Key-Pairs
-[plain-ruby]:     https://github.com/thekompanee/chamber/wiki/Installation#in-a-ruby-project-or-ruby-gem
-[travis]:         https://github.com/thekompanee/chamber/wiki/TravisCI
-[wiki]:           https://github.com/thekompanee/chamber/wiki
+[comparison]:    https://github.com/thekompanee/chamber/wiki/Gem-Comparison
+[jeff-profile]:  https://github.com/jfelchner
+[kompanee-logo]: https://kompanee-public-assets.s3.amazonaws.com/readmes/kompanee-horizontal-black.png
+[kompanee-site]: http://www.thekompanee.com
+[license]:       https://github.com/thekompanee/chamber/blob/master/LICENSE.txt
+[mark-profile]:  https://github.com/m5rk
+[wiki]:          https://github.com/thekompanee/chamber/wiki
+[installation]:  https://github.com/thekompanee/chamber/wiki/Installation

data/lib/chamber.rb

@@ -7,12 +7,8 @@ require 'chamber/rails'
 module  Chamber
   attr_writer :instance
 
-  def load(options = {})
-    self.instance = Instance.new(options)
-  end
-
-  def to_s(options = {})
-    instance.to_s(options)
+  def load(**args)
+    self.instance = Instance.new(**args)
   end
 
   def env
@@ -20,7 +16,61 @@ module  Chamber
   end
 
   def instance
-    @instance ||= Instance.new({})
+    @instance ||= Instance.new
+  end
+
+  def [](key)
+    instance.[](key)
+  end
+
+  def configuration
+    instance.configuration
+  end
+
+  def decrypt(value, **args)
+    instance.decrypt(value, **args)
+  end
+
+  def encrypt(value, **args)
+    instance.encrypt(value, **args)
+  end
+
+  def files
+    instance.files
+  end
+
+  def filenames
+    instance.filenames
+  end
+
+  def namespaces
+    instance.namespaces
+  end
+
+  def secure
+    instance.secure
+  end
+
+  def sign
+    instance.sign
+  end
+
+  def verify
+    instance.verify
+  end
+
+  def to_environment
+    instance.to_environment
+  end
+
+  def to_hash
+    instance.to_hash
+  end
+
+  def to_s(**args)
+    return '' unless @instance
+
+    instance.to_s(**args)
   end
 
   def method_missing(name, *args)
@@ -33,11 +83,23 @@ module  Chamber
     instance.respond_to?(name, include_private)
   end
 
-  module_function :load,
-                  :to_s,
+  module_function :[],
+                  :configuration,
+                  :decrypt,
+                  :encrypt,
                   :env,
+                  :filenames,
+                  :files,
                   :instance,
                   :instance=,
+                  :load,
                   :method_missing,
-                  :respond_to_missing?
+                  :namespaces,
+                  :respond_to_missing?,
+                  :secure,
+                  :sign,
+                  :to_environment,
+                  :to_hash,
+                  :to_s,
+                  :verify
 end

data/lib/chamber/adapters/cloud/circle_ci.rb

@@ -17,11 +17,11 @@ class   CircleCi
                 :username,
                 :vcs_type
 
-  def initialize(options = {})
-    self.api_token = options.fetch(:api_token)
-    self.project   = options.fetch(:project)
-    self.username  = options.fetch(:username)
-    self.vcs_type  = options.fetch(:vcs_type)
+  def initialize(api_token:, project:, username:, vcs_type:)
+    self.api_token = api_token
+    self.project   = project
+    self.username  = username
+    self.vcs_type  = vcs_type
   end
 
   def add_environment_variable(name, value)
@@ -39,18 +39,21 @@ class   CircleCi
     response['name']
   end
 
+  # rubocop:disable Layout/MultilineAssignmentLayout
   def environment_variables
-    @environment_variables ||= begin
-      request = ::Net::HTTP::Get.new(request_uri(resource: 'envvar'))
+    @environment_variables ||= \
+      begin
+        request = ::Net::HTTP::Get.new(request_uri(resource: 'envvar'))
 
-      request.basic_auth api_token, ''
-      request['Content-Type'] = 'application/json'
+        request.basic_auth api_token, ''
+        request['Content-Type'] = 'application/json'
 
-      ::JSON
-        .parse(response(request).body)
-        .each_with_object({}) { |e, m| m[e['name']] = e['value'] }
-    end
+        ::JSON
+          .parse(response(request).body)
+          .each_with_object({}) { |e, m| m[e['name']] = e['value'] }
+      end
   end
+  # rubocop:enable Layout/MultilineAssignmentLayout
 
   def remove_environment_variable(name)
     request = ::Net::HTTP::Delete.new(request_uri(resource: "envvar/#{name}"))

data/lib/chamber/adapters/cloud/heroku.rb

@@ -8,38 +8,65 @@ module  Chamber
 module  Adapters
 module  Cloud
 class   Heroku
-  attr_accessor :app
+  API_HOST     = 'api.heroku.com'
+  API_PORT     = 443
+  API_BASE_URI = ''
 
-  def initialize(options = {})
-    self.app = options.fetch(:app)
+  attr_accessor :api_token,
+                :app
+
+  def initialize(api_token:, app:)
+    self.api_token = api_token
+    self.app       = app
   end
 
-  def add_environment_variable(name, value)
-    value = value.shellescape unless value =~ /\n/
+  def add_environment_variable(name, value) # rubocop:disable Metrics/AbcSize
+    value   = value.gsub(/\n/, '\n') if value
+    request = ::Net::HTTP::Patch.new(config_vars_uri)
+
+    request['Authorization'] = "Bearer #{api_token}"
+    request['Accept']        = 'application/vnd.heroku+json; version=3'
+    request['Content-Type']  = 'application/json'
+    request.body             = ::JSON.dump(Hash[name, value])
 
-    response = heroku(%Q{config:set #{name}="#{value}"})
+    response = ::JSON.parse(response(request).body)
 
-    fail NameError, "The variable name '#{name}' is invalid" if response.match?(/invalid/)
+    fail NameError, response['message'] if response['message']
 
     response
   end
 
   def environment_variables
-    @environment_variables ||= ::JSON.parse(heroku('config --json'))
+    request = ::Net::HTTP::Get.new(config_vars_uri)
+
+    request['Authorization'] = "Bearer #{api_token}"
+    request['Accept']        = 'application/vnd.heroku+json; version=3'
+
+    response = ::JSON.parse(response(request).body)
+
+    fail NameError, response['message'] if response['message']
+
+    response
   end
 
   def remove_environment_variable(name)
-    heroku("config:unset #{name}")
+    add_environment_variable(name, nil)
   end
 
   private
 
-  def heroku(command)
-    Bundler.with_clean_env { `heroku #{command}#{app_option} 2>&1` }
+  def config_vars_uri
+    "#{API_BASE_URI}/apps/#{app}/config-vars"
+  end
+
+  def response(request)
+    connection.request(request)
   end
 
-  def app_option
-    app ? " --app='#{app}'" : ''
+  def connection
+    @connection ||= ::Net::HTTP.new(API_HOST, API_PORT).tap do |conn|
+      conn.use_ssl = true
+    end
   end
 end
 end

data/lib/chamber/binary/circle_ci.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'thor'
+require 'chamber/core_ext/hash'
 require 'chamber/commands/cloud/clear'
 require 'chamber/commands/cloud/push'
 require 'chamber/commands/cloud/pull'
@@ -36,8 +37,9 @@ class   CircleCi < Thor
                desc:    'The type of VCS your project is using.',
                enum:    %w{github bitbucket}
 
-  desc 'clear', 'Removes all CircleCi environment variables which match settings that ' \
-                'Chamber knows about'
+  desc 'clear',
+       'Removes all CircleCi environment variables which match settings that Chamber ' \
+       'knows about'
 
   method_option :dry_run,
                 type:    :boolean,
@@ -46,11 +48,14 @@ class   CircleCi < Thor
                          'would change if cleared'
 
   def clear
-    Commands::Cloud::Clear.call(options.merge(shell: self, adapter: 'circle_ci'))
+    Commands::Cloud::Clear.call(**options
+                                    .transform_keys(&:to_sym)
+                                    .merge(shell: self, adapter: 'circle_ci'))
   end
 
-  desc 'push', 'Sends settings to CircleCi so that they may be used in the application ' \
-               'once it is deployed'
+  desc 'push',
+       'Sends settings to CircleCi so that they may be used in the application ' \
+       'once it is deployed'
 
   method_option :dry_run,
                 type:    :boolean,
@@ -75,11 +80,14 @@ class   CircleCi < Thor
                          'will be pushed'
 
   def push
-    Commands::Cloud::Push.call(options.merge(shell: self, adapter: 'circle_ci'))
+    Commands::Cloud::Push.call(**options
+                                   .transform_keys(&:to_sym)
+                                   .merge(shell: self, adapter: 'circle_ci'))
   end
 
-  desc 'pull', 'Retrieves the environment variables for the application and stores ' \
-               'them in a temporary file'
+  desc 'pull',
+       'Retrieves the environment variables for the application and stores them in a ' \
+       'temporary file'
 
   method_option :into,
                 type: :string,
@@ -87,11 +95,14 @@ class   CircleCi < Thor
                       'stored. This file WILL BE OVERRIDDEN.'
 
   def pull
-    Commands::Cloud::Pull.call(options.merge(shell: self, adapter: 'circle_ci'))
+    Commands::Cloud::Pull.call(**options
+                                   .transform_keys(&:to_sym)
+                                   .merge(shell: self, adapter: 'circle_ci'))
   end
 
-  desc 'compare', 'Displays the difference between what is currently stored in the ' \
-                  'CircleCi application\'s config and what Chamber knows about locally'
+  desc 'compare',
+       'Displays the difference between what is currently stored in the ' \
+       'CircleCi application\'s config and what Chamber knows about locally'
 
   method_option :only_sensitive,
                 type:    :boolean,
@@ -102,7 +113,9 @@ class   CircleCi < Thor
                          'which are marked as "_secure"'
 
   def compare
-    Commands::Cloud::Compare.call(options.merge(shell: self, adapter: 'circle_ci'))
+    Commands::Cloud::Compare.call(**options
+                                      .transform_keys(&:to_sym)
+                                      .merge(shell: self, adapter: 'circle_ci'))
   end
 end
 end