terraspace 0.3.6 → 0.4.0

data/lib/terraspace/version.rb

@@ -1,3 +1,3 @@
 module Terraspace
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

data/spec/terraspace/{terraform/hooks → hooks}/builder_spec.rb

@@ -1,7 +1,6 @@
-describe Terraspace::Terraform::Hooks::Builder do
+describe Terraspace::Hooks::Builder do
   let(:builder) do
-    builder = described_class.new(mod, name)
-    builder.instance_variable_set(:@file, file) # override @file for spec
+    builder = described_class.new(mod, dsl_file, name)
     builder
   end
   let(:mod) do
@@ -11,7 +10,7 @@ describe Terraspace::Terraform::Hooks::Builder do
   end
 
   context "single" do
-    let(:file) { fixture("terraform/hooks/single.rb") }
+    let(:dsl_file) { fixture("terraform/hooks/single.rb") }
     let(:name) { "apply" }
     it "build creates the @hooks structure" do
       hooks = builder.build
@@ -25,7 +24,7 @@ describe Terraspace::Terraform::Hooks::Builder do
   end
 
   context "multiple" do
-    let(:file) { fixture("terraform/hooks/multiple.rb") }
+    let(:dsl_file) { fixture("terraform/hooks/multiple.rb") }
     let(:name) { "apply" }
     it "build creates the @hooks structure" do
       hooks = builder.build

data/spec/terraspace/terraform/remote_state/output_proxy_spec.rb

@@ -1,4 +1,4 @@
-NullObject = Terraspace::Terraform::RemoteState::NullObject
+Unresolved = Terraspace::Terraform::RemoteState::Unresolved
 
 describe Terraspace::Terraform::RemoteState::OutputProxy do
   let(:proxy) do
@@ -10,9 +10,9 @@ describe Terraspace::Terraform::RemoteState::OutputProxy do
 
   context "unresolved" do
     before(:each) { mod.resolved = false }
-    it "always return NullObject" do
+    it "always return Unresolved" do
       value = proxy.to_s
-      expect(value).to be_a(NullObject)
+      expect(value).to be_a(Unresolved)
       expect(value.to_str).to eq "(unresolved)"
     end
   end

data/terraspace.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "memoist"
   spec.add_dependency "rainbow"
   spec.add_dependency "render_me_pretty"
-  spec.add_dependency "terraspace-bundler", "~> 0.2.0"
+  spec.add_dependency "terraspace-bundler", "~> 0.3.0"
   spec.add_dependency "thor"
   spec.add_dependency "tty-tree"
   spec.add_dependency "zeitwerk"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2020-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -470,6 +470,10 @@ files:
 - lib/terraspace/cli/bundle.rb
 - lib/terraspace/cli/check_setup.rb
 - lib/terraspace/cli/clean.rb
+- lib/terraspace/cli/clean/all.rb
+- lib/terraspace/cli/clean/base.rb
+- lib/terraspace/cli/clean/cache.rb
+- lib/terraspace/cli/clean/logs.rb
 - lib/terraspace/cli/cloud.rb
 - lib/terraspace/cli/cloud/runs.rb
 - lib/terraspace/cli/commander.rb
@@ -487,7 +491,9 @@ files:
 - lib/terraspace/cli/help/build.md
 - lib/terraspace/cli/help/bundle.md
 - lib/terraspace/cli/help/check_setup.md
-- lib/terraspace/cli/help/clean.md
+- lib/terraspace/cli/help/clean/all.md
+- lib/terraspace/cli/help/clean/cache.md
+- lib/terraspace/cli/help/clean/logs.md
 - lib/terraspace/cli/help/cloud/destroy.md
 - lib/terraspace/cli/help/cloud/list.md
 - lib/terraspace/cli/help/cloud/runs/list.md
@@ -500,7 +506,7 @@ files:
 - lib/terraspace/cli/help/info.md
 - lib/terraspace/cli/help/init.md
 - lib/terraspace/cli/help/list.md
-- lib/terraspace/cli/help/log.md
+- lib/terraspace/cli/help/logs.md
 - lib/terraspace/cli/help/logs/remove.md
 - lib/terraspace/cli/help/logs/truncate.md
 - lib/terraspace/cli/help/new/bootstrap_test.md
@@ -526,10 +532,8 @@ files:
 - lib/terraspace/cli/info.rb
 - lib/terraspace/cli/init.rb
 - lib/terraspace/cli/list.rb
-- lib/terraspace/cli/log.rb
-- lib/terraspace/cli/log/concern.rb
 - lib/terraspace/cli/logs.rb
-- lib/terraspace/cli/logs/tasks.rb
+- lib/terraspace/cli/logs/concern.rb
 - lib/terraspace/cli/new.rb
 - lib/terraspace/cli/new/git_hook.rb
 - lib/terraspace/cli/new/helper.rb
@@ -610,6 +614,10 @@ files:
 - lib/terraspace/ext.rb
 - lib/terraspace/ext/bundler.rb
 - lib/terraspace/ext/core/module.rb
+- lib/terraspace/hooks/builder.rb
+- lib/terraspace/hooks/concern.rb
+- lib/terraspace/hooks/dsl.rb
+- lib/terraspace/hooks/runner.rb
 - lib/terraspace/logger.rb
 - lib/terraspace/logger/formatter.rb
 - lib/terraspace/mod.rb
@@ -655,13 +663,11 @@ files:
 - lib/terraspace/terraform/cloud/sync.rb
 - lib/terraspace/terraform/cloud/syncer.rb
 - lib/terraspace/terraform/cloud/workspace.rb
-- lib/terraspace/terraform/hooks/builder.rb
-- lib/terraspace/terraform/hooks/dsl.rb
 - lib/terraspace/terraform/remote_state/fetcher.rb
 - lib/terraspace/terraform/remote_state/marker/output.rb
 - lib/terraspace/terraform/remote_state/marker/pretty_tracer.rb
-- lib/terraspace/terraform/remote_state/null_object.rb
 - lib/terraspace/terraform/remote_state/output_proxy.rb
+- lib/terraspace/terraform/remote_state/unresolved.rb
 - lib/terraspace/terraform/runner.rb
 - lib/terraspace/tester.rb
 - lib/terraspace/tester/finder.rb
@@ -791,11 +797,11 @@ files:
 - spec/terraspace/dependency/graph_spec.rb
 - spec/terraspace/dependency/helper/depends_on_spec.rb
 - spec/terraspace/dependency/helper/output_spec.rb
+- spec/terraspace/hooks/builder_spec.rb
 - spec/terraspace/provider/expander/generic_spec.rb
 - spec/terraspace/seeder/content_spec.rb
 - spec/terraspace/seeder_spec.rb
 - spec/terraspace/terraform/args/custom_spec.rb
-- spec/terraspace/terraform/hooks/builder_spec.rb
 - spec/terraspace/terraform/remote_state/fetcher_spec.rb
 - spec/terraspace/terraform/remote_state/marker/output_spec.rb
 - spec/terraspace/terraform/remote_state/output_proxy_spec.rb
@@ -944,11 +950,11 @@ test_files:
 - spec/terraspace/dependency/graph_spec.rb
 - spec/terraspace/dependency/helper/depends_on_spec.rb
 - spec/terraspace/dependency/helper/output_spec.rb
+- spec/terraspace/hooks/builder_spec.rb
 - spec/terraspace/provider/expander/generic_spec.rb
 - spec/terraspace/seeder/content_spec.rb
 - spec/terraspace/seeder_spec.rb
 - spec/terraspace/terraform/args/custom_spec.rb
-- spec/terraspace/terraform/hooks/builder_spec.rb
 - spec/terraspace/terraform/remote_state/fetcher_spec.rb
 - spec/terraspace/terraform/remote_state/marker/output_spec.rb
 - spec/terraspace/terraform/remote_state/output_proxy_spec.rb

data/lib/terraspace/cli/help/clean.md

@@ -1,5 +0,0 @@
-## Example
-
-    $ terraspace clean
-    Removed .terraspace-cache
-    $

data/lib/terraspace/cli/log.rb

@@ -1,112 +0,0 @@
-require "eventmachine"
-require "eventmachine-tail"
-
-class Terraspace::CLI
-  class Log < Base
-    include Log::Concern
-
-    def initialize(options={})
-      super
-      @action, @stack = options[:action], options[:stack]
-      @action ||= '**'
-      @stack  ||= '*'
-    end
-
-    def run
-      check_logs!
-      if @options[:follow]
-        follow_logs
-      else
-        all_log_paths.each { |path| show_log(path) }
-      end
-    end
-
-    def follow_logs
-      glob_path = "#{Terraspace.log_root}/#{@action}/#{@stack}.log"
-      Dir.glob(glob_path).each do |path|
-        puts "Following #{pretty(path)}".color(:purple)
-      end
-      EventMachine.run do
-        interval = Integer(ENV['TS_LOG_GLOB_INTERNAL'] || 1)
-        EventMachine::FileGlobWatchTail.new(glob_path, nil, interval) do |filetail, line|
-          puts line # always show timestamp in follow mode
-        end
-      end
-    end
-
-    def show_log(path)
-      report_log(path)
-      lines = readlines(path)
-      lines = apply_limit(lines)
-      lines.each do |line|
-        puts format(line)
-      end
-    end
-
-    def report_log(path)
-      pretty_path = pretty(path)
-      if File.exist?(path)
-        puts "Showing: #{pretty_path}".color(:purple)
-      end
-    end
-
-    def format(line)
-      if timestamps
-        line
-      else
-        line.sub(/.*\]: /,'')
-      end
-    end
-
-    def all_log_paths
-      Dir.glob("#{Terraspace.log_root}/#{@action}/#{@stack}.log")
-    end
-
-    def check_logs!
-      return unless all_log_paths.empty?
-      puts "WARN: No logs found".color(:yellow)
-    end
-
-    # Only need to check if both action and stack are provided. Otherwise the Dir.globs are used to discover the files
-    def check_log!
-      return unless single_log?
-      path = "#{Terraspace.log_root}/#{@action}/#{@stack}.log"
-      return if File.exist?(path)
-      puts "ERROR: Log file was not found: #{pretty(path)}".color(:red)
-      exit 1
-    end
-
-    def single_log?
-      @action != '**' && @stack != '*'
-    end
-
-    def apply_limit(lines)
-      return lines if all
-      left = limit * -1
-      lines[left..-1] || []
-    end
-
-    def all
-      if single_log?
-        @options[:all].nil? ? true : @options[:all]
-      else # multiple
-        @options[:all].nil? ? false : @options[:all]
-      end
-    end
-
-    def limit
-      @options[:limit].nil? ? 10 : @options[:limit]
-    end
-
-    def timestamps
-      if single_log?
-        @options[:timestamps].nil? ? false : @options[:timestamps]
-      else
-        @options[:timestamps].nil? ? true : @options[:timestamps]
-      end
-    end
-    def pretty(path)
-      Terraspace::Util.pretty_path(path)
-    end
-  end
-end

data/lib/terraspace/terraform/hooks/builder.rb

@@ -1,40 +0,0 @@
-module Terraspace::Terraform::Hooks
-  class Builder
-    extend Memoist
-    include Dsl
-    include DslEvaluator
-    include Terraspace::Util
-
-    attr_accessor :name
-    def initialize(mod, name)
-      @mod, @name = mod, name
-      @file = "#{Terraspace.root}/config/cli/hooks.rb"
-      @hooks = {before: {}, after: {}}
-    end
-
-    def build
-      return @hooks unless File.exist?(@file)
-      evaluate_file(@file)
-      @hooks.deep_stringify_keys!
-    end
-    memoize :build
-
-    def run_hooks
-      build
-      run_hook("before")
-      yield if block_given?
-      run_hook("after")
-    end
-
-    def run_hook(type)
-      execute = @hooks.dig(type, @name.to_s, "execute")
-      return unless execute
-
-      exit_on_fail = @hooks.dig(type, @name.to_s, "exit_on_fail")
-      exit_on_fail = exit_on_fail.nil? ? true : exit_on_fail
-
-      logger.info "Running #{type} hook"
-      Terraspace::Shell.new(@mod, execute, exit_on_fail: exit_on_fail).run
-    end
-  end
-end