rake_terraform 0.35.0 → 1.0.0.pre.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2c1eb472cc4f80c52ca39865d920c200a425e6f76e7e37f6407d603b280dbc1
-  data.tar.gz: 7b6603b087edb2f7cc5c8b86f238453640afb51c398014377d56628dea47f797
+  metadata.gz: fd20b77a664a79fab0d81ba66cd46ebddaf2a09ea5cd01c72425b54438586281
+  data.tar.gz: f2f27f6c4314a992232c1897a3b85c2b1bbd0c7d1a550fbf1093a3a0e8bee3bf
 SHA512:
-  metadata.gz: 9830f1df1e666b04864365620f05be1e46bab2944717ee495fe40acc264007aad57cbd72f39ee6487a5213f905ad7a6b977f9745f0e6b8fa8e2eb7313ec4a40c
-  data.tar.gz: 62b729595baf7c54d205ad327f03196947230b371e2789897d8077f2d2bce92715f7a9035777940f376d86193b22a3e7f22f72c4678075c7a3fa4e0ca8a9a1c4
+  metadata.gz: 6c39779c8e16c06cae0e4d8908672c1d2d29e8cd5b139e9709bb047e677458f8fca134ac8456eca4e71af63e7aa26ede63b56a72e3277a2758c3df810d77777b
+  data.tar.gz: 5e293d0e96e7a47971ce548cdc30cbacfe52b550610c0c7718a4204042a730cb0094c4560cb5a275c6114becc5dda9fe831a4ee4778ff72ff3b831f98676d3e8

data/Gemfile.lock

@@ -1,15 +1,16 @@
 PATH
   remote: .
   specs:
-    rake_terraform (0.35.0)
+    rake_terraform (1.0.0.pre.pre.1)
       colored2 (~> 3.1)
-      rake_dependencies (~> 1.6)
-      ruby-terraform (~> 0.46)
+      rake_dependencies (>= 1.8)
+      rake_factory (>= 0.15)
+      ruby-terraform (~> 0.48)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.3)
+    activesupport (5.2.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -18,44 +19,44 @@ GEM
     concurrent-ruby (1.1.5)
     diff-lcs (1.3)
     fakefs (0.20.1)
-    gem-release (2.0.4)
+    gem-release (2.1.1)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     lino (1.1.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
     minitar (0.9)
-    minitest (5.12.2)
+    minitest (5.14.0)
     open4 (1.3.4)
-    rake (13.0.0)
-    rake_dependencies (1.6.0)
+    rake (13.0.1)
+    rake_dependencies (1.10.0)
       hamster (~> 3.0)
       minitar (~> 0.9)
-      rake_factory (~> 0.11)
+      rake_factory (>= 0.11)
       rubyzip (~> 2.0)
-    rake_factory (0.11.0)
+    rake_factory (0.15.0)
       activesupport (~> 5.2)
       rake (~> 13.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
     rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
+    rspec-support (3.9.2)
     ruby-terraform (0.48.0)
       lino (~> 1.1)
     rubyzip (2.0.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
 
 PLATFORMS

data/lib/rake_terraform/task_sets/all.rb

@@ -0,0 +1,77 @@
+require 'rake_factory'
+
+require_relative '../tasks'
+
+module RakeTerraform
+  module TaskSets
+    class All < RakeFactory::TaskSet
+      parameter :configuration_name, :required => true
+      parameter :source_directory, :required => true
+      parameter :work_directory, :required => true
+
+      parameter :backend_config
+
+      parameter :vars
+      parameter :var_file
+      parameter :state_file
+
+      parameter :debug, :default => false
+
+      parameter :no_color, :default => false
+      parameter :no_backup, :default => false
+      parameter :no_print_output, :default => false
+
+      parameter :backup_file
+      parameter :plan_file
+
+      parameter :argument_names
+
+      parameter :ensure_task_name, :default => :'terraform:ensure'
+
+      parameter :validate_task_name, :default => :validate
+      parameter :validate_argument_names
+
+      parameter :plan_task_name, :default => :plan
+      parameter :plan_argument_names
+
+      parameter :provision_task_name, :default => :provision
+      parameter :provision_argument_names
+
+      parameter :destroy_task_name, :default => :destroy
+      parameter :destroy_argument_names
+
+      parameter :output_task_name, :default => :output
+      parameter :output_argument_names
+
+      task Tasks::Validate,
+          name: ->(ts) { ts.validate_task_name },
+          argument_names: ->(ts) {
+            ts.validate_argument_names || ts.argument_names || []
+          }
+      task Tasks::Plan, {
+          name: ->(ts) { ts.plan_task_name },
+          argument_names: ->(ts) {
+            ts.plan_argument_names || ts.argument_names || []
+          }
+      }
+      task Tasks::Provision, {
+          name: ->(ts) { ts.provision_task_name },
+          argument_names: ->(ts) {
+            ts.provision_argument_names || ts.argument_names || []
+          }
+      }
+      task Tasks::Destroy, {
+          name: ->(ts) { ts.destroy_task_name },
+          argument_names: ->(ts) {
+            ts.destroy_argument_names || ts.argument_names || []
+          }
+      }
+      task Tasks::Output, {
+          name: ->(ts) { ts.output_task_name },
+          argument_names: ->(ts) {
+            ts.output_argument_names || ts.argument_names || []
+          }
+      }
+    end
+  end
+end

data/lib/rake_terraform/task_sets.rb

@@ -0,0 +1 @@
+require_relative 'task_sets/all'

data/lib/rake_terraform/tasks/destroy.rb

@@ -1,14 +1,16 @@
+require 'rake_factory'
 require 'ruby_terraform'
 require 'ostruct'
 require 'colored2'
-require_relative '../tasklib'
 
 module RakeTerraform
   module Tasks
-    class Destroy < TaskLib
-      parameter :name, :default => :destroy
-      parameter :argument_names, :default => []
-
+    class Destroy < RakeFactory::Task
+      default_name :destroy
+      default_prerequisites ->(t) { [t.ensure_task_name] }
+      default_description ->(t) {
+        "Destroy #{t.configuration_name} using terraform"
+      }
       parameter :configuration_name, :required => true
       parameter :source_directory, :required => true
       parameter :work_directory, :required => true
@@ -25,72 +27,33 @@ module RakeTerraform
 
       parameter :backup_file
 
-      parameter :ensure_task, :default => :'terraform:ensure'
-
-      def process_arguments(args)
-        self.name = args[0] if args[0]
-      end
-
-      def define
-        desc "Destroy #{configuration_name} using terraform"
-        task name, argument_names => [ensure_task] do |_, args|
-          Colored2.disable! if no_color
-
-          puts "Destroying #{configuration_name}".cyan
-
-          params = OpenStruct.new({
-              configuration_name: configuration_name,
-              source_directory: source_directory,
-              work_directory: work_directory,
-              backend_config: backend_config,
-              var_file: var_file,
-              state_file: state_file,
-              debug: debug,
-              no_color: no_color,
-              no_backup: no_backup,
-              backup_file: backup_file,
-          })
-
-          derived_source_directory = source_directory.respond_to?(:call) ?
-             source_directory.call(
-                 *[args, params].slice(0, source_directory.arity)) :
-             source_directory
-
-          configuration_directory = File.join(work_directory, derived_source_directory)
-
-          RubyTerraform.clean(
-              directory: configuration_directory)
-
-          mkdir_p File.dirname(configuration_directory)
-          cp_r derived_source_directory, configuration_directory
-
-          params.configuration_directory = configuration_directory
-
-          derived_backend_config = backend_config.respond_to?(:call) ?
-              backend_config.call(
-                  *[args, params].slice(0, backend_config.arity)) :
-              backend_config
-          derived_vars = vars.respond_to?(:call) ?
-              vars.call(*[args, params].slice(0, vars.arity)) :
-              vars
-          derived_state_file = state_file.respond_to?(:call) ?
-              state_file.call(
-                  *[args, params].slice(0, state_file.arity)) :
-              state_file
-
-          Dir.chdir(configuration_directory) do
-            RubyTerraform.init(
-                backend_config: derived_backend_config,
-                no_color: no_color)
-            RubyTerraform.destroy(
-                force: true,
-                no_color: no_color,
-                no_backup: no_backup,
-                backup: backup_file,
-                state: derived_state_file,
-                vars: derived_vars,
-                var_file: var_file)
-          end
+      parameter :ensure_task_name, :default => :'terraform:ensure'
+
+      action do |t|
+        Colored2.disable! if t.no_color
+
+        configuration_directory =
+            File.join(t.work_directory, t.source_directory)
+
+        puts "Destroying #{t.configuration_name}".cyan
+        RubyTerraform.clean(
+            directory: configuration_directory)
+
+        mkdir_p File.dirname(configuration_directory)
+        cp_r t.source_directory, configuration_directory
+
+        Dir.chdir(configuration_directory) do
+          RubyTerraform.init(
+              backend_config: t.backend_config,
+              no_color: t.no_color)
+          RubyTerraform.destroy(
+              force: true,
+              no_color: t.no_color,
+              no_backup: t.no_backup,
+              backup: t.backup_file,
+              state: t.state_file,
+              vars: t.vars,
+              var_file: t.var_file)
         end
       end
     end

data/lib/rake_terraform/tasks/output.rb

@@ -1,13 +1,16 @@
+require 'rake_factory'
 require 'ruby_terraform'
 require 'ostruct'
 require 'colored2'
-require_relative '../tasklib'
 
 module RakeTerraform
   module Tasks
-    class Output < TaskLib
-      parameter :name, :default => :output
-      parameter :argument_names, :default => []
+    class Output < RakeFactory::Task
+      default_name :output
+      default_prerequisites ->(t) { [t.ensure_task_name] }
+      default_description ->(t) {
+        "Output #{t.configuration_name} using terraform"
+      }
 
       parameter :configuration_name, :required => true
       parameter :source_directory, :required => true
@@ -21,67 +24,33 @@ module RakeTerraform
       parameter :no_color, :default => false
       parameter :no_print_output, :default => false
 
-      parameter :ensure_task, :default => :'terraform:ensure'
+      parameter :ensure_task_name, :default => :'terraform:ensure'
 
-      def process_arguments(args)
-        self.name = args[0] if args[0]
-      end
-
-      def define
-        desc "Output #{configuration_name} using terraform"
-        task name, argument_names => [ensure_task] do |_, args|
-          Colored2.disable! if no_color
-
-          puts "Output of #{configuration_name}".cyan
-
-          params = OpenStruct.new({
-            configuration_name: configuration_name,
-            source_directory: source_directory,
-            work_directory: work_directory,
-            backend_config: backend_config,
-            state_file: state_file,
-            debug: debug,
-            no_color: no_color,
-            no_print_output: no_print_output,
-          })
-
-          derived_source_directory = source_directory.respond_to?(:call) ?
-             source_directory.call(
-                 *[args, params].slice(0, source_directory.arity)) :
-             source_directory
-
-          configuration_directory = File.join(work_directory, derived_source_directory)
-
-          RubyTerraform.clean(
-              directory: configuration_directory)
+      action do |t|
+        Colored2.disable! if t.no_color
 
-          mkdir_p File.dirname(configuration_directory)
-          cp_r derived_source_directory, configuration_directory
+        configuration_directory =
+            File.join(t.work_directory, t.source_directory)
 
-          params.configuration_directory = configuration_directory
+        puts "Output of #{t.configuration_name}".cyan
+        RubyTerraform.clean(
+            directory: configuration_directory)
 
-          derived_backend_config = backend_config.respond_to?(:call) ?
-              backend_config.call(
-                  *[args, params].slice(0, backend_config.arity)) :
-              backend_config
-          derived_state_file = state_file.respond_to?(:call) ?
-              state_file.call(
-                  *[args, params].slice(0, state_file.arity)) :
-              state_file
+        mkdir_p File.dirname(configuration_directory)
+        cp_r t.source_directory, configuration_directory
 
-          Dir.chdir(configuration_directory) do
-            RubyTerraform.init(
-                backend_config: derived_backend_config,
-                no_color: no_color)
+        Dir.chdir(configuration_directory) do
+          RubyTerraform.init(
+              backend_config: t.backend_config,
+              no_color: t.no_color)
 
-            output = RubyTerraform.output(
-                no_color: no_color,
-                state: derived_state_file)
+          output = RubyTerraform.output(
+              no_color: t.no_color,
+              state: t.state_file)
 
-            puts output unless no_print_output
+          puts output unless t.no_print_output
 
-            output
-          end
+          output
         end
       end
     end

data/lib/rake_terraform/tasks/plan.rb

@@ -1,13 +1,16 @@
+require 'rake_factory'
 require 'ruby_terraform'
 require 'ostruct'
 require 'colored2'
-require_relative '../tasklib'
 
 module RakeTerraform
   module Tasks
-    class Plan < TaskLib
-      parameter :name, :default => :plan
-      parameter :argument_names, :default => []
+    class Plan < RakeFactory::Task
+      default_name :plan
+      default_prerequisites ->(t) { [t.ensure_task_name] }
+      default_description ->(t) {
+        "Plan #{t.configuration_name} using terraform"
+      }
 
       parameter :configuration_name, :required => true
       parameter :source_directory, :required => true
@@ -25,68 +28,32 @@ module RakeTerraform
       parameter :plan_file
       parameter :destroy, :default => false
 
-      parameter :ensure_task, :default => :'terraform:ensure'
+      parameter :ensure_task_name, :default => :'terraform:ensure'
 
-      def process_arguments(args)
-        self.name = args[0] if args[0]
-      end
-
-      def define
-        desc "Plan #{configuration_name} using terraform"
-        task name, argument_names => [ensure_task] do |_, args|
-          Colored2.disable! if no_color
-
-          puts "Planning #{configuration_name}".cyan
-
-          params = OpenStruct.new({
-            configuration_name: configuration_name,
-            source_directory: source_directory,
-            work_directory: work_directory,
-            backend_config: backend_config,
-            state_file: state_file,
-            debug: debug,
-            no_color: no_color,
-          })
-
-          derived_source_directory = source_directory.respond_to?(:call) ?
-             source_directory.call(
-                 *[args, params].slice(0, source_directory.arity)) :
-             source_directory
-
-          configuration_directory = File.join(work_directory, derived_source_directory)
-
-          RubyTerraform.clean(
-              directory: configuration_directory)
+      action do |t|
+        Colored2.disable! if t.no_color
 
-          mkdir_p File.dirname(configuration_directory)
-          cp_r derived_source_directory, configuration_directory
+        configuration_directory =
+            File.join(t.work_directory, t.source_directory)
 
-          params.configuration_directory = configuration_directory
+        puts "Planning #{configuration_name}".cyan
+        RubyTerraform.clean(
+            directory: configuration_directory)
 
-          derived_backend_config = backend_config.respond_to?(:call) ?
-              backend_config.call(
-                  *[args, params].slice(0, backend_config.arity)) :
-              backend_config
-          derived_vars = vars.respond_to?(:call) ?
-              vars.call(*[args, params].slice(0, vars.arity)) :
-              vars
-          derived_state_file = state_file.respond_to?(:call) ?
-              state_file.call(
-                  *[args, params].slice(0, state_file.arity)) :
-              state_file
+        mkdir_p File.dirname(configuration_directory)
+        cp_r t.source_directory, configuration_directory
 
-          Dir.chdir(configuration_directory) do
-            RubyTerraform.init(
-                backend_config: derived_backend_config,
-                no_color: no_color)
-            RubyTerraform.plan(
-                no_color: no_color,
-                destroy: destroy,
-                state: derived_state_file,
-                plan: plan_file,
-                vars: derived_vars,
-                var_file: var_file)
-          end
+        Dir.chdir(configuration_directory) do
+          RubyTerraform.init(
+              backend_config: t.backend_config,
+              no_color: t.no_color)
+          RubyTerraform.plan(
+              no_color: t.no_color,
+              destroy: t.destroy,
+              state: t.state_file,
+              plan: t.plan_file,
+              vars: t.vars,
+              var_file: t.var_file)
         end
       end
     end

data/lib/rake_terraform/tasks/provision.rb

@@ -1,13 +1,16 @@
+require 'rake_factory'
 require 'ruby_terraform'
 require 'ostruct'
 require 'colored2'
-require_relative '../tasklib'
 
 module RakeTerraform
   module Tasks
-    class Provision < TaskLib
-      parameter :name, :default => :provision
-      parameter :argument_names, :default => []
+    class Provision < RakeFactory::Task
+      default_name :provision
+      default_prerequisites ->(t) { [t.ensure_task_name] }
+      default_description ->(t) {
+        "Provision #{t.configuration_name} using terraform"
+      }
 
       parameter :configuration_name, :required => true
       parameter :source_directory, :required => true
@@ -25,72 +28,34 @@ module RakeTerraform
 
       parameter :backup_file
 
-      parameter :ensure_task, :default => :'terraform:ensure'
+      parameter :ensure_task_name, :default => :'terraform:ensure'
 
-      def process_arguments(args)
-        self.name = args[0] if args[0]
-      end
-
-      def define
-        desc "Provision #{configuration_name} using terraform"
-        task name, argument_names => [ensure_task] do |_, args|
-          Colored2.disable! if no_color
-
-          puts "Provisioning #{configuration_name}".cyan
-
-          params = OpenStruct.new({
-            configuration_name: configuration_name,
-            source_directory: source_directory,
-            work_directory: work_directory,
-            backend_config: backend_config,
-            var_file: var_file,
-            state_file: state_file,
-            debug: debug,
-            no_color: no_color,
-            no_backup: no_backup,
-            backup_file: backup_file,
-          })
-
-          derived_source_directory = source_directory.respond_to?(:call) ?
-             source_directory.call(
-                 *[args, params].slice(0, source_directory.arity)) :
-             source_directory
-
-          configuration_directory = File.join(work_directory, derived_source_directory)
+      action do |t|
+        Colored2.disable! if t.no_color
 
-          RubyTerraform.clean(
-              directory: configuration_directory)
+        configuration_directory =
+            File.join(t.work_directory, t.source_directory)
 
-          mkdir_p File.dirname(configuration_directory)
-          cp_r derived_source_directory, configuration_directory
+        puts "Provisioning #{t.configuration_name}".cyan
+        RubyTerraform.clean(
+            directory: configuration_directory)
 
-          params.configuration_directory = configuration_directory
+        mkdir_p File.dirname(configuration_directory)
+        cp_r t.source_directory, configuration_directory
 
-          derived_backend_config = backend_config.respond_to?(:call) ?
-              backend_config.call(
-                  *[args, params].slice(0, backend_config.arity)) :
-              backend_config
-          derived_vars = vars.respond_to?(:call) ?
-              vars.call(*[args, params].slice(0, vars.arity)) :
-              vars
-          derived_state_file = state_file.respond_to?(:call) ?
-              state_file.call(
-                  *[args, params].slice(0, state_file.arity)) :
-              state_file
 
-          Dir.chdir(configuration_directory) do
-            RubyTerraform.init(
-                backend_config: derived_backend_config,
-                no_color: no_color)
-            RubyTerraform.apply(
-                auto_approve: true,
-                no_color: no_color,
-                no_backup: no_backup,
-                backup: backup_file,
-                state: derived_state_file,
-                vars: derived_vars,
-                var_file: var_file)
-          end
+        Dir.chdir(configuration_directory) do
+          RubyTerraform.init(
+              backend_config: t.backend_config,
+              no_color: t.no_color)
+          RubyTerraform.apply(
+              auto_approve: true,
+              no_color: t.no_color,
+              no_backup: t.no_backup,
+              backup: t.backup_file,
+              state: t.state_file,
+              vars: t.vars,
+              var_file: t.var_file)
         end
       end
     end

data/lib/rake_terraform/tasks/validate.rb

@@ -1,13 +1,16 @@
+require 'rake_factory'
 require 'ruby_terraform'
 require 'ostruct'
 require 'colored2'
-require_relative '../tasklib'
 
 module RakeTerraform
   module Tasks
-    class Validate < TaskLib
-      parameter :name, :default => :validate
-      parameter :argument_names, :default => []
+    class Validate < RakeFactory::Task
+      default_name :validate
+      default_prerequisites ->(t) { [t.ensure_task_name] }
+      default_description ->(t) {
+        "Validate #{t.configuration_name} using terraform"
+      }
 
       parameter :configuration_name, :required => true
       parameter :source_directory, :required => true
@@ -22,66 +25,30 @@ module RakeTerraform
       parameter :debug, :default => false
       parameter :no_color, :default => false
 
-      parameter :ensure_task, :default => :'terraform:ensure'
+      parameter :ensure_task_name, :default => :'terraform:ensure'
 
-      def process_arguments(args)
-        self.name = args[0] if args[0]
-      end
-
-      def define
-        desc "Validate #{configuration_name} using terraform"
-        task name, argument_names => [ensure_task] do |_, args|
-          Colored2.disable! if no_color
-
-          puts "Validating #{configuration_name}".cyan
-
-          params = OpenStruct.new({
-            configuration_name: configuration_name,
-            source_directory: source_directory,
-            work_directory: work_directory,
-            backend_config: backend_config,
-            state_file: state_file,
-            debug: debug,
-            no_color: no_color,
-          })
-
-          derived_source_directory = source_directory.respond_to?(:call) ?
-             source_directory.call(
-                 *[args, params].slice(0, source_directory.arity)) :
-             source_directory
-
-          configuration_directory = File.join(work_directory, derived_source_directory)
-
-          RubyTerraform.clean(
-              directory: configuration_directory)
+      action do |t|
+        Colored2.disable! if t.no_color
 
-          mkdir_p File.dirname(configuration_directory)
-          cp_r derived_source_directory, configuration_directory
+        configuration_directory =
+            File.join(t.work_directory, t.source_directory)
 
-          params.configuration_directory = configuration_directory
+        puts "Validating #{t.configuration_name}".cyan
+        RubyTerraform.clean(
+            directory: configuration_directory)
 
-          derived_backend_config = backend_config.respond_to?(:call) ?
-              backend_config.call(
-                  *[args, params].slice(0, backend_config.arity)) :
-              backend_config
-          derived_vars = vars.respond_to?(:call) ?
-              vars.call(*[args, params].slice(0, vars.arity)) :
-              vars
-          derived_state_file = state_file.respond_to?(:call) ?
-              state_file.call(
-                  *[args, params].slice(0, state_file.arity)) :
-              state_file
+        mkdir_p File.dirname(configuration_directory)
+        cp_r t.source_directory, configuration_directory
 
-          Dir.chdir(configuration_directory) do
-            RubyTerraform.init(
-                backend_config: derived_backend_config,
-                no_color: no_color)
-            RubyTerraform.validate(
-                no_color: no_color,
-                state: derived_state_file,
-                vars: derived_vars,
-                var_file: var_file)
-          end
+        Dir.chdir(configuration_directory) do
+          RubyTerraform.init(
+              backend_config: t.backend_config,
+              no_color: t.no_color)
+          RubyTerraform.validate(
+              no_color: t.no_color,
+              state: t.state_file,
+              vars: t.vars,
+              var_file: t.var_file)
         end
       end
     end

data/lib/rake_terraform/tasks.rb

@@ -3,4 +3,3 @@ require_relative 'tasks/plan'
 require_relative 'tasks/provision'
 require_relative 'tasks/destroy'
 require_relative 'tasks/output'
-require_relative 'tasks/all'

data/lib/rake_terraform/version.rb

@@ -1,3 +1,3 @@
 module RakeTerraform
-  VERSION = "0.35.0"
+  VERSION = "1.0.0-pre.1"
 end

data/lib/rake_terraform.rb

@@ -2,14 +2,14 @@ require 'logger'
 require 'rake_dependencies'
 require 'ruby_terraform'
 require 'rake_terraform/version'
-require 'rake_terraform/tasklib'
 require 'rake_terraform/tasks'
+require 'rake_terraform/task_sets'
 
 module RakeTerraform
   include RubyTerraform
 
   def self.define_command_tasks(&block)
-    RakeTerraform::Tasks::All.new(&block)
+    RakeTerraform::TaskSets::All.define(&block)
   end
 
   def self.define_installation_tasks(opts = {})

data/rake_terraform.gemspec

@@ -23,8 +23,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'rake_dependencies', '~> 1.6'
-  spec.add_dependency 'ruby-terraform', '~> 0.46'
+  spec.add_dependency 'rake_dependencies', '>= 1.8'
+  spec.add_dependency 'rake_factory', '>= 0.15'
+  spec.add_dependency 'ruby-terraform', '~> 0.48'
   spec.add_dependency 'colored2', '~> 3.1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: rake_terraform
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 1.0.0.pre.pre.1
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-18 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake_dependencies
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rake_factory
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: ruby-terraform
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.48'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.46'
+        version: '0.48'
 - !ruby/object:Gem::Dependency
   name: colored2
   requirement: !ruby/object:Gem::Requirement
@@ -172,10 +186,9 @@ files:
 - config/secrets/rubygems/credentials
 - go
 - lib/rake_terraform.rb
-- lib/rake_terraform/exceptions.rb
-- lib/rake_terraform/tasklib.rb
+- lib/rake_terraform/task_sets.rb
+- lib/rake_terraform/task_sets/all.rb
 - lib/rake_terraform/tasks.rb
-- lib/rake_terraform/tasks/all.rb
 - lib/rake_terraform/tasks/destroy.rb
 - lib/rake_terraform/tasks/output.rb
 - lib/rake_terraform/tasks/plan.rb
@@ -205,9 +218,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.1
 signing_key: 

data/lib/rake_terraform/exceptions.rb

@@ -1,4 +0,0 @@
-module RakeTerraform
-  class RequiredParameterUnset < ::StandardError
-  end
-end

data/lib/rake_terraform/tasklib.rb

@@ -1,98 +0,0 @@
-require 'rake/tasklib'
-require_relative 'exceptions'
-
-module RakeTerraform
-  class TaskLib < ::Rake::TaskLib
-    class << self
-      def parameter_definitions
-        @parameter_definitions ||= {}
-      end
-
-      def parameter(name, options = {})
-        parameter_definition = ParameterDefinition.new(
-            name, options[:default], options[:required])
-        name = parameter_definition.name
-
-        attr_accessor(name)
-
-        parameter_definitions[name] = parameter_definition
-      end
-
-      def setup_defaults_for(instance)
-        parameter_definitions.values.each do |parameter_definition|
-          parameter_definition.apply_default_to(instance)
-        end
-      end
-
-      def check_required_for(instance)
-        dissatisfied = parameter_definitions.values.reject do |definition|
-          definition.satisfied_by?(instance)
-        end
-        unless dissatisfied.empty?
-          names = dissatisfied.map(&:name)
-          raise RequiredParameterUnset,
-                "Required parameter#{names.length > 1 ? 's' : ''} #{names.join(',')} unset."
-        end
-      end
-    end
-
-    def initialize(*args, &block)
-      setup_defaults
-      process_arguments(args)
-      process_block(block)
-      check_required
-      define
-    end
-
-    def setup_defaults
-      self.class.setup_defaults_for(self)
-    end
-
-    def process_arguments(_)
-    end
-
-    def process_block(block)
-      block.call(self) if block
-    end
-
-    def check_required
-      self.class.check_required_for(self)
-    end
-
-    def define
-    end
-
-    private
-
-    class ParameterDefinition
-      attr_reader :name
-
-      def initialize(name, default = nil, required = false)
-        @name = name.to_sym
-        @default = default
-        @required = required
-      end
-
-      def writer_method
-        "#{name}="
-      end
-
-      def reader_method
-        name
-      end
-
-      def apply_default_to(instance)
-        instance.__send__(writer_method, @default) unless @default.nil?
-      end
-
-      def dissatisfied_by?(instance)
-        value = instance.__send__(reader_method)
-        @required && value.nil?
-      end
-
-      def satisfied_by?(instance)
-        !dissatisfied_by?(instance)
-      end
-    end
-  end
-end

data/lib/rake_terraform/tasks/all.rb

@@ -1,151 +0,0 @@
-module RakeTerraform
-  module Tasks
-    class All < TaskLib
-      parameter :configuration_name, :required => true
-      parameter :source_directory, :required => true
-      parameter :work_directory, :required => true
-
-      parameter :backend_config
-
-      parameter :vars
-      parameter :var_file
-      parameter :state_file
-
-      # Emit additional information for debugging purposes
-      # Useful to check this value in lambdas passed to backend_config, vars and state_file
-      parameter :debug, :default => false
-
-      parameter :no_color, :default => false
-      parameter :no_backup, :default => false
-      parameter :no_print_output, :default => false
-
-      parameter :backup_file
-      parameter :plan_file
-
-      # Allows specifying rake task arguments, for example bucket:provision[my_deployment_id]
-      parameter :argument_names
-
-      parameter :ensure_task, :default => :'terraform:ensure'
-
-      parameter :validate_task_name, :default => :validate
-      parameter :validate_argument_names
-
-      parameter :plan_task_name, :default => :plan
-      parameter :plan_argument_names
-
-      parameter :provision_task_name, :default => :provision
-      parameter :provision_argument_names
-
-      parameter :destroy_task_name, :default => :destroy
-      parameter :destroy_argument_names
-
-      parameter :output_task_name, :default => :output
-      parameter :output_argument_names
-
-      def define
-        Validate.new do |t|
-          t.name = validate_task_name
-          t.argument_names = validate_argument_names || argument_names || []
-
-          t.configuration_name = configuration_name
-          t.source_directory = source_directory
-          t.work_directory = work_directory
-
-          t.backend_config = backend_config
-
-          t.vars = vars
-          t.var_file = var_file
-          t.state_file = state_file
-
-          t.debug = debug
-          t.no_color = no_color
-
-          t.ensure_task = ensure_task
-        end
-        Plan.new do |t|
-          t.name = plan_task_name
-          t.argument_names = plan_argument_names || argument_names || []
-
-          t.configuration_name = configuration_name
-          t.source_directory = source_directory
-          t.work_directory = work_directory
-
-          t.backend_config = backend_config
-
-          t.vars = vars
-          t.var_file = var_file
-          t.state_file = state_file
-
-          t.debug = debug
-          t.no_color = no_color
-
-          t.plan_file = plan_file
-
-          t.ensure_task = ensure_task
-        end
-        Provision.new do |t|
-          t.name = provision_task_name
-          t.argument_names = provision_argument_names || argument_names || []
-
-          t.configuration_name = configuration_name
-          t.source_directory = source_directory
-          t.work_directory = work_directory
-
-          t.backend_config = backend_config
-
-          t.vars = vars
-          t.var_file = var_file
-          t.state_file = state_file
-
-          t.debug = debug
-          t.no_color = no_color
-          t.no_backup = no_backup
-
-          t.backup_file = backup_file
-
-          t.ensure_task = ensure_task
-        end
-        Destroy.new do |t|
-          t.name = destroy_task_name
-          t.argument_names = destroy_argument_names || argument_names || []
-
-          t.configuration_name = configuration_name
-          t.source_directory = source_directory
-          t.work_directory = work_directory
-
-          t.backend_config = backend_config
-
-          t.vars = vars
-          t.var_file = var_file
-          t.state_file = state_file
-
-          t.debug = debug
-          t.no_color = no_color
-          t.no_backup = no_backup
-
-          t.backup_file = backup_file
-
-          t.ensure_task = ensure_task
-        end
-        Output.new do |t|
-          t.name = output_task_name
-          t.argument_names = output_argument_names || argument_names || []
-
-          t.configuration_name = configuration_name
-          t.source_directory = source_directory
-          t.work_directory = work_directory
-
-          t.backend_config = backend_config
-
-          t.state_file = state_file
-
-          t.debug = debug
-          t.no_color = no_color
-          t.no_print_output = no_print_output
-
-          t.ensure_task = ensure_task
-        end
-      end
-    end
-  end
-end