app_builder 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 7f082bfd74839a0da79160de4b4e0d8cc76428c45edba8de0a693c315fdafc89
-  data.tar.gz: 42854ccc07fe1e5a86f789a724e90dd8c3a88cefeed15c612f858747a898d975
+SHA1:
+  metadata.gz: 16e6784f07c5a6ea216a05502d569ead643ef3cc
+  data.tar.gz: 6d2fb40d61b2e7329eb4c3a2f528feaea073a013
 SHA512:
-  metadata.gz: 39737fe2d6a50f3d006f2fac2580db2cd0b3f95a468e62174327f0bdf1e09a4b5e57f9a33e00ea5364d9d12708d5b79e71e79bfdb982dbd577071bd6163cd4b2
-  data.tar.gz: 897305cd932a00ff217c2b87adb1f282b829ab939fb9724549eb9ea0544c9d7545216a93b3bfb345d4d4b13dda6be37954efc10cfef76a01560482d093870c04
+  metadata.gz: '0865b3c4d763355ff5aa601ea8dd2b098af728efcd92c336ce2674745819e73aee94deb1d243ac67a3d6f460f41d73ca071b935fddd5f19a0d06ec1741f3374f'
+  data.tar.gz: 20aa8af30e89a5f56daa96d151acc1864f4995a30799b03c442ab5b6a21825785bd0386947948373889198b028df80c3cd52479e11458e1c88a3c0096f538242

data/app_builder.gemspec

@@ -20,6 +20,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "net-ssh"
+  spec.add_dependency "net-scp"
+
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"

data/lib/app_builder.rb

@@ -2,10 +2,16 @@ require "erb"
 require "forwardable"
 require "logger"
 require "open3"
+require "tempfile"
 require "yaml"
 
+require "net/ssh"
+require "net/scp"
+
 require "app_builder/version"
 require "app_builder/config"
+require "app_builder/logger"
+require "app_builder/server.rb"
 require "app_builder/base"
 require "app_builder/archiver"
 require "app_builder/builder"

data/lib/app_builder/archiver.rb

@@ -1,8 +1,8 @@
 module AppBuilder
   class Archiver < Base
     class << self
-      def archive(config)
-        new(config).archive
+      def archive(conf)
+        new(conf).archive
       end
     end
 

data/lib/app_builder/base.rb

@@ -7,8 +7,8 @@ module AppBuilder
       def_delegator :config, name
     end
 
-    def initialize(config = nil)
-      @config = config || ::AppBuilder::Config.new
+    def initialize(conf = nil)
+      @config = conf || ::AppBuilder::Config.new
     end
 
     private

data/lib/app_builder/builder.rb

@@ -1,18 +1,25 @@
 module AppBuilder
   class Builder < Base
+    attr_accessor :archiver
+
     class << self
-      def build(config)
-        new(config).build
+      def build(conf)
+        new(conf).build
+      end
+    end
+
+    def initialize(conf = nil)
+      if conf.class <= Archiver
+        @archiver = conf
+        conf = conf.config
       end
+      super(conf)
+      @archiver ||= Archiver.new(config)
     end
 
     def build
       archiver.archive
       execute("tar zcf #{builded_src_path} .", chdir: archive_path)
     end
-
-    def archiver
-      @archiver ||= Archiver.new(config)
-    end
   end
 end

data/lib/app_builder/logger.rb

@@ -0,0 +1,48 @@
+module AppBuilder
+  class Logger < ::Logger
+    class Formatter < ::Logger::Formatter
+      Format = "%s\t%s\t%d\t%s\n".freeze
+
+      def call(severity, time, progname, msg)
+        Format % [severity, format_datetime(time), $$, msg2str(msg)]
+      end
+
+      private
+
+        def format_datetime(time)
+          time.strftime(@datetime_format || "%F %H:%M:%S.%6N".freeze)
+        end
+    end
+
+    def initialize(logdev, shift_age = 0, shift_size = 1048576, level: DEBUG,
+                 progname: nil, formatter: nil, datetime_format: nil,
+                 shift_period_suffix: '%Y%m%d')
+      super
+      @default_formatter = Formatter.new
+    end
+
+    def format_message(severity, datetime, progname, msg)
+      apply_severity_color(
+        severity,
+        (@formatter || @default_formatter).call(severity, datetime, progname, msg),
+      )
+    end
+
+    private
+
+      def apply_severity_color(severity, msg)
+        case severity
+        when "DEBUG".freeze
+          "\033[2m#{msg}\033[m"
+        when "INFO".freeze
+          "\033[32m#{msg}\033[m"
+        when "WARN".freeze
+          "\033[33m#{msg}\033[m"
+        when "ERROR".freeze, "FATAL".freeze
+          "\033[31m#{msg}\033[m"
+        else
+          msg
+        end
+      end
+  end
+end

