terraspace-bundler 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a02d9119392f13a0a31079c756f565f1de0e4d200a3af9f84c732f4656ed6fc
-  data.tar.gz: d9e07212f6efce634f6836bb8ac2a1dd184dc5a34562c24252c8e69c27f4889c
+  metadata.gz: 2837b88a7aebfc3da49d6cd0fb1b620bf83466ea375ff238cb8a854ad98218b8
+  data.tar.gz: d7c0637b9275fc66bc7865fe2fbf87671bb9257092c6de7b616f9238defbadbe
 SHA512:
-  metadata.gz: 6e79f9d42d0ddc7856877ce4d1ce0dd2452eddb883e68694b28bc776512a56bcf829747bd589a66a28bf9687dca590404ff6cc8906df57c96a8dc62c40d12571
-  data.tar.gz: 1915a7ec28c0cdce027b5f5ebcee59924853d4ad3ad8de2cc6e0db5ab5ff7f6d4d2260881e9df42cbeddc226d5574793701533647d07c86f576c04c4b3dcc7dc
+  metadata.gz: f0db0f6f68bb6bca532ac9fa6c1eefbcf9620324b39be2a52ae4b915faf2e9c5f5645f72aa96398b9d1624400930351273615d6916c588e8d4b53e25fec66441
+  data.tar.gz: 812d72dc1cfcd4039b08487574e7e4dced650e7ede4f119e43b45968732ea9203291b5823500b8db4b541eb1fff33687f3d82a7d5a92462f58df5d98ce8c0ba4

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 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.3] - 2021-02-24
+- [#8](https://github.com/boltops-tools/terraspace-bundler/pull/8) fix https sources
+- [#9](https://github.com/boltops-tools/terraspace-bundler/pull/9) Git checkout retry with v
+
 ## [0.3.2]
 - #4 only purge and export explicit mods
 - are you sure prompt for purge_cache

data/lib/terraspace_bundler.rb

@@ -7,6 +7,7 @@ require "dsl_evaluator"
 require "fileutils"
 require "memoist"
 require "rainbow/ext/string"
+require "singleton"
 require "terraspace_bundler/version"
 require "yaml"
 

data/lib/terraspace_bundler/cli/bundle.rb

@@ -37,7 +37,7 @@ class TerraspaceBundler::CLI
     terrafile_option.call
     def update(*mods)
       TB.update_mode = true
-      TB::Runner.new(options.merge(mods: mods, mode: "update")).run
+      TB::Runner.new(options.merge(mods: mods)).run
     end
   end
 end

data/lib/terraspace_bundler/mod.rb

@@ -12,10 +12,9 @@ module TerraspaceBundler
       @version, @ref, @tag, @branch = @props[:version], @props[:ref], @props[:tag], @props[:branch]
     end
 
+    # support variety of options, prefer version
     def checkout_version
-      v = detected_version
-      v = "v#{v}" if type == "registry" && @version && !v.starts_with?("v")
-      v
+      @version || @ref || @tag || @branch
     end
 
     # use url instead of source because for registry modules, the repo name is different
@@ -23,8 +22,11 @@ module TerraspaceBundler
       url_words[-1]
     end
 
+    # https://github.com/tongueroo/pet - 2nd to last word
+    # git@github.com:tongueroo/pet - 2nd to last word without chars before :
     def org
-      url_words[-2] # second to last word
+      s = url_words[-2] # second to last word
+      s.split(':').last # in case of git@github.com:tongueroo/pet form
     end
 
     def full_repo
@@ -38,11 +40,6 @@ module TerraspaceBundler
     end
 
   private
-    # support variety of options, prefer version
-    def detected_version
-      @version || @ref || @tag || @branch
-    end
-
     def url_words
       url.split('/')
     end

data/lib/terraspace_bundler/mod/props_builder.rb

@@ -35,7 +35,20 @@ class TerraspaceBundler::Mod
       if registry?
         registry.github_url
       else
-        "#{TB.config.base_clone_url}#{source}" # Note: make sure to not use @source, is org may no be added
+        git_source_url
+      end
+    end
+
+    def git_source_url
+      if @source.include?('http') || @source.include?(':')
+        # Examples:
+        #   mod "pet", source: "https://github.com/tongueroo/pet"
+        #   mod "pet", source: "git@github.com:tongueroo/pet"
+        @source
+      else
+        # Examples:
+        #   mod "pet", source: "tongueroo/pet"
+        "#{TB.config.base_clone_url}#{source}" # Note: make sure to not use @source, org may not be added
       end
     end
 

data/lib/terraspace_bundler/syncer.rb

@@ -51,7 +51,7 @@ module TerraspaceBundler
     end
 
     def update_all?
-      @options[:mode] == "update" && @options[:mods].empty?
+      TB.update_mode? && @options[:mods].empty?
     end
 
     def subtract(mods1, mods2)

data/lib/terraspace_bundler/util/git.rb

@@ -21,10 +21,16 @@ module TerraspaceBundler::Util
     def git(command)
       sh("git #{command}")
     rescue TB::GitError => e
-      logger.error "ERROR: There was a git error".color(:red)
-      logger.error "Current dir: #{Dir.pwd}"
-      logger.error "The error occur when running:"
-      logger.error e.message
+      action, version = command.split(' ')
+      if action == "checkout" && version !~ /^v/
+        command = "checkout v#{version}"
+        retry
+      else
+        logger.error "ERROR: There was a git error".color(:red)
+        logger.error "Current dir: #{Dir.pwd}"
+        logger.error "The error occur when running:"
+        logger.error e.message
+      end
       exit 1
     end
   end

data/lib/terraspace_bundler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terraspace-bundler
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-20 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: Bundles terraform modules