dployr 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b382202193f87d485df3e630d80d00fe16757356
-  data.tar.gz: 84199d78c073963b72f65d641442bbf32e2cdf2c
+  metadata.gz: 901f079e84371186e545d8c438b618e84ff8d711
+  data.tar.gz: 4abb4a9493c968a60b52337d4a92c0fa83de4128
 SHA512:
-  metadata.gz: 7fe63977dac1afc5eaa20966a9500dee3c25af05ddbce63f9056d7376779f9b3a72ab2f72db8d190e5c62b486d0af13ac09e7f78890c8c3fc51cea0bf750ab28
-  data.tar.gz: 67406e12e53495591bb9e83066519adaf7d9a66c208e6d79c3e2b9a9bc1c324461f382bb664a9e76d90c57378525d6dc0ef145f1376e0222ba3a953b003bd5cb
+  metadata.gz: f8f663dcc49d7d2cd944d9001ca96d9f75b80989add9ce2fc0c529723f656f81516cc23da40026afb2b93aeb397438163a79327b84fe45539f4f1df12f4d7f67
+  data.tar.gz: 2f946f5046e40ca1acd16410df0731276dc08a5561ccff27b166146cc1c3d3bae5c736ddfe12ecc8a8f4a9157d22072b60848ad6814689539ebc79aa72dadad0

data/.gitignore

