ruboty-capistrano 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f1cb596f87b71458a2783696b4bd0bc340d4705
-  data.tar.gz: c6dd46e793ff38b271dc1fe03e1381c2e1b3bd92
+  metadata.gz: 2f1ecfbcec27de756e885dbcc48a1f6e1619d921
+  data.tar.gz: 4723bc8ba7bb77f3d04f418bc5368e2c036fa150
 SHA512:
-  metadata.gz: 38213f80b138755ac65944bf312d57360bf23eab9a68280b8b18aea6066638e70d7f2cc95d04dac87f6f7c9b3fae781f0b80173738b32dc0fe8892813ab0a7f3
-  data.tar.gz: a1c447e7fa0fd1c13a50a562131ff8a2e7c1c7e6a364f77b658b9e40e0e9b0115f33546c9579124a5edaf7adc0c59f0778624d01dd14b8bc5d12a5c5f30037e5
+  metadata.gz: 3e905af00a7eb9f90a4b8ecd6b59a4dbb61beb995f0787f3c4581ec9fb507969ec7d1299d84be44aca9b9cd1b71e57d14ab54ed9ac513d6e7869a63dd005ef65
+  data.tar.gz: 4230b3736a12505c88b0f53917f0da2f617eac21b2de5f0037b3d08f218ef712dc3529d14bbf53cec34c8293ec74023134912bd75b83dab902b9a1b1c3d5261c

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    ruboty-capistrano (0.1.2)
+    ruboty-capistrano (0.1.3)
+      octokit
 
 GEM
   remote: https://rubygems.org/
@@ -11,10 +12,26 @@ GEM
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    coderay (1.1.1)
     concurrent-ruby (1.0.2)
     diff-lcs (1.2.5)
+    dotenv (2.1.1)
+    faraday (0.10.0)
+      multipart-post (>= 1.2, < 3)
     i18n (0.7.0)
+    mem (0.1.5)
+    method_source (0.8.2)
     minitest (5.9.0)
+    multipart-post (2.0.0)
+    octokit (4.6.2)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    public_suffix (2.0.4)
     rake (10.5.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
@@ -29,6 +46,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
+    ruboty (1.2.4)
+      activesupport
+      bundler
+      dotenv
+      mem
+      slop
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    slop (3.6.0)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -39,9 +66,11 @@ PLATFORMS
 DEPENDENCIES
   activesupport
   bundler (~> 1.12)
+  pry
   rake (~> 10.0)
   rspec (~> 3.0)
+  ruboty
   ruboty-capistrano!
 
 BUNDLED WITH
-   1.12.5
+   1.13.6

data/README.md

@@ -26,23 +26,25 @@ Or install it yourself as:
 ### Deploy
 
 ```
-@bot_name deploy environment branch_name
+@bot_name deploy role branch_name
 ```
 
 ### Rollback
 
 ```
-@bot_name rollback environment
+@bot_name rollback role
 ```
 
 ## Env
 
 ```
 RUBOTY_ENV              - deploy先の環境を指定する
-DEFAULT_BRANCH          - deploy時において、branch指定されていなかった場合に、deployするdefaultのbranch
-DEPLOY_REPOSITORY_PATH  - deploy対象のrepositoryのpath
+LOCAL_REPOSITORY_PATH  - deploy対象が存在しているディレクトリパス
 (ex: "sample:/path/to/sample;admin:/path/to/admin")
 DEPLOY_LOG_PATH         - deploy時のログを残すpath
+GITHUB_ACCESS_TOKEN     - GitHubのアクセストークン(GitHubのAPIを用いるため)
+REMOTE_REPOSITORY_PATH  - deploy対象のGitHubのrepository
+(ex: "sample:hoge/sample-repo;admin:hoge/admin-repo")
 ```
 
 ## License

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

@@ -0,0 +1,51 @@
+module Ruboty
+  module Capistrano
+    module Actions
+      class Deployment < Ruboty::Actions::Base
+        include Ruboty::Capistrano::GitHubRepositoryValidator
+
+        attr_reader :role, :branch, :errors
+
+        def initialize(role: , branch:)
+          @role = role
+          @branch = branch
+          @errors = []
+        end
+
+        def run
+          return unless validates
+
+          deploy
+          errors.empty?
+        end
+
+        def message_before_deploy
+          "#{env}環境の#{role}にBRANCH:#{branch}をdeployします"
+        end
+
+        def message_after_deploy
+          "#{env}環境の#{role}にBRANCH:#{branch}をdeployしました"
+        end
+
+        private
+
+        def env
+          Ruboty::Capistrano.config.env
+        end
+
+        def repo_path
+          Ruboty::Capistrano.config.local_repo_path[role]
+        end
+
+        def deploy
+          cmd = "cd #{repo_path} && bundle && bundle exec cap #{env} deploy BRANCH=#{branch}"
+          out, err, status = Bundler.with_clean_env { Open3.capture3(cmd) }
+          return if err.empty?
+
+          Ruboty::Capistrano.logger err
+          errors << 'deploy中にエラーが発生しました'
+        end
+      end
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ module Ruboty
           @message = message
           @env = Ruboty::Capistrano.config.env
           @role = message.match_data[1]
-          @path = Ruboty::Capistrano.config.repository_path[@role]
+          @path = Ruboty::Capistrano.config.local_repo_path[@role]
         end
 
         def call

data/lib/ruboty/capistrano/config.rb

@@ -3,15 +3,21 @@ module Ruboty
     class Config
       include ActiveSupport::Configurable
 
-      configure do |config|
-        config.env = ENV['RUBOTY_ENV']
-        config.log_path = ENV['DEPLOY_LOG_PATH']
-        config.repository_path = ENV['DEPLOY_REPOSITORY_PATH'].split(';').inject({}) do |hash, s|
+      extract = lambda do |env_str|
+        env_str.split(';').inject({}) do |hash, s|
           key, value = s.split(":").first, s.split(":").last
           hash[key] = value
           hash
         end
       end
+
+      configure do |config|
+        config.env = ENV['RUBOTY_ENV']
+        config.github_access_token = ENV['GITHUB_ACCESS_TOKEN']
+        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'])
+      end
     end
   end
 end

data/lib/ruboty/capistrano/github_repository_validators.rb

@@ -0,0 +1,24 @@
+module Ruboty::Capistrano
+  module GitHubRepositoryValidator
+    def self.included(klass)
+      raise 'wrong include error' unless klass.ancestors.include?(Ruboty::Actions::Base)
+    end
+
+    def validates
+      !!github_client.branch(repo, branch)
+    rescue Octokit::NotFound => e
+      errors << e.message
+      false
+    end
+
+    private
+
+    def github_client
+      Octokit::Client.new(access_token: Ruboty::Capistrano.config.github_access_token)
+    end
+
+    def repo
+      Ruboty::Capistrano.config.remote_repo_path[role]
+    end
+  end
+end

data/lib/ruboty/capistrano/version.rb

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

data/lib/ruboty/capistrano.rb

@@ -1,8 +1,12 @@
 require 'open3'
 require 'active_support/all'
 require 'date'
+require 'octokit'
 require 'ruboty/capistrano/version'
+require 'ruboty/capistrano/github_repository_validators'
 require 'ruboty/handlers/capistrano'
+require 'ruboty/capistrano/actions/deployment'
+require 'ruboty/capistrano/actions/rollback'
 
 module Ruboty
   module Capistrano
@@ -11,5 +15,13 @@ module Ruboty
     def self.config
       @config ||= Ruboty::Capistrano::Config.config
     end
+
+    def self.loggers
+      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)
+    end
   end
 end

data/lib/ruboty/handlers/capistrano.rb

@@ -1,21 +1,32 @@
-require 'ruboty/capistrano/actions/deploy'
-require 'ruboty/capistrano/actions/rollback'
-
 module Ruboty
   module Handlers
     class Capistrano < Base
-      env :DEPLOY_REPOSITORY_PATH, 'Deploy用の Repository Path を設定する'
+      env :LOCAL_REPOSITORY_PATH, 'Deploy用の Repository Path を設定する'
 
       on(/deploy\s+(.*)\s+(.*)/m, name: 'deploy', description: 'deployする')
       on(/rollback\s+(.*)/m, name: 'rollback', description: 'rollbackする')
 
       def deploy(message)
-        Ruboty::Capistrano::Actions::Deploy.new(message).call
+        deployment = Ruboty::Capistrano::Actions::Deployment.new(deploy_params(message))
+        message.reply(deployment.message_before_deploy)
+
+        if deployment.run
+          message.reply(deployment.message_after_deploy)
+        else
+          message.reply(deployment.errors.join(','))
+        end
       end
 
       def rollback(message)
         Ruboty::Capistrano::Actions::Rollback.new(message).call
       end
+
+      private
+
+      def deploy_params(message)
+        role, branch = message.match_data[1..2]
+        { role: role, branch: branch }
+      end
     end
   end
 end

data/ruboty-capistrano.gemspec

@@ -20,6 +20,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.add_development_dependency "activesupport"
   spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_dependency 'octokit'
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "ruboty"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-capistrano
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Morioka Shuhei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: octokit
+  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: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: ruboty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: " Ruboty plugin for deploy application via capistrano."
 email:
 - selmertsx@gmail.com
@@ -83,9 +125,10 @@ files:
 - bin/console
 - bin/setup
 - lib/ruboty/capistrano.rb
-- lib/ruboty/capistrano/actions/deploy.rb
+- lib/ruboty/capistrano/actions/deployment.rb
 - lib/ruboty/capistrano/actions/rollback.rb
 - lib/ruboty/capistrano/config.rb
+- lib/ruboty/capistrano/github_repository_validators.rb
 - lib/ruboty/capistrano/version.rb
 - lib/ruboty/handlers/capistrano.rb
 - ruboty-capistrano.gemspec

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

@@ -1,51 +0,0 @@
-module Ruboty
-  module Capistrano
-    module Actions
-      class Deploy < Ruboty::Actions::Base
-        class DeployError < StandardError; end
-
-        attr_reader :message, :path, :env, :branch, :role
-
-        def initialize(message)
-          @message = message
-          @env = Ruboty::Capistrano.config.env
-          @role = message.match_data[1]
-          @path = Ruboty::Capistrano.config.repository_path[@role]
-          @branch = message.match_data[2] || ENV['DEFAULT_BRANCH']
-          @logger = Logger.new(deploy_log_path)
-        end
-
-        def call
-          message.reply("#{@env}環境の#{@role}にBRANCH:#{@branch}をdeployします")
-          deploy
-          message.reply("#{@env}環境の#{@role}にBRANCH:#{@branch}をdeploy完了しました")
-        rescue => e
-          err_message = <<~TEXT
-            :cop:問題が発生しました:cop:
-          TEXT
-
-          @logger.error e.message
-          message.reply(err_message)
-        end
-
-        private
-        def deploy
-          if @env == 'production' && @branch != 'master'
-            raise InvalidDeploySettingError.new('production環境はmaster以外でdeploy出来ません')
-          end
-
-          cmd = "cd #{path} && bundle && bundle exec cap #{@env} deploy BRANCH=#{@branch}"
-          out, err, status = Bundler.with_clean_env { Open3.capture3(cmd) }
-          @logger.info out
-          raise DeployError.new(err) unless err.empty?
-        end
-
-        def deploy_log_path
-          return STDOUT if Ruboty::Capistrano.config.log_path.to_s.empty?
-
-          File.join(Ruboty::Capistrano.config.log_path, "#{DateTime.now.strftime('%Y%m%d%H%M')}.log")
-        end
-      end
-    end
-  end
-end