escualo 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2311d5bcbd817cbed4b83e76cbf0186a48d10854
-  data.tar.gz: 51835791f32711753d833276c54c11ebc1bf700c
+  metadata.gz: 59841e0d8f38aefbe2fd5639987a7a9ebc98e83b
+  data.tar.gz: 4bfefa0fa63748a7af08e6daf8efc2f30522f174
 SHA512:
-  metadata.gz: 13c4f2ee302e8f8f1c61ce235d5df7e9a2661e230f07c24f527452c9c7057cce2cd7071062057ca9e66100f3eb1a9be792c80c711836bf45c60ba4d11396911e
-  data.tar.gz: b6c2495418d878d3f722316acbe8710f92ea264eb44c497fd8ed84449c1366580ae4b79d64fc07000215ce286835744978f21f8dbd700a75e3d0534741fc02db
+  metadata.gz: c3439fcb6720ff05c6fbc9aa5772c6de4794406ce3fcaccbac8bbf925b3d2bc31fc73094dc3c0057f72f527a796309478a4376c47cd8613d0257be9d27b43b1e
+  data.tar.gz: d4f1073f77f625d182caa5ce9f811f726c658e6030f8683db3a0a77d569f102efbc3dbe8bb832292fefee23f4937a9b61498848de0affc830ae8904f64c40e51

data/lib/commands/plugin.rb

@@ -19,13 +19,11 @@ command 'plugin install' do |c|
               options do
 
       step "Installing plugin #{plugin}" do
-        log = installer.run ssh, options
-      end
-
-      if installer.check ssh, options
-        say 'Installed successfully!'
-      else
-        say "Something went wrong"
+        if Escualo::Plugin.run_and_check installer, ssh, options
+          say 'Installed successfully!'
+        else
+          say "Something went wrong"
+        end
       end
     end
   end

data/lib/commands/script.rb

@@ -1,30 +1,38 @@
-def run_commands_for!(script, extra='', ssh, options)
-  Escualo::Script.each_command script, extra do |command|
-    puts "Running `#{command}`"
-    ssh.shell.perform! command, options
-  end
-end
-
 command 'script' do |c|
   c.syntax = 'escualo script <FILE>'
   c.description = 'Runs a escualo configuration'
+  c.option '--dockerized', TrueClass, 'Create a Dockerfile instead of running commands'
+  c.option '--base-image BASE_IMAGE', String, 'Default base image. Only for dockerized runs'
+
   c.action do |args, options|
+    options.default base_image: 'ubuntu'
+
+    if options.dockerized
+      mode = Escualo::Script::Dockerized.new
+    else
+      mode = Escualo::Script::Standard.new
+    end
+
+    mode.start! options
+
     file = YAML.load_file args.first
     local_ssh = Net::SSH::Connection::LocalSession.new
     delegated_options = Escualo::Script.delegated_options options
 
     step 'Running local commands...' do
-      run_commands_for! file['local'], delegated_options, local_ssh, options
+      mode.run_commands_for! file['local'], delegated_options, local_ssh, options
     end
 
     step 'Running remote commands...' do
       Net::SSH.with_session(ssh_session_options) do |ssh|
-        run_commands_for! file['remote'], ssh, options
+        mode.run_commands_for! file['remote'], ssh, options
       end
     end
 
     step 'Running deploy commands...' do
-      run_commands_for! file['deploy'], delegated_options, local_ssh, options
+      mode.run_commands_for! file['deploy'], delegated_options, local_ssh, options
     end
+
+    mode.finish!
   end
 end

data/lib/escualo/bootstrap.rb

@@ -28,13 +28,11 @@ module Escualo
         }, options
         ssh.shell.perform! 'rbenv install 2.3.1 && rbenv global 2.3.1 && rbenv rehash', options
       else
