tele 0.1.0 → 0.1.1

data/README

@@ -55,7 +55,7 @@ DESCRIPTION
       The following options are available:
 
       -h
-          Display this help message.
+          Displays this help message.
 
       -d path
           Sets path as the directory where tele will search for scripts and
@@ -69,6 +69,9 @@ 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.
+
 USAGE
       To provision two servers called `server1` and `server2` with Redis,
       starting from scratch:

data/bin/tele

@@ -20,6 +20,8 @@ def recipes_for(assigned_roles)
         recipes.push(name)
       end
     end
+
+    recipes.uniq!
   end
 end
 
@@ -65,6 +67,10 @@ out = Module.new do
     puts "\033[01;32mOK\033[00m"
   end
 
+  def self.log(match)
+    puts "\033[1;30m#{match[:date]} \033[1;33m#{match[:who]}\033[00m #{match[:message]}"
+  end
+
   def self.unknown
     puts "?"
   end
@@ -90,6 +96,19 @@ Clap.run commands,
     %x{cp -r #{source} #{target}}
 
     %x{find #{target} -name .empty -print0 | xargs rm}
+  },
+
+  "tail" => lambda {
+    $stdout.sync = true
+
+    parser = %r{^(?<date>.* \d\d:\d\d:\d\d) \w+ tele/(?<who>.*)\[\d+\]: (?<message>.*)$}
+
+    IO.popen("tail -0 -f /var/log/system.log /var/log/syslog 2>/dev/null") do |io|
+      while line = io.gets
+        next unless match = parser.match(line)
+        out.log(match)
+      end
+    end
   }
 
 unless File.directory?(path)

data/tele.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "tele"
-  s.version           = "0.1.0"
+  s.version           = "0.1.1"
   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

@@ -58,11 +58,17 @@ end
 test "`tele deploy` runs recipes" do
   out, err = tele("deploy", "-d", "test/.tele.simple")
 
-  assert out =~ /db-1/
+  assert out =~ /staging/
   assert out =~ /cassandra: .*ERROR/
   assert out =~ /redis: .*OK/
 end
 
+test "`tele deploy` doesn't run the same recipe twice in a single server" do
+  out, err = tele("deploy", "-d", "test/.tele.simple")
+
+  assert_equal File.read("/tmp/tele/touch-count").to_i, 1
+end
+
 test "`tele init`" do
   `rm -rf test/tmp`
   `mkdir test/tmp`
@@ -86,5 +92,28 @@ end
 test "Logging to syslog" do
   out, err = tele("status", "-d", "test/.tele.simple")
 
-  assert `tail -n 20 /var/log/syslog /var/log/system.log 2>/dev/null`[%r{tele/db-1/cassandra.*Can't find Cassandra}]
+  assert `tail -n 20 /var/log/syslog /var/log/system.log 2>/dev/null`[%r{tele/staging/cassandra.*Can't find Cassandra}]
+end
+
+test "`tele tail` shows Tele logs" do
+  log = []
+  tailing = false
+
+  t = Thread.new do
+    Open3.popen3("#{root "bin/tele"} tail") do |_, out, _, _|
+      tailing = true
+      while line = out.gets
+        log << line
+      end
+    end
+  end
+
+  until tailing; end
+
+  tele("deploy", "-d", "test/.tele.simple")
+
+  t.kill
+
+  assert_equal log.size, 1
+  assert log[0] =~ %r{staging/cassandra.*Can't find Cassandra}
 end

metadata

@@ -2,7 +2,7 @@
 name: tele
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Damian Janowski
@@ -11,7 +11,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 Z
+date: 2011-06-22 00:00:00 -03:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clap
@@ -43,6 +44,7 @@ files:
 - templates/.tele/ssh_config
 - tele.gemspec
 - test/tele.rb
+has_rdoc: true
 homepage: http://github.com/djanowski/tele
 licenses: []
 
@@ -66,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Provisioning at a distance