app_builder-rails 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba6a0ad3b3e5db84dfe7d034f95b5ce785c7a309
-  data.tar.gz: c0cad50cd171feba7d0c446d75213c7f507c235f
+  metadata.gz: 6bdb4d97b32b89b700638c896910b2b20136a0b8
+  data.tar.gz: d4d1f9a6b844b728c598c2251f0b397a13734b2d
 SHA512:
-  metadata.gz: d18eeedb6b92fd673b0de0f8077212fa52df56cd3031648a53d0f3ed0b4bec3b12d72cac0d6ae2a19b034517a39821ce41b1739f5f3aaff2b8107ce18694f5f2
-  data.tar.gz: fe6ab7f7917c0197bfa2ae311aa3be81fe43c7bbc686431c209c151f69442ddb85c8e8956eaa86a7b3606c86c6f1f680af4331c0a1672012c264a2666496f5e7
+  metadata.gz: 0a49e37ba94e10c1163f2dd2a95cd0fca68d750a066e4266239cbdce304075db27d01b34679b339950741f21ea7cde30006538ec3a170e350ce1a2a3ca58e9b9
+  data.tar.gz: d5dc6010c3a99f5410e9c1ed37a81d7486a583d42caa7367861949c12e7e4d42cb67d38e793c8a48826c41b9afa621845568c78f83c842a86b27b5c882b786ba

data/lib/app_builder/rails/version.rb

@@ -1,5 +1,5 @@
 module AppBuilder
   module Rails
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/lib/generators/app_builder/install/templates/deploy.rake

@@ -1,30 +1,39 @@
 namespace :deploy do
-  def deploy_path
-    File.expand_path("../../config/deploy", __dir__)
-  end
-
-  def build_env
-    @build_env ||= AppBuilder::Environment.new(
-      ENV.fetch("BILD_ENV", "develop"),
-      File.join(deploy_path, "environment.yml"),
+  def config
+    env_name = ENV.fetch("BILD_ENV", "develop")
+    env = AppBuilder::Environment.new(
+      env_name,
+      File.expand_path("../../config/deploy/environment.yml", __dir__)
+    )
+    config = AppBuilder::Config.new(
+      resource_type:          env[:resource_type],
+      upload_id:              env[:upload_id],
+      remote_app_home_base:   env[:remote_app_home_base],
+      resource_host:          env[:resource_host],
+      resource_user:          env[:resource_user],
+      resource_ssh_options:   env[:resource_ssh_options].symbolize_keys,
+      resource_document_root: env[:resource_document_root],
     )
-  end
 
-  def build_config
-    @build_config ||= AppBuilder::Config.new(
-      resource_type:          build_env[:resource_type],
-      upload_id:              build_env[:upload_id],
-      remote_app_home_base:   build_env[:remote_app_home_base],
-      resource_host:          build_env[:resource_host],
-      resource_user:          build_env[:resource_user],
-      resource_ssh_options:   build_env[:resource_ssh_options].symbolize_keys,
-      resource_document_root: build_env[:resource_document_root],
-      manifest_template_path: File.join(deploy_path, "templates", "manifest.yml.erb"),
+    env = AppBuilder::Environment.new(
+      env_name,
+      File.join(config.archive_path, "config", "deploy", "environment.yml"),
     )
+    config.manifest_template_path = File.join(config.archive_path, "config", "deploy", "templates", "manifest.yml.erb")
+    config.after_archive = [
+      proc {
+        env.create_file(
+          File.join(config.archive_path, "config", "deploy", "templates", "database.yml.erb"),
+          File.join(config.archive_path, "config", "database.yml"),
+        )
+      },
+    ]
+
+    config
   end
 
   desc "Upload builded source and stretcher manifest file."
   task :upload do
-    AppBuilder::Uploader.upload(build_config)
+    AppBuilder::Uploader.upload(config)
   end
 end

data/lib/generators/app_builder/install/templates/deploy_s3.rake

@@ -1,21 +1,30 @@
 namespace :deploy do
-  def deploy_path
-    File.expand_path("../../config/deploy", __dir__)
-  end
-
-  def build_env
-    @build_env ||= AppBuilder::Environment.new(
-      ENV.fetch("BILD_ENV", "develop"),
-      File.join(deploy_path, "environment.yml"),
+  def build_config
+    env_name = ENV.fetch("BILD_ENV", "develop")
+    env = AppBuilder::Environment.new(
+      env_name,
+      File.expand_path("../../config/deploy/environment.yml", __dir__)
+    )
+    config = AppBuilder::Config.new(
+      upload_id:              env[:upload_id],
+      remote_app_home_base:   env[:remote_app_home_base],
     )
-  end
 
-  def build_config
-    @build_config ||= AppBuilder::Config.new(
-      upload_id:            build_env[:upload_id],
-      remote_app_home_base: build_env[:remote_app_home_base],
-      manifest_template_path: File.join(deploy_path, "templates", "manifest.yml.erb"),
+    env = AppBuilder::Environment.new(
+      env_name,
+      File.join(config.archive_path, "config", "deploy", "environment.yml"),
     )
+    config.manifest_template_path = File.join(config.archive_path, "config", "deploy", "templates", "manifest.yml.erb")
+    config.after_archive = [
+      proc {
+        env.create_file(
+          File.join(config.archive_path, "config", "deploy", "templates", "database.yml.erb"),
+          File.join(config.archive_path, "config", "database.yml"),
+        )
+      },
+    ]
+
+    config
   end
 
   desc "Upload builded source and stretcher manifest file."

data/lib/generators/app_builder/install/templates/manifest.yml.erb

@@ -7,13 +7,14 @@ commands:
     - mkdir -p <%= remote_app_home %>/releases
     - mkdir -p <%= remote_app_home %>/shared/log
     - mkdir -p <%= remote_app_home %>/shared/pids
+    - mkdir -p <%= remote_app_home %>/shared/bundle
   post:
     - ln -nfs <%= remote_app_home %>/releases/<%= build_id %> <%= remote_app_home %>/current
     - rm -rf <%= remote_app_home %>/current/log
     - ln -nfs <%= remote_app_home %>/shared/log <%= remote_app_home %>/current/log
     - mkdir -p <%= remote_app_home %>/current/tmp
     - ln -nfs <%= remote_app_home %>/shared/pids <%= remote_app_home %>/current/tmp/pids
-    - cd <%= remote_app_home %>/current && bundle install --deployment --without development test
+    - cd <%= remote_app_home %>/current && bundle install --deployment --without development test --path <%= remote_app_home %>/shared/bundle
     - echo 'deploy done'
   success:
     - echo 'deploy success'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_builder-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - i2bskn
@@ -116,7 +116,6 @@ files:
 - lib/app_builder/rails/version.rb
 - lib/generators/app_builder/install/USAGE
 - lib/generators/app_builder/install/install_generator.rb
-- lib/generators/app_builder/install/templates/.keep
 - lib/generators/app_builder/install/templates/deploy.rake
 - lib/generators/app_builder/install/templates/deploy_s3.rake
 - lib/generators/app_builder/install/templates/environment.yml