terraspace-bundler 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b65082aa14ea1fb025bf7578584d9ee307e88107fff02c14ccad67fbcdf49ce
-  data.tar.gz: d6a597993b5e20c4de5384dae7751091dad02a85e7190d0d127589cc164cdf70
+  metadata.gz: 3a02d9119392f13a0a31079c756f565f1de0e4d200a3af9f84c732f4656ed6fc
+  data.tar.gz: d9e07212f6efce634f6836bb8ac2a1dd184dc5a34562c24252c8e69c27f4889c
 SHA512:
-  metadata.gz: 3ee15d36d396afa262f2b2e8a7765d6665ffc6d1559ee2b37f1465a35703637240b1689110a81454c6ccb56fa74618d6ac0c78d01a001636b1310e09226034fd
-  data.tar.gz: 6843a2efc05ec4b08df20e276bb1247c9b0638f9534afcbf37ead78f815f99dfbad754535e8854459b7dab0cd320a0ddc6b459850171170471bb5dd73f426bb2
+  metadata.gz: 6e79f9d42d0ddc7856877ce4d1ce0dd2452eddb883e68694b28bc776512a56bcf829747bd589a66a28bf9687dca590404ff6cc8906df57c96a8dc62c40d12571
+  data.tar.gz: 1915a7ec28c0cdce027b5f5ebcee59924853d4ad3ad8de2cc6e0db5ab5ff7f6d4d2260881e9df42cbeddc226d5574793701533647d07c86f576c04c4b3dcc7dc

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.3.2]
+- #4 only purge and export explicit mods
+- are you sure prompt for purge_cache
+- clean up update mode
+
 ## [0.3.1]
 - #3 all_stacks: only consider dirs
 

data/lib/terraspace_bundler/cli/bundle.rb

@@ -27,6 +27,7 @@ class TerraspaceBundler::CLI
 
     desc "purge_cache", "Purge cache."
     long_desc Help.text("bundle/purge_cache")
+    option :yes, aliases: :y, type: :boolean, desc: "bypass are you sure prompt"
     def purge_cache
       PurgeCache.new(options).run
     end
@@ -35,6 +36,7 @@ class TerraspaceBundler::CLI
     long_desc Help.text("bundle/update")
     terrafile_option.call
     def update(*mods)
+      TB.update_mode = true
       TB::Runner.new(options.merge(mods: mods, mode: "update")).run
     end
   end

data/lib/terraspace_bundler/cli/purge_cache.rb

@@ -2,10 +2,28 @@ class TerraspaceBundler::CLI
   class PurgeCache < Base
     include TB::Mod::PathConcern
     include TB::Util::Logging
+    include TB::Util::Sure
 
     def run
-      FileUtils.rm_rf(tmp_root)
-      logger.info "Removed #{tmp_root}"
+      paths = [tmp_root]
+      are_you_sure?(paths)
+      paths.each do |path|
+        FileUtils.rm_rf(path)
+        logger.info "Removed #{path}"
+      end
+
+    end
+
+    def are_you_sure?(paths)
+      pretty_paths = paths.map { |p| "    #{p}" }.join("\n")
+      message = <<~EOL.chomp
+        Will remove these folders and all their files:
+
+        #{pretty_paths}
+
+        Are you sure?
+      EOL
+      sure?(message) # from Util::Sure
     end
   end
 end

data/lib/terraspace_bundler/core.rb

@@ -22,5 +22,15 @@ module TerraspaceBundler
       dsl
     end
     memoize :dsl
+
+    @@update_mode = false
+    def update_mode
+      @@update_mode
+    end
+    alias_method :update_mode?, :update_mode
+
+    def update_mode=(v)
+      @@update_mode = v
+    end
   end
 end

data/lib/terraspace_bundler/exporter.rb

@@ -1,5 +1,6 @@
 module TerraspaceBundler
   class Exporter
+    include TB::Mod::PathConcern
     include TB::Util::Logging
 
     def initialize(options={})
@@ -7,13 +8,22 @@ module TerraspaceBundler
     end
 
     def run
-      purge
-      lockfile.mods.each do |mod|
+      purge_all
+      mods.each do |mod|
         logger.info "Exporting #{mod.name}"
+        purge(mod)
         export(mod)
       end
     end
 
+    def mods
+      mods = lockfile.mods
+      if TB.update_mode? && !@options[:mods].empty?
+        mods.select! { |mod| @options[:mods].include?(mod.name) }
+      end
+      mods
+    end
+
     def export(mod)
       downloader = Mod::Downloader.new(mod)
       downloader.run
@@ -25,11 +35,17 @@ module TerraspaceBundler
     end
 
   private
-    def purge
+    def purge_all
+      return if TB.update_mode?
       return unless TB.config.export_purge
       FileUtils.rm_rf(TB.config.export_to)
     end
 
+    def purge(mod)
+      mod_path = get_mod_path(mod)
+      FileUtils.rm_rf(mod_path)
+    end
+
     def lockfile
       Lockfile.instance
     end

data/lib/terraspace_bundler/lockfile/version_comparer.rb

@@ -40,7 +40,7 @@ class TerraspaceBundler::Lockfile
       # Only check when set.
       # Also in update mode then always check it.
       @changed = @current.sha && !@locked.sha.include?(@current.sha) ||
-                 update_mode? && !@current.latest_sha.include?(@locked.sha)
+                 TB.update_mode? && !@current.latest_sha.include?(@locked.sha)
       if @changed
         @reason = reason_message("sha")
         return @changed
@@ -52,11 +52,5 @@ class TerraspaceBundler::Lockfile
     def reason_message(version)
       "Replacing mod #{@current.name} because #{version} is different in Terrafile and Terrafile.lock"
     end
-
-    def update_mode?
-      self.class.update_mode
-    end
-
-    class_attribute :update_mode
   end
 end

data/lib/terraspace_bundler/mod/path_concern.rb

@@ -26,8 +26,12 @@ class TerraspaceBundler::Mod
     end
 
     def mod_path
-      export_to = @mod.export_to || TB.config.export_to
-      "#{export_to}/#{@mod.name}"
+      get_mod_path(@mod)
+    end
+
+    def get_mod_path(mod)
+      export_to = mod.export_to || TB.config.export_to
+      "#{export_to}/#{mod.name}"
     end
   end
 end

data/lib/terraspace_bundler/syncer.rb

@@ -31,7 +31,6 @@ module TerraspaceBundler
 
     def sync_mods
       # VersionComparer is used in lockfile.sync and does heavy lifting to check if mod should be updated and replaced
-      TB::Lockfile::VersionComparer.update_mode = @options[:mode] == "update"
       terrafile.mods.each do |mod|
         next unless sync?(mod)
         logger.debug "Syncing #{mod.name}"

data/lib/terraspace_bundler/util/sure.rb

@@ -0,0 +1,22 @@
+module TerraspaceBundler::Util
+  module Sure
+    def sure?(message="Are you sure?", desc=nil)
+      if @options[:yes]
+        sure = 'y'
+      else
+        out = if desc
+          "\n#{desc}\n#{message} (y/N) "
+        else
+          "#{message} (y/N) "
+        end
+        print out
+        sure = $stdin.gets
+      end
+
+      unless sure =~ /^y/
+        puts "Whew! Exiting."
+        exit 0
+      end
+    end
+  end
+end

data/lib/terraspace_bundler/version.rb

@@ -1,3 +1,3 @@
 module TerraspaceBundler
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace-bundler
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-18 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -215,6 +215,7 @@ files:
 - lib/terraspace_bundler/terrafile.rb
 - lib/terraspace_bundler/util/git.rb
 - lib/terraspace_bundler/util/logging.rb
+- lib/terraspace_bundler/util/sure.rb
 - lib/terraspace_bundler/version.rb
 - spec/fixtures/Terrafile
 - spec/fixtures/rewrite/example-subfolder.tf