avm-tools 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4deaa72e5e51d1dc4db756e57ea2bd1c8c6578f531d1ef2084a330719d74fb15
-  data.tar.gz: 6dd2b7bf04bdaa95b24d020fa7f4947ed3197588e497fe40ce51c0a5f90a688c
+  metadata.gz: b281c9ce7a6b01c3627f2176525badcb1e8da74db083a19e4a044183a81d5098
+  data.tar.gz: bed6e84f9f7ffbc8cb04f801d946bb3d121aa037b091d3eb7674a003608766e0
 SHA512:
-  metadata.gz: 85cbe7adec68930b3d499a5d9765a8d86072a32f2f41730455c7236d5ba940dcee7fe259718840146143972c90cd0b50799c059f3745801051322ad5e733b978
-  data.tar.gz: 8dc0bb879ed769cc3760c4cbaf02dc2b62a7d765e97eb7bf7fcfc5cfaa15e761b1b95e57504e7ec79c7519dadd19077301a2ca679deddac41789feed60640fa0
+  metadata.gz: a2f4351b55f7e26efa4db5e92f3c8d0cc559380cc17f38fc41881c202c57c6caec07ab357934cdf4bc46419c7881bea01f0fd7ddf17db9948339ef14a34ea81d
+  data.tar.gz: 18357869454f75bd31b70e098a624beb3caa00a289ccc0bb15533aca7cb2ed3ac206503c26babc56660d9c09ec1471a42bab51d48114209df86a9102919f7613

data/lib/avm/instances/base/auto_values/filesystem.rb

@@ -12,6 +12,14 @@ module Avm
           def auto_data_fs_path
             inherited_entry_value(:host_id, :data_fs_path) { |v| v + '/' + id }
           end
+
+          def auto_fs_url
+            read_entry_optional('ssh.url').if_present do |ssh_url|
+              read_entry_optional('fs_path').if_present do |fs_path|
+                "#{ssh_url}#{fs_path}"
+              end
+            end
+          end
         end
       end
     end

data/lib/avm/tools/runner/git/deploy.rb

@@ -17,14 +17,15 @@ module Avm
           DOC = <<~DOCOPT
             Deploy a Git revision to a location (Local or remote).
 
-              Usage:
-              __PROGRAM__ [options] <target-url> [<append-directories>...]
-            __PROGRAM__ -h | --help
+            Usage:
+              __PROGRAM__ [options] [<target-url>]
+              __PROGRAM__ -h | --help
 
             Options:
               -h --help                     Mostra esta ajuda.
               -r --reference=<reference>    Reference [default: HEAD].
               -i --instance=<instance-id>   Read entries from instance with id=<instance-id>.
+              -a --append-dirs=<append-dirs>  Append directories to deploy (List separated by ":").
           DOCOPT
 
           def run
@@ -41,12 +42,14 @@ module Avm
             infov 'Reference', reference
             infov 'Instance ID', instance_id.if_present('- BLANK -')
             infov 'Appended directories', appended_directories
+            infov 'Target URL', target_url
           end
 
           def validate
-            return if reference_sha1.present?
-
-            fatal_error "Object ID not found for reference \"#{reference}\""
+            unless reference_sha1.present?
+              fatal_error "Object ID not found for reference \"#{reference}\""
+            end
+            fatal_error 'Nor <target-url> nor --instance was setted' unless target_url.present?
           end
 
           def main_info_banner
@@ -67,12 +70,18 @@ module Avm
 
           def deploy
             ::Avm::Git::Commit.new(git, reference_sha1)
-                              .deploy_to_url(options.fetch('<target-url>'))
+                              .deploy_to_url(target_url)
                               .append_directories(appended_directories)
                               .variables_source_set(variables_source)
                               .run
           end
 
+          def target_url
+            options['<target-url>'].if_present { |v| return v }
+            instance.if_present { |v| return v.read_entry('fs.url') }
+            nil
+          end
+
           def variables_source
             instance || ::Avm.configs
           end
@@ -86,7 +95,7 @@ module Avm
           end
 
           def appended_directories
-            options.fetch('<append-directories>')
+            options.fetch('--append-dirs').to_s.split(':')
           end
         end
       end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.24.0'
+    VERSION = '0.25.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2019-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers