tele 0.1.3 → 0.1.4

data/README

@@ -6,7 +6,7 @@ NAME
 SYNOPSIS
       tele init
       tele deploy [-d path] [-s server]
-      tele tail
+      tele exec [-d path] [-s server] command
       tele -h
 
 DESCRIPTION
@@ -75,8 +75,8 @@ DESCRIPTION
           Runs every recipe script on the servers declared in layout.json. The
           exit code must be 0 if the command was successful.
 
-      tail
-          Displays standard output and standard error from each running recipe.
+      exec
+          Runs an arbitrary command on the matching servers.
 
 USAGE
       To provision two servers called `server1` and `server2` with Redis,
@@ -116,4 +116,4 @@ USAGE
           $ tele deploy -s server1
 
 INSTALLATION
-      $ gem install tele
+      $ gem install tele

data/bin/tele

@@ -45,26 +45,54 @@ def roles
   layout["roles"]
 end
 
-def run(server, recipe)
-  script = path("recipes", "#{recipe}.sh")
+def run(server, recipe, script)
+  $out.server(server, recipe)
 
-  if File.exist?(script)
-    IO.popen(ssh(server, SSH_OPTIONS), "r+") do |io|
-      io.puts(File.read(script))
-      io.close_write
+  if script.nil?
+    $out.unknown
+    print "\n"
+    return
+  end
 
-      while line = io.gets
-        yield(line)
-      end
+  result = execute(server, script) do |line|
+    print line
+    $out.server(server, recipe)
+  end
+
+  case result
+  when 0
+    $out.ok
+  else
+    $out.error
+  end
+
+  print "\n"
+end
+
+def execute(server, script)
+  IO.popen(ssh(server, SSH_OPTIONS), "r+") do |io|
+    io.puts(script)
+    io.close_write
+
+    while line = io.gets
+      yield(line)
     end
+  end
 
-    $?.exitstatus
+  $?.exitstatus
+end
+
+def connect(&block)
+  servers.each do |server, _|
+    IO.popen(ssh(server, SSH_OPTIONS + %w[-Mq]), "w")
   end
+
+  servers.each(&block)
 end
 
-out = Module.new do
-  def self.recipe(server, recipe)
-    print "#{server}/#{recipe}: "
+$out = Module.new do
+  def self.server(server, recipe)
+    print "#{[server, recipe].compact.join("/")}: "
   end
 
   def self.error
@@ -122,32 +150,18 @@ SSH_OPTIONS = [
 ]
 
 commands = Clap.run commands,
-  "deploy" => lambda {
-    servers.each do |server, _|
-      IO.popen(ssh(server, SSH_OPTIONS + %w[-Mq]), "w")
+  "exec" => lambda { |cmd|
+    connect do |server, _|
+      run(server, nil, cmd)
     end
+  },
 
-    servers.each do |server, assigned_roles|
+  "deploy" => lambda {
+    connect do |server, assigned_roles|
       recipes_for(assigned_roles).each do |recipe|
-        out.recipe(server, recipe)
-
-        # first = true
-
-        result = run(server, recipe) do |line|
-          print line
-          out.recipe(server, recipe) # unless first
-        end
-
-        case result
-        when nil
-          out.unknown
-        when 0
-          out.ok
-        else
-          out.error
-        end
+        script = path("recipes", "#{recipe}.sh")
 
-        print "\n"
+        run(server, recipe, (File.read(script) if File.exist?(script)))
       end
     end
   }

data/tele.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "tele"
-  s.version           = "0.1.3"
+  s.version           = "0.1.4"
   s.summary           = "Provisioning at a distance"
   s.description       = "Tele is a small provisioning framework that allows you to run bash scripts on remote servers over SSH."
   s.authors           = ["Damian Janowski", "Michel Martens"]

data/test/tele.rb

@@ -101,3 +101,9 @@ test "`tele foobar` shouts an error" do
 
   assert err.include?("Error: unrecognized parameter: foobar")
 end
+
+test "`tele exec` runs commands" do
+  out, err = tele("exec", "echo foo", "-d", "test/.tele.simple")
+
+  assert out.include?("staging: foo")
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tele
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clap
-  requirement: &70301175305080 !ruby/object:Gem::Requirement
+  requirement: &70350700960560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301175305080
+  version_requirements: *70350700960560
 description: Tele is a small provisioning framework that allows you to run bash scripts
   on remote servers over SSH.
 email: