escualo 1.0.3 → 2.0.0

data/lib/escualo/script.rb

@@ -1,77 +1,23 @@
 module Escualo
   module Script
-    def self.each_command(script, extra='', &block)
-      script.map { |it| "escualo #{it} #{extra}" }.each(&block) if script
+    def self.commands(escualo, script, extra)
+      (script||[]).map { |it| "#{escualo} #{it} #{extra}" }
     end
 
     def self.delegated_options(options)
       [options.hostname.try { |it| "--hostname #{it}" },
        options.username.try { |it| "--username #{it}" },
-       options.password.try { |it| "--password #{it}" },
+       options.password.try { |it| "--ssh-password #{it}" },
        options.ssh_key.try { |it| "--ssh-key #{it}" },
        options.ssh_port.try { |it| "--ssh-port #{it}" },
        options.trace && '--trace',
-       options.verbose && '--verbose'
+       options.verbose && '--verbose',
       ].compact.join(' ')
     end
 
-    class Mode
-      def run_commands_for!(script, extra='', ssh, options)
-        Escualo::Script.each_command script, extra do |command|
-          run_command! command, ssh, options
-        end
-      end
-    end
-
-    class Standard < Mode
-      def start!(*)
-      end
-
-      def run_command!(command, ssh, options)
-        ssh.shell.perform! command, options
-      end
-
-      def finish!
-      end
-    end
-
-    class Dockerized < Mode
-      attr_accessor :dockerfile
-
-      def start!(options)
-        @dockerfile = "
-FROM #{base_image options}
-MAINTAINER #{ENV['USER']}
-RUN apt-get update && apt-get install ruby ruby-dev build-essential -y
-#{escualo_install options}"
-      end
-
-      def escualo_install(options)
-        if options.development
-          "
-COPY escualo-#{Escualo::VERSION}.gem escualo-#{Escualo::VERSION}.gem
-RUN gem install escualo-#{Escualo::VERSION}.gem\n"
-        else
-          "RUN gem install escualo -v #{Escualo::VERSION}\n"
-        end
-      end
-
-      def base_image(options)
-        if options.base_image == 'ubuntu'
-          'ubuntu:xenial'
-        elsif options.base_image == 'debian'
-          'debian:jessie'
-        else
-          raise "Unsupported base image #{options.base_image}. Only debian and ubuntu are supported"
-        end
-      end
-
-      def run_command!(command, ssh, options)
-        @dockerfile << "RUN #{command}\n"
-      end
-
-      def finish!
-        File.write('Dockerfile', @dockerfile)
+    def self.run!(session, escualo, script, extra='')
+      Escualo::Script.commands(escualo, script, extra).each do |command|
+        session.embed! command
       end
     end
   end

data/lib/escualo/session/docker_session.rb

@@ -0,0 +1,56 @@
+class Escualo::Session::Docker < Escualo::Session
+  attr_accessor :dockerfile
+
+  def embed!(command)
+    dockerfile << Open3.exec!("#{command} --dockerized")
+  end
+
+  def tell!(command)
+    dockerfile << "RUN #{command}\n"
+  end
+
+  def upload!(file, destination)
+    dockerfile << "COPY #{file} #{destination}\n"
+  end
+
+  def write_template!(name, template, &block)
+    template.write! name
+    block.call name
+  end
+
+  def ask(*)
+    raise 'can not ask on a docker session'
+  end
+
+  def start!(options)
+    if options.write_dockerfile
+      @dockerfile = "FROM #{base_image options}\nMAINTAINER #{ENV['USER']}\n"
+    else
+      @dockerfile = ''
+    end
+  end
+
+  def base_image(options)
+    if options.base_image == 'ubuntu'
+      'ubuntu:xenial'
+    elsif options.base_image == 'debian'
+      'debian:jessie'
+    else
+      raise "Unsupported base image #{options.base_image}. Only debian and ubuntu are supported"
+    end
+  end
+
+  def finish!(options)
+    if options.write_dockerfile
+      File.write('Dockerfile', dockerfile)
+    else
+      puts dockerfile
+    end
+  end
+
+  def self.started(options = struct)
+    new.tap do |it|
+      it.start!(options)
+    end
+  end
+end

data/lib/escualo/session/local_session.rb

@@ -0,0 +1,23 @@
+class Escualo::Session::Local < Escualo::Session
+  def exec!(command)
+    ask command
+    nil
+  end
+
+  def ask(command)
+    Open3.exec! command
+  end
+
+  def stream!(command)
+    Open3.popen2e command do |_input, output, wait|
+      output.each do |line|
+        $stdout.print line
+      end
+      raise "command #{command} failed" unless wait.value.success?
+    end
+  end
+
+  def upload!(file, destination)
+    FileUtils.cp file, destination
+  end
+end

data/lib/escualo/session/remote_session.rb

@@ -0,0 +1,42 @@
+class Escualo::Session::Remote < Escualo::Session
+  def initialize(ssh, options)
+    super(options)
+    @ssh = ssh
+  end
+
+  def upload!(file, destination)
+    @ssh.scp.upload! file, destination
+  end
+
+  def exec!(command)
+    ask command
+    nil
+  end
+
+  def ask(command)
+    out = []
+    @ssh.stream! wrap(command) do |_stream, data|
+      out << data
+    end
+    out
+  end
+
+  def stream!(command)
+    command = wrap(command)
+    @ssh.stream! command do |stream, data|
+      if stream == :stdout
+        $stdout.print data
+      else
+        $stderr.print data
+      end
+    end
+  end
+
+  private
+
+  def wrap(command)
+    "bash -i -s <<EOBASH
+#{command.gsub('$', '\$')}
+EOBASH"
+  end
+end

data/lib/escualo/session.rb

@@ -0,0 +1,83 @@
+require 'fileutils'
+
+class Escualo::Session
+  attr_accessor :options
+
+  def initialize(options=struct)
+    @options = options
+  end
+
+  def check?(command, include)
+    ask(command).include? include rescue false
+  end
+
+  def embed!(command)
+    tell! command
+  end
+
+  def tell_all!(*commands)
+    tell! commands.compact.join(' && ')
+  end
+
+  def tell!(command)
+    if options.verbose
+      stream! command
+    else
+      exec! command
+    end
+  end
+
+  def upload_template!(destination, name, bindings)
+    write_template! name, Mumukit::Core::Template.new(File.join(__dir__, '..', 'templates', "#{name}.erb"), bindings) do |file|
+      upload! file, destination
+    end
+  end
+
+  def write_template!(name, template, &block)
+    template.with_tempfile!('template', &block)
+  end
+
+  def self.parse_session_options(options)
+    struct username: options.username || 'root',
+           hostname: options.hostname || 'localhost',
+           ssh_options: {
+               keys: [options.ssh_key].compact,
+               port: options.ssh_port || 22
+           },
+           verbose: options.verbose,
+           local: options.hostname.blank? && options.username.blank? && options.ssh_key.blank? && options.ssh_port.blank?,
+           dockerized: options.dockerized
+  end
+
+  def self.within(options, force_local=false, &block)
+    session_options = parse_session_options options
+
+    if session_options.dockerized
+      within_dockerized_session session_options, options, &block
+    elsif session_options.local || force_local
+      block.call(Escualo::Session::Local.new session_options)
+    else
+      within_ssh_session(session_options, &block)
+    end
+  end
+
+  def self.within_dockerized_session(session_options, options, &block)
+    session = Escualo::Session::Docker.new session_options
+    session.start! options
+    block.call(session)
+    session.finish! options
+  end
+
+  def self.within_ssh_session(session_options, &block)
+    Net::SSH.start(
+        session_options.hostname,
+        session_options.username,
+        session_options.ssh_options) do |ssh|
+      block.call(Escualo::Session::Remote.new ssh, session_options)
+    end
+  end
+end
+
+require_relative './session/docker_session'
+require_relative './session/remote_session'
+require_relative './session/local_session'

