forj 0.0.41 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01a8a3f3825a0b5242367c3ff69a83675588800e
-  data.tar.gz: 2f78609c995ebf36be3f4becfc6b7bccbd3d42c4
+  metadata.gz: 86bafd8e907ea87422d3ffe34ee5d64030530de9
+  data.tar.gz: d129b3a2b79f4c4217730078c135c32ca25e6c96
 SHA512:
-  metadata.gz: f8bcda70764cf154d9762ac21f560965317d526c49e120f0469567ef8bd7238abc88638fd786bd5cb1e2bc539a3b4643f40f186c4e01de2bf1912cafc20f5f1d
-  data.tar.gz: cb6e149758f4111c93012df9f3fa6b4cecd865f408cf23ccca71d516685d630fdee6f57df4cf6a4d0f7169aeb73b6df2c8c4d58f9ce584432c8ec34737a8c435
+  metadata.gz: 82ededa706f07e22540a5563e567ff78f0631cb3c5b5779113382d93c755880080cece6f8e2ffc367aea45b8f91147a1daf273b1dde7fa10036bffbb72b980df
+  data.tar.gz: 48abdf7a3e8b2efdecccd488fb2a67eba44d607709d5d29899ef75f0628d28e7757178e3490b977a740f5d502f753f48eef60cb4c07d9ab8c7776cacc89fe1d7

data/lib/boot.rb

@@ -91,7 +91,7 @@ module Boot
          Repositories.clone_repo(maestro_url)
          maestro_repo=File.expand_path('~/.forj/maestro')
       else
-         maestro_repo=File.expand_path(oConfig.get(:maestro_repo))
+         maestro_repo=File.expand_path(oForjAccount.get(:maestro_repo))
          if not File.exists?('%s/templates/infra/maestro.box.%s.env' % [maestro_repo, branch])
             Logging.fatal(1, "'%s' is not a recognized Maestro repository. forj cli searched for templates/infra/%s-maestro.box.GITBRANCH.env.tmpl" % [maestro_repo, cloud_provider])
          end

data/lib/forj-account.rb

@@ -316,6 +316,13 @@ class ForjAccount
       orig_key_path = File.expand_path(@oConfig.get(:keypair_path, yCreds))
 
       Logging.warning("'keypair_path' is missing at least from defaults.yaml. To fix it, set it in your configuration file ~/.forj/config.yaml under default section") if not orig_key_path
+
+      key_name = ask ("Please provide the keypair name used by default on this account:") do | q |
+         q.default = key_name
+         q.validate = /.*+/
+      end
+      key_name = key_name.to_s
+
       key_path = nil
       while not key_path
          key_path = ask ("Please provide the SSH private key path used by default on this account:") do | q |
@@ -325,10 +332,10 @@ class ForjAccount
          keys_entered = keypair_detect(key_name, key_path)
          if not keys_entered[:private_key_exist?] and not keys_entered[:public_key_exist?]
             if agree("The key you entered was not found. Do you want to create this one?")
-               base_dir = File.dirname(keys_entered[:keypair_path])
-               if File.directory?(base_dir)
-                  if agree("'%s' doesn't exist. Do you want to create it?")
-                     ensure_forj_dirs_exists(base_dir)
+               base_dir = keys_entered[:keypair_path]
+               if not File.directory?(base_dir)
+                  if agree("'%s' doesn't exist. Do you want to create it?" % base_dir)
+                     Helpers.ensure_dir_exists(base_dir)
                   end
                end
             else
@@ -344,11 +351,6 @@ class ForjAccount
          key_name = nil
       end
 
-      key_name = ask ("Please provide the keypair name used by default on this account:") do | q |
-         q.default = key_name
-         q.validate = /.*+/
-      end
-      key_name = key_name.to_s
 
       keys = keypair_detect(key_name, key_path)
 
@@ -362,7 +364,7 @@ class ForjAccount
       # Creation sequences
       if not keys[:private_key_exist?]
          # Need to create a key. ask if we need so.
-         Logging.message("Private key file '%s' was not found. forj will propose to create one for you. Please review the proposed private key file name and path.\nYou can press Enter to accept the default value." % keys[:private_key_path])
+         Logging.message("The private key file attached to keypair named '%s'  is not found. forj will propose to create one for you. Please review the proposed private key file name and path.\nYou can press Enter to accept the default value." % keys[:keypair_name])
          real_key_path = File.expand_path(ask("Private key file path:") do |q|
             q.validate = /\w+/
             q.default = private_key_file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forj
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
 platform: ruby
 authors:
 - forj team