tele 0.1.2 → 0.1.3

data/README

@@ -4,7 +4,10 @@ NAME
       tele -- Provisioning at a distance.
 
 SYNOPSIS
-      tele [-h] [-d path] (init|deploy)
+      tele init
+      tele deploy [-d path] [-s server]
+      tele tail
+      tele -h
 
 DESCRIPTION
       Tele is a small provisioning framework that allows you to run bash
@@ -62,6 +65,9 @@ DESCRIPTION
           configuration files. You can also use the environment variable
           TELE_HOME.
 
+      -s server
+          Allows you to specify a server you want to deploy.
+
       init
           Copies a .tele template to the current directory.
 
@@ -106,5 +112,8 @@ USAGE
           # Run tele deploy
           $ tele deploy
 
+          # Run tele deploy only for server1
+          $ tele deploy -s server1
+
 INSTALLATION
-      $ gem install tele
+      $ gem install tele

data/bin/tele

@@ -38,7 +38,7 @@ def layout
 end
 
 def servers
-  layout["servers"]
+  $servers ||= layout["servers"]
 end
 
 def roles
@@ -49,30 +49,34 @@ def run(server, recipe)
   script = path("recipes", "#{recipe}.sh")
 
   if File.exist?(script)
-    %x{bash -c "#{ssh(server, SSH_OPTIONS)} < #{script} > >(logger -t 'tele/#{server}/#{recipe}') 2>&1"}
+    IO.popen(ssh(server, SSH_OPTIONS), "r+") do |io|
+      io.puts(File.read(script))
+      io.close_write
+
+      while line = io.gets
+        yield(line)
+      end
+    end
+
     $?.exitstatus
   end
 end
 
 out = Module.new do
-  def self.server(name)
-    puts name
+  def self.recipe(server, recipe)
+    print "#{server}/#{recipe}: "
   end
 
   def self.error
-    puts "\033[01;31mERROR\033[00m"
+    print "\033[01;31mERROR\033[00m"
   end
 
   def self.ok
-    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]}"
+    print "\033[01;32mOK\033[00m"
   end
 
   def self.unknown
-    puts "?"
+    print "\033[1;33m?\033[00m"
   end
 end
 
@@ -86,9 +90,17 @@ commands = Clap.run ARGV,
   },
   "-d" => lambda { |path|
     ENV["TELE_HOME"] = File.join(Dir.pwd, path)
+  },
+  "-s" => lambda { |server|
+    unless servers.has_key?(server)
+      $stderr.puts "Unknown server: #{server}"
+      exit 1
+    end
+
+    servers.delete_if { |s, _| s != server }
   }
 
-Clap.run commands,
+commands = Clap.run commands,
   "init" => lambda {
     source = File.expand_path("../templates/.tele", File.dirname(__FILE__))
     target = File.expand_path(Dir.pwd)
@@ -96,19 +108,6 @@ 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)
@@ -122,19 +121,24 @@ SSH_OPTIONS = [
   "-S", "/tmp/ssh-%r@%h:%p",
 ]
 
-Clap.run commands,
+commands = Clap.run commands,
   "deploy" => lambda {
     servers.each do |server, _|
       IO.popen(ssh(server, SSH_OPTIONS + %w[-Mq]), "w")
     end
 
     servers.each do |server, assigned_roles|
-      out.server(server)
-
       recipes_for(assigned_roles).each do |recipe|
-        print "  #{recipe}: "
+        out.recipe(server, recipe)
+
+        # first = true
 
-        case run(server, recipe)
+        result = run(server, recipe) do |line|
+          print line
+          out.recipe(server, recipe) # unless first
+        end
+
+        case result
         when nil
           out.unknown
         when 0
@@ -142,8 +146,13 @@ Clap.run commands,
         else
           out.error
         end
-      end
 
-      puts
+        print "\n"
+      end
     end
   }
+
+unless commands.empty?
+  $stderr.puts "Error: unrecognized parameter: #{commands.join(" ")}"
+  exit 1
+end

data/tele.gemspec

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

@@ -31,7 +31,7 @@ test "`tele deploy` displays missing recipes" do
   out, err = tele("deploy", "-d", "test/.tele.missing-recipes")
 
   assert out =~ /db-1/
-  assert out =~ /redis: .*\?/
+  assert out =~ /redis.*: .*\?/
 end
 
 test "`tele deploy` displays layout" do
@@ -39,30 +39,37 @@ test "`tele deploy` displays layout" do
 
   assert err.empty?
 
-  parts = out.split("\n\n")
+  parts = out.split("\n")
 
-  assert parts[0] =~ /app-1/
-  assert parts[0] =~ /redis/
-  assert parts[0] =~ /ruby/
-  assert parts[0] =~ /unicorn/
+  assert parts[0] =~ %r[^app-1/redis]
+  assert parts[1] =~ %r[^app-1/ruby]
+  assert parts[2] =~ %r[^app-1/unicorn]
 
-  assert parts[1] =~ /app-2/
-  assert parts[1] =~ /redis/
+  assert parts[3] =~ %r[^app-2/redis]
 
-  assert parts[2] =~ /app-3/
-  assert parts[2] =~ /redis/
-  assert parts[2] =~ /ruby/
-  assert parts[2] =~ /unicorn/
+  assert parts[4] =~ %r[app-3/redis]
+  assert parts[5] =~ %r[app-3/ruby]
+  assert parts[6] =~ %r[app-3/unicorn]
 end
 
 test "`tele deploy` runs recipes" do
   out, err = tele("deploy", "-d", "test/.tele.simple")
 
-  assert out =~ /staging/
-  assert out =~ /cassandra: .*ERROR/
-  assert out =~ /redis: .*OK/
+  assert out =~ %r[^staging/cassandra.* .*ERROR]
+  assert out =~ %r[^staging/redis.* Installed]
+  assert out =~ %r[^staging/redis.* .*OK]
 end
 
+test "`tele deploy -s production` runs only production recipes" do
+  out, err = tele("deploy", "-d", "test/.tele.multi", "-s", "production")
+
+  assert out !~ /staging/
+
+  assert out =~ %r[production/cassandra.*: .*ERROR]
+  assert out =~ %r[production/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")
 
@@ -89,31 +96,8 @@ test "`tele init`" do
   end
 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/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
+test "`tele foobar` shouts an error" do
+  out, err = tele("foobar", "-d", "test/.tele.simple")
 
-  assert_equal log.size, 1
-  assert log[0] =~ %r{staging/cassandra.*Can't find Cassandra}
+  assert err.include?("Error: unrecognized parameter: foobar")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tele
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-09 00:00:00.000000000 +02:00
-default_executable: 
+date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clap
-  requirement: &2154016360 !ruby/object:Gem::Requirement
+  requirement: &70301175305080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,7 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154016360
+  version_requirements: *70301175305080
 description: Tele is a small provisioning framework that allows you to run bash scripts
   on remote servers over SSH.
 email:
@@ -43,7 +42,6 @@ files:
 - templates/.tele/recipes/.empty
 - tele.gemspec
 - test/tele.rb
-has_rdoc: true
 homepage: http://github.com/djanowski/tele
 licenses: []
 post_install_message: 
@@ -64,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Provisioning at a distance