shuttle-deploy 0.2.3 → 0.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd0e01bd7713dc75eaaef43800b74bf841743d49
-  data.tar.gz: 7b774a999af69cab717e3b7e2fa511c0e39428bd
+  metadata.gz: a60eef8a58e783fe2a2ef12ca30eb520028c112e
+  data.tar.gz: c89dea78a0aab855018b83b841e9055da4d9a434
 SHA512:
-  metadata.gz: b81173dc5ff5c967e431cec1bd5cd63aae104d282d44683d8ef9b6ad77460e1f1da245b53aed7dcede8e24a7da36583e66e725e0a3e30f70feee2e75c8f6c041
-  data.tar.gz: ae52b45d7cb993b36511edc81020f00aacd76c9516969f6988ef73bffc96e5ed8009b9c84f814ee9dbf6e185920fed02a1e8f4ecefdb262b476c60c804a94db8
+  metadata.gz: 70760088dbcef4c8bb0b73eae39d4e93bfc5fbe3984a14df5226bbdec8211556ff28f704c7ff9c5cdc9a9dfe17b07dbedb27ddff872612d00ebe7f281bff2a4a
+  data.tar.gz: e53f549d4b5cc575aa7372da18b99b69ddc8168c3c37a57b2f0f9d3d7d0fc7656894325428ae1bd504628380dd007e3c384873528f007851458e14b60403020e

data/README.md

@@ -329,7 +329,7 @@ List of all available hooks that you can use to run custom commands:
 - `before_setup`         - Before base application directories are created
 - `after_setup`          - After application directories are created
 - `before_checkout_code` - Before code update (git pull, etc)
-- `after_checkout_core`  - After code has been updated
+- `after_checkout_code`  - After code has been updated
 - `before_link_release`  - Before linking release
 - `after_link_release`   - After release has been linked
 - `before_rollback`      - Before rollback operation

data/lib/shuttle.rb

@@ -22,6 +22,7 @@ module Shuttle
   autoload :PathHelpers, "shuttle/path_helpers"
   autoload :Strategy,    "shuttle/strategy"
   autoload :Hook,        "shuttle/hook"
+  autoload :Task,        "shuttle/task"
   autoload :Generator,   "shuttle/generator"
 
   autoload :Static,      "shuttle/deployment/static"

data/lib/shuttle/hook.rb

@@ -4,9 +4,13 @@ module Shuttle
       @deploy = deploy
     end
 
-    def run(commands, allow_failures=false)
+    def run(commands, allow_failures = false)
       [commands].flatten.compact.uniq.each do |cmd|
-        execute(cmd, allow_failures)
+        if cmd =~ /^task=\s?([A-Za-z\d\_]+)\s?/
+          Shuttle::Task.new(@deploy, $1.strip, allow_failures).run
+        else
+          execute(cmd, allow_failures)
+        end
       end
     end
 

data/lib/shuttle/runner.rb

@@ -1,3 +1,5 @@
+require "timeout"
+
 module Shuttle
   class Runner
     attr_reader :options
@@ -82,8 +84,13 @@ module Shuttle
         ssh.logger = Logger.new(STDOUT)
       end
 
-      ssh.open
-
+      begin
+        Timeout::timeout(10) { ssh.open }
+      rescue Timeout::Error
+        STDERR.puts "Unable to establish SSH connection to the server within 10 seconds"
+        exit 1
+      end
+      
       klass = Shuttle.const_get(strategy.capitalize) rescue nil
       command.gsub!(/:/,'_')
       exit_code = 0

data/lib/shuttle/strategy.rb

@@ -275,7 +275,7 @@ module Shuttle
       end
     end
 
-    def execute_hook(name, allow_failures=false)
+    def execute_hook(name, allow_failures = false)
       if config.hooks && config.hooks[name]
         execute_commands(config.hooks[name], allow_failures)
       end
@@ -298,7 +298,7 @@ module Shuttle
       result.success? ? false : true
     end
 
-    def execute_commands(commands=[], allow_failures=false)
+    def execute_commands(commands = [], allow_failures = false)
       Shuttle::Hook.new(self).run(commands, allow_failures)
     end
   end

data/lib/shuttle/task.rb

@@ -0,0 +1,52 @@
+module Shuttle
+  class Task
+    def initialize(deploy, task_name, allow_failures = false)
+      @deploy         = deploy
+      @task_name      = task_name
+      @allow_failures = allow_failures
+    end
+
+    def run
+      commands = find_task_commands(@task_name)
+      
+      if commands.nil?
+        @deploy.error("Unable to find task: #{@task_name}")
+      end
+
+      commands.each do |cmd|
+        execute(@task_name, cmd, @allow_failures)
+      end
+    end
+
+    private
+
+    def find_task_commands(name)
+      return unless @deploy.config.tasks.kind_of?(Hash)
+
+      if @deploy.config.tasks[name]
+        commands = [@deploy.config.tasks[name]]
+        commands.flatten.compact
+      end
+    end
+
+    def execute(task, cmd, allow_failures)
+      @deploy.log %{Executing [task=#{task}] "#{cmd.strip}"}
+
+      command = cmd
+
+      if @deploy.ssh.directory_exists?(@deploy.release_path)
+        command = "cd #{@deploy.release_path} && #{command}"
+      end
+
+      result = @deploy.ssh.run(command)
+
+      if result.failure? && allow_failures == false
+        @deploy.error("Failed: #{result.output}")
+      else
+        if !result.output.empty?
+          @deploy.stream_output(result.output)
+        end
+      end
+    end
+  end
+end

data/lib/shuttle/version.rb

@@ -1,3 +1,3 @@
 module Shuttle
-  VERSION = "0.2.3"
+  VERSION = "0.3.0.beta1"
 end

data/spec/task_spec.rb

@@ -0,0 +1,50 @@
+require "spec_helper"
+
+describe Shuttle::Task do
+  let(:config) { double(tasks: tasks) }
+  let(:deploy) { double(config: config) }
+  let(:task)   { described_class.new(deploy, "foo") }
+
+  before do
+    allow(task).to receive(:execute)
+  end
+
+  describe "#run" do
+    context "when task does not exist" do
+      let(:tasks) { Hashr.new }
+
+      before do
+        allow(deploy).to receive(:error) { raise Shuttle::DeployError }
+      end
+
+      it "triggers deployment error" do
+        expect { task.run }.to raise_error Shuttle::DeployError
+      end
+    end
+
+    context "when task does not have commands" do
+      let(:tasks) { Hashr.new(foo: []) }
+
+      before do
+        task.run
+      end
+
+      it "does not execute any commands" do
+        expect(task).to have_received(:execute).exactly(0).times
+      end
+    end
+
+    context "when task has commands" do
+      let(:tasks) { Hashr.new(foo: ["cmd1", "cmd2"]) }
+
+      before do
+        task.run
+      end
+
+      it "executes all commands" do
+        expect(task).to have_received(:execute).with("foo", "cmd1", false)
+        expect(task).to have_received(:execute).with("foo", "cmd2", false)
+      end
+    end
+  end
+end

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: shuttle-deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0.beta1
 platform: ruby
 authors:
 - Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: net-ssh-session
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: terminal_helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hashr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.22
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: toml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
 description: Minimalistic deployment tool for small and one-server applications
@@ -158,8 +158,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE
 - README.md
@@ -193,6 +193,7 @@ files:
 - lib/shuttle/support/bundler.rb
 - lib/shuttle/support/thin.rb
 - lib/shuttle/target.rb
+- lib/shuttle/task.rb
 - lib/shuttle/version.rb
 - shuttle-deploy.gemspec
 - spec/cli_spec.rb
@@ -203,6 +204,7 @@ files:
 - spec/path_helpers_spec.rb
 - spec/spec_helper.rb
 - spec/target_spec.rb
+- spec/task_spec.rb
 homepage: https://github.com/sosedoff/shuttle
 licenses:
 - MIT
@@ -213,17 +215,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Minimalistic deployment tool
@@ -236,3 +238,4 @@ test_files:
 - spec/path_helpers_spec.rb
 - spec/spec_helper.rb
 - spec/target_spec.rb
+- spec/task_spec.rb