app_builder 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 149fe7ac668f0ea948e2af2e8b9aae387ac6ef1cac4592bf1177ff4e0f2ecf61
-  data.tar.gz: 67988388e57e2ec2497b4af7afbdde4461286ba380393f8c670cacd534839c4f
+  metadata.gz: c3a9a7a2e2b527a50937de68b43d92875efd6d3ebed6b825d6ab85b2ac1b77fc
+  data.tar.gz: 50209788fbf7a82ecf0750156595830884972c319398a4415a64ec1dfa042641
 SHA512:
-  metadata.gz: 3f235767dd93845ffd8c14ea5de871bc40c6015e283fad6853f823fd4c9039dde72e8c5db52995f33bbea08c3726ca7d2a468d7ddb65f8f0b3c0a5851cb26976
-  data.tar.gz: 43f9111c90199bdbabbf2d7bd3862ed58f254be6864bc1052e12e4e6680bbb22627836c4d1852d9402f7afc253c8e467684d1dbbbeb1769b5e7fba4a78833c27
+  metadata.gz: 9e2f8f7182e97a7d05c7415ceb8cf85a4b4548f5e091dc3411aa873a1b922d8968b14f2a0c96288eb6473be6eb9fad00f50e75b424f7133e124b33a89d471e62
+  data.tar.gz: 8795cfc3472e6eb06f81167c0eb718d1811b059c39e702a98c6834d57a2f58b9bd6c1d362ab3b72a04e968cc32e8c0067cf3680154bd54e796100356c21b6797

data/lib/app_builder/config.rb

@@ -1,14 +1,15 @@
 module AppBuilder
   class Config
     CHANGEABLE_PARAMETERS = [
-      :build_id,          # default: timestamp
-      :project_name,      # default: repository name
-      :remote_repository, # default: remote origin
-      :branch,            # default: TARGET_BRANCH or master
-      :revision,          # default: commit hash
-      :upload_type,       # :s3 or :http or :https (default: :s3)
-      :upload_id,         # bucket name or remote host (default: none)
-      :logger,            # default: AppBuilder::Logger
+      :build_id,             # default: timestamp
+      :project_name,         # default: repository name
+      :remote_repository,    # default: remote origin
+      :branch,               # default: TARGET_BRANCH or master
+      :revision,             # default: commit hash
+      :upload_type,          # :s3 or :http or :https (default: :s3)
+      :upload_id,            # bucket name or remote host (default: none)
+      :remote_app_home_base, # default: /var/www
+      :logger,               # default: AppBuilder::Logger
 
       # hooks
       :before_archive,
@@ -47,6 +48,7 @@ module AppBuilder
       :remote_src_file,
       :remote_manifest_file,
       :src_url,
+      :manifest_url,
       :remote_app_home,
     ].concat(CHANGEABLE_PARAMETERS).freeze
 
@@ -109,11 +111,19 @@ module AppBuilder
     end
 
     def src_url
-      "#{upload_type.to_s}://#{File.join(upload_id, remote_src_path, build_name)}"
+      uploaded_url(remote_src_file)
+    end
+
+    def manifest_url
+      uploaded_url(remote_manifest_file)
     end
 
     def remote_app_home
-      File.join("/var/www", project_name)
+      File.join(remote_app_home_base, project_name)
+    end
+
+    def uploaded_url(path)
+      "#{upload_type.to_s}://#{File.join(upload_id, path)}"
     end
 
     def reset
@@ -127,6 +137,7 @@ module AppBuilder
       @remote_manifest_path   = "manifests"
       @resource_user          = ENV.fetch("USER", nil)
       @resource_ssh_options   = {}
+      @remote_app_home_base   = "/var/www"
       @logger                 = Logger.new(STDOUT)
       @upload_type            = :s3
 

data/lib/app_builder/uploader.rb

@@ -32,7 +32,7 @@ module AppBuilder
     end
 
     def upload_to_s3(local, remote)
-      log(:info, "Upload #{local} to #{src_url}")
+      log(:info, "Upload #{local} to #{config.uploaded_url(remote)}")
       s3_client.put_object(
         bucket: upload_id,
         key:    remote,

data/lib/app_builder/version.rb

@@ -1,3 +1,3 @@
 module AppBuilder
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - i2bskn