paratele 0.0.3 → 0.2

data/README

@@ -1,10 +1,10 @@
 TELE(1)
 
 NAME
-      tele -- Provisioning at a distance.
+      paratele -- Provisioning at a distance.
 
 SYNOPSIS
-      tele [-h] [-d path] (init|status|install)
+      paratele [-h] [-d path] (init|run)
 
 DESCRIPTION
       Tele is a small provisioning framework that allows you to run bash
@@ -99,8 +99,11 @@ USAGE
             Host server2
               Hostname 10.0.0.2
 
-          # Run tele install
-          $ tele run install
+          # Run the install script for all recipes
+          $ paratele run install
+
+          # Run the deploy script for certain servers
+          $ paratele run deploy web1,db1
 
 INSTALLATION
-      $ gem install tele
+      $ gem install paratele

data/Rakefile

@@ -1,7 +1,6 @@
+task :default => :test
+
 task :test do
   require "cutest"
-
   Cutest.run(Dir["test/tele.rb"])
 end
-
-task :default => :test

data/bin/paratele

@@ -1,42 +1,62 @@
-#! /usr/bin/env ruby
+#!/usr/bin/env ruby
 
-help = File.expand_path(File.join("..", "README"), File.dirname(__FILE__))
-
-if ARGV.empty?
-  exec "less #{help}"
-end
-
-require "clap"
 require "json"
 require "open3"
+require "clap"
+require "erb"
 
-def path(*parts)
-  File.expand_path(File.join(*parts), ENV["TELE_HOME"])
+$verbosity = 1
+$home = Dir.pwd
+
+class Template
+  attr_accessor :attributes
+
+  def initialize source
+    @source = source
+  end
+
+  def render
+    ERB.new(@source).result(binding)
+  end
 end
 
-def ssh(server, script)
-  out, status = Open3.capture2e("ssh -T -F #{path("ssh_config")} #{server} < #{script}")
-  [out, status.exitstatus]
+def path *parts
+  File.join($home, *parts)
 end
 
 def layout
-  $layout ||= JSON.parse(File.read(path("layout.json")))
+  @layout ||= JSON.parse(File.read(path("layout.json")))
 end
 
-def servers
-  layout["servers"]
+def run server, recipe, command, attributes={}
+  template_path = path("recipes", recipe, "#{command}.erb")
+  if File.exists?(template_path)
+    source = File.read(template_path)
+    template = Template.new(source)
+    template.attributes = attributes
+    ssh(server, template.render)
+  end
 end
 
-def recipe_script(recipe, command)
-  path("recipes", recipe, "#{command}.sh")
+def ssh server, script
+  out, status = Open3.capture2e("ssh -T -F #{path("ssh_config")} #{server}", :stdin_data => script)
+  [out, status.exitstatus]
 end
 
-def run(server, recipe, command)
-  script = recipe_script(recipe, command)
+commands = Clap.run ARGV,
+  "-q" => lambda {
+    $verbosity = 0
+  },
+  "-v" => lambda {
+    $verbosity = 2
+  },
+  "-d" => lambda {|path|
+    $home = File.join(Dir.pwd, path)
+  }
 
-  if File.exist?(script)
-    ssh(server, script)
-  end
+unless File.exists?(path("layout.json"))
+  $stderr.puts "Couldn't find `layout.json`"
+  exit 1
 end
 
 out = Module.new do
@@ -65,76 +85,49 @@ out = Module.new do
   end
 end
 
-###
-
-ENV["TELE_HOME"] ||= File.join(Dir.pwd, ".tele")
+case ARGV.shift
+when "run" then
+  command = ARGV.shift
+  environment, servers = ARGV.shift.split(":")
 
-verbosity = 1
+  environment = layout[environment]
+  servers = if servers
+              servers.split(",")
+            else
+              environment["servers"].keys
+            end
 
-commands = Clap.run ARGV,
-  "-h" => lambda {
-    exec "less #{help}"
-  },
-  "-q" => lambda {
-    verbosity = 0
-  },
-  "-v" => lambda {
-    verbosity = 2
-  },
-  "-d" => lambda {|path|
-    ENV["TELE_HOME"] = File.join(Dir.pwd, path)
-  }
+  exit_status = 0
 
-Clap.run commands,
-  "init" => lambda {
-    source = File.expand_path("../templates/.tele", File.dirname(__FILE__))
-    target = File.expand_path(Dir.pwd)
+  servers.each do |server|
+    recipes = environment["servers"][server]
 
-    %x{cp -r #{source} #{target}}
-    out.done
-  }
+    out.server(server)
 
-unless File.directory?(path)
-  $stderr.puts "Couldn't find a .tele directory"
-  exit 1
-end
+    recipes.each do |recipe|
+      print "  #{recipe}: "
 
-Clap.run commands,
-  "run" => lambda {|command|
-    if commands.size == 3
-      selected = commands.last.split(",")
-      servers.select! {|server| selected.include?(server)}
-    end
+      if File.exists?(path("recipes", recipe))
+        stdout, status = run(server, recipe, command, environment["attributes"])
 
-    exit_status = 0
-
-    servers.each do |server, recipes|
-      out.server(server)
-
-      recipes.each do |recipe|
-        print "  #{recipe}: "
-
-        if File.exists?(path("recipes", recipe))
-          stdout, status = run(server, recipe, command)
-
-          case status
-          when nil
-            out.unknown
-          when 0
-            out.ok
-            $stderr.print stdout if verbosity >= 2
-          else
-            out.error
-            $stderr.print stdout if verbosity >= 1
-            exit_status = 1
-            break
-          end
-        else
+        case status
+        when nil
           out.unknown
-          exit 1
+        when 0
+          out.ok
+          $stderr.print stdout if $verbosity >= 2
+        else
+          out.error
+          $stderr.print stdout if $verbosity >= 1
+          exit_status = 1
+          break
         end
+      else
+        out.unknown
+        exit 1
       end
     end
+  end
 
-    exit exit_status
-  }
+  exit exit_status
+end

data/paratele.gemspec

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.name              = "paratele"
-  s.version           = "0.0.3"
+  s.version           = "0.2"
   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"]
-  s.email             = ["djanowski@dimaion.com", "michel@soveran.com"]
-  s.homepage          = "http://github.com/djanowski/tele"
+  s.authors           = ["Damian Janowski", "Michel Martens", "Harry Vangberg"]
+  s.email             = ["djanowski@dimaion.com", "michel@soveran.com", "harry@vangberg.name"]
+  s.homepage          = "http://github.com/vangberg/paratele"
 
   s.executables.push("paratele")
 
   s.add_dependency("clap")
 
-  s.files = ["LICENSE", "README", "Rakefile", "bin/paratele", "bin/tele", "templates/.tele/layout.json", "templates/.tele/ssh_config", "paratele.gemspec", "tele.gemspec", "test/tele.rb"]
+  s.files = ["LICENSE", "README", "Rakefile", "bin/paratele", "paratele.gemspec", "test/tele.missing-recipes", "test/tele.rb", "test/tele.simple"]
 end

data/test/tele.rb

@@ -7,28 +7,25 @@ def root(*args)
   File.join(ROOT, *args)
 end
 
-def tele(*args)
-  sh("ruby #{root "bin/tele"} #{Shellwords.join args}")
+def paratele(*args)
+  sh("ruby #{root "bin/paratele"} #{Shellwords.join args}")
 end
 
 def sh(cmd)
   Open3.capture3(cmd)
 end
 
-prepare do
-  `rm -rf /tmp/tele`
-  `mkdir /tmp/tele`
-end
-
-test "`tele run` without a config" do
-  out, err, status = tele("run", "install")
+test "`paratele run` without a config" do
+  Dir.chdir("test") {
+    out, err, status = paratele("run", "install", "production")
 
-  assert err =~ /Couldn't find/
-  assert_equal 1, status.exitstatus
+    assert err =~ /Couldn't find/
+    assert_equal 1, status.exitstatus
+  }
 end
 
-test "`tele run` with missing recipes" do
-  out, err, status = tele("run", "deploy", "-d", "test/.tele.missing-recipes")
+test "`paratele run` with missing recipes" do
+  out, err, status = paratele("run", "deploy", "production", "-d", "test/tele.missing-recipes")
 
   assert_equal 1, status.exitstatus
   assert out =~ /db-1/
@@ -36,8 +33,8 @@ test "`tele run` with missing recipes" do
   assert out !~ /cassandra: .*\?/
 end
 
-test "`tele run` successful" do
-  out, err, status = tele("run", "install", "-d", "test/.tele.simple")
+test "`paratele run` successful - production" do
+  out, err, status = paratele("run", "install", "production", "-d", "test/tele.simple")
 
   assert_equal 0, status.exitstatus
   assert out =~ /db-1/
@@ -45,10 +42,26 @@ test "`tele run` successful" do
   assert out =~ /redis: .*OK/
   assert out =~ /cdb: .*OK/
   assert out =~ /cassandra: .*OK/
+
+  assert out !~ /sta-1/
 end
 
-test "`tele run` with recipes missing a command" do
-  out, err, status = tele("run", "status", "-d", "test/.tele.simple")
+test "`paratele run` successful - staging" do
+  out, err, status = paratele("run", "install", "staging", "-d", "test/tele.simple")
+
+  assert_equal 0, status.exitstatus
+  assert out =~ /sta1/
+  assert out =~ /redis: .*OK/
+  assert out =~ /erb: .*OK/
+
+  assert out !~ /db-1/
+  assert out !~ /db-2/
+  assert out !~ /cdb:/
+  assert out !~ /cassandra:/
+end
+
+test "`paratele run` with recipes missing a command" do
+  out, err, status = paratele("run", "status", "production", "-d", "test/tele.simple")
 
   assert_equal 0, status.exitstatus
   assert out =~ /cassandra: .*\?/
@@ -56,8 +69,8 @@ test "`tele run` with recipes missing a command" do
   assert out =~ /redis: .*OK/
 end
 
-test "`tele run` with errors" do
-  out, err, status = tele("run", "update", "-d", "test/.tele.simple")
+test "`paratele run` with errors" do
+  out, err, status = paratele("run", "update", "production", "-d", "test/tele.simple")
 
   assert_equal 1, status.exitstatus
 
@@ -70,10 +83,11 @@ test "`tele run` with errors" do
   assert out =~ /redis: .*OK/
 end
 
-test "`tele run` with specific server" do
-  out, err, status = tele("run", "install", "db-2", "-d", "test/.tele.simple")
+test "`paratele run` with specific server" do
+  out, err, status = paratele("run", "install", "production:db-2", "-d", "test/tele.simple")
 
   assert_equal 0, status.exitstatus
+  assert out !~ /sta-1/
   assert out !~ /db-1/
   assert out !~ /cassandra/
   assert out !~ /cdb/
@@ -81,16 +95,17 @@ test "`tele run` with specific server" do
   assert out =~ /redis/
 end
 
-test "`tele run` with multiple server" do
-  out, err, status = tele("run", "install", "db-2,db-1", "-d", "test/.tele.simple")
+test "`paratele run` with multiple server" do
+  out, err, status = paratele("run", "install", "production:db-2,db-1", "-d", "test/tele.simple")
 
   assert_equal 0, status.exitstatus
+  assert out !~ /sta-1/
   assert out =~ /db-1/
   assert out =~ /db-2/
 end
 
-test "`tele run -v`" do
-  out, err, status = tele("run", "update", "-v", "-d", "test/.tele.simple")
+test "`paratele run -v`" do
+  out, err, status = paratele("run", "update", "production", "-v", "-d", "test/tele.simple")
 
   assert err =~ /Redis succesfully updated/
   assert err =~ /Updating Cassandra failed/
@@ -98,29 +113,11 @@ test "`tele run -v`" do
   assert out !~ /Updating Cassandra failed/
 end
 
-test "`tele run -q`" do
-  out, err, status = tele("run", "update", "-q", "-d", "test/.tele.simple")
+test "`paratele run -q`" do
+  out, err, status = paratele("run", "update", "production", "-q", "-d", "test/tele.simple")
 
   assert err !~ /Redis succesfully updated/
   assert err !~ /Updating Cassandra failed/
   assert out !~ /Redis succesfully updated/
   assert out !~ /Updating Cassandra failed/
 end
-
-__END__
-
-test "`tele init`" do
-  `rm -rf test/tmp`
-  `mkdir test/tmp`
-
-  assert !File.exists?("test/tmp/.tele")
-
-  Dir.chdir("test/tmp") do
-    out, err = tele("init")
-
-    assert File.exists?(".tele")
-
-    out, err, status = tele("status")
-    assert status.exitstatus == 0
-  end
-end

metadata

@@ -1,21 +1,18 @@
 --- !ruby/object:Gem::Specification 
 name: paratele
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+  prerelease: 
+  version: "0.2"
 platform: ruby
 authors: 
 - Damian Janowski
 - Michel Martens
+- Harry Vangberg
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 -03:00
+date: 2011-04-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,8 +23,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -35,6 +30,7 @@ description: Tele is a small provisioning framework that allows you to run bash
 email: 
 - djanowski@dimaion.com
 - michel@soveran.com
+- harry@vangberg.name
 executables: 
 - paratele
 extensions: []
@@ -46,14 +42,10 @@ files:
 - README
 - Rakefile
 - bin/paratele
-- bin/tele
-- templates/.tele/layout.json
-- templates/.tele/ssh_config
 - paratele.gemspec
-- tele.gemspec
 - test/tele.rb
 has_rdoc: true
-homepage: http://github.com/djanowski/tele
+homepage: http://github.com/vangberg/paratele
 licenses: []
 
 post_install_message: 
@@ -66,21 +58,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Provisioning at a distance

data/bin/tele

@@ -1,140 +0,0 @@
-#! /usr/bin/env ruby
-
-help = File.expand_path(File.join("..", "README"), File.dirname(__FILE__))
-
-if ARGV.empty?
-  exec "less #{help}"
-end
-
-require "clap"
-require "json"
-require "open3"
-
-def path(*parts)
-  File.expand_path(File.join(*parts), ENV["TELE_HOME"])
-end
-
-def ssh(server, script)
-  out, status = Open3.capture2e("ssh -T -F #{path("ssh_config")} #{server} < #{script}")
-  [out, status.exitstatus]
-end
-
-def layout
-  $layout ||= JSON.parse(File.read(path("layout.json")))
-end
-
-def servers
-  layout["servers"]
-end
-
-def recipe_script(recipe, command)
-  path("recipes", recipe, "#{command}.sh")
-end
-
-def run(server, recipe, command)
-  script = recipe_script(recipe, command)
-
-  if File.exist?(script)
-    ssh(server, script)
-  end
-end
-
-out = Module.new do
-  def self.server(name)
-    puts name
-  end
-
-  def self.error
-    puts "\033[01;31mERROR\033[00m"
-  end
-
-  def self.ok
-    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
-end
-
-###
-
-ENV["TELE_HOME"] ||= File.join(Dir.pwd, ".tele")
-
-verbosity = 1
-
-commands = Clap.run ARGV,
-  "-h" => lambda {
-    exec "less #{help}"
-  },
-  "-q" => lambda {
-    verbosity = 0
-  },
-  "-v" => lambda {
-    verbosity = 2
-  },
-  "-d" => lambda {|path|
-    ENV["TELE_HOME"] = File.join(Dir.pwd, path)
-  }
-
-Clap.run commands,
-  "init" => lambda {
-    source = File.expand_path("../templates/.tele", File.dirname(__FILE__))
-    target = File.expand_path(Dir.pwd)
-
-    %x{cp -r #{source} #{target}}
-    out.done
-  }
-
-unless File.directory?(path)
-  $stderr.puts "Couldn't find a .tele directory"
-  exit 1
-end
-
-Clap.run commands,
-  "run" => lambda {|command|
-    if commands.size == 3
-      selected = commands.last.split(",")
-      servers.select! {|server| selected.include?(server)}
-    end
-
-    exit_status = 0
-
-    servers.each do |server, recipes|
-      out.server(server)
-
-      recipes.each do |recipe|
-        print "  #{recipe}: "
-
-        if File.exists?(path("recipes", recipe))
-          stdout, status = run(server, recipe, command)
-
-          case status
-          when nil
-            out.unknown
-          when 0
-            out.ok
-            $stderr.print stdout if verbosity >= 2
-          else
-            out.error
-            $stderr.print stdout if verbosity >= 1
-            exit_status = 1
-            break
-          end
-        else
-          out.unknown
-          exit 1
-        end
-      end
-    end
-
-    exit exit_status
-  }

data/tele.gemspec

@@ -1,15 +0,0 @@
-Gem::Specification.new do |s|
-  s.name              = "tele"
-  s.version           = "0.0.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"]
-  s.email             = ["djanowski@dimaion.com", "michel@soveran.com"]
-  s.homepage          = "http://github.com/djanowski/tele"
-
-  s.executables.push("tele")
-
-  s.add_dependency("clap")
-
-  s.files = ["LICENSE", "README", "Rakefile", "bin/tele", "templates/.tele/layout.json", "templates/.tele/ssh_config", "tele.gemspec", "test/tele.rb"]
-end

data/templates/.tele/layout.json

@@ -1,9 +0,0 @@
-{
-  "roles": {
-
-  },
-
-  "servers": {
-
-  }
-}