escualo 0.1.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWY3ZjE5YWNiNGZhZWFiZGJkZWExNzdiOTZkZWNlYzI0NWFkMzMyOA==
-  data.tar.gz: !binary |-
-    MzJiM2MxMjcxMmY0Mzk5M2Y5ZjMyMTU4MTMwYWUxMjQ2M2U1YTYxYQ==
+SHA1:
+  metadata.gz: a7735e5b6aa9c1a1865ec1719c0b0628239dd98d
+  data.tar.gz: fc8f3fa5e936c4146a0d14c64d4c20ce7f4dce28
 SHA512:
-  metadata.gz: !binary |-
-    ZGM5Yjg4NDNlYWRmZDQwOGVlYjA5OTJhYjk1YjIwNjVhY2ExNTFiY2I1OWYw
-    YmVmOTE1MTFmODgxZGFjYTJkMjY2YzhjM2U5YTU5NzI0YzU2ZTA3M2YxMjQz
-    ZDNmOWY3MjViNDU5ZDY1ZDMwMWQ2OGZjZTFjY2ZlODhiNDY2Yzk=
-  data.tar.gz: !binary |-
-    NGQxNTY2MmFhNzRkYmRlZTYzODhiZWIyNDM2MDhjNmYzZTBjYmYyZWJjOTc5
-    Y2ZmZTIyMDAyMWJkMzJkMWZkN2Q0MmM4ZjRhNjYwYzNmNjRkYTlmNjE4Y2Ey
-    MzBmM2ZlYThjMzc2NWEyMjczMDUwMjNkMjM4ZGQ0MDFlNjdhODU=
+  metadata.gz: 829ce07501eaa8ccd5c863a0b8851e12765f8bae79e066fa4f6c73807f96748b7d6136e4464336b357720af33bdca93299f369804f451b8d5fe496ccf7e8953e
+  data.tar.gz: 2ea012c64d7bf9e43d6c21ad5a8c4a3ac26186b0964aa675de7e1604d0d75db1c1f0c8cf8fbf36a2cfd2ce908306cd9d016d183457998717db556b69eb1c9308

data/lib/command.rb

@@ -1,8 +1,13 @@
 class Commander::Command
   def ssh_action(&block)
     action do |args, options|
-      Net::SSH.start($hostname, $username, $ssh_options.compact) do |ssh|
-        block.call(args, options, ssh)
+      if $ssh_remote
+        say "Connecting to remote host #{$hostname}... " if options.verbose
+        Net::SSH.start($hostname, $username, $ssh_options.compact) do |ssh|
+          block.call(args, options, ssh)
+        end
+      else
+        block.call(args, options, Net::SSH::Connection::LocalSession.new)
       end
     end
   end

data/lib/escualo.rb

@@ -1,18 +1,17 @@
 require 'net/ssh'
 require 'net/scp'
-require 'securerandom'
 require 'yaml'
 require 'mumukit/core'
 
 module Escualo
 end
 
-require_relative './session'
 require_relative './template'
+require_relative './ssh'
 
 require_relative './escualo/version'
 require_relative './escualo/env'
 require_relative './escualo/bootstrap'
 require_relative './escualo/plugin'
 require_relative './escualo/remote'
-require_relative './escualo/artifact'
+require_relative './escualo/artifact'

data/lib/ssh.rb

@@ -0,0 +1,4 @@
+require_relative './ssh/perform'
+require_relative './ssh/upload'
+require_relative './ssh/local_session'
+require_relative './ssh/session'

metadata

@@ -1,144 +1,145 @@
 --- !ruby/object:Gem::Specification
 name: escualo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
   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: net-ssh
   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: net-scp
   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: mumukit-core
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: ! "escualo.rb is command-line tools that implements of the escualo provisioning
-  format used by Mumuki Platform.\n                        It allows to deploy mumuki
-  artifacts to any host"
+description: |-
+  escualo.rb is command-line tools that implements of the escualo provisioning format used by Mumuki Platform.
+                          It allows to deploy mumuki artifacts to any host
 email:
 - flbulgarelli@yahoo.com.ar
-executables: []
+executables:
+- escualo
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/escualo
 - lib/command.rb
 - lib/escualo.rb
-- lib/session.rb
+- lib/ssh.rb
 - lib/template.rb
 homepage: http://github.com/mumuki/escualo.rb
 licenses:
 - MIT
 metadata:
-  allowed_push_host: ! 'TODO: Set to ''http://mygemserver.com'''
+  allowed_push_host: 'TODO: Set to ''http://mygemserver.com'''
 post_install_message: 
 rdoc_options: []
 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'
 requirements: []

data/lib/session.rb

@@ -1,64 +0,0 @@
-class Net::SSH::Connection::Session
-  def upload_template!(destination, name, bindings)
-    Mumukit::Core::Template
-        .new(File.join(__dir__, 'templates', "#{name}.erb"), bindings)
-        .with_tempfile!('template') do |file|
-      scp.upload! file, destination
-    end
-  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
-        end
-        ch.on_extended_data do |c, type, data|
-          $stderr.print data
-        end
-      end
-    end
-    channel.wait
-  end
-
-  def shell
-    Shell.new self
-  end
-
-  def perform!(command, options)
-    if options.verbose
-      tell! command
-    else
-      exec! command
-    end
-  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}
-EOBASH"
-    end
-  end
-end