ruby-terraform 0.65.0.pre.2 → 0.65.0.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dbba56077adf66c7e32da731ddb62cc90bfea3d2ba29ead63913edf3e1da5bd
-  data.tar.gz: 708c49c91c22e75dcc9262f3d7858d51015451ebfb56dd222bddcf37d95d0fdb
+  metadata.gz: 8134ce739c38d0dc08a0ecdb0737d6227b8408809258c8eada6d95591182194d
+  data.tar.gz: bb5e4eeeaa9c3817ab67da0d2d2bb1b974aedb9b380934cbdc7ac633039e61c3
 SHA512:
-  metadata.gz: 12e0d2f034a80f3d3a3b08aaac13858ef88df3a7fcd16f41320c8aa79ea895cd11165ce8fe439568c46b906b85c54f6249a109899d50c1c4e1c4bd4a2b7356c4
-  data.tar.gz: a1e07bec999d28347645081e3d660c814f7e66a0d2c4f6079002a95e3ac021743904acc600a9a9f3965e8410b654c33381419110435cc0587cafad9acc93260a
+  metadata.gz: e7b1373932d2c2ff94456bad7e8a96daab3a84500a509bfd3ae557193a54e00310d773fd3d99996459bf5859434b385df609a863db7e4844536a64d98c24af53
+  data.tar.gz: c80e73a02de20a50a8feec447b826b5a63a1a8f62b8d7e40ec89c3e4266ef8a3b2a836257bb5a005d9676d6ec0ab6238e9db15709a3b5f9d844781782b1bb796

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-terraform (0.65.0.pre.2)
+    ruby-terraform (0.65.0.pre.3)
       lino (>= 1.5)
 
 GEM
@@ -157,18 +157,18 @@ DEPENDENCIES
   bundler (~> 2.0)
   faker (~> 2.17)
   gem-release (~> 2.1)
-  guard
-  guard-rspec
+  guard (~> 2.16)
+  guard-rspec (~> 4.7)
   rake (~> 13.0)
   rake_circle_ci (~> 0.9)
   rake_github (~> 0.5)
   rake_gpg (~> 0.12)
   rake_ssh (~> 0.4)
   rspec (~> 3.9)
-  rubocop
-  rubocop-rspec
+  rubocop (~> 1.12)
+  rubocop-rspec (~> 2.2)
   ruby-terraform!
-  simplecov
+  simplecov (~> 0.21)
 
 BUNDLED WITH
    2.2.15

data/README.md

@@ -467,7 +467,7 @@ RubyTerraform.workspace(operation: 'delete', workspace: 'staging')
 arguments:
 * `directory`: the directory containing terraform configuration, the default is
   the current path.
-* `operation`: `list`, `select`, `new` or `delete`. default `list`.
+* `operation`: `list`, `select`, `new` or `delete`. default `list`.
 * `workspace`: Workspace name.
 
 
@@ -551,15 +551,35 @@ interactive input from the terminal.
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then,
-run `rake spec` to run the tests. You can also run `bin/console` for an
-interactive prompt that will allow you to experiment.
+To install dependencies and run the build, run the pre-commit build:
 
