ruboty-capistrano 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2f1ecfbcec27de756e885dbcc48a1f6e1619d921
-  data.tar.gz: 4723bc8ba7bb77f3d04f418bc5368e2c036fa150
+SHA256:
+  metadata.gz: 98eb1ff20faf98c4324e0251dd1bde9558598c197083db240ee8ffda0a45db67
+  data.tar.gz: 44190bd6165237e7c36ecfba627d1a4e686f760eb7c2a8b499f110c72f83ee11
 SHA512:
-  metadata.gz: 3e905af00a7eb9f90a4b8ecd6b59a4dbb61beb995f0787f3c4581ec9fb507969ec7d1299d84be44aca9b9cd1b71e57d14ab54ed9ac513d6e7869a63dd005ef65
-  data.tar.gz: 4230b3736a12505c88b0f53917f0da2f617eac21b2de5f0037b3d08f218ef712dc3529d14bbf53cec34c8293ec74023134912bd75b83dab902b9a1b1c3d5261c
+  metadata.gz: ab23f72acc0b7122beb6a93bab71ceae38de1c5d7fe9ec7e0955887bc4b2494bb71c5e69dfed4940c9507b02c455ca8f5e88119be759a0ed762e58efb805281d
+  data.tar.gz: e3ec5c9723f4c8f9a07e2a67a8a1223f4689de81ca3fa725150b4f0c1448585d711d51a0d166ed50530e367555d42f57806f60f0a14f01df66fd8eed66c12cbd

data/{LICENSE.txt → LICENSE}

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Morioka Shuhei
+Copyright (c) 2016 Morioka Shuhei (selmertsx) and Speee, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/ruboty/capistrano.rb

@@ -16,12 +16,12 @@ module Ruboty
       @config ||= Ruboty::Capistrano::Config.config
     end
 
-    def self.loggers
+    def self.logger
       return STDOUT if Ruboty::Capistrano.config.log_path.to_s.empty?
       return @logger if @logger
 
-      log_path = File.join(Ruboty::Capistrano.config.log_path, "#{DateTime.now.strftime('%Y%m%d%H%M')}.log")
-      @logger = Logger.new(deploy_log_path)
+      log_path = File.join(Ruboty::Capistrano.config.log_path, "#{DateTime.now.strftime('%Y%m%d')}.log")
+      @logger = Logger.new(log_path)
     end
   end
 end

data/lib/ruboty/capistrano/actions/deployment.rb

@@ -37,12 +37,28 @@ module Ruboty
           Ruboty::Capistrano.config.local_repo_path[role]
         end
 
+        def cmd
+          return @cmd if @cmd
+          cmd_ary = []
+          cmd_ary << "cd #{repo_path}"
+          version_file = "#{repo_path}/.ruby-version"
+          if Ruboty::Capistrano.config.rbenv_root && File.exist?(version_file)
+            cmd_ary << "RBENV_VERSION=\"$(cat #{version_file})\" rbenv exec bundle"
+            cmd_ary << "RBENV_VERSION=\"$(cat #{version_file})\" rbenv exec bundle exec cap #{env} deploy BRANCH=#{branch}"
+          else
+            cmd_ary << 'bundle'
+            cmd_ary << "bundle exec cap #{env} deploy BRANCH=#{branch}"
+          end
+          @cmd = cmd_ary.join(' && ')
+        end
+
         def deploy
-          cmd = "cd #{repo_path} && bundle && bundle exec cap #{env} deploy BRANCH=#{branch}"
+          Ruboty::Capistrano.logger.info("RUN: #{cmd}")
           out, err, status = Bundler.with_clean_env { Open3.capture3(cmd) }
+          Ruboty::Capistrano.logger.info(out)
           return if err.empty?
 
-          Ruboty::Capistrano.logger err
+          Ruboty::Capistrano.logger.error(err)
           errors << 'deploy中にエラーが発生しました'
         end
       end

data/lib/ruboty/capistrano/config.rb

@@ -17,6 +17,7 @@ module Ruboty
         config.log_path = ENV['DEPLOY_LOG_PATH']
         config.remote_repo_path = extract.call(ENV['REMOTE_REPOSITORY_PATH'])
         config.local_repo_path = extract.call(ENV['LOCAL_REPOSITORY_PATH'])
+        config.rbenv_root = ENV['RBENV_ROOT']
       end
     end
   end

data/lib/ruboty/capistrano/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Capistrano
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

data/ruboty-capistrano.gemspec

@@ -6,7 +6,7 @@ require 'ruboty/capistrano/version'
 Gem::Specification.new do |spec|
   spec.name          = "ruboty-capistrano"
   spec.version       = Ruboty::Capistrano::VERSION
-  spec.authors       = ["Morioka Shuhei"]
+  spec.authors       = ["Morioka Shuhei (selmertsx)", "Speee, Inc."]
   spec.email         = ["selmertsx@gmail.com"]
 
   spec.summary       = %q{ Ruboty plugin for deploy application via capistrano.}

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-capistrano
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
-- Morioka Shuhei
+- Morioka Shuhei (selmertsx)
+- Speee, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -119,7 +120,7 @@ files:
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - bin/console
@@ -152,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruboty plugin for deploy application via capistrano.