escualo 2.0.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0fa6f10980a230f653c33126b1e2138b4e84c6f
-  data.tar.gz: 31b1b195aad36531165036df541bab7a5fad4d58
+  metadata.gz: f760bc96fc3d1d909c168493dc696bbe728430e1
+  data.tar.gz: 573ffed5fa0763389d1b23f0b548cd95d2265647
 SHA512:
-  metadata.gz: 5a346874dd6aa23c9b40ff200340f1ffd851c1f059039475b4bd88a9b67c1ea2c2845e6009d1a2d05e2b76c7dc051544fce86486e22dd8b82d8ab3558fe07ba8
-  data.tar.gz: ffc4bfc7cbcf0c2700cae65ff67dad6ea83dbc4d0e8165e02bf52bb96c0f7cf3c1fd8b1e1ad2c5986ec5b680cf92ae7f82b8d5403204d37b0a7740e809abfff5
+  metadata.gz: f8020df47e8a153df05b1e4326d693ea2720355cbe2d1c2458f6d898b5bf2fa7e2565f14c70c89627bacb11be047a10c078af2b32d972de9bc13e8bb5aaab157
+  data.tar.gz: 5f2dfa0644bff836637bac440b68e0805ff734e41832f976acc4e020cc27d8032e48f9d6d802b217b05333e59f1d774b2c3e049e5653807b4e64b418c1e14f37

data/bin/escualo

@@ -27,7 +27,6 @@ require_relative '../lib/commands/globals'
 
 require_relative '../lib/commands/bootstrap'
 require_relative '../lib/commands/deploy'
-require_relative '../lib/commands/script'
 require_relative '../lib/commands/upload'
 require_relative '../lib/commands/rake'
 

data/lib/commands/artifact.rb

@@ -24,6 +24,9 @@ command 'artifact create service' do |c|
     name = args.first
     port = args.second
 
+    raise 'missing service name!' unless name
+    raise 'missing port!' unless port
+
     exit_if("Service #{name} already created", options) { Escualo::Artifact.present?(session, name) }
 
     launch_command = "exec bundle exec rackup -o 0.0.0.0 -p #{port} > rack.log"
@@ -58,6 +61,8 @@ command 'artifact create site' do |c|
 
   c.session_action do |args, options, session|
     name = args.first
+    raise 'missing site name!' unless name
+
     exit_if("Site #{name} already created", options) { Escualo::Artifact.present?(session, name) }
 
     step 'Creating init scripts...', options do
@@ -77,6 +82,7 @@ command 'artifact create executable' do |c|
 
   c.session_action do |args, options, session|
     name = args.first
+    raise 'missing executable name!' unless name
 
     exit_if("Executable #{name} already created", options) { Escualo::Artifact.present?(session, name) }
     step 'Creating init scripts...', options do

data/lib/commands/globals.rb

@@ -6,6 +6,7 @@ global_option '--ssh-port PORT', String, 'The ssh port to connect. Defaults to 2
 global_option '--ssh-password PASSWORD', String, 'An optional remote password'
 
 global_option '--dockerized', TrueClass, 'Generate a docker script instead of running the commands'
+global_option '--unoptimized-dockerfile', TrueClass, 'Do not optimize commands when run dockerized'
 
 global_option '--verbose', TrueClass, 'Dumps extra output'
 

data/lib/commands/plugin.rb

@@ -5,7 +5,8 @@ command 'plugin install' do |c|
 
   c.option '--rabbit-admin-password PASSWORD', String, 'rabbitmq admin password, only for rabbit plugin'
 
-  c.option '--pg-version VERSION', String, 'PostgreSQL major and minor version. Default is 9.3, only for postgre plugin'
+  c.option '--pg-libs-only', TrueClass, 'Do not install server, only for postgres'
+  c.option '--pg-version VERSION', String, 'PostgreSQL major and minor version. Default is 9.3, only for postgres plugin'
   c.option '--pg-username USERNAME', String, 'PostgreSQL username'
   c.option '--pg-password PASSWORD', String, 'PostgreSQL password'
 

data/lib/escualo.rb

@@ -34,7 +34,6 @@ require_relative './escualo/apt_get'
 require_relative './escualo/gems'
 require_relative './escualo/base'
 require_relative './escualo/ruby'
-require_relative './escualo/script'
 require_relative './escualo/plugin'
 require_relative './escualo/remote'
 require_relative './escualo/artifact'