-To install this gem onto your local machine, run `bundle exec rake install`. To
-release a new version, update the version number in `version.rb`, and then run
-`bundle exec rake release`, which will create a git tag for the version, push
-git commits and tags, and push the `.gem` file to
-[rubygems.org](https://rubygems.org).
+```shell script
+./go
+```
+
+This runs all unit tests and other checks including coverage and code linting / 
+formatting.
+
+To run only the unit tests, including coverage:
+
+```shell script
+./go test:unit
+```
+
+To attempt to fix any code linting / formatting issues:
+
+```shell script
+./go library:fix
+```
+
+To check for code linting / formatting issues without fixing:
+
+```shell script
+./go library:check
+```
+
+You can also run `bin/console` for an interactive prompt that will allow you to 
+experiment.
 
 ### Managing CircleCI keys
 

data/Rakefile

@@ -5,10 +5,12 @@ require 'rake_ssh'
 require 'rake_gpg'
 require 'securerandom'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-task default: :spec
-
-RSpec::Core::RakeTask.new(:spec)
+task default: [
+  #:'library:fix',
+  :'test:unit'
+]
 
 namespace :encryption do
   namespace :passphrase do
@@ -39,6 +41,20 @@ namespace :keys do
   end
 end
 
+RuboCop::RakeTask.new
+
+namespace :library do
+  desc 'Run all checks of the library'
+  task check: [:rubocop]
+
+  desc 'Attempt to automatically fix issues with the library'
+  task fix: [:'rubocop:auto_correct']
+end
+
+namespace :test do
+  RSpec::Core::RakeTask.new(:unit)
+end
+
 RakeCircleCI.define_project_tasks(
   namespace: :circle_ci,
   project_slug: 'github/infrablocks/ruby_terraform'

data/lib/ruby_terraform/commands/apply.rb

@@ -20,29 +20,30 @@ module RubyTerraform
         no_color = opts[:no_color]
 
         builder
-            .with_subcommand('apply') do |sub|
-              vars.each do |key, value|
-                var_value = value.is_a?(String) ? value : JSON.generate(value)
-                sub = sub.with_option(
-                    '-var', "'#{key}=#{var_value}'", separator: ' ')
-              end
-              sub = sub.with_option('-var-file', var_file) if var_file
-              var_files.each do |file|
-                sub = sub.with_option('-var-file', file)
-              end
-              sub = sub.with_option('-target', target) if target
-              targets.each do |file|
-                sub = sub.with_option('-target', file)
-              end
-              sub = sub.with_option('-state', state) if state
-              sub = sub.with_option('-input', input) if input
-              sub = sub.with_option('-auto-approve', auto_approve) unless
-                  auto_approve.nil?
-              sub = sub.with_option('-backup', backup) if backup
-              sub = sub.with_flag('-no-color') if no_color
-              sub
-            end
-            .with_argument(plan || directory)
+          .with_subcommand('apply') do |sub|
+          vars.each do |key, value|
+            var_value = value.is_a?(String) ? value : JSON.generate(value)
+            sub = sub.with_option(
+              '-var', "'#{key}=#{var_value}'", separator: ' '
+            )
+          end
+          sub = sub.with_option('-var-file', var_file) if var_file
+          var_files.each do |file|
+            sub = sub.with_option('-var-file', file)
+          end
+          sub = sub.with_option('-target', target) if target
+          targets.each do |file|
+            sub = sub.with_option('-target', file)
+          end
+          sub = sub.with_option('-state', state) if state
+          sub = sub.with_option('-input', input) if input
+          sub = sub.with_option('-auto-approve', auto_approve) unless
+              auto_approve.nil?
+          sub = sub.with_option('-backup', backup) if backup
+          sub = sub.with_flag('-no-color') if no_color
+          sub
+        end
+          .with_argument(plan || directory)
       end
     end
   end

data/lib/ruby_terraform/commands/destroy.rb

@@ -18,29 +18,30 @@ module RubyTerraform
         auto_approve = opts[:auto_approve]
 
         builder
-            .with_subcommand('destroy') do |sub|
-              vars.each do |key, value|
-                var_value = value.is_a?(String) ? value : JSON.generate(value)
-                sub = sub.with_option(
-                    '-var', "'#{key}=#{var_value}'", separator: ' ')
-              end
-              sub = sub.with_option('-var-file', var_file) if var_file
-              var_files.each do |file|
-                sub = sub.with_option('-var-file', file)
-              end
-              sub = sub.with_option('-target', target) if target
-              targets.each do |target_name|
-                sub = sub.with_option('-target', target_name)
-              end
-              sub = sub.with_option('-state', state) if state
-              sub = sub.with_option('-auto-approve', auto_approve) unless
-                  auto_approve.nil?
-              sub = sub.with_option('-backup', backup) if backup
-              sub = sub.with_flag('-no-color') if no_color
-              sub = sub.with_flag('-force') if force
-              sub
-            end
-            .with_argument(directory)
+          .with_subcommand('destroy') do |sub|
+          vars.each do |key, value|
+            var_value = value.is_a?(String) ? value : JSON.generate(value)
+            sub = sub.with_option(
+              '-var', "'#{key}=#{var_value}'", separator: ' '
+            )
+          end
+          sub = sub.with_option('-var-file', var_file) if var_file
+          var_files.each do |file|
+            sub = sub.with_option('-var-file', file)
+          end
+          sub = sub.with_option('-target', target) if target
+          targets.each do |target_name|
+            sub = sub.with_option('-target', target_name)
+          end
+          sub = sub.with_option('-state', state) if state
+          sub = sub.with_option('-auto-approve', auto_approve) unless
+              auto_approve.nil?
+          sub = sub.with_option('-backup', backup) if backup
+          sub = sub.with_flag('-no-color') if no_color
+          sub = sub.with_flag('-force') if force
+          sub
+        end
+          .with_argument(directory)
       end
     end
   end

data/lib/ruby_terraform/commands/get.rb

@@ -5,12 +5,12 @@ module RubyTerraform
     class Get < Base
       def configure_command(builder, opts)
         builder
-            .with_subcommand('get') do |sub|
-              sub = sub.with_option('-update', true) if opts[:update]
-              sub = sub.with_flag('-no-color') if opts[:no_color]
-              sub
-            end
-            .with_argument(opts[:directory])
+          .with_subcommand('get') do |sub|
+          sub = sub.with_option('-update', true) if opts[:update]
+          sub = sub.with_flag('-no-color') if opts[:no_color]
+          sub
+        end
+          .with_argument(opts[:directory])
       end
     end
   end

data/lib/ruby_terraform/commands/init.rb

@@ -14,21 +14,28 @@ module RubyTerraform
         force_copy = opts[:force_copy]
 
         builder = builder
-            .with_subcommand('init') do |sub|
-              sub = sub.with_option('-backend', backend) unless backend.nil?
-              sub = sub.with_option('-force-copy', force_copy) unless force_copy.nil?
-              sub = sub.with_option('-get', get) unless get.nil?
-              sub = sub.with_option('-from-module', source) if source
-              sub = sub.with_flag('-no-color') if no_color
-              sub = sub.with_option('-plugin-dir', plugin_dir) unless plugin_dir.nil?
-              backend_config.each do |key, value|
-                sub = sub.with_option(
-                    '-backend-config',
-                    "'#{key}=#{value}'",
-                    separator: ' ')
-              end
-              sub
-            end
+                  .with_subcommand('init') do |sub|
+          sub = sub.with_option('-backend', backend) unless backend.nil?
+          unless force_copy.nil?
+            sub = sub.with_option('-force-copy',
+                                  force_copy)
+          end
+          sub = sub.with_option('-get', get) unless get.nil?
+          sub = sub.with_option('-from-module', source) if source
+          sub = sub.with_flag('-no-color') if no_color
+          unless plugin_dir.nil?
+            sub = sub.with_option('-plugin-dir',
+                                  plugin_dir)
+          end
+          backend_config.each do |key, value|
+            sub = sub.with_option(
+              '-backend-config',
+              "'#{key}=#{value}'",
+              separator: ' '
+            )
+          end
+          sub
+        end
 
         builder = builder.with_argument(path) if path
 

data/lib/ruby_terraform/commands/output.rb

@@ -18,7 +18,7 @@ module RubyTerraform
         mod = opts[:module]
 
         builder = builder
-            .with_subcommand('output') do |sub|
+                  .with_subcommand('output') do |sub|
           sub = sub.with_flag('-no-color') if no_color
           sub = sub.with_flag('-json') if json
           sub = sub.with_option('-state', state) if state

data/lib/ruby_terraform/commands/plan.rb

@@ -18,28 +18,29 @@ module RubyTerraform
         no_color = opts[:no_color]
 
         builder
-            .with_subcommand('plan') do |sub|
-              vars.each do |key, value|
-                var_value = value.is_a?(String) ? value : JSON.generate(value)
-                sub = sub.with_option(
-                    '-var', "'#{key}=#{var_value}'", separator: ' ')
-              end
-              sub = sub.with_option('-var-file', var_file) if var_file
-              var_files.each do |file|
-                sub = sub.with_option('-var-file', file)
-              end
-              sub = sub.with_option('-target', target) if target
-              targets.each do |file|
-                sub = sub.with_option('-target', file)
-              end
-              sub = sub.with_option('-state', state) if state
-              sub = sub.with_option('-out', plan) if plan
-              sub = sub.with_option('-input', input) if input
-              sub = sub.with_flag('-destroy') if destroy
-              sub = sub.with_flag('-no-color') if no_color
-              sub
-            end
-            .with_argument(directory)
+          .with_subcommand('plan') do |sub|
+          vars.each do |key, value|
+            var_value = value.is_a?(String) ? value : JSON.generate(value)
+            sub = sub.with_option(
+              '-var', "'#{key}=#{var_value}'", separator: ' '
+            )
+          end
+          sub = sub.with_option('-var-file', var_file) if var_file
+          var_files.each do |file|
+            sub = sub.with_option('-var-file', file)
+          end
+          sub = sub.with_option('-target', target) if target
+          targets.each do |file|
+            sub = sub.with_option('-target', file)
+          end
+          sub = sub.with_option('-state', state) if state
+          sub = sub.with_option('-out', plan) if plan
+          sub = sub.with_option('-input', input) if input
+          sub = sub.with_flag('-destroy') if destroy
+          sub = sub.with_flag('-no-color') if no_color
+          sub
+        end
+          .with_argument(directory)
       end
     end
   end

data/lib/ruby_terraform/commands/refresh.rb

@@ -16,26 +16,27 @@ module RubyTerraform
         no_color = opts[:no_color]
 
         builder
-            .with_subcommand('refresh') do |sub|
-              vars.each do |key, value|
-                var_value = value.is_a?(String) ? value : JSON.generate(value)
-                sub = sub.with_option(
-                    '-var', "'#{key}=#{var_value}'", separator: ' ')
-              end
-              sub = sub.with_option('-var-file', var_file) if var_file
-              var_files.each do |file|
-                sub = sub.with_option('-var-file', file)
-              end
-              sub = sub.with_option('-state', state) if state
-              sub = sub.with_option('-input', input) if input
-              sub = sub.with_option('-target', target) if target
-              targets.each do |target_name|
-                sub = sub.with_option('-target', target_name)
-              end
-              sub = sub.with_flag('-no-color') if no_color
-              sub
-            end
-            .with_argument(directory)
+          .with_subcommand('refresh') do |sub|
+          vars.each do |key, value|
+            var_value = value.is_a?(String) ? value : JSON.generate(value)
+            sub = sub.with_option(
+              '-var', "'#{key}=#{var_value}'", separator: ' '
+            )
+          end
+          sub = sub.with_option('-var-file', var_file) if var_file
+          var_files.each do |file|
+            sub = sub.with_option('-var-file', file)
+          end
+          sub = sub.with_option('-state', state) if state
+          sub = sub.with_option('-input', input) if input
+          sub = sub.with_option('-target', target) if target
+          targets.each do |target_name|
+            sub = sub.with_option('-target', target_name)
+          end
+          sub = sub.with_flag('-no-color') if no_color
+          sub
+        end
+          .with_argument(directory)
       end
     end
   end

data/lib/ruby_terraform/commands/remote_config.rb

@@ -9,17 +9,18 @@ module RubyTerraform
         backend_config = opts[:backend_config] || {}
 
         builder
-            .with_subcommand('remote')
-            .with_subcommand('config') do |sub|
-              sub = sub.with_option('-backend', backend) if backend
-              backend_config.each do |key, value|
-                sub = sub.with_option(
-                    '-backend-config', "'#{key}=#{value}'", separator: ' ')
-              end
+          .with_subcommand('remote')
+          .with_subcommand('config') do |sub|
+          sub = sub.with_option('-backend', backend) if backend
+          backend_config.each do |key, value|
+            sub = sub.with_option(
+              '-backend-config', "'#{key}=#{value}'", separator: ' '
+            )
+          end
 
-              sub = sub.with_flag('-no-color') if no_color
-              sub
-            end
+          sub = sub.with_flag('-no-color') if no_color
+          sub
+        end
       end
     end
   end

data/lib/ruby_terraform/commands/validate.rb

@@ -15,24 +15,25 @@ module RubyTerraform
         json_format = opts[:json]
 
         builder
-            .with_subcommand('validate') do |sub|
-              vars.each do |key, value|
-                var_value = value.is_a?(String) ? value : JSON.generate(value)
-                sub = sub.with_option(
-                    '-var', "'#{key}=#{var_value}'", separator: ' ')
-              end
-              sub = sub.with_option('-var-file', var_file) if var_file
-              var_files.each do |file|
-                sub = sub.with_option('-var-file', file)
-              end
-              sub = sub.with_option('-state', state) if state
-              sub = sub.with_option('-check-variables', check_variables) unless
-                  check_variables.nil?
-              sub = sub.with_flag('-no-color') if no_color
-              sub = sub.with_flag('-json') if json_format
-              sub
-            end
-            .with_argument(directory)
+          .with_subcommand('validate') do |sub|
+          vars.each do |key, value|
+            var_value = value.is_a?(String) ? value : JSON.generate(value)
+            sub = sub.with_option(
+              '-var', "'#{key}=#{var_value}'", separator: ' '
+            )
+          end
+          sub = sub.with_option('-var-file', var_file) if var_file
+          var_files.each do |file|
+            sub = sub.with_option('-var-file', file)
+          end
+          sub = sub.with_option('-state', state) if state
+          sub = sub.with_option('-check-variables', check_variables) unless
+              check_variables.nil?
+          sub = sub.with_flag('-no-color') if no_color
+          sub = sub.with_flag('-json') if json_format
+          sub
+        end
+          .with_argument(directory)
       end
     end
   end

data/lib/ruby_terraform/commands/workspace.rb

@@ -9,14 +9,12 @@ module RubyTerraform
         workspace = opts[:workspace] || nil
 
         builder = builder
-            .with_subcommand('workspace')
-            .with_subcommand(operation)
+                  .with_subcommand('workspace')
+                  .with_subcommand(operation)
 
         builder = builder.with_subcommand(workspace) if
             workspace && operation != 'list'
-        builder = builder.with_argument(directory)
-
-        builder
+        builder.with_argument(directory)
       end
     end
   end

data/lib/ruby_terraform/version.rb

@@ -1,3 +1,3 @@
 module RubyTerraform
-  VERSION = '0.65.0.pre.2'.freeze
+  VERSION = '0.65.0.pre.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-terraform
 version: !ruby/object:Gem::Version
-  version: 0.65.0.pre.2
+  version: 0.65.0.pre.3
 platform: ruby
 authors:
 - Toby Clemson
@@ -70,30 +70,30 @@ dependencies:
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.16'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -182,44 +182,44 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.21'
 description: Wraps the Terraform CLI so that Terraform can be invoked from a Ruby
   script or Rakefile.
 email: