ruby-terraform 0.65.0.pre.1 → 0.65.0.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16009b9bc2985a1338a90ca2fc881ed7e75150471d241359f4d62e61ca6dd7c7
-  data.tar.gz: d7f328671bf4c122776548ac81a2608e6beec764c20a292c95fc06120df40404
+  metadata.gz: c5cfd39cb3e8dbe09c0589280ac5b3879e913a9588574420bb285d89a8507217
+  data.tar.gz: 0e87b3b820aff40c28c38073735c4da17c14f95081b6a57f861df034a326bfa1
 SHA512:
-  metadata.gz: b6f49b564e09567b5393dc1a93d48764331b8551a5fce741e394288f0568276e8eb1e5c929f95e20d7ea26e0088533eea3d4a3cecbe5446bdce64a188854c5de
-  data.tar.gz: 010cabe4078842a9a67a2ee6f91583f0d20644d4c249aea837a0fd2cf94e6761fafeaa02640d58b92611d88016b3c5e76f8efb0b125bc3b13a47907f74968edc
+  metadata.gz: 86d696b30097ac1248ae4f421c591307bad5002ce91fb0352e30334d1c5861ec8abd43c734e6fb1eb0c6efefb07d7f9b09706684bd97b616a6f556e2e6fb9064
+  data.tar.gz: c55bd0a0a10da6bf852b097c17e11890c26ddbeb123edff321a31d5c89fa09404145299c69cda3b403979a0f88d6eca7d9ebf676b5e570933cd4e14f63b36483

data/Gemfile.lock

@@ -1,33 +1,37 @@
 PATH
   remote: .
   specs:
-    ruby-terraform (0.65.0.pre.1)
-      lino (>= 1.5)
+    ruby-terraform (0.65.0.pre.6)
+      lino (>= 2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
     coderay (1.1.3)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    excon (0.78.1)
+    docile (1.3.5)
+    excon (0.79.0)
     faker (2.17.0)
       i18n (>= 1.6, < 2)
-    faraday (1.1.0)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
+    faraday-net_http (1.0.1)
     ffi (1.15.0)
     formatador (0.2.5)
-    gem-release (2.2.0)
+    gem-release (2.2.1)
     guard (2.16.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -44,40 +48,44 @@ GEM
       rspec (>= 2.99.0, < 4.0)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    lino (1.5.0)
+    lino (2.3.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
-    listen (3.4.1)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.14.2)
+    minitest (5.14.4)
     multipart-post (2.1.1)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.19.0)
+    octokit (4.20.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    pry (0.13.1)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    pry (0.14.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    rake (13.0.1)
+    rainbow (3.0.0)
+    rake (13.0.3)
     rake_circle_ci (0.9.0)
       colored2 (~> 3.1)
       excon (~> 0.72)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
-    rake_factory (0.27.0)
+    rake_factory (0.29.0)
       activesupport (>= 4)
       rake (~> 13.0)
-    rake_github (0.5.0)
+    rake_github (0.7.0)
       colored2 (~> 3.1)
       octokit (~> 4.16)
       rake_factory (~> 0.23)
@@ -85,39 +93,62 @@ GEM
     rake_gpg (0.14.0)
       rake_factory (>= 0.23, < 1)
       ruby_gpg2 (>= 0.6, < 1)
-    rake_ssh (0.4.0)
+    rake_ssh (0.6.0)
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
       rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
+    rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    ruby2_keywords (0.0.2)
-    ruby_gpg2 (0.6.0)
+    rspec-support (3.10.2)
+    rubocop (1.12.1)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-rspec (2.2.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
+    ruby_gpg2 (0.8.0)
       lino (>= 1.5)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     shellany (0.0.1)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     sshkey (2.0.0)
     thor (1.1.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.8)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -126,15 +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 (~> 1.12)
+  rubocop-rspec (~> 2.2)
   ruby-terraform!
+  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
@@ -23,83 +25,99 @@ end
 namespace :keys do
   namespace :deploy do
     RakeSSH.define_key_tasks(
-        path: 'config/secrets/ci/',
-        comment: 'maintainers@infrablocks.io')
+      path: 'config/secrets/ci/',
+      comment: 'maintainers@infrablocks.io'
+    )
   end
 
   namespace :gpg do
     RakeGPG.define_generate_key_task(
-        output_directory: 'config/secrets/ci',
-        name_prefix: 'gpg',
-        owner_name: 'InfraBlocks Maintainers',
-        owner_email: 'maintainers@infrablocks.io',
-        owner_comment: 'ruby_terraform CI Key')
+      output_directory: 'config/secrets/ci',
+      name_prefix: 'gpg',
+      owner_name: 'InfraBlocks Maintainers',
+      owner_email: 'maintainers@infrablocks.io',
+      owner_comment: 'ruby_terraform CI Key'
+    )
   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'
+  namespace: :circle_ci,
+  project_slug: 'github/infrablocks/ruby_terraform'
 ) do |t|
   circle_ci_config =
-      YAML.load_file('config/secrets/circle_ci/config.yaml')
+    YAML.load_file('config/secrets/circle_ci/config.yaml')
 
-  t.api_token = circle_ci_config["circle_ci_api_token"]
+  t.api_token = circle_ci_config['circle_ci_api_token']
   t.environment_variables = {
-      ENCRYPTION_PASSPHRASE:
-          File.read('config/secrets/ci/encryption.passphrase')
-              .chomp
+    ENCRYPTION_PASSPHRASE:
+        File.read('config/secrets/ci/encryption.passphrase')
+            .chomp
   }
   t.checkout_keys = []
   t.ssh_keys = [
-      {
-          hostname: "github.com",
-          private_key: File.read('config/secrets/ci/ssh.private')
-      }
+    {
+      hostname: 'github.com',
+      private_key: File.read('config/secrets/ci/ssh.private')
+    }
   ]
 end
 
 RakeGithub.define_repository_tasks(
-    namespace: :github,
-    repository: 'infrablocks/ruby_terraform',
+  namespace: :github,
+  repository: 'infrablocks/ruby_terraform'
 ) do |t|
   github_config =
-      YAML.load_file('config/secrets/github/config.yaml')
+    YAML.load_file('config/secrets/github/config.yaml')
 
-  t.access_token = github_config["github_personal_access_token"]
+  t.access_token = github_config['github_personal_access_token']
   t.deploy_keys = [
-      {
-          title: 'CircleCI',
-          public_key: File.read('config/secrets/ci/ssh.public')
-      }
+    {
+      title: 'CircleCI',
+      public_key: File.read('config/secrets/ci/ssh.public')
+    }
   ]
 end
 
 namespace :pipeline do
-  task :prepare => [
-      :'circle_ci:project:follow',
-      :'circle_ci:env_vars:ensure',
-      :'circle_ci:checkout_keys:ensure',
-      :'circle_ci:ssh_keys:ensure',
-      :'github:deploy_keys:ensure'
+  task prepare: %i[
+    circle_ci:project:follow
+    circle_ci:env_vars:ensure
+    circle_ci:checkout_keys:ensure
+    circle_ci:ssh_keys:ensure
+    github:deploy_keys:ensure
   ]
 end
 
 namespace :version do
-  desc "Bump version for specified type (pre, major, minor, patch)"
+  desc 'Bump version for specified type (pre, major, minor, patch)'
   task :bump, [:type] do |_, args|
     bump_version_for(args.type)
   end
 end
 
-desc "Release gem"
+desc 'Release gem'
 task :release do
-  sh "gem release --tag --push"
+  sh 'gem release --tag --push'
 end
 
 def bump_version_for(version_type)
-  sh "gem bump --version #{version_type} " +
-      "&& bundle install " +
-      "&& export LAST_MESSAGE=\"$(git log -1 --pretty=%B)\" " +
-      "&& git commit -a --amend -m \"${LAST_MESSAGE} [ci skip]\""
+  sh "gem bump --version #{version_type} " \
+     '&& bundle install ' \
+     '&& export LAST_MESSAGE="$(git log -1 --pretty=%B)" ' \
+     '&& git commit -a --amend -m "${LAST_MESSAGE} [ci skip]"'
 end

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "ruby_terraform"
+require 'bundler/setup'
+require 'ruby_terraform'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "ruby_terraform"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/ruby-terraform.rb

@@ -1,3 +1,3 @@
 # Enable `require 'ruby-terraform'`, to match the gem name
 
-require_relative 'ruby_terraform.rb'
+require_relative 'ruby_terraform'

data/lib/ruby_terraform.rb

@@ -21,60 +21,25 @@ module RubyTerraform
   end
 
   module ClassMethods
-    def clean(opts = {})
-      Commands::Clean.new.execute(opts)
-    end
-
-    def init(opts = {})
-      Commands::Init.new.execute(opts)
-    end
-
-    def get(opts = {})
-      Commands::Get.new.execute(opts)
-    end
-
-    def validate(opts = {})
-      Commands::Validate.new.execute(opts)
-    end
-
-    def plan(opts = {})
-      Commands::Plan.new.execute(opts)
-    end
-
-    def apply(opts = {})
-      Commands::Apply.new.execute(opts)
-    end
-
-    def destroy(opts = {})
-      Commands::Destroy.new.execute(opts)
-    end
-
-    def remote_config(opts = {})
-      Commands::RemoteConfig.new.execute(opts)
-    end
-
-    def refresh(opts = {})
-      Commands::Refresh.new.execute(opts)
-    end
-
-    def output(opts = {})
-      Commands::Output.new.execute(opts)
-    end
-
-    def show(opts = {})
-      Commands::Show.new.execute(opts)
-    end
-
-    def workspace(opts = {})
-      Commands::Workspace.new.execute(opts)
-    end
-
-    def import(opts = {})
-      Commands::Import.new.execute(opts)
-    end
-
-    def format(opts = {})
-      Commands::Format.new.execute(opts)
+    {
+      apply: RubyTerraform::Commands::Apply,
+      clean: RubyTerraform::Commands::Clean,
+      destroy: RubyTerraform::Commands::Destroy,
+      format: RubyTerraform::Commands::Format,
+      get: RubyTerraform::Commands::Get,
+      import: RubyTerraform::Commands::Import,
+      init: RubyTerraform::Commands::Init,
+      output: RubyTerraform::Commands::Output,
+      plan: RubyTerraform::Commands::Plan,
+      refresh: RubyTerraform::Commands::Refresh,
+      remote_config: RubyTerraform::Commands::RemoteConfig,
+      show: RubyTerraform::Commands::Show,
+      validate: RubyTerraform::Commands::Validate,
+      workspace: RubyTerraform::Commands::Workspace
+    }.each do |method, command_class|
+      define_method(method) do |opts = {}|
+        command_class.new.execute(opts)
+      end
     end
   end
   extend ClassMethods
@@ -107,7 +72,7 @@ module RubyTerraform
     end
 
     def write(*args)
-      @targets.each {|t| t.write(*args)}
+      @targets.each { |t| t.write(*args) }
     end
 
     def close