app_builder 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 16e6784f07c5a6ea216a05502d569ead643ef3cc
-  data.tar.gz: 6d2fb40d61b2e7329eb4c3a2f528feaea073a013
+SHA256:
+  metadata.gz: 17ce5dd23729388a0087da20a784ff3b816f8c57fba31ca57f3e721e1a7ffdcf
+  data.tar.gz: a88df3a875b6a397cc1c1035628bea75ae59712130f6b952c57a173408c92387
 SHA512:
-  metadata.gz: '0865b3c4d763355ff5aa601ea8dd2b098af728efcd92c336ce2674745819e73aee94deb1d243ac67a3d6f460f41d73ca071b935fddd5f19a0d06ec1741f3374f'
-  data.tar.gz: 20aa8af30e89a5f56daa96d151acc1864f4995a30799b03c442ab5b6a21825785bd0386947948373889198b028df80c3cd52479e11458e1c88a3c0096f538242
+  metadata.gz: 7bfc464fb1677988dc93858de377d3497fdf4cb470e6adfbf4ca20ba8d0586100f162e70c4b28579a35280215b9cf5f78cfdd96c6c3a4c584dbecdecf02bd121
+  data.tar.gz: 211e70acaf02d62d8e4077f158f2952b57a89a3e6a4d66fa10e9f0ab763d6bc18b522442c65bef511dc6d5c1e3365764b20b5076369303352fd8738953fde193

data/app_builder.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "net-ssh"
   spec.add_dependency "net-scp"
+  spec.add_dependency "aws-sdk-s3"
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/app_builder.rb

@@ -7,6 +7,7 @@ require "yaml"
 
 require "net/ssh"
 require "net/scp"
+require "aws-sdk-s3"
 
 require "app_builder/version"
 require "app_builder/config"

data/lib/app_builder/base.rb

@@ -3,25 +3,26 @@ module AppBuilder
     extend Forwardable
 
     attr_accessor :config
-    ::AppBuilder::Config::PARAMETERS.each do |name|
+    Config::PARAMETERS.each do |name|
       def_delegator :config, name
     end
 
     def initialize(conf = nil)
-      @config = conf || ::AppBuilder::Config.new
+      @config = conf || Config.new
     end
 
     private
 
+      def log(level, message)
+        logger&.send(level, message)
+      end
+
       def execute(cmd, options = {})
-        log(:info, "Execute command [local]: #{cmd}")
-        stdout, stderr, status = Open3.capture3(cmd, **options)
-        log(:error, "Failed [#{status.exitstatus}]: #{stderr}") unless status.success?
-        stdout.chomp
+        build_server.execute(cmd, options).first
       end
 
-      def log(level, message)
-        logger&.send(level, message)
+      def build_server
+        @build_server ||= Server.new(:localhost, logger: logger)
       end
   end
 end

data/lib/app_builder/config.rb

@@ -1,20 +1,38 @@
 module AppBuilder
   class Config
-    VALID_OPTIONS = [
+    CHANGEABLE_PARAMETERS = [
       :build_id,
       :project_name,
       :remote_repository,
       :branch,
       :revision,
-      :src_base_url,
-      :manifest_base_url,
+      :upload_type,
+      :upload_id, # bucket name or remote host
+      :logger,
+
+      # source
+      :builded_src_ext,
       :remote_src_path,
-      :remote_manifest_path,
+
+      # manifest
       :manifest_template_path,
+      :remote_manifest_path,
+      :manifest_ext,
+
+      # Only use when upload to S3
+      :region,
+      :access_key_id,
+      :secret_access_key,
+
+      # Only use when upload with scp
       :resource_host,
-      :ssh_user,
-      :identity_file,
-      :logger,
+      :resource_user,
+      :resource_ssh_options,
+
+      # Only use when remote build
+      # :build_host,
+      # :build_user,
+      # :build_ssh_options,
     ].freeze
 
     PARAMETERS = [
@@ -25,12 +43,13 @@ module AppBuilder
       :builded_src_path,
       :builded_manifest_path,
       :revision_path,
+      :remote_src_file,
+      :remote_manifest_file,
       :src_url,
-      :manifest_url,
       :remote_app_home,
-    ].concat(VALID_OPTIONS).freeze
+    ].concat(CHANGEABLE_PARAMETERS).freeze
 
-    attr_accessor *VALID_OPTIONS
+    attr_accessor *CHANGEABLE_PARAMETERS
 
     def initialize(options = {})
       reset
@@ -45,11 +64,11 @@ module AppBuilder
     end
 
     def build_name
-      "#{build_id}.tar.gz"
+      [build_id, builded_src_ext].join(".")
     end
 
     def manifest_name
-      "#{build_id}.yml"
+      [build_id, manifest_ext].join(".")
     end
 
     def working_path
@@ -80,12 +99,16 @@ module AppBuilder
       File.join(archive_path, "revision.yml")
     end
 
-    def src_url
-      File.join(src_base_url, build_name)
+    def remote_src_file
+      File.join(remote_src_path, build_name)
     end
 
-    def manifest_url
-      File.join(manifest_base_url, manifest_name)
+    def remote_manifest_file
+      File.join(remote_manifest_path, manifest_name)
+    end
+
+    def src_url
+      "#{upload_type.to_s}://#{File.join(upload_id, remote_src_path, build_name)}"
     end
 
     def remote_app_home
@@ -93,15 +116,49 @@ 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"
       @manifest_template_path = File.expand_path("template/manifest.yml.erb", __dir__)
-      @ssh_user               = ENV.fetch("USER", nil)
-      @identity_file          = "~/.ssh/id_rsa"
+      @resource_user          = @build_user
+      @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"))
+      @secret_access_key = ENV.fetch("AWS_SECRET_ACCESS_KEY", aws_credential("aws_secret_access_key"))
     end
+
+    private
+
+      def aws_config(key)
+        find_aws_setting_by(
+          ENV.fetch("AWS_CONFIG_FILE", File.expand_path("~/.aws/config")),
+          key,
+        )
+      end
+
+      def aws_credential(key)
+        find_aws_setting_by(
+          ENV.fetch("AWS_CREDENTIAL_FILE", File.expand_path("~/.aws/credentials")),
+          key,
+        )
+      end
+
+      def find_aws_setting_by(path, key)
+        return nil unless File.exist?(path)
+        File.readlines(path).detect { |line|
+          line.start_with?(/\A\s*#{key}/)
+        }&.split("=")&.last&.strip
+      end
   end
 end

data/lib/app_builder/server.rb

@@ -2,7 +2,7 @@ module AppBuilder
   class Server
     attr_accessor :address, :user, :options, :logger
 
-    LOCAL_ADDRESSES = %w(local 127.0.0.1).freeze
+    LOCAL_ADDRESSES = %w(local localhost 127.0.0.1).freeze
 
     def initialize(address = nil, user: nil, options: {}, logger: nil)
       @address = address
@@ -14,8 +14,8 @@ module AppBuilder
     def execute(*cmds)
       results = []
 
+      options = cmds.last.is_a?(Hash) ? cmds.pop : {}
       if local?
-        options = cmds.last.is_a?(Hash) ? cmds.pop : {}
         cmds.each do |cmd|
           message = "Execute command [local]: #{cmd}"
           message += " (with: #{options.inspect})" unless options.empty?
@@ -28,6 +28,7 @@ module AppBuilder
       else
         ssh_start do |ssh|
           cmds.each do |cmd|
+            cmd = "cd #{options[:chdir]}; #{cmd}" if options.has_key?(:chdir)
             log(:info, "Execute command [#{address}]: #{cmd}")
             results << ssh.exec!(cmd).chomp
           end
@@ -77,8 +78,7 @@ module AppBuilder
     private
 
       def log(level, message)
-        return unless logger
-        logger.send(level, message)
+        logger&.send(level, message)
       end
 
       def ssh_options

data/lib/app_builder/uploader.rb

@@ -10,38 +10,37 @@ module AppBuilder
 
     def initialize(conf = nil)
       case conf
-      when AppBuilder::Archiver
+      when Archiver
         @builder = Builder.new(conf)
         conf = conf.config
-      when AppBuilder::Builder
+      when Builder
         @builder = conf
         conf = conf.config
       end
       super(conf)
+      @builder ||= Builder.new(config)
     end
 
     def upload
+      upload_proc = s3? ? method(:upload_to_s3) : method(:upload_to_server)
       builder.build
-      if s3?(src_url)
-        upload_to_s3(builded_src_path, src_url)
-      else
-        upload_to_server(builded_src_path, remote_src_path)
-      end
-
+      upload_proc.call(builded_src_path, remote_src_file)
       generate_manifest
-      if s3?(manifest_url)
-        upload_to_s3(builded_manifest_path, manifest_url)
-      else
-        upload_to_server(builded_manifest_path, remote_manifest_path)
-      end
+      upload_proc.call(builded_manifest_path, remote_manifest_file)
     end
 
     def upload_to_s3(local, remote)
-      execute("aws s3 cp #{local} #{remote}")
+      log(:info, "Upload #{local} to #{src_url}")
+      s3_client.put_object(
+        bucket: upload_id,
+        key:    remote,
+        body:   File.open(local),
+      )
     end
 
     def upload_to_server(local, remote)
-      execute("scp -i #{identity_file} #{local} #{ssh_user}@#{resource_host}:#{remote}")
+      log(:info, "Upload #{local} to #{src_url}")
+      resource_server.upload(local, remote)
     end
 
     def generate_manifest
@@ -52,8 +51,25 @@ module AppBuilder
 
     private
 
-      def s3?(url)
-        url.to_s.start_with?("s3://")
+      def s3?
+        upload_type == :s3
+      end
+
+      def s3_client
+        @s3_client ||= Aws::S3::Client.new(
+          region:        region,
+          access_key_id: access_key_id,
+          secret_access_key: secret_access_key
+        )
+      end
+
+      def resource_server
+        @resource_server ||= Server.new(
+          resource_host,
+          user:    resource_user,
+          options: resource_ssh_options,
+          logger:  logger
+        )
       end
   end
 end

data/lib/app_builder/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Application build utilities.