data/lib/escualo/version.rb

@@ -1,4 +1,4 @@
 module Escualo
-  VERSION = '1.0.3'
-  BASE_VERSION = '3.2'
+  VERSION = '2.0.0'
+  BASE_VERSION = '3.3'
 end

data/lib/escualo.rb

@@ -13,15 +13,27 @@ require 'mumukit/core'
 module Escualo
 end
 
+require 'open3'
+
+module Open3
+  def self.exec!(command)
+    out, status = Open3.capture2e(command)
+    raise "command failed #{command}: #{out}" unless status.success?
+    out
+  end
+end
+
 require_relative './template'
 require_relative './ssh'
 
 require_relative './escualo/version'
+require_relative './escualo/session'
 require_relative './escualo/env'
 require_relative './escualo/ppa'
+require_relative './escualo/apt_get'
 require_relative './escualo/gems'
 require_relative './escualo/base'
-require_relative './escualo/bootstrap'
+require_relative './escualo/ruby'
 require_relative './escualo/script'
 require_relative './escualo/plugin'
 require_relative './escualo/remote'

data/lib/ssh.rb

@@ -1,4 +1,26 @@
-require_relative './ssh/perform'
-require_relative './ssh/upload'
-require_relative './ssh/local_session'
-require_relative './ssh/session'
+class Net::SSH::Connection::Session
+  def stream!(command)
+    exit_code = 0
+    channel = self.open_channel do |channel|
+      channel.exec command do |ch, success|
+        raise 'could not execute command' unless success
+        ch.on_data do |c, data|
+          yield :stdout, data unless garbage? data
+        end
+        ch.on_extended_data do |c, type, data|
+          yield :stderr, data unless garbage? data
+        end
+        ch.on_request('exit-status') do |c, data|
+          exit_code = data.read_long
+        end
+      end
+    end
+    channel.wait
+    raise "command failed #{command}!" if exit_code != 0
+    nil
+  end
+
+  def garbage?(data)
+    data.start_with?('bash: cannot set terminal process group') || data.start_with?('bash: no job control in this shell')
+  end
+end

data/lib/templates/codechange.sh.erb

@@ -40,5 +40,5 @@ EOMONIT
 
  done
 
- monit reload
+ service monit reload
 fi

data/lib/templates/init.sh.erb

@@ -1,5 +1,6 @@
 #!/bin/bash
 REVISION=$1
+START_TYPE=$2
 
 cd /var/www/<%= @name %>
 
@@ -13,6 +14,12 @@ fi
 echo "[Escualo] [<%= @name %>] installing dependencies..."
 <%= @install_command %>
 
+if [ $START_TYPE = first ] && [ -e .escualo/install/first ]; then
+  echo "[Escualo] [<%= @name %>] .escualo/install/start and it is first run. Running it..."
+  chmod u+x .escualo/install/first
+  .escualo/install/first
+fi
+
 monit unmonitor escualo-<%= @name %>
 service <%= @name %> stop
 

data/lib/templates/post-receive.sh.erb

@@ -14,11 +14,17 @@ do
 
        echo "[Escualo] [<%= @name %>] master branch detected, deploying..."
        mkdir -p /var/www/<%= @name %>
-       git --work-tree=/var/www/<%= @name %> --git-dir=/var/repo/<%= @name %>.git checkout master -f
 
+       if [ "$(ls -A /var/www/<%= @name %>)" ]; then
+         START_TYPE=restart
+       else
+         START_TYPE=first
+       fi
+
+       git --work-tree=/var/www/<%= @name %> --git-dir=/var/repo/<%= @name %>.git checkout master -f
        <% if @service %>
        /var/scripts/<%= @name %>/codechange $newrev
        <% end %>
-       /var/scripts/<%= @name %>/init $newrev
+       /var/scripts/<%= @name %>/init $newrev $START_TYPE
     fi
 done

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escualo
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -135,7 +135,6 @@ files:
 - bin/escualo
 - lib/command.rb
 - lib/commands/artifact.rb
-- lib/commands/base.rb
 - lib/commands/bootstrap.rb
 - lib/commands/deploy.rb
 - lib/commands/env.rb
@@ -146,9 +145,9 @@ files:
 - lib/commands/script.rb
 - lib/commands/upload.rb
 - lib/escualo.rb
+- lib/escualo/apt_get.rb
 - lib/escualo/artifact.rb
 - lib/escualo/base.rb
-- lib/escualo/bootstrap.rb
 - lib/escualo/env.rb
 - lib/escualo/gems.rb
 - lib/escualo/plugin.rb
@@ -158,17 +157,18 @@ files:
 - lib/escualo/plugin/monit.rb
 - lib/escualo/plugin/nginx.rb
 - lib/escualo/plugin/node.rb
-- lib/escualo/plugin/postgre.rb
+- lib/escualo/plugin/postgres.rb
 - lib/escualo/plugin/rabbit.rb
 - lib/escualo/ppa.rb
 - lib/escualo/remote.rb
+- lib/escualo/ruby.rb
 - lib/escualo/script.rb
+- lib/escualo/session.rb
+- lib/escualo/session/docker_session.rb
+- lib/escualo/session/local_session.rb
+- lib/escualo/session/remote_session.rb
 - lib/escualo/version.rb
 - lib/ssh.rb
-- lib/ssh/local_session.rb
-- lib/ssh/perform.rb
-- lib/ssh/session.rb
-- lib/ssh/upload.rb
 - lib/template.rb
 - lib/templates/codechange.sh.erb
 - lib/templates/init.sh.erb

data/lib/commands/base.rb

@@ -1,8 +0,0 @@
-command 'base' do |c|
-  c.syntax = 'escualo base'
-  c.description = 'Install essential libraries'
-
-  c.ssh_action do |_args, options, ssh|
-    Escualo::Base.install_base ssh, options
-  end
-end

data/lib/escualo/bootstrap.rb

@@ -1,37 +0,0 @@
-module Escualo
-  module Bootstrap
-    def self.install_ruby(ssh, options)
-      ssh.shell.perform! 'apt-get purge libruby* -y', options
-      if options.with_rbenv
-        ssh.shell.perform! %q{
-          curl https://raw.githubusercontent.com/fesplugas/rbenv-installer/master/bin/rbenv-installer | bash &&
-          echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc &&
-          echo 'eval "$(rbenv init -)"' >> ~/.bashrc
-        }, options
-        ssh.shell.perform! 'rbenv install 2.3.1 && rbenv global 2.3.1 && rbenv rehash', options
-      else
-        ssh.shell.perform! %Q{
-        apt-get install software-properties-common -y &&
-        apt-add-repository '#{Escualo::PPA.for 'brightbox/ruby-ng'}' &&
-        apt-get update &&
-        apt-get install -y ruby2.3 ruby2.3-dev
-      }, options
-      end
-    end
-
-    def self.enable_swap(ssh)
-      ssh.exec! %q{ \
-        test -e /swapfile ||
-        fallocate -l 4G /swapfile && \
-        chmod 600 /swapfile && \
-        mkswap /swapfile && \
-        swapon /swapfile && \
-        swapon -s && \
-        echo '/swapfile   none    swap    sw    0   0' >> /etc/fstab}
-    end
-
-    def self.check(ssh)
-      Escualo::Env.present?(ssh, :ESCUALO_BASE_VERSION) && Escualo::Gems.present?(ssh)
-    end
-  end
-end

data/lib/escualo/plugin/postgre.rb

