dployr 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e18de4be7a56b2227ef830bd0159a0fe9e675a9
-  data.tar.gz: b2d9e30ad637839636e952069b43768d8476db1c
+  metadata.gz: 55e8744de1ada22c752a30e73a533774383b957a
+  data.tar.gz: 71bd763bd9e8de49200a57c9622f6c142de98aec
 SHA512:
-  metadata.gz: 5151faf23cfdc2b09998a78a78d25aaaf00123b234275fc9a903fc5d72c0b11907142c9b046e49142f3fc9ccf3ba2c0e65abaee599adf53827e0535c2c4f4dc9
-  data.tar.gz: 5fb7a5c245f56633f6759f12d22a5530ce8795b22fdc85a7ae3089de2f0fd6f07e2c82a177688a31abc13d65e634cb9bc5895265e93b4c9a3aeabfec71b8f99c
+  metadata.gz: 59247fbc73d154f5d8535adbc1e20584be2e5e243764260e033482f09b12f73f29513b7f2887f7676d5bd1706a733237c9257aed82533f5cf22aa4db00c4f1fc
+  data.tar.gz: 964b34cf57543d3db61b460147d920b539ac7e40202dd5194488354fd21e8f3d29842d1038910b4602bbe0e719fe71a1767265a6f00d7fcc92839e798c5721c6

data/README.md

@@ -2,7 +2,7 @@
 
 > Multicloud management and deployment made simple
 
-> **Spoiler! Alpha project. Funny work in progress**
+> **Spoiler! Alpha project. Use it by your own risk**
 
 <table>
 <tr>
@@ -18,8 +18,8 @@
 **Dployr** is a Ruby utility that simplifies cloud management
 and deployment across different providers
 
-You can configure your infraestructure and deployment from a simple configuration file which support built-in
-rich features like templating and inheritance
+You can configure your infraestructure and deployment from a
+simple configuration file which support built-in rich features
 
 Dployr only works in Ruby >= `1.9.x`
 
@@ -29,12 +29,13 @@ Dployr only works in Ruby >= `1.9.x`
 $ gem install dployr
 ```
 
-Or add it as dependency in your `Gemfile` or `.gemspec` file
+If you need to use it from another Ruby package,
+add it as dependency in your `Gemfile` or `.gemspec` file
 ```ruby
 # gemspec
-spec.add_dependency 'dployr', '>= 0.0.1'
+spec.add_dependency 'dployr', '>= 0.0.3'
 # Gemfile
-gem 'dployr', '>= 0.0.1'
+gem 'dployr', '>= 0.0.3'
 ```
 
 ## Documentation
@@ -43,7 +44,18 @@ Dployr documentation and API is available from [RubyDoc][rubydoc]
 
 ## Features
 
-`To do! but all will be cool :)`
+- Fully configurable from Ruby or YAML file with rich features like templating
+- Supports deployment to multiple providers
+- Built-in support for defailted instances configuration
+- Local and remote scripts execution per stage phase (start, test, provision, update, stop...)
+- Featured command-line and programmatic API
+
+## Supported providers
+
+Note that as Dployr is still in alpha stage, there are only a few providers supported
+
+- Amazon Web Services (`aws`)
+- Google Compute Engine (`gce`)
 
 ## Configuration
 
@@ -76,9 +88,15 @@ Notation: `%{attribute-name}`
 
 ##### Iteration context variables
 
-You can reference to the current `provider` or `region` of the current iteration context
+You can use references from config strings to specific iteration context values
 
-Notation: `${region}`
+Notation: `${value}`
+
+Supported values:
+
+- **provider** - Current context provider name identifier
+- **region** - Current context region name identifier
+- **name** - Current context template name identifier
 
 ##### Environment variables
 
@@ -140,7 +158,6 @@ default:
         args: "%{name}"
         path: ./scripts/updatedns.sh
 
-
 custom:
   name: 1
   web-server:
@@ -159,23 +176,26 @@ custom:
         attributes:
           instance_type: m1.large
     scripts:
-      post-start:
+      pre-start:
         -
           args:
             - "%{name}"
             - "%{type}"
             - "%{domain}"
-          path: ./scripts/.sh
-      -
-        args:
-          - "%{hydra}"
-        path: ./scripts/configureListener.sh
-      -
-        args:
-          - "%{$provider}-%{region}"
-          - "%{type}"
-        path: ./scripts/hydraProbe.sh
-
+          path: ./scripts/pre-start.sh
+      start:
+        -
+          args:
+            - "%{hydra}"
+          path: ./scripts/configure.sh
+      provision:
+        -
+          args:
+            - "%{$provider}-%{region}"
+            - "%{type}"
+          path: ./scripts/provision.sh
+      test:
+        - path: ./scripts/serverspec.sh
 ```
 
 ## Command-line interface
@@ -194,18 +214,35 @@ Commands
   provision instance provisioning
   config    generate configuration in YAML from Dployrfile
   execute   run custom stages
+  ssh       ssh into machine
   init      create a sample Dployrfile
 
 Options
 
   -n, --name NAME                  template name identifier to load
   -f, --file PATH                  custom config file path to load
-  -a, --attributes ATTRS           aditional attributes to pass to the configuration in matrix query format
+  -a, --attributes ATTRS           aditional attributes to pass to the configuration in matrix query
   -p, --provider VALUES            provider to use (allow multiple values comma-separated)
   -r, --region REGION              region to use (allow multiple values comma-separated)
   -v, -V, --version                version
   -h, --help                       help
+```
 
+### Examples
+
+Start a new instance. If it don't exists, it will be created
+```bash
+$ dployr start -n name -p aws -r eu-west-1 -a 'env=dev'
+```
+
+Provision an existent working instance
+```bash
+$ dployr provision -n name -p aws -r eu-west-1 -a 'env=dev'
+```
+
+Test a working instance
+```bash
+$ dployr test -n name -p aws -r eu-west-1 -a 'env=dev'
 ```
 
 ## Programmatic API

data/lib/dployr/cli.rb

@@ -47,6 +47,7 @@ opt_parser = OptionParser.new do |opt|
 
   opt.on("-v",  "-V", "--version", "version") do
     puts Dployr::VERSION
+    exit 0
   end
 
   opt.on("-h", "--help", "help") do

data/lib/dployr/commands/config.rb

@@ -15,24 +15,32 @@ module Dployr
         end
       end
 
+      private
+
       def render_file
         raise "Dployrfile was not found" if @dployr.file_path.nil?
         raise "Configuration is missing" unless @dployr.config.exists?
+
         begin
-          if @name and options[:provider] and options[:region]
-            config = get_region_config options
-          elsif @name
-            config = @dployr.config.get_config @name, @attrs
-          else
-            config = @dployr.config.get_config_all @attrs
-          end
-          unless config.nil?
-            puts config.to_yaml
-          else
-            @log.info "Missing configuration data"
-          end
+          print_config
         rescue Exception => e
-          raise "Cannot generate the config: #{e}"
+          puts "Cannot generate the config: #{e}"
+          exit 1
+        end
+      end
+
+      def print_config
+        if @name and @options[:provider] and @options[:region]
+          config = get_region_config @options
+        elsif @name
+          config = @dployr.config.get_config @name, @attrs
+        else
+          config = @dployr.config.get_config_all @attrs
+        end
+        unless config.nil?
+          puts config.to_yaml
+        else
+          raise "Missing configuration data"
         end
       end
 

data/lib/dployr/compute/aws.rb

@@ -1,10 +1,12 @@
 require 'fog'
-require 'net/ssh'
+require 'dployr/compute/common'
 
 module Dployr
   module Compute
     class AWS
-
+      
+      include Dployr::Compute::Common
+      
       def initialize(region)
         @options = {
           region: region[0..-2],
@@ -15,16 +17,6 @@ module Dployr
         @compute = Fog::Compute.new @options
       end
 
-      def get_instance(name, states)
-        servers = @compute.servers.all
-        servers.each do |instance|
-          if instance.tags["Name"] == name and states.include? instance.state
-            return instance
-          end
-        end
-        nil
-      end
-
       def get_ip(name)
         instance = get_instance(name, ["running"])
         instance.private_ip_address if instance
@@ -63,36 +55,45 @@ module Dployr
             subnet_id: attributes["subnet_id"],
             security_group_ids: attributes["security_groups"],
             tags: { Name: attributes["name"] }
-            #private_ip_address        : private_ip_address,
-            #user_data                 : user_data,
-            #elastic_ip                : elastic_ip,
-            #allocate_elastic_ip       : allocate_elastic_ip,
-            #block_device_mapping      : block_device_mapping,
-            #instance_initiated_shutdown_behavior : terminate_on_shutdown == true ? "terminate" : nil,
-            #monitoring                : monitoring,
-            #ebs_optimized             : ebs_optimized
           }
           puts options.to_yaml
           server = @compute.servers.create(options)
         end
         print "Wait for instance to get online".yellow
         server.wait_for { print ".".yellow; ready? }
-
-        print "\nWait for ssh to get ready...".yellow
-        while true
-          begin
-            Net::SSH.start(server.private_ip_address, attributes["username"], :keys => attributes["private_key_path"]) do |ssh|
-              print "\n"
-              return server.private_ip_address
-            end
-          rescue Exception => e
-            print ".".yellow
-            sleep 2
+        print "\n"
+        elastic_ip(attributes, server)
+        wait_ssh(attributes, server)
+      end
+      
+      private
+      
+      def get_instance(name, states)
+        servers = @compute.servers.all
+        servers.each do |instance|
+          if instance.tags["Name"] == name and states.include? instance.state
+            return instance
           end
         end
-        print "\n"
         nil
       end
+      
+      def elastic_ip(attributes, server)
+        if attributes["public_ip"]
+          if attributes["public_ip"] == "new"
+            puts "Creating new elastic ip...".yellow
+            response = @compute.allocate_address(server.vpc_id)
+            allocation_id = response[:body]["allocationId"]
+            attributes["public_ip"] = response[:body]["publicIp"]
+          else
+            puts "Looking for elastic ip #{attributes["public_ip"]}...".yellow
+            eip = @compute.addresses.get(attributes["public_ip"])
+            allocation_id = eip.allocation_id
+          end
+          puts "Associating elastic ip #{attributes["public_ip"]}...".yellow
+          @compute.associate_address(server.id,nil,nil,allocation_id)
+        end
+      end
 
     end
   end

data/lib/dployr/compute/common.rb

@@ -0,0 +1,28 @@
+require 'net/ssh'
+
+module Dployr
+  module Compute
+    module Common
+      
+      module_function
+
+      def wait_ssh(attributes, server)
+        print "Wait for ssh to get ready...".yellow
+        while true
+          begin
+            Net::SSH.start(server.private_ip_address, attributes["username"], :keys => attributes["private_key_path"]) do |ssh|
+              print "\n"
+              return server.private_ip_address
+            end
+          rescue Exception => e
+            print ".".yellow
+            sleep 2
+          end
+        end
+        print "\n"
+      end
+      
+
+    end
+  end
+end

data/lib/dployr/compute/gce.rb

@@ -1,10 +1,12 @@
 require 'fog'
-require 'net/ssh'
+require 'dployr/compute/common'
 
 module Dployr
   module Compute
     class GCE
 
+        include Dployr::Compute::Common
+        
         def initialize(region)
           @options = {
             provider: 'Google',
@@ -85,11 +87,13 @@ module Dployr
         end
 
         def start(attributes, region)
+          external_ip(attributes, region)
           server = get_instance(attributes["name"], ["stopped", "stopping"])
           if server
             puts "Starting stopped instance for #{attributes["name"]} in #{region}...".yellow
             server.start
           else
+            puts "Creating boot disk...".yellow
             disks = create_disk(attributes["name"], 10, region, attributes["image_name"])
             if defined? attributes["autodelete_disk"]
               autodelete_disk  = attributes["autodelete_disk"]
@@ -105,6 +109,7 @@ module Dployr
               machine_type: attributes["instance_type"],
               network: attributes["network"],
               disks: [disks.get_as_boot_disk(true, autodelete_disk)],
+              external_ip: attributes["public_ip"]
             }
             
             puts options.to_yaml
@@ -112,21 +117,27 @@ module Dployr
           end
           print "Wait for instance to get online".yellow
           server.wait_for { print ".".yellow; ready? }
-
-          print "\nWait for ssh to get ready...".yellow
-          while true
-            begin
-              Net::SSH.start(server.private_ip_address, attributes["username"], :keys => attributes["private_key_path"]) do |ssh|
-                print "\n"
-                return server.private_ip_address
+          print "\n"
+          wait_ssh(attributes, server)
+      end
+      
+      private
+      
+      def external_ip(attributes, region)
+        if attributes["public_ip"] == "new"
+            puts "Looking for previous public_ip...".yellow
+            ip = @compute.insert_address(attributes["name"], region[0..-3])
+            while true
+              ip = @compute.get_address(attributes["name"], region[0..-3])
+              if ip[:body]["address"]
+                attributes["public_ip"].replace ip[:body]["address"]
+                puts "Using public_ip #{attributes["public_ip"]}".yellow
+                break
               end
-            rescue Exception => e
-              print ".".yellow
-              sleep 2
+              puts "Waiting for ip to be ready...".yellow
+              sleep 1
             end
           end
-          print "\n"
-          return nil
       end
 
     end

data/lib/dployr/configuration.rb

@@ -37,8 +37,8 @@ module Dployr
     def get_config(name, attributes = {})
       instance = get_instance name
       attributes = @attributes.merge (attributes or {})
-      raise ArgumentError.new "Instance '#{name.to_s}' do not exists" if instance.nil?
-      replace_variables merge_config(instance), replace_variables(attributes)
+      raise Error.new "Instance '#{name.to_s}' do not exists" if instance.nil?
+      render_config name, instance, attributes
     end
 
     def get_config_all(attributes = {})
@@ -74,6 +74,18 @@ module Dployr
 
     private
 
+    def render_config(name, instance, attributes)
+      attributes = replace_variables attributes
+      config = merge_config instance, attributes
+      config = replace_name name, config
+      config = replace_variables config, attributes
+      config
+    end
+
+    def replace_name(name, config)
+      replace_keywords 'name', name, config
+    end
+
     def create_instance(name = 'unnamed', config)
       Dployr::Config::Instance.new do |i|
         i.name = name
@@ -104,8 +116,11 @@ module Dployr
       attrs
     end
 
-    def merge_config(instance)
-      merge_providers merge_parents merge_defaults instance.get_values
+    def merge_config(instance, attributes = {})
+      config = merge_defaults instance.get_values
+      config[:attributes] =
+        (get_by_key(config, :attributes) or {}).merge attributes if attributes
+      merge_providers merge_parents config
     end
 
     def merge_defaults(config)

data/lib/dployr/version.rb

@@ -1,3 +1,3 @@
 module Dployr
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/commands_config_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+require 'dployr/commands/config'
+
+describe Dployr::Commands::Config do
+
+  dployrfile = "spec/fixtures/basic/Dployrfile.yml"
+  arguments = "config -f #{dployrfile} -n dployr -p aws -r sa-east-1a -a 'index=100'"
+
+  before :all do
+    @result = `bin/dployr #{arguments}`
+    @exit_code = $?.exitstatus
+  end
+
+  it "should have a valid exit code" do
+    @result.should be_a String
+    @exit_code.should be 0
+  end
+
+  describe "attributes" do
+    it "should have a valid attribute name" do
+      @result.should include "name: dployr"
+    end
+
+    it "should have a valid attribute index" do
+      @result.should match /index: [']?100[']?/
+    end
+
+    it "should have a valid attribute prefix" do
+      @result.should include "prefix: dev"
+    end
+
+    it "should have a valid attribute private_key_path" do
+      @result.should match /private_key_path: [\"]?~\/pems\/innotechdev.pem[\"]?/
+    end
+
+    it "should have a valid attribute username" do
+      @result.should include "username: innotechdev"
+    end
+
+    it "should have a valid attribute instance_type" do
+      @result.should include "instance_type: t1.micro"
+    end
+
+    it "should have a valid attribute ami" do
+      @result.should include "ami: ami-370daf2a"
+    end
+
+    it "should have a valid attribute username" do
+      @result.should include "username: innotechdev"
+    end
+
+    it "should have a valid attribute keypair" do
+      @result.should include "keypair: vagrant-aws-saopaulo"
+    end
+
+    it "should have a valid attribute security_groups" do
+      @result.should include "security_groups:\n  - sg-3cf3e45e"
+    end
+
+    it "should have a valid attribute subnet_id" do
+      @result.should include "subnet_id: subnet-1eebe07c"
+    end
+  end
+
+  describe "scripts" do
+    it "should have a valid script in pre-provision stage" do
+      @result.should match /:scripts:\n  pre-provision:\n  - source: [\"]?.\/hello[\"]?\n    target: [\"]?\/tmp[\"]?/
+    end
+
+    it "should have a valid script in provision stage" do
+      @result.should match /provision:\n  - remote_path: [\"]?\/tmp\/hello\/jetty.sh[\"]?\n    args: ''/
+    end
+
+    it "should have a valid script in provision stage with template value" do
+      @result.should match /- remote_path: [\"]?\/tmp\/test.sh 100[\"]?\n/
+    end
+
+    it "should have a valid script in stop stage with template value" do
+      @result.should match /stop:\n  - remote_path: [\"]?\/tmp\/stop.sh 100[\"]?\n/
+    end
+  end
+
+end

data/spec/configuration_spec.rb

@@ -110,7 +110,7 @@ describe Dployr::Configuration do
           key_path: "path/to/key.pem"
         },
         scripts: [
-          { path: "setup.sh", args: ["--id ${index}"], remote: true }
+          { path: "setup.sh", args: ["--id ${index}", "--name ${name}"], remote: true }
         ],
         providers: {
           aws: {
@@ -327,6 +327,14 @@ describe Dployr::Configuration do
               zeus[:providers][:aws][:scripts][1][:path].should eql "setup.sh"
             end
 
+            it "should have a valid number of arguments" do
+              zeus[:providers][:aws][:scripts][1][:args].should have(2).items
+            end
+
+            it "should have a remote property" do
+              zeus[:providers][:aws][:scripts][1][:remote].should eql true
+            end
+
             it "should have a valid path" do
               zeus[:providers][:aws][:scripts][2][:path].should eql "router.sh"
             end
@@ -335,6 +343,10 @@ describe Dployr::Configuration do
               it "should replace the argument with the instance name" do
                 zeus[:providers][:aws][:scripts][2][:args][0].should eql "zeus"
               end
+
+              it "should replace the name context value" do
+                zeus[:providers][:aws][:scripts][1][:args][1].should eql "--name zeus"
+              end
             end
           end
 
@@ -471,7 +483,7 @@ describe Dployr::Configuration do
           end
 
           it "should have a valid name" do
-            @config[:attributes][:name].should eql "zeus"
+            @config[:attributes][:name].should eql "hera"
           end
         end
 

data/spec/fixtures/basic/Dployrfile.yml

@@ -0,0 +1,41 @@
+default:
+  attributes:
+    index: 1
+
+dployr:
+  attributes:
+    name: dployr-test
+    prefix: dev
+    private_key_path: ~/pems/innotechdev.pem
+    username: innotechdev
+  scripts:
+    pre-provision:
+      - source: ./hello
+        target: /tmp
+    provision:
+      - remote_path: /tmp/hello/jetty.sh
+        args: ""
+      - remote_path: "/tmp/test.sh %{index}"
+  providers:
+    aws:
+      attributes:
+        instance_type: t1.micro
+      regions:
+        sa-east-1a:
+          attributes:
+            ami: ami-370daf2a # centos-base-v7
+            keypair: vagrant-aws-saopaulo
+            security_groups:
+              - sg-3cf3e45e # lib_aws_saopaulo
+            subnet_id: subnet-1eebe07c
+          scripts:
+            stop:
+              - remote_path: "/tmp/stop.sh %{index}"
+    gce:
+      attributes:
+        instance_type: f1-micro
+      regions:
+        europe-west1-a:
+          attributes:
+            image_name: centos-base-v7 # centos-base-v7
+            network: liberty-gce

data/spec/fixtures/{config → german}/Dployrfile.yml

@@ -1,4 +1,4 @@
-german-dployr:
+german-template:
   attributes:
     name: "german-dployr"
     prefix: dev
@@ -9,16 +9,8 @@ german-dployr:
       - source: ./hello
         target: /tmp
     provision:
-      # -
-        # args: ""
-        # remote_path: "/tmp/hello/hello.sh"
-      # -
-        # args: ""
-        # local_path: "ls -l /tmp/"
-      # - args: ""
-        # remote_path: "sudo service jetty restart"
-      - args: ""
-        remote_path: "/tmp/hello/jetty.sh"
+      - remote_path: /tmp/hello/jetty.sh
+        args: ""
   providers:
     aws:
       attributes:
@@ -31,6 +23,7 @@ german-dployr:
             security_groups:
               - sg-3cf3e45e # lib_aws_saopaulo
             subnet_id: subnet-1eebe07c
+            #public_ip: new
     gce:
       attributes:
         instance_type: f1-micro
@@ -39,3 +32,4 @@ german-dployr:
           attributes:
             image_name: centos-base-v7 # centos-base-v7
             network: liberty-gce
+            #public_ip: 146.148.27.56

data/spec/fixtures/hello/createExecUser.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+createExecUser() {
+	USERNAME=$1
+	shift
+	DIRECTORIES=$@
+
+	NOLOGIN_PATH=$(which nologin)
+	sudo useradd -M -U -s $NOLOGIN_PATH $USERNAME
+	for dir in $DIRECTORIES; do
+		if [ ! -d $dir ]
+		then
+			sudo mkdir $dir
+		fi
+		echo "Change owner to $dir ..."
+		sudo chown -R ${USERNAME}:${USERNAME} $dir
+	done
+}

data/spec/fixtures/hello/jetty

@@ -0,0 +1,562 @@
+#!/usr/bin/env bash  
+#
+# Startup script for jetty under *nix systems (it works under NT/cygwin too).
+
+##################################################
+# Set the name which is used by other variables.
+# Defaults to the file name without extension.
+##################################################
+NAME=$(echo $(basename $0) | sed -e 's/^[SK][0-9]+//' -e 's/\.sh$//')
+
+# To get the service to restart correctly on reboot, uncomment below (3 lines):
+# ========================
+# chkconfig: 3 99 99
+# description: Jetty 9 webserver
+# processname: jetty
+# ========================
+
+# Configuration files
+#
+# /etc/default/$NAME
+#   If it exists, this is read at the start of script. It may perform any 
+#   sequence of shell commands, like setting relevant environment variables.
+#
+# $HOME/.$NAMErc (e.g. $HOME/.jettyrc)
+#   If it exists, this is read at the start of script. It may perform any 
+#   sequence of shell commands, like setting relevant environment variables.
+#
+# /etc/$NAME.conf
+#   If found, and no configurations were given on the command line,
+#   the file will be used as this script's configuration. 
+#   Each line in the file may contain:
+#     - A comment denoted by the pound (#) sign as first non-blank character.
+#     - The path to a regular file, which will be passed to jetty as a 
+#       config.xml file.
+#     - The path to a directory. Each *.xml file in the directory will be
+#       passed to jetty as a config.xml file.
+#     - All other lines will be passed, as-is to the start.jar
+#
+#   The files will be checked for existence before being passed to jetty.
+#
+# Configuration variables
+#
+# JAVA
+#   Command to invoke Java. If not set, java (from the PATH) will be used.
+#
+# JAVA_OPTIONS
+#   Extra options to pass to the JVM
+#
+# JETTY_HOME
+#   Where Jetty is installed. If not set, the script will try go
+#   guess it by first looking at the invocation path for the script,
+#   and then by looking in standard locations as $HOME/opt/jetty
+#   and /opt/jetty. The java system property "jetty.home" will be
+#   set to this value for use by configure.xml files, f.e.:
+#
+#    <Arg><Property name="jetty.home" default="."/>/webapps/jetty.war</Arg>
+#
+# JETTY_BASE
+#   Where your Jetty base directory is.  If not set, the value from
+#   $JETTY_HOME will be used.
+#
+# JETTY_RUN
+#   Where the $NAME.pid file should be stored. It defaults to the
+#   first available of /var/run, /usr/var/run, JETTY_BASE and /tmp
+#   if not set.
+#  
+# JETTY_PID
+#   The Jetty PID file, defaults to $JETTY_RUN/$NAME.pid
+#   
+# JETTY_ARGS
+#   The default arguments to pass to jetty.
+#   For example
+#      JETTY_ARGS=jetty.host=0.0.0.0 jetty.port=8080 jetty.spdy.port=8443 jetty.secure.port=443
+#
+# JETTY_USER
+#   if set, then used as a username to run the server as
+
+JETTY_HOME=/opt/jetty
+JETTY_USER=jetty
+JETTY_PORT=8080
+JETTY_LOGS=/var/log/jetty/
+
+usage()
+{
+    echo "Usage: ${0##*/} [-d] {start|stop|run|restart|check|supervise} [ CONFIGS ... ] "
+    exit 1
+}
+
+[ $# -gt 0 ] || usage
+
+
+##################################################
+# Some utility functions
+##################################################
+findDirectory()
+{
+  local L OP=$1
+  shift
+  for L in "$@"; do
+    [ "$OP" "$L" ] || continue 
+    printf %s "$L"
+    break
+  done 
+}
+
+running()
+{
+  local PID=$(cat "$1" 2>/dev/null) || return 1
+  kill -0 "$PID" 2>/dev/null
+}
+
+started()
+{
+  # wait for 60s to see "STARTED" in PID file, needs jetty-started.xml as argument
+  for T in 1 2 3 4 5 6 7 9 10 11 12 13 14 15 
+  do
+    sleep 4
+    [ -z "$(grep STARTED $1 2>/dev/null)" ] || return 0
+    [ -z "$(grep STOPPED $1 2>/dev/null)" ] || return 1
+    [ -z "$(grep FAILED $1 2>/dev/null)" ] || return 1
+    local PID=$(cat "$2" 2>/dev/null) || return 1
+    kill -0 "$PID" 2>/dev/null || return 1
+    echo -n ". "
+  done
+
+  return 1;
+}
+
+
+readConfig()
+{
+  (( DEBUG )) && echo "Reading $1.."
+  source "$1"
+}
+
+
+
+##################################################
+# Get the action & configs
+##################################################
+CONFIGS=()
+NO_START=0
+DEBUG=0
+
+while [[ $1 = -* ]]; do
+  case $1 in
+    -d) DEBUG=1 ;;
+  esac
+  shift
+done
+ACTION=$1
+shift
+
+##################################################
+# Read any configuration files
+##################################################
+ETC=/etc
+if [ $UID != 0 ]
+then 
+  ETC=$HOME/etc
+fi
+
+for CONFIG in $ETC/default/${NAME}{,9} $HOME/.${NAME}rc; do
+  if [ -f "$CONFIG" ] ; then 
+    readConfig "$CONFIG"
+  fi
+done
+
+
+##################################################
+# Set tmp if not already set.
+##################################################
+TMPDIR=${TMPDIR:-/tmp}
+
+##################################################
+# Jetty's hallmark
+##################################################
+JETTY_INSTALL_TRACE_FILE="start.jar"
+
+
+##################################################
+# Try to determine JETTY_HOME if not set
+##################################################
+if [ -z "$JETTY_HOME" ] 
+then
+  JETTY_SH=$0
+  case "$JETTY_SH" in
+    /*)     JETTY_HOME=${JETTY_SH%/*/*} ;;
+    ./*/*)  JETTY_HOME=${JETTY_SH%/*/*} ;;
+    ./*)    JETTY_HOME=.. ;;
+    */*/*)  JETTY_HOME=./${JETTY_SH%/*/*} ;;
+    */*)    JETTY_HOME=. ;;
+    *)      JETTY_HOME=.. ;;
+  esac
+
+  if [ ! -f "$JETTY_HOME/$JETTY_INSTALL_TRACE_FILE" ]
+  then 
+    JETTY_HOME=
+  fi
+fi
+
+
+##################################################
+# No JETTY_HOME yet? We're out of luck!
+##################################################
+if [ -z "$JETTY_HOME" ]; then
+  echo "** ERROR: JETTY_HOME not set, you need to set it or install in a standard location" 
+  exit 1
+fi
+
+cd "$JETTY_HOME"
+JETTY_HOME=$PWD
+
+
+##################################################
+# Set JETTY_BASE 
+##################################################
+if [ -z "$JETTY_BASE" ]; then
+  JETTY_BASE=$JETTY_HOME
+fi
+
+cd "$JETTY_BASE"
+JETTY_BASE=$PWD
+
+
+#####################################################
+# Check that jetty is where we think it is
+#####################################################
+if [ ! -r "$JETTY_HOME/$JETTY_INSTALL_TRACE_FILE" ] 
+then
+  echo "** ERROR: Oops! Jetty doesn't appear to be installed in $JETTY_HOME"
+  echo "** ERROR:  $JETTY_HOME/$JETTY_INSTALL_TRACE_FILE is not readable!"
+  exit 1
+fi
+
+##################################################
+# Try to find this script's configuration file,
+# but only if no configurations were given on the
+# command line.
+##################################################
+if [ -z "$JETTY_CONF" ] 
+then
+  if [ -f $ETC/${NAME}.conf ]
+  then
+    JETTY_CONF=$ETC/${NAME}.conf
+  elif [ -f "$JETTY_BASE/etc/jetty.conf" ]
+  then
+    JETTY_CONF=$JETTY_BASE/etc/jetty.conf
+  elif [ -f "$JETTY_HOME/etc/jetty.conf" ]
+  then
+    JETTY_CONF=$JETTY_HOME/etc/jetty.conf
+  fi
+fi
+
+##################################################
+# Get the list of config.xml files from jetty.conf
+##################################################
+if [ -f "$JETTY_CONF" ] && [ -r "$JETTY_CONF" ] 
+then
+  while read -r CONF
+  do
+    if expr "$CONF" : '#' >/dev/null ; then
+      continue
+    fi
+
+    if [ -d "$CONF" ] 
+    then
+      # assume it's a directory with configure.xml files
+      # for example: /etc/jetty.d/
+      # sort the files before adding them to the list of JETTY_ARGS
+      for XMLFILE in "$CONF/"*.xml
+      do
+        if [ -r "$XMLFILE" ] && [ -f "$XMLFILE" ] 
+        then
+          JETTY_ARGS+=("$XMLFILE")
+        else
+          echo "** WARNING: Cannot read '$XMLFILE' specified in '$JETTY_CONF'" 
+        fi
+      done
+    else
+      # assume it's a command line parameter (let start.jar deal with its validity)
+      JETTY_ARGS+=("$CONF")
+    fi
+  done < "$JETTY_CONF"
+fi
+
+#####################################################
+# Find a location for the pid file
+#####################################################
+if [ -z "$JETTY_RUN" ] 
+then
+  JETTY_RUN=$(findDirectory -w /var/run /usr/var/run $JETTY_BASE /tmp)
+fi
+
+#####################################################
+# Find a pid and state file
+#####################################################
+if [ -z "$JETTY_PID" ] 
+then
+  JETTY_PID="$JETTY_RUN/${NAME}.pid"
+fi
+
+if [ -z "$JETTY_STATE" ] 
+then
+  JETTY_STATE=$JETTY_BASE/${NAME}.state
+fi
+JAVA_OPTIONS+=("-Djetty.state=$JETTY_STATE")
+rm -f $JETTY_STATE
+
+##################################################
+# Setup JAVA if unset
+##################################################
+if [ -z "$JAVA" ]
+then
+  JAVA=$(which java)
+fi
+
+if [ -z "$JAVA" ]
+then
+  echo "Cannot find a Java JDK. Please set either set JAVA or put java (>=1.5) in your PATH." 2>&2
+  exit 1
+fi
+
+#####################################################
+# See if JETTY_LOGS is defined
+#####################################################
+if [ -z "$JETTY_LOGS" ] && [ -d $JETTY_BASE/logs ] 
+then
+  JETTY_LOGS=$JETTY_BASE/logs
+fi
+if [ -z "$JETTY_LOGS" ] && [ -d $JETTY_HOME/logs ] 
+then
+  JETTY_LOGS=$JETTY_HOME/logs
+fi
+if [ "$JETTY_LOGS" ]
+then
+  JAVA_OPTIONS+=("-Djetty.logs=$JETTY_LOGS")
+fi
+
+#####################################################
+# Are we running on Windows? Could be, with Cygwin/NT.
+#####################################################
+case "`uname`" in
+CYGWIN*) PATH_SEPARATOR=";";;
+*) PATH_SEPARATOR=":";;
+esac
+
+
+#####################################################
+# Add jetty properties to Java VM options.
+#####################################################
+JAVA_OPTIONS+=("-Djetty.home=$JETTY_HOME" "-Djetty.base=$JETTY_BASE" "-Djava.io.tmpdir=$TMPDIR")
+
+#####################################################
+# This is how the Jetty server will be started
+#####################################################
+
+JETTY_START=$JETTY_HOME/start.jar
+START_INI=$JETTY_BASE/start.ini
+if [ ! -f "$START_INI" ]
+then
+  echo "Cannot find a start.ini in your JETTY_BASE directory: $JETTY_BASE" 2>&2
+  exit 1
+fi
+
+RUN_ARGS=(${JAVA_OPTIONS[@]} -jar "$JETTY_START" ${JETTY_ARGS[*]})
+RUN_CMD=("$JAVA" ${RUN_ARGS[@]})
+
+#####################################################
+# Comment these out after you're happy with what 
+# the script is doing.
+#####################################################
+if (( DEBUG ))
+then
+  echo "START_INI      =  $START_INI"
+  echo "JETTY_HOME     =  $JETTY_HOME"
+  echo "JETTY_BASE     =  $JETTY_BASE"
+  echo "JETTY_CONF     =  $JETTY_CONF"
+  echo "JETTY_PID      =  $JETTY_PID"
+  echo "JETTY_START    =  $JETTY_START"
+  echo "JETTY_ARGS     =  ${JETTY_ARGS[*]}"
+  echo "JAVA_OPTIONS   =  ${JAVA_OPTIONS[*]}"
+  echo "JAVA           =  $JAVA"
+  echo "RUN_CMD        =  ${RUN_CMD}"
+fi
+
+##################################################
+# Do the action
+##################################################
+case "$ACTION" in
+  start)
+    echo -n "Starting Jetty: "
+
+    if (( NO_START )); then 
+      echo "Not starting ${NAME} - NO_START=1";
+      exit
+    fi
+
+    if [ $UID -eq 0 ] && type start-stop-daemon > /dev/null 2>&1 
+    then
+      unset CH_USER
+      if [ -n "$JETTY_USER" ]
+      then
+        CH_USER="-c$JETTY_USER"
+      fi
+
+      start-stop-daemon -S -p"$JETTY_PID" $CH_USER -d"$JETTY_HOME" -b -m -a "$JAVA" -- "${RUN_ARGS[@]}" --daemon
+
+    else
+
+      if [ -f "$JETTY_PID" ]
+      then
+        if running $JETTY_PID
+        then
+          echo "Already Running!"
+          exit 1
+        else
+          # dead pid file - remove
+          rm -f "$JETTY_PID"
+        fi
+      fi
+
+      if [ "$JETTY_USER" ] 
+      then
+        touch "$JETTY_PID"
+        chown "$JETTY_USER" "$JETTY_PID"
+        # FIXME: Broken solution: wordsplitting, pathname expansion, arbitrary command execution, etc.
+        su - "$JETTY_USER" -c "
+          exec ${RUN_CMD[*]} --daemon &
+          disown \$!
+          echo \$! > '$JETTY_PID'"
+      else
+        "${RUN_CMD[@]}" &
+        disown $!
+        echo $! > "$JETTY_PID"
+      fi
+
+    fi
+
+    if expr "${JETTY_ARGS[*]}" : '.*jetty-started.xml.*' >/dev/null
+    then
+      if started "$JETTY_STATE" "$JETTY_PID"
+      then
+        echo "OK `date`"
+      else
+        echo "FAILED `date`"
+      fi
+    else
+      echo "ok `date`"
+    fi
+
+    ;;
+
+  stop)
+    echo -n "Stopping Jetty: "
+    if [ $UID -eq 0 ] && type start-stop-daemon > /dev/null 2>&1; then
+      start-stop-daemon -K -p"$JETTY_PID" -d"$JETTY_HOME" -a "$JAVA" -s HUP
+      
+      TIMEOUT=30
+      while running "$JETTY_PID"; do
+        if (( TIMEOUT-- == 0 )); then
+          start-stop-daemon -K -p"$JETTY_PID" -d"$JETTY_HOME" -a "$JAVA" -s KILL
+        fi
+
+        sleep 1
+      done
+
+      rm -f "$JETTY_PID"
+      echo OK
+    else
+      PID=$(cat "$JETTY_PID" 2>/dev/null)
+      kill "$PID" 2>/dev/null
+      
+      TIMEOUT=30
+      while running $JETTY_PID; do
+        if (( TIMEOUT-- == 0 )); then
+          kill -KILL "$PID" 2>/dev/null
+        fi
+
+        sleep 1
+      done
+
+      rm -f "$JETTY_PID"
+      echo OK
+    fi
+
+    ;;
+
+  restart)
+    JETTY_SH=$0
+    if [ ! -f $JETTY_SH ]; then
+      if [ ! -f $JETTY_HOME/bin/jetty.sh ]; then
+        echo "$JETTY_HOME/bin/jetty.sh does not exist."
+        exit 1
+      fi
+      JETTY_SH=$JETTY_HOME/bin/jetty.sh
+    fi
+
+    "$JETTY_SH" stop "$@"
+    "$JETTY_SH" start "$@"
+
+    ;;
+
+  supervise)
+    #
+    # Under control of daemontools supervise monitor which
+    # handles restarts and shutdowns via the svc program.
+    #
+    exec "${RUN_CMD[@]}"
+
+    ;;
+
+  run|demo)
+    echo "Running Jetty: "
+
+    if [ -f "$JETTY_PID" ]
+    then
+      if running "$JETTY_PID"
+      then
+        echo "Already Running!"
+        exit 1
+      else
+        # dead pid file - remove
+        rm -f "$JETTY_PID"
+      fi
+    fi
+
+    exec "${RUN_CMD[@]}"
+    ;;
+
+  check|status)
+    echo "Checking arguments to Jetty: "
+    echo "START_INI      =  $START_INI"
+    echo "JETTY_HOME     =  $JETTY_HOME"
+    echo "JETTY_BASE     =  $JETTY_BASE"
+    echo "JETTY_CONF     =  $JETTY_CONF"
+    echo "JETTY_PID      =  $JETTY_PID"
+    echo "JETTY_START    =  $JETTY_START"
+    echo "JETTY_LOGS     =  $JETTY_LOGS"
+    echo "CLASSPATH      =  $CLASSPATH"
+    echo "JAVA           =  $JAVA"
+    echo "JAVA_OPTIONS   =  ${JAVA_OPTIONS[*]}"
+    echo "JETTY_ARGS     =  ${JETTY_ARGS[*]}"
+    echo "RUN_CMD        =  ${RUN_CMD[*]}"
+    echo
+    
+    if [ -f "$JETTY_PID" ]
+    then
+      echo "Jetty running pid=$(< "$JETTY_PID")"
+      exit 0
+    fi
+    exit 1
+
+    ;;
+
+  *)
+    usage
+
+    ;;
+esac
+
+exit 0

data/spec/fixtures/hello/jetty.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+source /tmp/hello/createExecUser.sh
+
+# Install JRE 1.7
+# sudo yum install java-1.7.0-openjdk.x86_64 -y
+# sudo alternatives --set java /usr/lib/jvm/jre-1.7.0-openjdk.x86_64/bin/java
+
+# Install & Run Jetty
+if [ ! -d /opt/jetty ]
+then
+	#wget http://download.eclipse.org/jetty/9.1.1.v20140108/dist/jetty-distribution-9.1.1.v20140108.tar.gz -O jetty.tar.gz
+	#wget http://cdn.mirror.garr.it/mirror3/mirrors/eclipse//jetty/9.1.0.v20131115/dist/jetty-distribution-9.1.0.v20131115.tar.gz -O jetty.tar.gz
+	wget http://eclipse.mirror.triple-it.nl/jetty/stable-9/dist/jetty-distribution-9.1.4.v20140401.tar.gz -O jetty.tar.gz
+	tar -xf jetty.tar.gz 
+	rm jetty.tar.gz
+	mv jetty-* jetty
+	sudo mv jetty /opt/
+	sudo /usr/sbin/useradd jetty
+	sudo mkdir /var/log/jetty
+	sudo chown -R jetty:jetty /var/log/jetty /opt/jetty
+fi
+	
+sudo cp /tmp/hello/jetty /etc/init.d
+sudo chmod a+x /etc/init.d/jetty
+sudo chkconfig --add jetty
+sudo chkconfig jetty on
+sudo service jetty restart
+	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dployr
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tomas Aparicio
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -139,6 +139,7 @@ files:
 - lib/dployr/commands/stop_destroy.rb
 - lib/dployr/commands/utils.rb
 - lib/dployr/compute/aws.rb
+- lib/dployr/compute/common.rb
 - lib/dployr/compute/gce.rb
 - lib/dployr/config/constants.rb
 - lib/dployr/config/create.rb
@@ -155,14 +156,19 @@ files:
 - lib/dployr/scripts/ssh.rb
 - lib/dployr/utils.rb
 - lib/dployr/version.rb
+- spec/commands_config_spec.rb
 - spec/commands_util_spec.rb
 - spec/config_file_utils_spec.rb
 - spec/config_instance_spec.rb
 - spec/configuration_spec.rb
 - spec/fixtures/Dployrfile
 - spec/fixtures/Dployrfile.yml
-- spec/fixtures/config/Dployrfile.yml
-- spec/fixtures/config/hello/hello.sh
+- spec/fixtures/basic/Dployrfile.yml
+- spec/fixtures/german/Dployrfile.yml
+- spec/fixtures/hello/createExecUser.sh
+- spec/fixtures/hello/hello.sh
+- spec/fixtures/hello/jetty
+- spec/fixtures/hello/jetty.sh
 - spec/fog_spec_.rb
 - spec/init_spec.rb
 - spec/spec_helper.rb
@@ -188,19 +194,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dployr
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Multicloud management and deployment with asteroids made simple
 test_files:
+- spec/commands_config_spec.rb
 - spec/commands_util_spec.rb
 - spec/config_file_utils_spec.rb
 - spec/config_instance_spec.rb
 - spec/configuration_spec.rb
 - spec/fixtures/Dployrfile
 - spec/fixtures/Dployrfile.yml
-- spec/fixtures/config/Dployrfile.yml
-- spec/fixtures/config/hello/hello.sh
+- spec/fixtures/basic/Dployrfile.yml
+- spec/fixtures/german/Dployrfile.yml
+- spec/fixtures/hello/createExecUser.sh
+- spec/fixtures/hello/hello.sh
+- spec/fixtures/hello/jetty
+- spec/fixtures/hello/jetty.sh
 - spec/fog_spec_.rb
 - spec/init_spec.rb
 - spec/spec_helper.rb