-        ssh.shell.perform! %q{
+        ssh.shell.perform! %Q{
         apt-get install software-properties-common -y &&
-        apt-add-repository ppa:brightbox/ruby-ng &&
+        apt-add-repository #{Escualo::PPA.for 'brightbox/ruby-ng'} &&
         apt-get update &&
-        apt-get install -y \
-                 ruby2.3 \
-                 ruby2.3-dev
+        apt-get install -y ruby2.3 ruby2.3-dev
       }, options
       end
     end

data/lib/escualo/env.rb

@@ -37,10 +37,14 @@ module Escualo
 
     def self.set(ssh, variables)
       variables.each do |key, value|
-        ssh.exec!("echo 'export #{key}=#{value}' > ~/.escualo/vars/#{key}")
+        ssh.exec!(set_command key, value)
       end
     end
 
+    def self.set_command(key, value)
+      "echo export #{key}=#{value} > ~/.escualo/vars/#{key}"
+    end
+
     def self.unset(ssh, variable_names)
       variable_names.each do |name|
         ssh.exec!("rm ~/.escualo/vars/#{name}")

data/lib/escualo/plugin/nginx.rb

@@ -4,10 +4,10 @@ module Escualo::Plugin
       config = options.nginx_conf.try { |it| File.read it }
 
       ssh.perform! %Q{
-        sudo add-apt-repository ppa:nginx/stable && \
-        sudo apt-get update && \
-        sudo apt-get install nginx -y && \
-        #{config ? "/etc/nginx/nginx.conf < cat #{config} && " : ''} \
+        sudo add-apt-repository #{Escualo::PPA.for 'nginx/stable'} &&
+        sudo apt-get update &&
+        sudo apt-get install nginx -y &&
+        #{config ? "/etc/nginx/nginx.conf < cat #{config} && " : ''}
         service nginx restart
       }, options
     end

data/lib/escualo/plugin.rb

@@ -5,6 +5,11 @@ module Escualo
     def self.load(name)
       "Escualo::Plugin::#{name.capitalize}".constantize.new
     end
+
+    def self.run_and_check(plugin, ssh, options)
+      plugin.run ssh, options
+      plugin.check ssh, options
+    end
   end
 end
 

data/lib/escualo/ppa.rb

@@ -0,0 +1,5 @@
+module Escualo::PPA
+  def self.for(name)
+    "deb http://ppa.launchpad.net/#{name}/ubuntu trusty main"
+  end
+end

data/lib/escualo/remote.rb

@@ -2,10 +2,18 @@ module Escualo
   module Remote
     def self.attach(dir, name)
       remote_name = "escualo-#{name}-#{$hostname}"
-      remote_url = "ssh://#{$username}@#{$hostname}:#{$ssh_port}/var/repo/#{name}.git"
+      remote_url = remote_git_url(name)
       %x{cd #{dir} && git remote add #{remote_name} #{remote_url}}
     end
 
+    def self.remote_git_url(name)
+      if $ssh_remote
+        "ssh://#{$username}@#{$hostname}:#{$ssh_port}/var/repo/#{name}.git"
+      else
+        "/var/repo/#{name}.git"
+      end
+    end
+
     def self.clone(dir, repo, options)
       repo_url = "https://github.com/#{repo}"
       %x{git clone #{repo_url} #{dir}}

data/lib/escualo/script.rb

@@ -14,6 +14,57 @@ module Escualo
        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
+RUN gem install escualo
+"
+      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)
+      end
+    end
   end
 end
 

data/lib/escualo/version.rb

@@ -1,4 +1,4 @@
 module Escualo
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
   BASE_VERSION = '3.2'
 end

data/lib/escualo.rb

@@ -18,6 +18,7 @@ require_relative './ssh'
 
 require_relative './escualo/version'
 require_relative './escualo/env'
+require_relative './escualo/ppa'
 require_relative './escualo/bootstrap'
 require_relative './escualo/script'
 require_relative './escualo/plugin'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escualo
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -142,6 +142,7 @@ files:
 - lib/escualo/plugin/node.rb
 - lib/escualo/plugin/postgre.rb
 - lib/escualo/plugin/rabbit.rb
+- lib/escualo/ppa.rb
 - lib/escualo/remote.rb
 - lib/escualo/script.rb
 - lib/escualo/version.rb