tele 0.0.2 → 0.1.0

data/README

@@ -4,7 +4,7 @@ NAME
       tele -- Provisioning at a distance.
 
 SYNOPSIS
-      tele [-h] [-d path] (init|status|install)
+      tele [-h] [-d path] (init|deploy)
 
 DESCRIPTION
       Tele is a small provisioning framework that allows you to run bash
@@ -16,10 +16,8 @@ DESCRIPTION
 
           .tele/layout.json
           .tele/ssh_config
-          .tele/recipes/redis/status.sh
-          .tele/recipes/redis/install.sh
-          .tele/recipes/unicorn/status.sh
-          .tele/recipes/unicorn/install.sh
+          .tele/recipes/redis.sh
+          .tele/recipes/unicorn.sh
 
       In the example, there are recipes for Redis and Unicorn. Please note that you are in
       charge of creating them.
@@ -67,16 +65,9 @@ DESCRIPTION
       init
           Copies a .tele template to the current directory.
 
-      status
-          Runs every status.sh script on the servers declared in layout.json,
-          and prints the responses. The status.sh script must return 0 if
-          everything is correct, and a value different form zero otherwise.
-          What to check in the script is up to the user.
-
-      install
-          Runs every install.sh script on the servers declared in layout.json,
-          but only if the status.sh returns an error. The exit code must be 0
-          if the installation was successful.
+      deploy
+          Runs every recipe script on the servers declared in layout.json. The
+          exit code must be 0 if the command was successful.
 
 USAGE
       To provision two servers called `server1` and `server2` with Redis,
@@ -85,13 +76,8 @@ USAGE
           # Create the .tele directory.
           $ tele init
 
-          # Create directories for the recipes.
-          $ mkdir -p .tele/recipes/redis
-
-          # Create status.sh script.
-          $ echo "which redis-server" > ./tele/recipes/redis/status.sh
-
-          # Create install.sh script (ommited).
+          # Create the Redis recipe.
+          $ echo "which redis-server || sudo apt-get install redis" > .tele/recipes/redis.sh
 
           # Edit .tele/layout.json as follows:
 
@@ -114,8 +100,8 @@ USAGE
             Host server2
               Hostname 10.0.0.2
 
-          # Run tele install
-          $ tele install
+          # Run tele deploy
+          $ tele deploy
 
 INSTALLATION
       $ gem install tele

data/bin/tele

@@ -27,9 +27,8 @@ def path(*parts)
   File.expand_path(File.join(*parts), ENV["TELE_HOME"])
 end
 
-def ssh(server, script)
-  %x{bash -c "ssh -T -F #{path("ssh_config")} #{server} < #{script} > >(logger -t 'tele/#{server}') 2>&1"}
-  $?.exitstatus
+def ssh(server, options = [])
+  "ssh #{options.join(" ")} #{server}"
 end
 
 def layout
@@ -44,15 +43,12 @@ def roles
   layout["roles"]
 end
 
-def recipe_script(recipe, command)
-  path("recipes", recipe, "#{command}.sh")
-end
-
-def run(server, recipe, command)
-  script = recipe_script(recipe, command)
+def run(server, recipe)
+  script = path("recipes", "#{recipe}.sh")
 
   if File.exist?(script)
-    ssh(server, script)
+    %x{bash -c "#{ssh(server, SSH_OPTIONS)} < #{script} > >(logger -t 'tele/#{server}/#{recipe}') 2>&1"}
+    $?.exitstatus
   end
 end
 
@@ -69,14 +65,6 @@ out = Module.new do
     puts "\033[01;32mOK\033[00m"
   end
 
-  def self.missing
-    puts "\033[01;33mMISSING\033[00m"
-  end
-
-  def self.done
-    puts "\033[01;32mDONE\033[00m"
-  end
-
   def self.unknown
     puts "?"
   end
@@ -100,7 +88,8 @@ Clap.run commands,
     target = File.expand_path(Dir.pwd)
 
     %x{cp -r #{source} #{target}}
-    out.done
+
+    %x{find #{target} -name .empty -print0 | xargs rm}
   }
 
 unless File.directory?(path)
@@ -108,50 +97,31 @@ unless File.directory?(path)
   exit 1
 end
 
+SSH_OPTIONS = [
+  "-T",
+  "-F", path("ssh_config"),
+  "-S", "/tmp/ssh-%r@%h:%p",
+]
+
 Clap.run commands,
-  "status" => lambda {
+  "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}: "
 
-        case run(server, recipe, :status)
+        case run(server, recipe)
         when nil
           out.unknown
         when 0
           out.ok
         else
-          out.missing
-        end
-      end
-
-      puts
-    end
-  },
-
-  "install" => lambda {
-    servers.each do |server, assigned_roles|
-      out.server(server)
-
-      recipes_for(assigned_roles).each do |recipe|
-        print "  #{recipe}: "
-
-        if run(server, recipe, :status) == 0
-          out.ok
-        else
-          case run(server, recipe, :install)
-          when nil
-            out.unknown
-          when 0
-            if run(server, recipe, :status) == 0
-              out.done
-            else
-              out.missing
-            end
-          else
-            out.error
-          end
+          out.error
         end
       end
 

data/tele.gemspec

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

@@ -20,30 +20,22 @@ prepare do
   `mkdir /tmp/tele`
 end
 
-test "`tele status` without a config" do
-  out, err, status = tele("status")
+test "`tele deploy` fails without a config" do
+  out, err, status = tele("deploy")
 
   assert err =~ /Couldn't find/
   assert_equal 1, status.exitstatus
 end
 
-test "`tele status` with missing recipes" do
-  out, err = tele("status", "-d", "test/.tele.missing-recipes")
+test "`tele deploy` displays missing recipes" do
+  out, err = tele("deploy", "-d", "test/.tele.missing-recipes")
 
   assert out =~ /db-1/
   assert out =~ /redis: .*\?/
 end
 
-test "`tele status`" do
-  out, err = tele("status", "-d", "test/.tele.simple")
-
-  assert out =~ /db-1/
-  assert out =~ /redis: .*OK/
-  assert out =~ /cassandra: .*MISSING/
-end
-
-test "`tele status`" do
-  out, err = tele("status", "-d", "test/.tele")
+test "`tele deploy` displays layout" do
+  out, err = tele("deploy", "-d", "test/.tele")
 
   assert err.empty?
 
@@ -63,14 +55,12 @@ test "`tele status`" do
   assert parts[2] =~ /unicorn/
 end
 
-test "`tele install`" do
-  out, err = tele("install", "-d", "test/.tele.simple")
+test "`tele deploy` runs recipes" do
+  out, err = tele("deploy", "-d", "test/.tele.simple")
 
   assert out =~ /db-1/
   assert out =~ /cassandra: .*ERROR/
-  assert out =~ /cdb: .*DONE/
   assert out =~ /redis: .*OK/
-  assert out =~ /tokyo: .*MISSING/
 end
 
 test "`tele init`" do
@@ -82,9 +72,13 @@ test "`tele init`" do
   Dir.chdir("test/tmp") do
     out, err = tele("init")
 
+    assert err.empty?
+
     assert File.exists?(".tele")
+    assert File.exists?(".tele/recipes")
+    assert !File.exists?(".tele/recipes/.empty")
 
-    out, err, status = tele("status")
+    out, err, status = tele("deploy")
     assert status.exitstatus == 0
   end
 end
@@ -92,5 +86,5 @@ 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`["Can't find Cassandra"]
+  assert `tail -n 20 /var/log/syslog /var/log/system.log 2>/dev/null`[%r{tele/db-1/cassandra.*Can't find Cassandra}]
 end

metadata

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