chamber 2.12.3 → 2.14.1

data/lib/chamber/binary/heroku.rb

@@ -1,14 +1,17 @@
 # frozen_string_literal: true
 
 require 'thor'
-require 'chamber/commands/heroku/clear'
-require 'chamber/commands/heroku/push'
-require 'chamber/commands/heroku/pull'
-require 'chamber/commands/heroku/compare'
+require 'chamber/core_ext/hash'
+require 'chamber/commands/cloud/clear'
+require 'chamber/commands/cloud/push'
+require 'chamber/commands/cloud/pull'
+require 'chamber/commands/cloud/compare'
 
 module  Chamber
 module  Binary
 class   Heroku < Thor
+  include Thor::Actions
+
   class_option :app,
                type:     :string,
                aliases:  '-a',
@@ -16,8 +19,15 @@ class   Heroku < Thor
                desc:     'The name of the Heroku application whose config values will ' \
                          'be affected'
 
-  desc 'clear', 'Removes all Heroku environment variables which match settings that ' \
-                'Chamber knows about'
+  class_option :api_token,
+               type:     :string,
+               aliases:  '-t',
+               required: true,
+               desc:     'The API token to access your Heroku project.'
+
+  desc 'clear',
+       'Removes all Heroku environment variables which match settings that ' \
+       'Chamber knows about'
 
   method_option :dry_run,
                 type:    :boolean,
@@ -26,11 +36,14 @@ class   Heroku < Thor
                          'would change if cleared'
 
   def clear
-    Commands::Heroku::Clear.call(options)
+    Commands::Cloud::Clear.call(**options
+                                    .transform_keys(&:to_sym)
+                                    .merge(shell: self, adapter: 'heroku'))
   end
 
-  desc 'push', 'Sends settings to Heroku so that they may be used in the application ' \
-               'once it is deployed'
+  desc 'push',
+       'Sends settings to Heroku so that they may be used in the application ' \
+       'once it is deployed'
 
   method_option :dry_run,
                 type:    :boolean,
@@ -38,6 +51,14 @@ class   Heroku < Thor
                 desc:    'Does not actually push anything to Heroku, but instead ' \
                          'displays what would change if pushed'
 
+  method_option :keys,
+                type:    :boolean,
+                aliases: '-k',
+                desc:    'Pushes private Chamber keys to Heroku as environment ' \
+                         'variables. Chamber will automatically detect it and ' \
+                         'transparently decrypt your secure settings without any ' \
+                         'further synchronization.'
+
   method_option :only_sensitive,
                 type:    :boolean,
                 aliases: '-o',
@@ -47,11 +68,14 @@ class   Heroku < Thor
                          'will be pushed'
 
   def push
-    Commands::Heroku::Push.call(options)
+    Commands::Cloud::Push.call(**options
+                                   .transform_keys(&:to_sym)
+                                   .merge(shell: self, adapter: 'heroku'))
   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,
@@ -59,11 +83,14 @@ class   Heroku < Thor
                       'stored. This file WILL BE OVERRIDDEN.'
 
   def pull
-    puts Commands::Heroku::Pull.call(options)
+    Commands::Cloud::Pull.call(**options
+                                   .transform_keys(&:to_sym)
+                                   .merge(shell: self, adapter: 'heroku'))
   end
 
-  desc 'compare', 'Displays the difference between what is currently stored in the ' \
-                  'Heroku application\'s config and what Chamber knows about locally'
+  desc 'compare',
+       'Displays the difference between what is currently stored in the ' \
+       'Heroku application\'s config and what Chamber knows about locally'
 
   method_option :only_sensitive,
                 type:    :boolean,
@@ -74,7 +101,9 @@ class   Heroku < Thor
                          'which are marked as "_secure"'
 
   def compare
-    Commands::Heroku::Compare.call(options)
+    Commands::Cloud::Compare.call(**options
+                                      .transform_keys(&:to_sym)
+                                      .merge(shell: self, adapter: 'heroku'))
   end
 end
 end

data/lib/chamber/binary/runner.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 require 'thor'
+require 'chamber/core_ext/hash'
 require 'chamber/rubinius_fix'
 require 'chamber/binary/travis'
 require 'chamber/binary/heroku'
+require 'chamber/binary/circle_ci'
 require 'chamber/commands/show'
 require 'chamber/commands/files'
 require 'chamber/commands/secure'
@@ -17,7 +19,7 @@ module  Binary
 class   Runner < Thor
   include Thor::Actions
 
-  source_root ::File.expand_path('../../../../templates', __FILE__)
+  source_root ::File.expand_path('../../../templates', __dir__)
 
   class_option  :rootpath,
                 type:    :string,
@@ -61,16 +63,21 @@ class   Runner < Thor
 
   ################################################################################
 
-  desc 'travis SUBCOMMAND ...ARGS',   'For manipulating Travis CI environment variables'
+  desc 'travis SUBCOMMAND ...ARGS', 'For manipulating Travis CI environment variables'
   subcommand 'travis', Chamber::Binary::Travis
 
   ################################################################################
 
-  desc 'heroku SUBCOMMAND ...ARGS',   'For manipulating Heroku environment variables'
+  desc 'heroku SUBCOMMAND ...ARGS', 'For manipulating Heroku environment variables'
   subcommand 'heroku', Chamber::Binary::Heroku
 
   ################################################################################
 
+  desc 'circleci SUBCOMMAND ...ARGS', 'For manipulating CircleCI environment variables'
+  subcommand 'circleci', Chamber::Binary::CircleCi
+
+  ################################################################################
+
   desc 'show', 'Displays the list of settings and their values'
 
   method_option :as_env,
@@ -86,7 +93,7 @@ class   Runner < Thor
                          'Useful for debugging.'
 
   def show
-    puts Commands::Show.call(options.merge(shell: self))
+    puts Commands::Show.call(**options.transform_keys(&:to_sym).merge(shell: self))
   end
 
   ################################################################################
@@ -94,15 +101,16 @@ class   Runner < Thor
   desc 'files', 'Lists the settings files which are parsed with the given options'
 
   def files
-    puts Commands::Files.call(options.merge(shell: self))
+    puts Commands::Files.call(**options.transform_keys(&:to_sym).merge(shell: self))
   end
 
   ################################################################################
 
-  desc 'compare', 'Displays the difference between the settings in the first set ' \
-                  'of namespaces and the settings in the second set.  Useful for ' \
-                  'tracking down why there may be issues in development versus test ' \
-                  'or differences between staging and production.'
+  desc 'compare',
+       'Displays the difference between the settings in the first set ' \
+       'of namespaces and the settings in the second set.  Useful for ' \
+       'tracking down why there may be issues in development versus test ' \
+       'or differences between staging and production.'
 
   method_option :keys_only,
                 type:    :boolean,
@@ -111,23 +119,26 @@ class   Runner < Thor
                          'of the two sets of settings'
 
   method_option :first,
-                type: :array,
-                desc: 'The list of namespaces which will be used as the source of ' \
-                      'the comparison'
+                type:     :array,
+                required: true,
+                desc:     'The list of namespaces which will be used as the source of ' \
+                          'the comparison'
 
   method_option :second,
-                type: :array,
-                desc: 'The list of namespaces which will be used as the destination ' \
-                      'of the comparison'
+                type:     :array,
+                required: true,
+                desc:     'The list of namespaces which will be used as the ' \
+                          'destination of the comparison'
 
   def compare
-    Commands::Compare.call(options.merge(shell: self))
+    Commands::Compare.call(**options.transform_keys(&:to_sym).merge(shell: self))
   end
 
   ################################################################################
 
-  desc 'secure', 'Secures any values which appear to need to be encrypted in any of ' \
-                 'the settings files which match irrespective of namespaces'
+  desc 'secure',
+       'Secures any values which appear to need to be encrypted in any of ' \
+       'the settings files which match irrespective of namespaces'
 
   method_option :only_sensitive,
                 type:    :boolean,
@@ -140,37 +151,42 @@ class   Runner < Thor
                          'what values would be encrypted'
 
   def secure
-    Commands::Secure.call(options.merge(shell: self))
+    Commands::Secure.call(**options.transform_keys(&:to_sym).merge(shell: self))
   end
 
   ################################################################################
 
-  desc 'sign', 'Creates or verifies signatures for all current settings files using ' \
-               'the signature private key.'
+  desc 'sign',
+       'Creates or verifies signatures for all current settings files using ' \
+       'the signature private key.'
 
   method_option :verify,
                 type:    :boolean,
                 default: false
 
+  method_option :signature_name,
+                type:    :string,
+                default: `git config --get 'user.name'`.chomp
+
   def sign
     if options[:verify]
-      Commands::Verify.call(options.merge(shell: self))
+      Commands::Verify.call(**options.transform_keys(&:to_sym).merge(shell: self))
     else
-      Commands::Sign.call(options.merge(shell: self))
+      Commands::Sign.call(**options.transform_keys(&:to_sym).merge(shell: self))
     end
   end
 
   ################################################################################
 
-  desc 'init', 'Sets Chamber up using best practices for secure configuration ' \
-               'management'
+  desc 'init',
+       'Sets Chamber up using best practices for secure configuration management'
 
   method_option :signature,
                 type:    :boolean,
                 default: false
 
   def init
-    Commands::Initialize.call(options.merge(shell: self))
+    Commands::Initialize.call(**options.transform_keys(&:to_sym).merge(shell: self))
   end
 end
 end

data/lib/chamber/binary/travis.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
 require 'thor'
+require 'chamber/core_ext/hash'
 require 'chamber/commands/travis/secure'
 
 module  Chamber
 module  Binary
 class   Travis < Thor
-  desc 'secure', 'Uses your Travis CI public key to encrypt the settings you have ' \
-                 'chosen not to commit to the repo'
+  desc 'secure',
+       'Uses your Travis CI public key to encrypt the settings you have ' \
+       'chosen not to commit to the repo'
 
   method_option :dry_run,
                 type:    :boolean,
@@ -24,7 +26,7 @@ class   Travis < Thor
                          'which are marked as "_secure"'
 
   def secure
-    Commands::Travis::Secure.call(options)
+    Commands::Travis::Secure.call(**options.transform_keys(&:to_sym).merge(shell: self))
   end
 end
 end

data/lib/chamber/commands/base.rb

@@ -6,26 +6,20 @@ require 'chamber/instance'
 module  Chamber
 module  Commands
 class   Base
-  def self.call(options = {})
-    new(options).call
+  def self.call(**args)
+    new(**args).call
   end
 
   attr_accessor :chamber,
-                :shell,
-                :dry_run
-  attr_reader   :rootpath
+                :dry_run,
+                :rootpath,
+                :shell
 
-  def initialize(options = {})
-    self.chamber  = Chamber::Instance.new options
-    self.shell    = options[:shell]
-    self.rootpath = options[:rootpath]
-    self.dry_run  = options[:dry_run]
-  end
-
-  protected
-
-  def rootpath=(other)
-    @rootpath ||= Pathname.new(other)
+  def initialize(shell: nil, rootpath: nil, dry_run: nil, **args)
+    self.chamber  = Chamber::Instance.new(rootpath: rootpath, **args)
+    self.shell    = shell
+    self.rootpath = chamber.configuration.rootpath
+    self.dry_run  = dry_run
   end
 end
 end

data/lib/chamber/commands/cloud/base.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'chamber/commands/base'
+
+module  Chamber
+module  Commands
+module  Cloud
+class   Base < Chamber::Commands::Base
+  attr_accessor :adapter
+
+  def initialize(adapter:, **args)
+    super(**args)
+
+    self.adapter = adapter_class(adapter).new(**args)
+  end
+
+  private
+
+  def adapter_class(adapter_name)
+    require "chamber/adapters/cloud/#{adapter_name}"
+
+    @adapter_class ||= case adapter_name
+                       when 'circle_ci'
+                         Chamber::Adapters::Cloud::CircleCi
+                       when 'heroku'
+                         Chamber::Adapters::Cloud::Heroku
+                       else
+                         fail ArgumentError,
+                              "Invalid Chamber cloud adapter name: #{adapter_name}"
+                       end
+  end
+end
+end
+end
+end

data/lib/chamber/commands/{heroku → cloud}/clear.rb

@@ -1,23 +1,21 @@
 # frozen_string_literal: true
 
-require 'chamber/commands/base'
-require 'chamber/commands/heroku'
+require 'chamber/commands/cloud/base'
 
 module  Chamber
 module  Commands
-module  Heroku
-class   Clear < Chamber::Commands::Base
-  include Chamber::Commands::Heroku
-
+module  Cloud
+class   Clear < Chamber::Commands::Cloud::Base
   def call
     chamber.to_environment.each_key do |key|
-      next unless configuration.match(key)
+      next unless adapter.environment_variables.has_key?(key)
 
       if dry_run
         shell.say_status 'remove', key, :blue
       else
         shell.say_status 'remove', key, :green
-        shell.say heroku("config:unset #{key}")
+
+        adapter.remove_environment_variable(key)
       end
     end
   end

data/lib/chamber/commands/cloud/compare.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'chamber/commands/cloud/base'
+require 'chamber/commands/comparable'
+require 'chamber/commands/securable'
+
+module  Chamber
+module  Commands
+module  Cloud
+class   Compare < Chamber::Commands::Cloud::Base
+  include Chamber::Commands::Securable
+  include Chamber::Commands::Comparable
+
+  protected
+
+  def first_settings_data
+    ::JSON.pretty_generate(securable_environment_variables)
+  end
+
+  def second_settings_data
+    ::JSON.pretty_generate(adapter.environment_variables)
+  end
+end
+end
+end
+end

data/lib/chamber/commands/cloud/pull.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'json'
+require 'chamber/commands/cloud/base'
+
+module  Chamber
+module  Commands
+module  Cloud
+class   Pull < Chamber::Commands::Cloud::Base
+  attr_accessor :target_file
+
+  def initialize(into:, **args)
+    super
+
+    self.target_file = into
+  end
+
+  def call
+    if target_file
+      shell.create_file(target_file,
+                        ::JSON.pretty_generate(adapter.environment_variables))
+    else
+      adapter.environment_variables
+    end
+  end
+end
+end
+end
+end