@@ -4,4 +4,5 @@ Gemfile.lock
 pkg/*
 .rvmrc
 .ruby-version
-coverage/*
+coverage/*
+.project

data/README.md

@@ -37,78 +37,15 @@ spec.add_dependency 'dployr', '>= 0.0.1'
 gem 'dployr', '>= 0.0.1'
 ```
 
-## Usage
+## Documentation
 
-### Command-line interface
-
-```
-Usage: dployr <command> [options]
-
-Commands
-
-  up        start instances
-  halt      stop instances
-  status    retrieve the instances status
-  test      run remote test in instances
-  deploy    start, provision and test running instances
-  provision instance provisioning
-  config    generate configuration in YAML format
-  init      create a sample Dployrfile
-
-Options
-
-  -e, --environment ENV            environment to pass to the instances
-  -n, --name NAME                  template name identifier to load
-  -a, --attributes ATTRS           aditional attributes to pass to the configuration in matrix query format
-  -p, --provider                   provider to use (allow multiple values comma-separated)
-  -r, --region                     region to use (allow multiple values comma-separated)
-  -h, --help                       help
-
-```
-
-### Programmatic API
-
-```ruby
-Dployr::configure do |dployr|
-
-  dployr.config.add_instance({
-    attributes: {
-      name: "example",
-      instance_type: "m1.small",
-      version: "${VERSION}"
-    },
-    scripts: [
-      { path: "configure.sh" }
-    ],
-    providers: {
-      aws: {
-        attributes: {
-          network_id: "be457fca",
-          instance_type: "m1.small",
-          "type-%{name}" => "small"
-        },
-        regions: {
-          "eu-west-1a" => {
-            attributes: {
-              keypair: "vagrant-aws-ireland"
-            },
-            scripts: [
-              { path: "router.sh", args: ["%{name}", "${region}", "${provider}"] }
-            ]
-          }
-        }
-      }
-    }
-  })
-
-end
-```
+Dployr documentation and API is available from [RubyDoc][rubydoc]
 
 ## Features
 
 `To do! but all will be cool :)`
 
-## Configuration file
+## Configuration
 
 Configuration file must be called `Dployrfile`. It can be also a standard Ruby file
 or a YAML file (adding the `.yml` or `.yaml` extension)
@@ -238,6 +175,71 @@ custom:
 
 ```
 
+## Command-line interface
+
+```
+Usage: dployr <command> [options]
+
+Commands
+
+  up        start instances
+  halt      stop instances
+  status    retrieve the instances status
+  test      run remote test in instances
+  deploy    start, provision and test running instances
+  provision instance provisioning
+  config    generate configuration in YAML format
+  init      create a sample Dployrfile
+
+Options
+
+  -e, --environment ENV            environment to pass to the instances
+  -n, --name NAME                  template name identifier to load
+  -a, --attributes ATTRS           aditional attributes to pass to the configuration in matrix query format
+  -p, --provider                   provider to use (allow multiple values comma-separated)
+  -r, --region                     region to use (allow multiple values comma-separated)
+  -h, --help                       help
+
+```
+
+## Programmatic API
+
+```ruby
+Dployr::configure do |dployr|
+
+  dployr.config.add_instance({
+    attributes: {
+      name: "example",
+      instance_type: "m1.small",
+      version: "${VERSION}"
+    },
+    scripts: [
+      { path: "configure.sh" }
+    ],
+    providers: {
+      aws: {
+        attributes: {
+          network_id: "be457fca",
+          instance_type: "m1.small",
+          "type-%{name}" => "small"
+        },
+        regions: {
+          "eu-west-1a" => {
+            attributes: {
+              keypair: "vagrant-aws-ireland"
+            },
+            scripts: [
+              { path: "router.sh", args: ["%{name}", "${region}", "${provider}"] }
+            ]
+          }
+        }
+      }
+    }
+  })
+
+end
+```
+
 ## Contributing
 
 Feel free to report any issue you experiment via Github issues.
@@ -291,4 +293,5 @@ $ rake release
 [gemnasium]: https://gemnasium.com/innotech/dployr
 [gem]: http://rubygems.org/gems/dployr
 [ruby-guide]: https://github.com/bbatsov/ruby-style-guide
-[rspec-test]: http://betterspecs.org/
+[rspec-best]: http://betterspecs.org/
+[rubydoc]: http://www.rubydoc.info/gems/dployr/

data/bin/dployr

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 $LOAD_PATH.push File.expand_path("../../lib", __FILE__)
-require 'dployr/cli/cli'
+require 'dployr/cli'

data/config/Dployrfile.yml

@@ -0,0 +1,30 @@
+german-dployr:
+  attributes:
+    name: "german-dployr"
+    prefix: dev
+    private_key_path: ~/pems/innotechdev.pem
+    username: innotechdev
+  scripts:
+    pre-provision:
+      -
+        source: ./hello
+        target: /tmp
+    provision:
+      -
+        args: ""
+        path: "/tmp/hello/hello.sh"
+      -
+        args: ""
+        path: "ls -l /tmp" 
+  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

data/config/hello/hello.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+echo hello
+echo hola >&2
+exit 0

data/dployr.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version     = Dployr::VERSION
   s.summary     = "Multicloud management and deployment with asteroids made simple"
   s.description = "Multicloud management and deployment with asteroids made simple with a rich programmatic API and featured CLI"
-  s.authors     = ["Tomas Aparicio"]
+  s.authors     = ["Tomas Aparicio", "German Ramos"]
   s.email       = ["nerds@innotechapp.com"]
   s.homepage    = "https://github.com/innotech/dployr"
   s.license     = "MIT"
@@ -21,6 +21,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency "fog", "~> 1.21"
   s.add_dependency "deep_merge", "~> 1.0"
+  s.add_dependency "net-ssh", "~> 2.8.0"
+  s.add_dependency "net-scp", "~> 1.2.0"
+  s.add_dependency "colorize", "~> 0.7.2"
 
   s.add_development_dependency "rake", "~> 10"
   s.add_development_dependency "rspec", "~> 2"

data/lib/dployr/{cli/cli.rb → cli.rb}

@@ -1,7 +1,6 @@
 require 'optparse'
 require 'dployr'
 require 'dployr/version'
-require 'dployr/cli/commands'
 
 command = ARGV[0]
 options = {}
@@ -11,37 +10,38 @@ opt_parser = OptionParser.new do |opt|
   opt.separator  ""
   opt.separator  "  Commands"
   opt.separator  ""
-  opt.separator  "    up        start instances"
+  opt.separator  "    start     start instances"
   opt.separator  "    halt      stop instances"
   opt.separator  "    destroy   destroy instances"
   opt.separator  "    status    retrieve the instances status"
   opt.separator  "    test      run remote test in instances"
   opt.separator  "    deploy    start, provision and test running instances"
   opt.separator  "    provision instance provisioning"
-  opt.separator  "    config    generate configuration in YAML format"
+  opt.separator  "    config    generate configuration in YAML from Dployrfile"
+  opt.separator  "    execute   run custom stages"
   opt.separator  "    init      create a sample Dployrfile"
   opt.separator  ""
   opt.separator  "  Options"
   opt.separator  ""
 
-  opt.on("-e", "--environment ENV", "environment to pass to the instances") do |v|
-    options[:environment] = v
-  end
-
   opt.on("-n", "--name NAME", "template name identifier to load") do |v|
     options[:name] = v
   end
 
+  opt.on("-f", "--file PATH", "custom config file path to load") do |v|
+    options[:file] = v
+  end
+
   opt.on("-a", "--attributes ATTRS", "aditional attributes to pass to the configuration in matrix query format") do |v|
     options[:attributes] = v
   end
 
-  opt.on("-p", "--provider", "provider to use (allow multiple values comma-separated)") do |v|
+  opt.on("-p", "--provider VALUES", "provider to use (allow multiple values comma-separated)") do |v|
     options[:provider] = v
   end
 
-  opt.on("-r", "--region", "region to use (allow multiple values comma-separated)") do |v|
-    options[:provider] = v
+  opt.on("-r", "--region REGION", "region to use (allow multiple values comma-separated)") do |v|
+    options[:region] = v
   end
 
   opt.on("-v",  "-V", "--version", "version") do
@@ -50,6 +50,7 @@ opt_parser = OptionParser.new do |opt|
 
   opt.on("-h", "--help", "help") do
     puts opt_parser
+    exit 0
   end
 
   opt.separator  ""
@@ -57,21 +58,35 @@ end
 
 opt_parser.parse!
 
+dployr = Dployr::Init.new @attributes
+dployr.load_config options[:file]     
+config = dployr.config.get_region(options[:name], options[:provider], options[:region])
+
 case command
-when "up"
-  puts "Command currently not available"
+when "start"
+  Dployr::Commands::Start.new(config, options)
 when "halt"
-  puts "Command currently not available"
+  Dployr::Commands::Stop_Destroy.new(config, options, "halt")
+when "destroy"
+  Dployr::Commands::Stop_Destroy.new(config, options, "destroy")
 when "status"
   puts "Command currently not available"
 when "provision"
-  puts "Command currently not available"
+  Dployr::Commands::Provision_Test.new(config, options, "provision")
 when "test"
-  puts "Command currently not available"
+  Dployr::Commands::Provision_Test.new(config, options, "test")
 when "deploy"
-  puts "Command currently not available"
+  Dployr::Commands::Start.new(config, options)
+  Dployr::Commands::Provision_Test.new(config, options, "provision")
+  Dployr::Commands::Provision_Test.new(config, options, "test")
+when "execute"
+  Dployr::Commands::Execute.new(config, options, ARGV[1..-1])
 when "config"
-  Dployr::CLI::Config.new options
+  Dployr::Commands::Config.new(config, options)
 when "init"
   Dployr::Config::Create.write_file
+when '-h', '--help', 'help'
+  # help already showed by option
+else
+  puts opt_parser
 end

data/lib/dployr/commands/config.rb

@@ -0,0 +1,24 @@
+require 'logger'
+require 'dployr/utils'
+require 'dployr/compute/aws'
+require 'colorize'
+
+module Dployr
+  module Commands
+    class Config
+
+      include Dployr::Utils
+
+      def initialize(config, options)
+        begin
+          puts "Options:", options.to_yaml
+          puts "\nConfig:", config.to_yaml
+        rescue Exception => e
+          @log.error e
+          Process.exit! false
+        end
+      end
+      
+    end
+  end
+end

data/lib/dployr/commands/execute.rb

@@ -0,0 +1,43 @@
+require 'logger'
+require 'dployr/utils'
+require 'dployr/compute/aws'
+require 'colorize'
+
+module Dployr
+  module Commands
+    class Execute
+
+      include Dployr::Utils
+
+      def initialize(config, options, stages)
+        begin
+          @log = Logger.new STDOUT     
+          @name = config[:attributes]["name"]
+          @provider = options[:provider].upcase
+          @region = options[:region]
+          @attributes = config[:attributes]
+
+          puts "Connecting to #{@provider}...".yellow
+          @client = Dployr::Compute.const_get(@provider.to_sym).new(@region)
+          
+          puts "Looking for #{@name} in #{@region}...".yellow
+          @ip = @client.get_ip(@name)
+          if @ip
+            puts "#{@name} found with IP #{@ip}".yellow
+          else
+            raise "#{@name} not found"
+          end
+          
+          stages.each do |stage|
+            Dployr::Scripts::Hook.new @ip, config, stage
+          end
+          
+        rescue Exception => e
+          @log.error e
+          Process.exit! false
+        end
+      end
+
+    end
+  end
+end

data/lib/dployr/commands/provision_test.rb

@@ -0,0 +1,45 @@
+require 'logger'
+require 'dployr/utils'
+require 'dployr/compute/aws'
+require 'colorize'
+
+module Dployr
+  module Commands
+    class Provision_Test
+
+      include Dployr::Utils
+
+      def initialize(config, options, action)
+        begin
+          @log = Logger.new STDOUT     
+          @name = config[:attributes]["name"]
+          @provider = options[:provider].upcase
+          @region = options[:region]
+          @attributes = config[:attributes]
+          @action = action
+
+          puts "Connecting to #{@provider}...".yellow
+          @client = Dployr::Compute.const_get(@provider.to_sym).new(@region)
+          
+          puts "Looking for #{@name} in #{@region}...".yellow
+          @ip = @client.get_ip(@name)
+          if @ip
+            puts "#{@name} found with IP #{@ip}".yellow
+          else
+            raise "#{@name} not found"
+          end
+          
+          Dployr::Scripts::Default_Hooks.new @ip, config, @action, self
+          
+        rescue Exception => e
+          @log.error e
+          Process.exit! false
+        end
+      end
+
+      def action
+        return @ip
+      end
+    end
+  end
+end

data/lib/dployr/commands/start.rb

@@ -0,0 +1,46 @@
+require 'logger'
+require 'dployr/utils'
+require 'dployr/compute/aws'
+require 'colorize'
+
+module Dployr
+  module Commands
+    class Start
+
+      include Dployr::Utils
+
+      def initialize(config, options)
+        begin
+          @log = Logger.new STDOUT      
+          @name = config[:attributes]["name"]
+          @provider = options[:provider].upcase
+          @region = options[:region]
+          @attributes = config[:attributes]
+
+          puts "Connecting to #{@provider}...".yellow
+          @client = Dployr::Compute.const_get(@provider.to_sym).new(@region)
+                 
+          puts "Looking for #{@name} in #{@region}...".yellow
+          @ip = @client.get_ip(@name)  
+         
+          Dployr::Scripts::Default_Hooks.new @ip, config, "start", self
+         
+        rescue Exception => e
+          @log.error e
+          Process.exit! false
+        end
+      end
+      
+      def action
+        if @ip
+          puts "#{@name} found with IP #{@ip}".yellow
+        else
+          @ip = @client.start(@attributes, @region)
+          puts "Startded instance for #{@name} in #{@region} with IP #{@ip} succesfully".yellow
+        end
+        return @ip
+      end
+      
+    end
+  end
+end

data/lib/dployr/commands/stop_destroy.rb

@@ -0,0 +1,49 @@
+require 'logger'
+require 'dployr/utils'
+require 'dployr/compute/aws'
+require 'colorize'
+
+module Dployr
+  module Commands
+    class Stop_Destroy
+
+      include Dployr::Utils
+
+      def initialize(config, options, action)
+        begin
+          @log = Logger.new STDOUT     
+          @name = config[:attributes]["name"]
+          @provider = options[:provider].upcase
+          @region = options[:region]
+          @attributes = config[:attributes]
+          @action = action
+          
+          puts "Connecting to #{@provider}...".yellow
+          @client = Dployr::Compute.const_get(@provider.to_sym).new(@region)
+          
+          puts "Looking for #{@name} in #{@region}...".yellow
+          @ip = @client.get_ip(@name)
+          if @ip
+            puts "#{@name} found with IP #{@ip}".yellow
+          else
+            puts "#{@name} not found".yellow
+          end
+              
+          Dployr::Scripts::Default_Hooks.new @ip, config, @action, self
+          
+        rescue Exception => e
+          @log.error e
+          Process.exit! false
+        end
+      end
+      
+      def action        
+        puts "#{@action.capitalize}ing #{@name} in #{@region}...".yellow
+        @client.send(@action.to_sym, @name) 
+        puts "#{@name} #{@action}ed sucesfully".yellow
+        return @ip
+      end
+      
+    end
+  end
+end

data/lib/dployr/compute/aws.rb

@@ -0,0 +1,100 @@
+require 'fog'
+require 'net/ssh'
+
+module Dployr
+  module Compute
+    class AWS
+
+        def initialize(region)
+          @options = {
+            region: region[0..-2],
+            provider: 'AWS',
+            aws_access_key_id: ENV["AWS_ACCESS_KEY"],
+            aws_secret_access_key: ENV["AWS_SECRET_KEY"]
+          }
+          @compute = Fog::Compute.new @options
+        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
+          return nil
+        end
+
+        def get_ip(name)
+          instance = get_instance(name, ["running"])
+          if instance
+            return instance.private_ip_address
+          end
+        end
+        
+        def destroy(name)
+          instance = get_instance(name, ["running", "stopped", "stopping"])
+          if instance
+            return instance.destroy
+          end
+          raise "Instance #{name} not found"
+        end
+        
+        def halt(name)
+          instance = get_instance(name, ["running"])
+          if instance
+            return instance.stop
+          end
+          raise "Instance #{name} not found"
+        end
+
+        def start(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 new instance for #{attributes["name"]} in #{region}...".yellow
+            options = {
+              availability_zone: region,
+              flavor_id: attributes["instance_type"],
+              image_id: attributes["ami"],
+              key_name: attributes["keypair"],
+              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
+            end
+          end
+          print "\n"
+          return null
+      end
+
+    end
+  end
+end

data/lib/dployr/config/constants.rb

@@ -2,7 +2,10 @@ module Dployr
   module Config
     module Constants
 
-      FILENAME = "Dployrfile"
+      FILENAME = 'Dployrfile'
+
+      FILENAMES = [FILENAME, 'dployrfile', 'dployr', 'Dployr']
+
       EXTENSIONS = ['rb', 'yml', 'yaml']
 
     end

data/lib/dployr/config/create.rb

@@ -1,8 +1,10 @@
+require 'dployr/config/constants'
+
 module Dployr
   module Config
     module Create
 
-      FILENAME = 'Dployrfile'
+      include Dployr::Config::Constants
 
       RB_CONTENT = <<-EOS
       Dployr::configure do |dployr|

data/lib/dployr/config/file_utils.rb

@@ -20,15 +20,16 @@ module Dployr
       def discover(dir = Dir.pwd)
         [nil].concat(EXTENSIONS).each do |ext|
           (0..5).each do |n|
-            file_name = FILENAME
-            file_name += ".#{ext}" if ext
-            file_path = File.join dir, ('../' * n), file_name
-            if File.exists? file_path
-              return File.expand_path file_path, dir
+            FILENAMES.each do |file|
+              file += ".#{ext}" if ext
+              file_path = File.join dir, ('../' * n), file
+              if File.file? file_path
+                return File.expand_path file_path, dir
+              end
             end
           end
         end
-        nil
+        return nil
       end
 
     end

data/lib/dployr/config/instance.rb

@@ -82,7 +82,7 @@ module Dployr
       end
 
       def set_scripts(scripts)
-        @scripts = scripts if scripts.is_a? Array
+        @scripts = scripts if scripts.is_a? Hash or scripts.is_a? Array
       end
 
       def set_attributes(attrs)

data/lib/dployr/configuration.rb

@@ -20,7 +20,7 @@ module Dployr
     end
 
     def set_default(config)
-      @default = create_instance('default', config) if config.is_a? Hash
+      @default = create_instance 'default', config if config.is_a? Hash
     end
 
     def add_instance(name, config)
@@ -44,7 +44,6 @@ module Dployr
       @instances.each do |i|
         config << get_config(i.name, attributes)
       end
-      puts config
       config
     end
 
@@ -137,7 +136,10 @@ module Dployr
       keys.each do |type|
         current = deep_copy get_by_key(parent, type)
         source = get_by_key child, type
-        if type == :scripts
+        if current and source
+          raise Error.new "Cannot merge different types: #{parent}" if current.class != source.class
+        end
+        if type.to_sym == :scripts and current.is_a? Array
           current = [] unless current.is_a? Array
           current.concat source if source.is_a? Array
           current = current.compact.uniq
@@ -145,7 +147,8 @@ module Dployr
           current = {} unless current.is_a? Hash
           current = deep_merge current, source
         end
-        child[type] = current if current.length
+        child.delete type.to_s unless child[type.to_s].nil?
+        child[type.to_sym] = current if current
       end
       child
     end

data/lib/dployr/init.rb

@@ -27,7 +27,8 @@ module Dployr
 
     include Dployr::Config::FileUtils
 
-    attr_reader :file_path, :config
+    attr_reader :config
+    attr_accessor :file_path
 
     @@instance = nil
 
@@ -35,22 +36,30 @@ module Dployr
       @@instance = self
       @attributes = attributes
       @config = Dployr::Configuration.new
-      @file_path = discover
-      load_file @file_path
+      @file_path = nil
     end
 
     def self.instance
       @@instance
     end
 
+    def load_config(file_path = nil)
+      if file_path
+        @file_path = file_path
+      else
+        @file_path = discover
+      end
+      set_config @file_path
+    end
+
     private
 
-    def load_file(file_path)
-      if file_path.is_a? String
-        if yaml_file? file_path
-          load_yaml file_path
+    def set_config(file_path)
+      if @file_path.is_a? String
+        if yaml_file? @file_path
+          load_yaml @file_path
         else
-          load file_path
+          load @file_path
         end
       end
     end

data/lib/dployr/scripts/default_hooks.rb

@@ -0,0 +1,31 @@
+require 'logger'
+require 'dployr/utils'
+require 'colorize'
+
+module Dployr
+  module Scripts
+    class Default_Hooks
+
+      include Dployr::Utils
+
+      def initialize(ip, config, stage, command)
+        @log = Logger.new STDOUT
+        @config = config
+        @ip = ip
+        @stage = stage
+      
+        if @config[:scripts]["pre-#{@stage}"]
+          Dployr::Scripts::Hook.new @ip, config, "pre-#{@stage}"
+        end
+        @ip = command.action()
+        if @config[:scripts][@stage]
+          Dployr::Scripts::Hook.new @ip, config, "#{@stage}"
+        end
+        if @config[:scripts]["post-#{@stage}"]
+          Dployr::Scripts::Hook.new @ip, config, "#{@stage}"
+        end
+      end
+      
+    end
+  end
+end

data/lib/dployr/scripts/hook.rb

@@ -0,0 +1,38 @@
+require 'logger'
+require 'dployr/utils'
+require 'colorize'
+
+module Dployr
+  module Scripts
+    class Hook
+
+      include Dployr::Utils
+
+      def initialize(ip, instance, stage)
+        @log = Logger.new STDOUT
+        @ip = ip
+        @instance = instance
+        @stage = stage
+        run
+      end
+
+      private
+
+      def run
+        attrs = @instance[:attributes]
+        host = attrs["name"]
+        username = attrs["username"]
+        private_key_path = attrs["private_key_path"]
+
+        puts "STAGE '#{@stage}':".yellow
+        @instance[:scripts][@stage].each do |script|
+          if script["target"]
+            Dployr::Scripts::Scp.new @ip, host, username, private_key_path, script
+          else
+            Dployr::Scripts::Shell.new @ip, host, username, private_key_path, script
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dployr/scripts/scp.rb

@@ -0,0 +1,31 @@
+require 'logger'
+require 'net/scp'
+require 'colorize'
+require 'dployr/utils'
+
+module Dployr
+  module Scripts
+    class Scp
+
+      include Dployr::Utils
+
+      def initialize(ip, host, username, private_key_path, script)
+
+        begin
+          @log = Logger.new STDOUT
+          puts "Connecting to #{host} (SCP)...".yellow
+          Net::SCP.start(ip, username, :keys => [private_key_path]) do |scp|
+            source = script["source"]
+            target = script["target"]
+            puts "Coping #{source} -> #{target}".yellow
+            scp.upload(source, target, :recursive => true, :preserve => true)
+          end
+
+        rescue Exception => e
+          @log.error e
+          raise Error.new "Cannot copy to remote: #{e}"
+        end
+      end
+    end
+  end
+end

data/lib/dployr/scripts/shell.rb

@@ -0,0 +1,86 @@
+require 'logger'
+require 'net/ssh'
+require 'colorize'
+require 'dployr/utils'
+
+module Dployr
+  module Scripts
+    class Shell
+
+      include Dployr::Utils
+
+      def initialize(ip, host, username, private_key_path, script)
+        @log = Logger.new STDOUT
+        @ip = ip
+        @host = host
+        @username = username
+        @private_key_path = private_key_path
+        @script = script
+
+        begin
+          start
+        rescue Exception => e
+          @log.error e
+          Process.exit! false
+        end
+      end
+
+      private
+
+      def start
+        puts "Connecting to #{@host} (SSH)...".yellow
+        Net::SSH.start(@ip, @username, :keys => [@private_key_path]) do |ssh|
+          command = @script["path"]
+          arguments = @script["args"]
+
+          puts "Running remote script '#{command} #{arguments}'".yellow
+          result = ssh_exec!(ssh, command)
+          if result[:exit_code] > 0
+            raise "Exit code #{result[:exit_code]} when running script '#{command} #{arguments}'".yellow
+          else
+            puts "Remote script '#{command} #{arguments}' finished succesfully".yellow
+          end
+        end
+      end
+
+      # http://craiccomputing.blogspot.com.es/2010/08/printing-colored-text-in-unix-terminals.html
+      def ssh_exec!(ssh, command)
+        stdout_data = ""
+        stderr_data = ""
+        exit_code = nil
+        exit_signal = nil
+        ssh.open_channel do |channel|
+          channel.exec(command) do |ch, success|
+            unless success
+              abort "FAILED: couldn't execute command (ssh.channel.exec)"
+            end
+            channel.on_data do |ch,data|
+              stdout_data+=data
+              print "[#{@host}] #{data}".green
+            end
+
+            channel.on_extended_data do |ch,type,data|
+              stderr_data+=data
+              print "[#{@host}] #{data}".red
+            end
+
+            channel.on_request("exit-status") do |ch,data|
+              exit_code = data.read_long
+            end
+
+            channel.on_request("exit-signal") do |ch, data|
+              exit_signal = data.read_long
+            end
+          end
+        end
+        ssh.loop
+        {
+          stdout_data: stdout_data,
+          stderr_data: stderr_data,
+          exit_code: exit_code,
+          exit_signal: exit_signal
+        }
+      end
+    end
+  end
+end

data/lib/dployr/utils.rb

@@ -1,3 +1,5 @@
+require 'deep_merge'
+
 module Dployr
   module Utils
 
@@ -17,7 +19,7 @@ module Dployr
     end
 
     def get_real_key(hash, key)
-      if hash.is_a? Hash
+      if key and hash.is_a? Hash
         if hash.key? key
           key
         elsif hash.key? key.to_sym

data/lib/dployr/version.rb

@@ -1,3 +1,3 @@
 module Dployr
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/dployr.rb

@@ -1,8 +1,15 @@
-require 'yaml'
-require 'deep_merge'
 require 'dployr/version'
 require 'dployr/init'
 require 'dployr/configuration'
 require 'dployr/config/create'
 require 'dployr/config/file_utils'
 require 'dployr/config/instance'
+require 'dployr/commands/provision_test'
+require 'dployr/commands/start'
+require 'dployr/commands/stop_destroy'
+require 'dployr/commands/config'
+require 'dployr/commands/execute'
+require 'dployr/scripts/hook'
+require 'dployr/scripts/default_hooks'
+require 'dployr/scripts/shell'
+require 'dployr/scripts/scp'

data/spec/configuration_spec.rb

@@ -359,7 +359,7 @@ describe Dployr::Configuration do
               zeus[:providers][:aws][:regions]["eu-west-1a"].should be_a Hash
             end
 
-            describe "eu-west-1a" do
+            describe "europe-west1-a" do
               let(:region) {
                 zeus[:providers][:aws][:regions]["eu-west-1a"]
               }

data/spec/init_spec.rb

@@ -7,7 +7,6 @@ describe Dployr::Init do
 
     before :all do
       Dir.chdir fixtures
-      @dployr = Dployr::Init.new
     end
 
     after :all do
@@ -15,7 +14,13 @@ describe Dployr::Init do
     end
 
     describe "file discovery" do
-      it "should discover the file" do
+
+      before :all do
+        @dployr = Dployr::Init.new
+        @dployr.load_config
+      end
+
+      it "should discover Dployrfile" do
         @dployr.file_path.should eql "#{fixtures}/Dployrfile"
       end
 
@@ -23,5 +28,21 @@ describe Dployr::Init do
         @dployr.config.should be_instance_of Dployr::Configuration
       end
     end
+
+    describe "custom path" do
+
+      before :all do
+        @dployr = Dployr::Init.new
+        @dployr.load_config File.join File.dirname(__FILE__), 'fixtures', 'Dployrfile.yml'
+      end
+
+      it "should load with custom path" do
+        @dployr.file_path.should eql "#{fixtures}/Dployrfile.yml"
+      end
+
+      it "should create a new config instance" do
+        @dployr.config.should be_instance_of Dployr::Configuration
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dployr
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tomas Aparicio
+- German Ramos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -38,6 +39,48 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,12 +127,17 @@ files:
 - README.md
 - Rakefile
 - bin/dployr
+- config/Dployrfile.yml
+- config/hello/hello.sh
 - dployr.gemspec
 - lib/dployr.rb
-- lib/dployr/cli/cli.rb
-- lib/dployr/cli/commands.rb
-- lib/dployr/cli/commands/config.rb
-- lib/dployr/compute/client.rb
+- lib/dployr/cli.rb
+- lib/dployr/commands/config.rb
+- lib/dployr/commands/execute.rb
+- lib/dployr/commands/provision_test.rb
+- lib/dployr/commands/start.rb
+- lib/dployr/commands/stop_destroy.rb
+- lib/dployr/compute/aws.rb
 - lib/dployr/config/constants.rb
 - lib/dployr/config/create.rb
 - lib/dployr/config/file_utils.rb
@@ -97,6 +145,10 @@ files:
 - lib/dployr/configuration.rb
 - lib/dployr/init.rb
 - lib/dployr/logger.rb
+- lib/dployr/scripts/default_hooks.rb
+- lib/dployr/scripts/hook.rb
+- lib/dployr/scripts/scp.rb
+- lib/dployr/scripts/shell.rb
 - lib/dployr/utils.rb
 - lib/dployr/version.rb
 - spec/config_file_utils_spec.rb

data/lib/dployr/cli/commands/config.rb

@@ -1,66 +0,0 @@
-require 'logger'
-require 'dployr'
-require 'dployr/utils'
-
-module Dployr
-  module CLI
-    class Config
-
-      include Dployr::Utils
-
-      def initialize(options)
-        @options = options
-        @name = options[:name]
-        @log = Logger.new STDOUT
-        @attributes = parse_attributes @options[:attributes]
-
-        begin
-          create
-          render_file
-        rescue Exception => e
-          @log.error e
-          Process.exit! false
-        end
-      end
-
-      def create
-        begin
-          @dployr = Dployr::Init.new @attributes
-        rescue Exception => e
-          raise "Cannot load the config: #{e}"
-        end
-      end
-
-      def render_file
-        raise "Dployrfile was not found" if @dployr.file_path.nil?
-        raise "Configuration is missing" unless @dployr.config.exists?
-        begin
-          if @name
-            config = @dployr.config.get_config @name, @attributes
-          else
-            puts @attributes
-            config = @dployr.config.get_config_all @attributes
-          end
-          unless config.nil?
-            puts config.to_yaml
-          else
-            @log.info "Missing configuration data"
-          end
-        rescue Exception => e
-          raise "Cannot generate the config: #{e}"
-        end
-      end
-
-      def parse_attributes(attributes)
-        if attributes.is_a? String
-          if @options[:attributes][0] == '-'
-            parse_flags attributes
-          else
-            parse_matrix attributes
-          end
-        end
-      end
-
-    end
-  end
-end

data/lib/dployr/cli/commands.rb

@@ -1 +0,0 @@
-require 'dployr/cli/commands/config'

data/lib/dployr/compute/client.rb

@@ -1,28 +0,0 @@
-require 'fog'
-
-module Dployr
-  module Compute
-    class Client
-
-      attr_reader :client
-
-      DEFAULT = {
-        provider: 'AWS'
-      }
-
-      def initialize(options)
-        @options = options
-        @client = Fog::Compute.new DEFAULT.merge options
-      end
-
-      def servers
-        @client.servers
-      end
-
-      def create_server(options)
-        @client.servers.create options
-      end
-
-    end
-  end
-end