data/lib/escualo/env.rb

@@ -1,11 +1,7 @@
 module Escualo
   module Env
     def self.setup(session)
-      source_escualorc = "'source ~/.escualorc'"
-      session.tell_all! 'mkdir -p ~/.escualo/vars',
-                        %q{echo 'for var in ~/.escualo/vars/*; do source $var; done' > ~/.escualorc},
-                        %q{chmod u+x ~/.escualorc},
-                        "grep -q #{source_escualorc} ~/.bashrc || echo #{source_escualorc} >> ~/.bashrc"
+      session.setup_environment_variables!
     end
 
     def self.set_builtins(session, options)
@@ -19,7 +15,8 @@ module Escualo
     end
 
     def self.clean(session, options)
-      session.tell! 'rm ~/.escualo/vars/*'
+      session.clean_environment_variables!
+
       set_builtins session, options
     end
 
@@ -34,17 +31,23 @@ module Escualo
     end
 
     def self.set(session, variables)
-      session.tell_all! *variables.map { |key, value| set_command key, value }
+      session.set_environment_variables! variables
     end
 
-    def self.set_command(key, value)
-      "echo export #{key}=#{value} > ~/.escualo/vars/#{key}"
+    def self.unset(session, variable_names)
+      session.unset_environment_variables! variable_names
     end
 
-    def self.unset(session, variable_names)
-      variable_names.each do |name|
-        session.tell!("rm ~/.escualo/vars/#{name}")
-      end
+    def self.unset_command(name)
+      "rm ~/.escualo/vars/#{name}"
+    end
+
+    def self.clean_command
+      'rm ~/.escualo/vars/*'
+    end
+
+    def self.set_command(key, value)
+      "echo export #{key}=#{value} > ~/.escualo/vars/#{key}"
     end
 
     def self.locale_variables

data/lib/escualo/plugin/postgres.rb

@@ -1,23 +1,35 @@
 module Escualo::Plugin
   class Postgres
     def run(session, options)
-      raise 'missing pg-username' unless options.pg_username
-      raise 'missing pg-password' unless options.pg_password
+      if_server options do
+        raise 'missing pg-username' unless options.pg_username
+        raise 'missing pg-password' unless options.pg_password
+      end
 
       pg_hba_conf = "/etc/postgresql/#{options.pg_version}/main/pg_hba.conf"
+      dependencies = options.pg_libs_only ?
+          "postgresql-client-#{options.pg_version} libpq-dev" :
+          "postgresql-#{options.pg_version} libpq-dev"
 
-      Escualo::AptGet.install session, "postgresql-#{options.pg_version} libpq-dev"
+      Escualo::AptGet.install session, dependencies
 
-      session.tell_all! "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}"
+      if_server options do
+        session.tell_all! "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}"
 
-      session.tell_all! '/etc/init.d/postgresql restart',
-                        'cd /',
-                        "echo \"create role #{options.pg_username} with createdb login password '#{options.pg_password}';\" | sudo -u postgres PGDATABASE='' psql"
+        session.tell_all! '/etc/init.d/postgresql restart',
+                          'cd /',
+                          "echo \"create role #{options.pg_username} with createdb login password '#{options.pg_password}';\" | sudo -u postgres PGDATABASE='' psql"
+      end
     end
 
+    def if_server(options)
+      unless options.pg_libs_only
+        yield
+      end
+    end
 
     def installed?(session, options)
       session.check? 'psql --version', "psql (PostgreSQL) #{options.pg_version}"

data/lib/escualo/session.rb

@@ -11,10 +11,6 @@ class Escualo::Session
     ask(command).include? include rescue false
   end
 
-  def embed!(command)
-    tell! command
-  end
-
   def tell_all!(*commands)
     tell! commands.compact.join(' && ')
   end
@@ -33,51 +29,17 @@ class Escualo::Session
     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
+  def self.set_command(key, value)
+    "echo export #{key}=#{value} > ~/.escualo/vars/#{key}"
   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
+  def write_template!(name, template, &block)
+    template.with_tempfile!('template', &block)
   end
 end
 
 require_relative './session/docker_session'
 require_relative './session/remote_session'
 require_relative './session/local_session'
+require_relative './session/within'
+require_relative './session/environment'

data/lib/escualo/session/docker_session.rb

@@ -1,8 +1,25 @@
 class Escualo::Session::Docker < Escualo::Session
   attr_accessor :dockerfile
 
-  def embed!(command)
-    dockerfile << Open3.exec!("#{command} --dockerized")
+  def unset_environment_variables!(*)
+    raise 'can not unset variables on dockerfile optimized mode' unless options.unoptimized_dockerfile
+    super
+  end
+
+  def clean_environment_variables!(*)
+    raise 'can not clean variables on dockerfile optimized mode' unless options.unoptimized_dockerfile
+    super
+  end
+
+  def setup_environment_variables!
+    super if options.unoptimized_dockerfile
+  end
+
+  def set_environment_variables!(variables)
+    return super if options.unoptimized_dockerfile
+    variables.each do |key, value|
+      dockerfile << "ENV #{key} #{value}\n"
+    end
   end
 
   def tell!(command)
@@ -22,30 +39,12 @@ class Escualo::Session::Docker < Escualo::Session
     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
+  def start!(_options)
+    @dockerfile = ''
   end
 
-  def finish!(options)
-    if options.write_dockerfile
-      File.write('Dockerfile', dockerfile)
-    else
-      puts dockerfile
-    end
+  def finish!(_options)
+    puts dockerfile
   end
 
   def self.started(options = struct)

data/lib/escualo/session/environment.rb

@@ -0,0 +1,22 @@
+class Escualo::Session
+
+  def clean_environment_variables!
+    tell! Escualo::Env.clean_command
+  end
+
+  def setup_environment_variables!
+    source_escualorc = "'source ~/.escualorc'"
+    tell_all! 'mkdir -p ~/.escualo/vars',
+              %q{echo 'for var in ~/.escualo/vars/*; do source $var; done' > ~/.escualorc},
+              %q{chmod u+x ~/.escualorc},
+              "grep -q #{source_escualorc} ~/.bashrc || echo #{source_escualorc} >> ~/.bashrc"
+  end
+
+  def set_environment_variables!(variables)
+    tell_all! *variables.map { |key, value| Escualo::Env.set_command key, value }
+  end
+
+  def unset_environment_variables!(variable_names)
+    tell_all! *variable_names.map { |name| Escualo::Env.unset_command name }
+  end
+end

data/lib/escualo/session/within.rb

@@ -0,0 +1,43 @@
+class Escualo::Session
+  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,
+           unoptimized_dockerfile: options.unoptimized_dockerfile
+
+  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

data/lib/escualo/version.rb

@@ -1,4 +1,4 @@
 module Escualo
-  VERSION = '2.0.2'
+  VERSION = '3.0.0'
   BASE_VERSION = '3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escualo
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -142,7 +142,6 @@ files:
 - lib/commands/plugin.rb
 - lib/commands/rake.rb
 - lib/commands/remote.rb
-- lib/commands/script.rb
 - lib/commands/upload.rb
 - lib/escualo.rb
 - lib/escualo/apt_get.rb
@@ -162,11 +161,12 @@ files:
 - 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/environment.rb
 - lib/escualo/session/local_session.rb
 - lib/escualo/session/remote_session.rb
+- lib/escualo/session/within.rb
 - lib/escualo/version.rb
 - lib/ssh.rb
 - lib/template.rb

data/lib/commands/script.rb

@@ -1,20 +0,0 @@
-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 '--write-dockerfile', TrueClass, 'Write a complete Dockerfile instead of writing to stdout. Default is false'
-  c.option '--dockerfile PATH', String, 'Destination Dockerfile. Default is `Dockerfile`'
-  c.option '--development', TrueClass, 'Use local escualo gemspec instead of fetching from internet'
-  c.option '--base-image BASE_IMAGE', String, 'Default base image. Only for dockerized runs'
-
-  c.action do |args, options|
-    options.default base_image: 'ubuntu',
-                    dockerfile: 'Dockerfile'
-    file = YAML.load_file args.first
-    delegated_options = Escualo::Script.delegated_options options
-
-    Escualo::Session.within(options, true) do |session|
-      Escualo::Script.run!(session, $PROGRAM_NAME, file, delegated_options)
-    end
-  end
-end

data/lib/escualo/script.rb

@@ -1,25 +0,0 @@
-module Escualo
-  module 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| "--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',
-      ].compact.join(' ')
-    end
-
-    def self.run!(session, escualo, script, extra='')
-      Escualo::Script.commands(escualo, script, extra).each do |command|
-        session.embed! command
-      end
-    end
-  end
-end
-