app_builder 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17ce5dd23729388a0087da20a784ff3b816f8c57fba31ca57f3e721e1a7ffdcf
-  data.tar.gz: a88df3a875b6a397cc1c1035628bea75ae59712130f6b952c57a173408c92387
+  metadata.gz: 149fe7ac668f0ea948e2af2e8b9aae387ac6ef1cac4592bf1177ff4e0f2ecf61
+  data.tar.gz: 67988388e57e2ec2497b4af7afbdde4461286ba380393f8c670cacd534839c4f
 SHA512:
-  metadata.gz: 7bfc464fb1677988dc93858de377d3497fdf4cb470e6adfbf4ca20ba8d0586100f162e70c4b28579a35280215b9cf5f78cfdd96c6c3a4c584dbecdecf02bd121
-  data.tar.gz: 211e70acaf02d62d8e4077f158f2952b57a89a3e6a4d66fa10e9f0ab763d6bc18b522442c65bef511dc6d5c1e3365764b20b5076369303352fd8738953fde193
+  metadata.gz: 3f235767dd93845ffd8c14ea5de871bc40c6015e283fad6853f823fd4c9039dde72e8c5db52995f33bbea08c3726ca7d2a468d7ddb65f8f0b3c0a5851cb26976
+  data.tar.gz: 43f9111c90199bdbabbf2d7bd3862ed58f254be6864bc1052e12e4e6680bbb22627836c4d1852d9402f7afc253c8e467684d1dbbbeb1769b5e7fba4a78833c27

data/lib/app_builder/archiver.rb

@@ -7,18 +7,12 @@ module AppBuilder
     end
 
     def archive
-      execute("mkdir -p #{working_path} #{archive_path} #{build_path}")
-      if File.exist?("#{repo_path}/HEAD")
-        execute("git remote update", chdir: repo_path)
-      else
-        execute("git clone --mirror #{remote_repository} #{repo_path}")
+      create_base_directories
+      update_repository
+      execute_with_hooks(:archive) do
+        execute("git archive #{branch} | tar -x -C #{archive_path}", chdir: repo_path)
+        create_revision_to(revision_path)
       end
-
-      execute("git archive #{branch} | tar -x -C #{archive_path}", chdir: repo_path)
-
-      rev_hash = { "branch" => branch, "revision" => revision }
-      File.open(revision_path, "w") { |f| f.write(rev_hash.to_yaml) }
-      log(:info, "Create revision: #{rev_hash.inspect}")
     end
   end
 end

data/lib/app_builder/base.rb

@@ -13,6 +13,31 @@ module AppBuilder
 
     private
 
+      def execute_with_hooks(type)
+        raise ArgumentError unless block_given?
+        Array(send("before_#{type}")).each { |hook| hook.call(self) }
+        yield
+        Array(send("after_#{type}")).each { |hook| hook.call(self) }
+      end
+
+      def create_base_directories
+        execute("mkdir -p #{working_path} #{archive_path} #{build_path}")
+      end
+
+      def update_repository
+        if File.exist?("#{repo_path}/HEAD")
+          execute("git remote update", chdir: repo_path)
+        else
+          execute("git clone --mirror #{remote_repository} #{repo_path}")
+        end
+      end
+
+      def create_revision_to(path)
+        rev_hash = { "branch" => branch, "revision" => revision }
+        File.open(path, "w") { |f| f.write(rev_hash.to_yaml) }
+        log(:info, "Create revision: #{rev_hash.inspect}")
+      end
+
       def log(level, message)
         logger&.send(level, message)
       end

data/lib/app_builder/builder.rb

@@ -19,7 +19,9 @@ module AppBuilder
 
     def build
       archiver.archive
-      execute("tar zcf #{builded_src_path} .", chdir: archive_path)
+      execute_with_hooks(:build) do
+        execute("tar zcf #{builded_src_path} .", chdir: archive_path)
+      end
     end
   end
 end

data/lib/app_builder/config.rb

@@ -1,23 +1,29 @@
 module AppBuilder
   class Config
     CHANGEABLE_PARAMETERS = [
-      :build_id,
-      :project_name,
-      :remote_repository,
-      :branch,
-      :revision,
-      :upload_type,
-      :upload_id, # bucket name or remote host
-      :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)
+      :logger,            # default: AppBuilder::Logger
+
+      # hooks
+      :before_archive,
+      :after_archive,
+      :before_build,
+      :after_build,
+      :before_upload,
+      :after_upload,
 
       # source
-      :builded_src_ext,
-      :remote_src_path,
+      :remote_src_path, # default: assets
 
       # manifest
-      :manifest_template_path,
-      :remote_manifest_path,
-      :manifest_ext,
+      :manifest_template_path, # default: lib/app_builder/template/manifest.yml.erb in this repository
+      :remote_manifest_path,   # default: manifests
 
       # Only use when upload to S3
       :region,
@@ -28,11 +34,6 @@ module AppBuilder
       :resource_host,
       :resource_user,
       :resource_ssh_options,
-
-      # Only use when remote build
-      # :build_host,
-      # :build_user,
-      # :build_ssh_options,
     ].freeze
 
     PARAMETERS = [
@@ -64,11 +65,11 @@ module AppBuilder
     end
 
     def build_name
-      [build_id, builded_src_ext].join(".")
+      "#{build_id}.tar.gz"
     end
 
     def manifest_name
-      [build_id, manifest_ext].join(".")
+      "#{build_id}.yml"
     end
 
     def working_path
@@ -116,30 +117,40 @@ module AppBuilder
     end
 
     def reset
-      @build_host             = "localhost"
-      @build_user             = ENV.fetch("USER", nil)
-      @build_ssh_options      = {}
       @build_id               = Time.now.strftime("%Y%m%d%H%M%S")
       @project_name           = File.basename(`git rev-parse --show-toplevel`.chomp)
       @remote_repository      = `git remote get-url origin`.chomp
       @branch                 = ENV.fetch("TARGET_BRANCH", "master")
       @revision               = `git rev-parse #{branch}`.chomp
-      @builded_src_ext        = "tar.gz"
-      @manifest_ext           = "yml"
+      @remote_src_path        = "assets"
       @manifest_template_path = File.expand_path("template/manifest.yml.erb", __dir__)
-      @resource_user          = @build_user
+      @remote_manifest_path   = "manifests"
+      @resource_user          = ENV.fetch("USER", nil)
       @resource_ssh_options   = {}
       @logger                 = Logger.new(STDOUT)
       @upload_type            = :s3
 
-      # for upload to S3
-      @region = ENV.fetch("AWS_DEFAULT_REGION", aws_config("region") || "ap-northeast-1")
-      @access_key_id = ENV.fetch("AWS_ACCESS_KEY_ID", aws_credential("aws_access_key_id"))
+      # for upload to S3 (from `.aws/config` and `.aws/credentials`)
+      @region            = ENV.fetch("AWS_DEFAULT_REGION", aws_config("region") || "ap-northeast-1")
+      @access_key_id     = ENV.fetch("AWS_ACCESS_KEY_ID", aws_credential("aws_access_key_id"))
       @secret_access_key = ENV.fetch("AWS_SECRET_ACCESS_KEY", aws_credential("aws_secret_access_key"))
+
+      initialize_hooks
     end
 
     private
 
+      def initialize_hooks
+        [
+          :@before_archive,
+          :@after_archive,
+          :@before_build,
+          :@after_build,
+          :@before_upload,
+          :@after_upload,
+        ].each { |hook_name| instance_variable_set(hook_name, []) }
+      end
+
       def aws_config(key)
         find_aws_setting_by(
           ENV.fetch("AWS_CONFIG_FILE", File.expand_path("~/.aws/config")),

data/lib/app_builder/uploader.rb

@@ -24,9 +24,11 @@ module AppBuilder
     def upload
       upload_proc = s3? ? method(:upload_to_s3) : method(:upload_to_server)
       builder.build
-      upload_proc.call(builded_src_path, remote_src_file)
-      generate_manifest
-      upload_proc.call(builded_manifest_path, remote_manifest_file)
+      execute_with_hooks(:upload) do
+        upload_proc.call(builded_src_path, remote_src_file)
+        generate_manifest
+        upload_proc.call(builded_manifest_path, remote_manifest_file)
+      end
     end
 
     def upload_to_s3(local, remote)

data/lib/app_builder/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh