tele 0.1.5 → 1.0.0

data/README

@@ -5,12 +5,12 @@ NAME
 
 SYNOPSIS
       tele init
-      tele deploy [-d path] [-s server]
-      tele exec [-d path] [-s server] command
+      tele deploy environment [-d path]
+      tele exec environment command [-d path]
       tele -h
 
 DESCRIPTION
-      Tele is a small provisioning framework that allows you to run bash
+      Tele is a small provisioning framework that allows you to run shell
       scripts on remote servers over SSH. It uses your own SSH, not a Ruby
       version, so you can profit from your settings and public/private keys.
 
@@ -26,34 +26,38 @@ DESCRIPTION
       charge of creating them.
 
       layout.json
-          The server layout, with the available roles and servers. Example:
+          The server layout, with the available roles, environments and servers. Example:
 
           {
             "roles": {
-              "db": ["redis"],
+              "db":  ["redis"],
               "web": ["ruby", "unicorn"],
-              "app": ["db", "web"]
             },
 
-            "servers": {
-              "app-1": ["db", "web"],
-              "app-2": ["db"],
-              "app-3": ["app"]
+            "environments": {
+              "staging": {
+                "ec2-small": ["db", "web"]
+              },
+
+              "production": {
+                "linode-1": ["db"],
+                "linode-2": ["web"]
+              }
             }
           }
 
           The key "roles" stores a tree, where each key is mapped
           to an array of recipes. The leaves--those elements in the tree that
           are not present as keys--are the ones that have to be available as
-          bash scripts. In this example, both "redis" and "unicorn" are leaves,
-          while "db", "web" and "app" are recipes composed of other recipes.
+          shell scripts. In this example, both "redis" and "unicorn" are leaves,
+          while "db" and "web" are recipes composed of other recipes.
 
-          The key "servers" stores a map of servers to roles. The keys can be
-          either hostnames declared in .tele/ssh_config or IP addresses.
+          The key "environments" stores a map of environments to servers to roles.
+          Server names must correspond with an entry in .tele/ssh_config.
 
       ssh_config
-          Configuration file for the SSH connection. Check the SSH_CONFIG man
-          page for more information.
+          Configuration file for the SSH connection.
+          Check ssh_config(5) for more information.
 
       The following options are available:
 
@@ -65,18 +69,16 @@ 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.
 
-      deploy
-          Runs every recipe script on the servers declared in layout.json. The
-          exit code must be 0 if the command was successful.
+      deploy environment
+          Runs every recipe script on the servers declared in layout.json for
+          the given environment.
+          Deploying halts on the first failed recipe.
 
-      exec
-          Runs an arbitrary command on the matching servers.
+      exec environment command
+          Runs an arbitrary command on all servers of the given environment.
 
 USAGE
       To provision two servers called `server1` and `server2` with Redis,
@@ -95,9 +97,11 @@ USAGE
                 "db": ["redis"]
               },
 
-              "servers": {
-                "server1": ["db"],
-                "server2": ["db"]
+              "environments": {
+                "development" {
+                  "server1": ["db"],
+                  "server2": ["db"]
+                }
               }
             }
 
@@ -110,10 +114,7 @@ USAGE
               Hostname 10.0.0.2
 
           # Run tele deploy
-          $ tele deploy
-
-          # Run tele deploy only for server1
-          $ tele deploy -s server1
+          $ tele deploy development
 
 INSTALLATION
       $ gem install tele

data/bin/tele

@@ -11,6 +11,12 @@ require "json"
 
 trap(:INT) { puts; exit 1 }
 
+def flunk(message)
+  $stderr.puts(message)
+  $stderr.puts("Run `tele -h` if you need help.")
+  exit 1
+end
+
 def recipes_for(assigned_roles)
   [].tap do |recipes|
     assigned_roles.each do |name|
@@ -37,8 +43,12 @@ def layout
   $layout ||= JSON.parse(File.read(path("layout.json")))
 end
 
+def environments
+  layout["environments"]
+end
+
 def servers
-  $servers ||= layout["servers"]
+  environments[$environment]
 end
 
 def roles
@@ -120,14 +130,6 @@ 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 }
   }
 
 commands = Clap.run commands,
@@ -138,12 +140,11 @@ commands = Clap.run commands,
     %x{cp -r #{source} #{target}}
 
     %x{find #{target} -name .empty -print0 | xargs rm}
+
+    exit 0
   }
 
-unless File.directory?(path)
-  $stderr.puts "Couldn't find a .tele directory"
-  exit 1
-end
+flunk("Couldn't find a .tele directory.") unless File.directory?(path)
 
 SSH_OPTIONS = [
   "-T",
@@ -151,6 +152,12 @@ SSH_OPTIONS = [
   "-S", "/tmp/ssh-%r@%h:%p",
 ]
 
+flunk("Can't find any environments.") unless environments
+
+$environment = commands.delete_at(1)
+
+flunk("Unknown environment: #{$environment}") unless environments[$environment]
+
 commands = Clap.run commands,
   "exec" => lambda { |cmd|
     connect do |server, _|
@@ -170,7 +177,4 @@ commands = Clap.run commands,
     end
   }
 
-unless commands.empty?
-  $stderr.puts "Error: unrecognized parameter: #{commands.join(" ")}"
-  exit 1
-end
+flunk("Error: unrecognized parameter: #{commands.join(" ")}") unless commands.empty?

data/tele.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.name              = "tele"
   s.version           = Tele::VERSION
   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.description       = "Tele is a small provisioning framework that allows you to run shell scripts on remote servers over SSH."
   s.authors           = ["Damian Janowski", "Michel Martens"]
   s.email             = ["djanowski@dimaion.com", "michel@soveran.com"]
   s.homepage          = "http://github.com/djanowski/tele"

data/templates/.tele/layout.json

@@ -3,7 +3,9 @@
 
   },
 
-  "servers": {
+  "environments": {
+    "production": {
 
+    }
   }
 }

data/test/tele.rb

@@ -28,14 +28,14 @@ test "`tele deploy` fails without a config" do
 end
 
 test "`tele deploy` displays missing recipes" do
-  out, err = tele("deploy", "-d", "test/.tele.missing-recipes")
+  out, err = tele("deploy", "-d", "test/.tele.missing-recipes", "production")
 
   assert out =~ /db-1/
   assert out =~ /redis.*: .*\?/
 end
 
 test "`tele deploy` displays layout" do
-  out, err = tele("deploy", "-d", "test/.tele")
+  out, err = tele("deploy", "-d", "test/.tele", "production")
 
   assert err.empty?
 
@@ -53,32 +53,30 @@ test "`tele deploy` displays layout" do
 end
 
 test "`tele deploy` runs recipes" do
-  out, err = tele("deploy", "-d", "test/.tele.simple")
+  out, err = tele("deploy", "-d", "test/.tele.simple", "production")
 
-  assert out =~ %r[^staging/cassandra.* .*Can't find Cassandra]
-  assert out =~ %r[^staging/cassandra.* .*ERROR]
-  assert out =~ %r[^staging/redis.* Installed]
-  assert out =~ %r[^staging/redis.* .*OK]
+  assert out =~ %r[^app-1/cassandra.* .*Can't find Cassandra]
+  assert out =~ %r[^app-1/cassandra.* .*ERROR]
+  assert out =~ %r[^app-1/redis.* Installed]
+  assert out =~ %r[^app-1/redis.* .*OK]
 end
 
-test "`tele deploy -s production` runs only production recipes" do
-  out, err = tele("deploy", "-d", "test/.tele.multi", "-s", "production")
+test "`tele deploy ENVIRONMENT` only deploys the given environment" do
+  out, err = tele(*%w[deploy -d test/.tele.envs staging])
 
-  assert out !~ /staging/
-
-  assert out =~ %r[production/cassandra.*: .*ERROR]
-  assert out =~ %r[production/redis.*: .*OK]
+  assert File.exist?("/tmp/tele/staging")
+  assert !File.exist?("/tmp/tele/production")
 end
 
 test "`tele deploy` halts deploy if a recipe fails" do
-  out, err = tele("deploy", "-d", "test/.tele.error")
+  out, err = tele("deploy", "-d", "test/.tele.error", "production")
 
   assert out =~ %r[db-1/cassandra.*: .*ERROR]
   assert out !~ %r[db-1/no-run]
 end
 
 test "`tele deploy` doesn't run the same recipe twice in a single server" do
-  out, err = tele("deploy", "-d", "test/.tele.simple")
+  out, err = tele("deploy", "-d", "test/.tele.simple", "production")
 
   assert_equal File.read("/tmp/tele/touch-count").to_i, 1
 end
@@ -98,19 +96,19 @@ test "`tele init`" do
     assert File.exists?(".tele/recipes")
     assert !File.exists?(".tele/recipes/.empty")
 
-    out, err, status = tele("deploy")
+    out, err, status = tele("deploy", "production")
     assert status.exitstatus == 0
   end
 end
 
 test "`tele foobar` shouts an error" do
-  out, err = tele("foobar", "-d", "test/.tele.simple")
+  out, err = tele("foobar", "-d", "test/.tele.simple", "production")
 
   assert err.include?("Error: unrecognized parameter: foobar")
 end
 
 test "`tele exec` runs commands" do
-  out, err = tele("exec", "echo foo", "-d", "test/.tele.simple")
+  out, err = tele("exec", "production", "echo foo", "-d", "test/.tele.simple")
 
-  assert out.include?("staging: foo")
+  assert out.include?("app-1: foo")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tele
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
+date: 2012-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clap
-  requirement: &70215095440960 !ruby/object:Gem::Requirement
+  requirement: &70324407389760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,8 +22,8 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70215095440960
-description: Tele is a small provisioning framework that allows you to run bash scripts
+  version_requirements: *70324407389760
+description: Tele is a small provisioning framework that allows you to run shell scripts
   on remote servers over SSH.
 email:
 - djanowski@dimaion.com