data/lib/app_builder/server.rb

@@ -0,0 +1,97 @@
+module AppBuilder
+  class Server
+    attr_accessor :address, :user, :options, :logger
+
+    LOCAL_ADDRESSES = %w(local 127.0.0.1).freeze
+
+    def initialize(address = nil, user: nil, options: {}, logger: nil)
+      @address = address
+      @user    = user || ENV.fetch("USER", nil)
+      @options = options
+      @logger  = logger
+    end
+
+    def execute(*cmds)
+      results = []
+
+      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?
+          log(:info, message)
+
+          stdout, stderr, status = Open3.capture3(cmd, **options)
+          log(:error, "Failed [#{status.exitstatus}]: #{stderr}") unless status.success?
+          results << stdout
+        end
+      else
+        ssh_start do |ssh|
+          cmds.each do |cmd|
+            log(:info, "Execute command [#{address}]: #{cmd}")
+            results << ssh.exec!(cmd).chomp
+          end
+        end
+      end
+
+      results
+    end
+
+    def upload(src_path, dest_path)
+      erb = File.extname(src_path) == ".erb".freeze
+      if local?
+        if erb
+          log(:info, "Create #{dest_path} from #{src_path}")
+          File.open(dest_path, "w") { |f| f.write(ERB.new(File.read(src_path)).result) }
+        else
+          execute("cp #{src_path} #{dest_path}")
+        end
+      else
+        ssh_start do |ssh|
+          log(:info, "Upload: local:#{src_path} to #{address}:#{dest_path}")
+          if erb
+            begin
+              f = Tempfile.open(File.basename(dest_path))
+              f.write(ERB.new(File.read(src_path)).result)
+              f.close
+              ssh.scp.upload!(f.path, dest_path)
+            rescue
+              f.unlink
+            end
+          else
+            ssh.scp.upload!(src_path, dest_path)
+          end
+        end
+      end
+    end
+
+    def ssh_start
+      raise ArgumentError unless block_given?
+      Net::SSH.start(address, ssh_user, ssh_options) { |ssh| yield ssh }
+    end
+
+    def local?
+      address.nil? || LOCAL_ADDRESSES.include?(address.to_s)
+    end
+
+    private
+
+      def log(level, message)
+        return unless logger
+        logger.send(level, message)
+      end
+
+      def ssh_options
+        return default_ssh_options if options.nil? || options.empty?
+        default_ssh_options.merge(options)
+      end
+
+      def ssh_user
+        user || ENV["USER"]
+      end
+
+      def default_ssh_options
+        { port: 22, keys: File.expand_path("~/.ssh/id_rsa"), forward_agent: true }
+      end
+  end
+end

data/lib/app_builder/uploader.rb

@@ -1,9 +1,23 @@
 module AppBuilder
   class Uploader < Base
+    attr_accessor :builder
+
     class << self
-      def upload(config)
-        new(config).upload
+      def upload(conf)
+        new(conf).upload
+      end
+    end
+
+    def initialize(conf = nil)
+      case conf
+      when AppBuilder::Archiver
+        @builder = Builder.new(conf)
+        conf = conf.config
+      when AppBuilder::Builder
+        @builder = conf
+        conf = conf.config
       end
+      super(conf)
     end
 
     def upload
@@ -41,9 +55,5 @@ module AppBuilder
       def s3?(url)
         url.to_s.start_with?("s3://")
       end
-
-      def builder
-        @builder || Builder.new(config)
-      end
   end
 end

data/lib/app_builder/version.rb

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

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: app_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - i2bskn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-07-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  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: net-scp
+  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
@@ -87,6 +115,8 @@ files:
 - lib/app_builder/base.rb
 - lib/app_builder/builder.rb
 - lib/app_builder/config.rb
+- lib/app_builder/logger.rb
+- lib/app_builder/server.rb
 - lib/app_builder/template/manifest.yml.erb
 - lib/app_builder/uploader.rb
 - lib/app_builder/version.rb
@@ -109,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Application build utilities.