@@ -1,23 +0,0 @@
-module Escualo::Plugin
-  class Postgre
-    def run(ssh, options)
-      pg_hba_conf = "/etc/postgresql/#{options.pg_version}/main/pg_hba.conf"
-
-      ssh.shell.perform! %Q{
-        apt-get install postgresql libpq-dev -y &&
-        echo 'local   all             postgres                                peer' > #{pg_hba_conf} &&
-        echo 'local   all             postgres                                peer' >> #{pg_hba_conf} &&
-        echo 'local   all             all                                     password' >> #{pg_hba_conf} &&
-        echo 'host    all             all             127.0.0.1/32            md5' >> #{pg_hba_conf} &&
-        cd / &&
-        sudo -u postgres PGDATABASE='' psql <<EOF
-        create role $POSTGRESQL_DB_USERNAME with createdb login password '$POSTGRESQL_DB_PASSWORD';
-EOF
-      }, options
-    end
-
-    def check(ssh, options)
-      ssh.shell.exec!('psql --version').include? "psql (PostgreSQL) #{options.pg_version}" rescue false
-    end
-  end
-end

data/lib/ssh/local_session.rb

@@ -1,44 +0,0 @@
-require 'fileutils'
-require 'open3'
-
-module Net::SSH
-  def self.with_session(options, &block)
-    if options.delete(:local)
-      block.call(Net::SSH::Connection::LocalSession.new)
-    else
-      start(options.delete(:hostname),
-            options.delete(:username),
-            options.compact) do |ssh|
-        block.call(ssh)
-      end
-    end
-  end
-end
-
-class Net::SSH::Connection::LocalSession
-  include Net::SSH::Connection::Perform
-  include Net::SSH::Connection::Upload
-
-  def exec!(command)
-    out, status = Open3.capture2e(command)
-    raise out unless status.success?
-    out
-  end
-
-  def upload_file!(file, destination)
-    FileUtils.cp file, destination
-  end
-
-  def tell!(command)
-    Open3.popen2e command do |_input, output, wait|
-      output.each do |line|
-        $stdout.print line
-      end
-      raise "command #{command} failed" unless wait.value.success?
-    end
-  end
-
-  def shell
-    self
-  end
-end

data/lib/ssh/perform.rb

@@ -1,9 +0,0 @@
-module Net::SSH::Connection::Perform
-  def perform!(command, options)
-    if options.verbose
-      tell! command
-    else
-      exec! command
-    end
-  end
-end

data/lib/ssh/session.rb

@@ -1,61 +0,0 @@
-class Net::SSH::Connection::Session
-  include Net::SSH::Connection::Perform
-  include Net::SSH::Connection::Upload
-
-  def upload_file!(file, destination)
-    scp.upload! file, destination
-  end
-
-  def tell!(command)
-    channel = self.open_channel do |ch|
-      ch.exec command do |ch, success|
-        raise 'could not execute command' unless success
-        ch.on_data do |c, data|
-          $stdout.print data unless garbage? data
-        end
-        ch.on_extended_data do |c, type, data|
-          $stderr.print data unless garbage? data
-        end
-      end
-    end
-    channel.wait
-  end
-
-  def shell
-    Shell.new self
-  end
-
-  private
-
-  def garbage?(data)
-    data.start_with?('bash: cannot set terminal process group') || data.start_with?('bash: no job control in this shell')
-  end
-
-  class Shell
-    attr_reader :ssh
-
-    def initialize(ssh)
-      @ssh = ssh
-    end
-
-    def perform!(command, options)
-      ssh.perform! wrap(command), options
-    end
-
-    def exec!(command)
-      ssh.exec! wrap(command)
-    end
-
-    def tell!(command)
-      ssh.tell! wrap(command)
-    end
-
-    private
-
-    def wrap(command)
-      "bash -i -s <<EOBASH
-#{command.gsub('$', '\$')}
-EOBASH"
-    end
-  end
-end

data/lib/ssh/upload.rb

@@ -1,9 +0,0 @@
-module Net::SSH::Connection::Upload
-  def upload_template!(destination, name, bindings)
-    Mumukit::Core::Template
-        .new(File.join(__dir__, '..', 'templates', "#{name}.erb"), bindings)
-        .with_tempfile!('template') do |file|
-      upload_file! file, destination
-    end
-  end
-end