dployr 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84dbc231d29673da035d182bf6198848a4b0bbe1
-  data.tar.gz: 504c80fb2ea79996efa2b155affc7f1fcced00a6
+  metadata.gz: 304f9d5d7f79de110215c48e59f5c3dc39bbe29c
+  data.tar.gz: 3fa3639b3f5058161d5fb1b318d217dcfa1c4a78
 SHA512:
-  metadata.gz: 8d1d4eb41cf77fc668a7e785a4c6228f9f15ce64add9cc1c434a10311964fe789b21031ef9a09c4930b932878a6962897732f1f3f03d18746e361c155ac90fb2
-  data.tar.gz: 102f3eb0359b547f595fc64e13cb3ba9db54b27a26101eef0eb27dc2113c75e15d1af101119f1affb0d797fc8f8ab8075bc5663c05307b9ead3e32c2f1c38cee
+  metadata.gz: 6eaaaf925b1c8e8ef30519a4c664577359cc33266cc8db708979f32f903ac5bd0bf58bcf13d624c6059ba0b0c19846914f65d0e07690036004b91d0b016ab79b
+  data.tar.gz: 51a0d39c49c4ce149003d5acd1807879f4a0878f5fb159f8c086d3b7d09a900076f2a153c3db348217a00acd5dfe388a49957505aa8c73e4fda3ee701e26d2ca

data/README.md

@@ -2,7 +2,7 @@
 
 > Multicloud management and deployment made simple
 
-> **Spoiler! Alpha project. Use it by your own risk**
+> **Alpha project, use it by your own risk**
 
 <table>
 <tr>
@@ -18,10 +18,10 @@
 **Dployr** is a Ruby utility that simplifies cloud management
 and deployment across different providers
 
-You can configure your infraestructure and deployment from a
+You can setup your project cloud infraestructure from a
 simple configuration file which support built-in rich features
 
-Dployr only works in Ruby >= `1.9.x`
+Dployr provides a featured [command-line interface](#command-line-interface) and [programmatic API](#programmatic-api)
 
 ## Installation
 
@@ -33,20 +33,19 @@ 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.3'
+spec.add_dependency 'dployr', '~> 0.0.1'
 # Gemfile
-gem 'dployr', '>= 0.0.3'
+gem 'dployr', '>= 0.0.1'
 ```
 
-## Documentation
-
-Dployr documentation and API is available from [RubyDoc][rubydoc]
+Requires Ruby 1.9.3+
 
 ## Features
 
 - Fully configurable from Ruby or YAML file with rich features like templating
-- Supports deployment to multiple providers
-- Built-in support for defailted instances configuration
+- Supports deployment to multiple cloud providers
+- Supports default instances and inherited configuration values
+- Full control of virtual instances (start, restart, stop, test, provision)
 - Local and remote scripts execution per stage phase (start, test, provision, update, stop...)
 - Featured command-line and programmatic API
 
@@ -56,6 +55,7 @@ Note that as Dployr is still in alpha stage, there are only a few providers supp
 
 - Amazon Web Services (`aws`)
 - Google Compute Engine (`gce`)
+- Baremetal
 
 ## Configuration
 
@@ -66,11 +66,10 @@ or a YAML file (adding the `.yml` or `.yaml` extension)
 
 Each configuration level supports the followings members:
 
-- **attributes** `Object` Custom attrbutes to apply to the current template
-- **scripts** `Array|Object`
-- **providers** `Object`
-- **authentication** `Object` (optional)
-- **extends** `String|Array` Allows to inherits the current config object from others
+- **attributes** `Object` Custom attributes to apply to the current template
+- **scripts** `Object` Scripts hooks per phase to run (start, stop, test...)
+- **providers** `Object` Nested configuration provider-specific (aws, gce...)
+- **extends** `String|Array` Allows to inherits the current template from other templates
 
 #### Templating
 
@@ -104,18 +103,15 @@ Notation: `${HOME}`
 
 #### Example
 
-Featured example configuration file (YAML)
+Featured example configuration file in YAML
 ```yml
 ---
+# general configuration applied to templates
 default:
   attributes:
     name: "default"
     prefix: dev
     private_key_path: ~/pems/private.pem
-  authentication:
-    private_key_path: ~/.ssh/id_rsa
-    public_key_path: ~/.ssh/id_rsa.pub
-    username: ubuntu
   providers:
     aws:
       attributes:
@@ -159,43 +155,35 @@ default:
         path: ./scripts/updatedns.sh
 
 custom:
-  name: 1
-  web-server:
-    attributes:
-      prefix: zeus-dev
-    authentication:
-      private_key_path: ~/.ssh/id_rsa
-      public_key_path: ~/.ssh/id_rsa.pub
-      username: ubuntu
-    providers:
-      aws:
-        regions:
-        attributes:
-          instance_type: m1.medium
-      gce:
-        attributes:
-          instance_type: m1.large
-    scripts:
-      pre-start:
-        -
-          args:
-            - "%{name}"
-            - "%{type}"
-            - "%{domain}"
-          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
+  attributes:
+    prefix: zeus-dev
+  providers:
+    aws:
+      regions:
+      attributes:
+        instance_type: m1.medium
+        public_ip: new # create a elastic IP
+    gce:
+      attributes:
+        instance_type: m1.large
+  scripts:
+    pre-start:
+      - args:
+          - "%{name}"
+          - "%{type}"
+          - "%{domain}"
+        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
@@ -209,6 +197,7 @@ Commands
   halt      stop instances
   destroy   destroy instances
   status    retrieve the instances status
+  info      retrieve instance information and output it in YAML format
   test      run remote test in instances
   deploy    start, provision and test running instances
   provision instance provisioning
@@ -221,9 +210,11 @@ 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
+  -a, --attributes ATTRS           aditional attributes to pass to the configuration in matrix query format
   -p, --provider VALUES            provider to use (allow multiple values comma-separated)
   -r, --region REGION              region to use (allow multiple values comma-separated)
+  -i, --public-ip                  use public ip instead of private ip to when access instances
+      --debug                      enable debug mode
   -v, -V, --version                version
   -h, --help                       help
 ```
@@ -245,8 +236,21 @@ Test a working instance
 $ dployr test -n name -p aws -r eu-west-1 -a 'env=dev'
 ```
 
+Generate config in YAML format
+```bash
+$ dployr config -n name -p aws -r eu-west-1 -a 'env=dev'
+```
+
 ## Programmatic API
 
+You can use the Ruby programmatic API to integrate it in your own implementation
+
+### API
+
+Dployr API documentation is available from [RubyDoc][rubydoc]
+
+### Configuration
+
 ```ruby
 Dployr::configure do |dployr|
 

data/lib/dployr/cli.rb

@@ -6,13 +6,13 @@ command = ARGV[0]
 options = {}
 
 opt_parser = OptionParser.new do |opt|
-  opt.banner   = "  Usage: dployr <command> [options]"
+  opt.banner   = "\n  Usage: dployr <command> [options]"
   opt.separator  ""
   opt.separator  "  Commands"
   opt.separator  ""
-  opt.separator  "    start     start instances"
+  opt.separator  "    start     start instances or create networks"
   opt.separator  "    halt      stop instances"
-  opt.separator  "    destroy   destroy instances"
+  opt.separator  "    destroy   destroy instances or delete networks"
   opt.separator  "    status    retrieve the instances status"
   opt.separator  "    info      retrieve instance information and output it in YAML format"
   opt.separator  "    test      run remote test in instances"
@@ -20,7 +20,7 @@ opt_parser = OptionParser.new do |opt|
   opt.separator  "    provision instance provisioning"
   opt.separator  "    config    generate configuration in YAML from Dployrfile"
   opt.separator  "    execute   run custom stages"
-  opt.separator  "    ssh       ssh into machine"
+  opt.separator  "    ssh       ssh into machine (only Unix-like OS)"
   opt.separator  "    init      create a sample Dployrfile"
   opt.separator  ""
   opt.separator  "  Options"
@@ -46,7 +46,7 @@ opt_parser = OptionParser.new do |opt|
     options[:region] = v
   end
 
-  opt.on("-i", "--public-ip", "use public ip instead of private ip to when access instances") do |v|
+  opt.on("-i", "--public-ip", "use public ip instead of private ip to when access to instances") do |v|
     options[:public_ip] = v
   end
 

data/lib/dployr/commands/base.rb

@@ -17,7 +17,7 @@ module Dployr
         @log = Logger.new STDOUT
         @attrs = parse_attributes @options[:attributes]
         @options[:public_ip] = false if !options[:public_ip]
-        @provider = options[:provider].upcase
+        @provider = options[:provider].upcase if options[:provider]
         create
         get_config
       end
@@ -34,7 +34,7 @@ module Dployr
       def create_compute_client
         begin
           Dployr::Compute.const_get(@provider.to_sym).new @regions
-        rescue Exception => e
+        rescue => e
           raise "Provider '#{@provider}' is not supported: #{e}"
         end
       end

data/lib/dployr/commands/execute.rb

@@ -7,24 +7,20 @@ module Dployr
 
       def initialize(options, stages)
         super options
-        begin
-          puts "Connecting to #{@provider}...".yellow
-          @client = Dployr::Compute.const_get(@provider.to_sym).new(@options, @p_attrs)
 
-          puts "Looking for #{@name} in #{@region}...".yellow
-          @ip = @client.get_ip
-          if @ip
-            puts "#{@p_attrs["name"]} found with IP #{@ip}".yellow
-          else
-            raise "#{@p_attrs["name"]} not found"
-          end
+        puts "Connecting to #{@provider}...".yellow
+        @client = Dployr::Compute.const_get(@provider.to_sym).new @options, @p_attrs
 
-          stages.each do |stage|
-            Dployr::Scripts::Hook.new @ip, @config, stage
-          end
-        rescue Exception => e
-          self.log.error e
-          exit 1
+        puts "Looking for #{@name} in #{@region}...".yellow
+        @ip = @client.get_ip
+        if @ip
+          puts "#{@p_attrs["name"]} found with IP #{@ip}".yellow
+        else
+          raise "#{@p_attrs["name"]} not found"
+        end
+
+        stages.each do |stage|
+          Dployr::Scripts::Hook.new @ip, @config, stage
         end
       end
 

data/lib/dployr/commands/info.rb

@@ -7,17 +7,13 @@ module Dployr
 
       def initialize(options)
         super options
-        begin
-          @client = Dployr::Compute.const_get(@provider.to_sym).new(@options, @p_attrs)
-          @info = @client.get_info
-          if @info
-            puts @info.attributes.to_yaml
-          else
-            raise "#{@p_attrs["name"]} not found"
-          end
-        rescue Exception => e
-          self.log.error e
-          exit 1
+
+        @client = Dployr::Compute.const_get(@provider.to_sym).new(@options, @p_attrs)
+        @info = @client.get_info
+        if @info
+          puts @info.attributes.to_yaml
+        else
+          raise "#{@p_attrs["name"]} not found"
         end
       end
 

data/lib/dployr/commands/provision_test.rb

@@ -7,23 +7,19 @@ module Dployr
 
       def initialize(options, action)
         super options
-        begin
-          puts "Connecting to #{@provider}...".yellow
-          @client = Dployr::Compute.const_get(@provider.to_sym).new(@options, @p_attrs)
 
-          puts "Looking for #{@p_attrs["name"]} in #{@options[:region]}...".yellow
-          @ip = @client.get_ip
-          if @ip
-            puts "#{@p_attrs["name"]} found with IP #{@ip}".yellow
-          else
-            raise "#{@p_attrs["name"]} not found"
-          end
+        puts "Connecting to #{@provider}...".yellow
+        @client = Dployr::Compute.const_get(@provider.to_sym).new(@options, @p_attrs)
 
-          Dployr::Scripts::Default_Hooks.new @ip, @config, action, self
-        rescue Exception => e
-          @log.error e
-          exit 1
+        puts "Looking for #{@p_attrs["name"]} in #{@options[:region]}...".yellow
+        @ip = @client.get_ip
+        if @ip
+          puts "#{@p_attrs["name"]} found with IP #{@ip}".yellow
+        else
+          raise "#{@p_attrs["name"]} not found"
         end
+
+        Dployr::Scripts::Default_Hooks.new @ip, @config, action, self
       end
 
       def action

data/lib/dployr/commands/ssh.rb

@@ -8,24 +8,19 @@ module Dployr
 
       def initialize(options)
         super options
-        begin
-          puts "Connecting to #{@provider}...".yellow
-          @client = Dployr::Compute.const_get(@provider.to_sym).new(@options, @p_attrs)
 
-          puts "Looking for #{@p_attrs["name"]} in #{@options[:region]}...".yellow
-          @ip = @client.get_ip
-          if @ip
-            puts "#{@p_attrs["name"]} found with IP #{@ip}".yellow
-          else
-            raise "#{@p_attrs["name"]} not found"
-          end
+        puts "Connecting to #{@provider}...".yellow
+        @client = Dployr::Compute.const_get(@provider.to_sym).new @options, @p_attrs
 
-          Dployr::Scripts::Ssh.new @ip, @config
-
-        rescue Exception => e
-          self.log.error e
-          exit 1
+        puts "Looking for #{@p_attrs["name"]} in #{@options[:region]}...".yellow
+        @ip = @client.get_ip
+        if @ip
+          puts "#{@p_attrs["name"]} found with IP #{@ip}".yellow
+        else
+          raise "#{@p_attrs["name"]} not found"
         end
+
+        Dployr::Scripts::Ssh.new @ip, @config
       end
 
     end

data/lib/dployr/commands/start.rb

@@ -6,17 +6,18 @@ module Dployr
 
       def initialize(options)
         super options
-        begin
-          puts "Connecting to #{@provider}...".yellow
-          @client = Dployr::Compute.const_get(@provider.to_sym).new(@options, @p_attrs)
 
+        puts "Connecting to #{@provider}...".yellow
+        @client = Dployr::Compute.const_get(@provider.to_sym).new @options, @p_attrs
+
+        if @p_attrs["type"] == "network"
+          puts "Creating network in #{@options[:provider]}: #{@options[:region]}...".yellow
+          @network = @client.create_network(@p_attrs["name"], @p_attrs["private_net"], @p_attrs["firewalls"], [])
+        else
           puts "Looking for #{@p_attrs["name"]} in #{@options[:region]}...".yellow
           @ip = @client.get_ip
 
           Dployr::Scripts::Default_Hooks.new @ip, @config, "start", self
-        rescue Exception => e
-          @log.error e
-          exit 1
         end
       end
 

data/lib/dployr/commands/stop_destroy.rb

@@ -7,12 +7,15 @@ module Dployr
 
       def initialize(options, action)
         super options
-        begin
-          @action = action
 
-          puts "Connecting to #{@provider}...".yellow
-          @client = Dployr::Compute.const_get(@provider.to_sym).new(@options, @p_attrs)
+        @action = action
+        puts "Connecting to #{@provider}...".yellow
+        @client = Dployr::Compute.const_get(@provider.to_sym).new @options, @p_attrs
 
+        if @p_attrs["type"] == "network"
+          puts "Destroying network in #{@options[:provider]}: #{@options[:region]}...".yellow
+          @network = @client.delete_network(@p_attrs["name"], @p_attrs["private_net"], @p_attrs["firewalls"], [])          
+        else
           puts "Looking for #{@p_attrs["name"]} in #{@options[:region]}...".yellow
           @ip = @client.get_ip
           if @ip
@@ -22,15 +25,13 @@ module Dployr
           end
 
           Dployr::Scripts::Default_Hooks.new @ip, @config, action, self
-        rescue Exception => e
-          @log.error e
-          exit 1
         end
+
       end
 
       def action
         puts "#{@action.capitalize}ing #{@p_attrs["name"]} in #{@options[:region]}...".yellow
-        @client.send(@action.to_sym)
+        @client.send @action.to_sym
         puts "#{@p_attrs["name"]} #{@action}ed sucesfully".yellow
         @ip
       end

data/lib/dployr/compute/aws.rb

@@ -4,38 +4,38 @@ require 'dployr/compute/common'
 module Dployr
   module Compute
     class AWS
-      
+
       include Dployr::Compute::Common
-      
+
       def initialize(options, attrs)
         @aws_options = {
           region: options[:region][0..-2],
           provider: 'AWS',
-          aws_access_key_id: ENV["AWS_ACCESS_KEY"],
-          aws_secret_access_key: ENV["AWS_SECRET_KEY"],
+          aws_access_key_id: (attrs["aws_access_key"] or ENV["AWS_ACCESS_KEY"]),
+          aws_secret_access_key: (attrs["aws_secret_key"] or ENV["AWS_SECRET_KEY"]),
         }
         @compute = Fog::Compute.new @aws_options
         @attrs = attrs
         @options = options
       end
 
-      def get_ip()
-        instance = get_instance(["running"]) # TODO: add starting states
+      def get_ip
+        instance = get_instance ["running"] # TODO: add starting states
         if instance
           if @options[:public_ip]
-            return instance.public_ip_address
+            instance.public_ip_address
           else
-            return instance.private_ip_address
+            instance.private_ip_address
           end
         end
       end
-      
-      def get_info()
-        get_instance(["running", "stopped", "stopping"])
+
+      def get_info
+        get_instance ["running", "stopped", "stopping"]
       end
 
-      def destroy()
-        instance = get_instance(["running", "stopped", "stopping"])
+      def destroy
+        instance = get_instance ["running", "stopped", "stopping"]
         if instance
           instance.destroy
         else
@@ -43,8 +43,8 @@ module Dployr
         end
       end
 
-      def halt()
-        instance = get_instance(["running"])
+      def halt
+        instance = get_instance ["running"]
         if instance
           instance.stop
         else
@@ -52,8 +52,8 @@ module Dployr
         end
       end
 
-      def start()
-        server = get_instance(["stopped", "stopping"])
+      def start
+        server = get_instance ["stopped", "stopping"]
         if server
           puts "Starting stopped instance for #{@attrs["name"]} in #{@options[:region]}...".yellow
           server.start
@@ -69,17 +69,17 @@ module Dployr
             tags: { Name: @attrs["name"] }
           }
           puts options.to_yaml
-          server = @compute.servers.create(options)
+          server = @compute.servers.create options
         end
         print "Wait for instance to get online".yellow
         server.wait_for { print ".".yellow; ready? }
         print "\n"
-        elastic_ip(server)
-        wait_ssh(@attrs, server, @options[:public_ip])
+        elastic_ip server
+        wait_ssh @attrs, server, @options[:public_ip]
       end
-      
+
       private
-      
+
       def get_instance(states)
         servers = @compute.servers.all
         servers.each do |instance|
@@ -89,21 +89,21 @@ module Dployr
         end
         nil
       end
-      
+
       def elastic_ip(server)
         if @attrs["public_ip"]
           if @attrs["public_ip"] == "new"
             puts "Creating new elastic ip...".yellow
-            response = @compute.allocate_address(server.vpc_id)
+            response = @compute.allocate_address server.vpc_id
             allocation_id = response[:body]["allocationId"]
             @attrs["public_ip"] = response[:body]["publicIp"]
           else
             puts "Looking for elastic ip #{@attrs["public_ip"]}...".yellow
-            eip = @compute.addresses.get(@attrs["public_ip"])
+            eip = @compute.addresses.get @attrs["public_ip"]
             allocation_id = eip.allocation_id
           end
           puts "Associating elastic ip #{@attrs["public_ip"]}...".yellow
-          @compute.associate_address(server.id,nil,nil,allocation_id)
+          @compute.associate_address server.id, nil, nil, allocation_id
         end
       end
 

data/lib/dployr/compute/common.rb

@@ -3,16 +3,17 @@ require 'net/ssh'
 module Dployr
   module Compute
     module Common
-      
+
       module_function
 
       def wait_ssh(attrs, server, use_public_ip)
         if use_public_ip
-              @ip = server.public_ip_address
-            else
-              @ip = server.private_ip_address
-            end
+          @ip = server.public_ip_address
+        else
+          @ip = server.private_ip_address
+        end
         print "Wait for ssh (#{@ip}) to get ready...".yellow
+
         while true
           begin
             Net::SSH.start(@ip, attrs["username"], :keys => attrs["private_key_path"]) do |ssh|
@@ -26,7 +27,6 @@ module Dployr
         end
         print "\n"
       end
-      
 
     end
   end

data/lib/dployr/compute/gce.rb

@@ -6,35 +6,35 @@ module Dployr
     class GCE
 
       include Dployr::Compute::Common
-      
+
       def initialize(options, attrs)
         @gce_options = {
           provider: 'Google',
-          google_project: ENV["GOOGLE_PROJECT_ID"],
-          google_client_email: ENV["GOOGLE_CLIENT_EMAIL"],
-          google_key_location: ENV["GOOGLE_KEY_LOCATION"],
+          google_project: (attrs["google_project_id"] or ENV["GOOGLE_PROJECT_ID"]),
+          google_client_email: (attrs["google_client_email"] or ENV["GOOGLE_CLIENT_EMAIL"]),
+          google_key_location: (attrs["google_key_location"] or ENV["GOOGLE_KEY_LOCATION"]),
         }
         @compute = Fog::Compute.new @gce_options
         @attrs = attrs
         @options = options
       end
 
-      def get_ip()
+      def get_ip
         instance = get_instance(["PROVISIONING", "STAGING", "RUNNING"])
         if instance
           if @options[:public_ip]
-            return instance.public_ip_address
+            instance.public_ip_address
           else
-            return instance.private_ip_address
+            instance.private_ip_address
           end
         end
       end
-      
-      def get_info()
+
+      def get_info
         get_instance(["RUNNING", "STOPPED"])
       end
 
-      def destroy()
+      def destroy
         instance = get_instance(["RUNNING", "STOPPED"])
         if instance
           puts "Destroying instance #{@attrs["name"]}...".yellow
@@ -47,12 +47,12 @@ module Dployr
           #   gdisk = @compute.disks.get(disk["deviceName"])
           #   gdisk.destroy
           # end
-          return   
+          return
         end
         raise "Instance #{@attrs["name"]} not found"
       end
 
-      def halt()
+      def halt
         instance = get_instance(["RUNNING"])
         if instance
           instance.disks.each do |disk|
@@ -60,28 +60,29 @@ module Dployr
               raise "Cannot halt instance with autoDelete disks"
             end
           end
-          return instance.destroy
+          instance.destroy
+        else
+          raise "Instance #{@attrs["name"]} not found"
         end
-        raise "Instance #{@attrs["name"]} not found"
       end
 
-      def start()
-        external_ip()
-        server = get_instance(["STOPPED"])
+      def start
+        external_ip
+        server = get_instance ["STOPPED"]
         if server
           puts "Starting stopped instance for #{@attrs["name"]} in #{@options[:region]}...".yellow
           server.start
         else
           puts "Creating boot disk...".yellow
-          disks = create_disk()
+          disks = create_disk
           if defined? @attrs["autodelete_disk"]
             autodelete_disk  = @attrs["autodelete_disk"]
           else
             autodelete_disk = false
           end
-          
+
           puts "Creating new instance for #{@attrs["name"]} in #{@options[:region]}...".yellow
-          
+
           start_options = {
             name: @attrs["name"],
             zone_name: @options[:region],
@@ -93,32 +94,59 @@ module Dployr
           puts start_options.to_yaml
           server = @compute.servers.create(start_options)
         end
+
         print "Wait for instance to get online".yellow
         server.wait_for { print ".".yellow; ready? }
         print "\n"
-        wait_ssh(@attrs, server, @options[:public_ip])
-    end
-    
+        wait_ssh @attrs, server, @options[:public_ip]
+      end
+
+      def create_network(network_name, network_range, firewalls, routes)
+        create_subnet(network_name, network_range)
+
+        if firewalls.respond_to?("each")
+          firewalls.each do |key, value|
+            add_firewall(key , network_name, value["address"], value["protocol"], value["port"])
+          end
+        end
+      end
+
+      def delete_network(network_name, network_range, firewalls, routes)
+        if exists("network", network_name)
+          delete_routes(routes)
+
+          if firewalls.respond_to?("each")
+            firewalls.each do |key, value|
+              delete_firewall(key)
+            end
+          end
+
+          delete_subnet(network_name)
+        else
+          puts "\tNetwork #{network_name} not found. Nothing to delete!"
+        end
+      end
+
       private
-      
-      def external_ip()
+
+      def external_ip
         if @attrs["public_ip"] == "new"
-            puts "Looking for previous public_ip...".yellow
-            ip = @compute.insert_address(@attrs["name"], @options[:region][0..-3])
-            while true
-              ip = @compute.get_address(@attrs["name"], @options[:region][0..-3])
-              if ip[:body]["address"]
-                @attrs["public_ip"].replace ip[:body]["address"]
-                puts "Using public_ip #{@attrs["public_ip"]}".yellow
-                break
-              end
-              puts "Waiting for ip to be ready...".yellow
-              sleep 1
+          puts "Looking for previous public_ip...".yellow
+          ip = @compute.insert_address(@attrs["name"], @options[:region][0..-3])
+          while true
+            ip = @compute.get_address(@attrs["name"], @options[:region][0..-3])
+            if ip[:body]["address"]
+              @attrs["public_ip"].replace ip[:body]["address"]
+              puts "Using public_ip #{@attrs["public_ip"]}".yellow
+              break
             end
+            puts "Waiting for ip to be ready...".yellow
+            sleep 1
           end
+        end
       end
-      
-      def create_disk()
+
+      def create_disk
         disk = @compute.disks.get(@attrs["name"])
         if disk != nil
           puts "Disk #{@attrs["name"]} already created. Reusing it.".yellow
@@ -131,9 +159,9 @@ module Dployr
             zone_name: @options[:region],
             source_image: @attrs["image_name"]
           )
-        
+
           disk.wait_for { disk.ready? }
-          return disk
+          disk
         end
       end
 
@@ -145,7 +173,93 @@ module Dployr
             return instance
           end
         end
-        return nil
+        nil
+      end
+
+      def create_subnet(network_name, private_net)
+        if ! exists("network", network_name)
+          @compute.insert_network(network_name, private_net)
+          puts "\tNetwork #{network_name} created"
+      else
+        puts "\tNetwork #{network_name} already exists. Nothing to create!"
+      end
+      end
+
+      def add_firewall(fw_name, network_name, source_range, ip_protocol, allowed_ports)
+        allowed = [
+            {
+              IPProtocol: "#{ip_protocol}",
+              ports: ["#{allowed_ports}"]
+            }
+        ]
+        options = {}
+        options[:source_ranges] = source_range
+
+        @compute.insert_firewall(fw_name, allowed, network_name, options)
+        puts "\tFirewall #{fw_name} created"
+      end
+
+      def exists(type, name)   
+        if type == "network"
+          list = @compute.list_networks.data[:body]
+        elsif type == "route"
+          list = @compute.list_routes.data[:body]
+        else
+          list = @compute.list_firewalls.data[:body]
+          puts "name #{name}"
+        end
+
+        items = list["items"]
+        if items.respond_to?("each")
+          items.each do |item|
+            if item["name"] == name
+              return true
+            end
+          end
+        end
+
+        return false
+      end
+
+      def add_route(route_name, network_name, dest_range, priority, vm_name)
+        # Get VM url --> https://www.googleapis.com/compute/..../vm_name
+        server = @compute.get_server(vm_name,"europe-west1-a").data[:body]
+        url_next_hop = server["selfLink"]
+
+          network = @compute.get_network(network_name).data[:body]
+        network_url = network["selfLink"]
+
+        options = {}
+        options[:description] = ""
+        options[:next_hop_instance] = "#{url_next_hop}"
+        # options[:next_hop_gateway] = ""
+        # options[:next_hop_ip] = ""
+
+        @compute.insert_route(route_name, network_url, dest_range, priority, options)
+        puts "\tRoute #{route_name} created"
+      end
+
+      def delete_routes(routes)
+        if routes.respond_to?("each")
+          routes.each do |route|
+            if gce_exist("route", route)
+              @compute.delete_route(route) 
+              puts "\tRoute #{route} deleted"
+            else
+              puts "\tRoute #{route} not found. Nothing to delete!"
+          end
+          end
+        end
+      end
+
+      def delete_firewall(key)
+        @compute.delete_firewall(key) 
+        puts "\tFirewall #{key} deleted"
+      end
+
+      def delete_subnet(network_name)
+        @compute.delete_network(network_name)
+        puts "\tNetwork #{network_name} deleted"
       end
 
     end

data/lib/dployr/config/instance.rb

@@ -49,7 +49,7 @@ module Dployr
       end
 
       def add_script(script)
-        @scripts << script if script.is_a? Hash
+        @scripts.merge! script if script.is_a? Hash
       end
 
       def add_provider(name, provider)

data/lib/dployr/scripts/local_shell.rb

@@ -14,15 +14,15 @@ module Dployr
       def start
         command = @script["local_path"]
         arguments = @script["args"]
+        arguments = arguments.join ' ' if arguments.is_a? Array
 
         puts "Running local script '#{command} #{arguments}'".yellow
         total_command = command
-          if arguments
-            total_command =  command + ' ' + arguments
-          end
-        result = system(total_command)
+        total_command =  command + ' ' + arguments if arguments
+
+        result = system total_command
         if result == false
-          raise "Exit code non zero when running local script '#{total_command}'".yellow
+          raise "Exit code non zero when running local script '#{total_command}'"
         else
           puts "Local script '#{command} #{arguments}' finished succesfully".yellow
         end

data/lib/dployr/scripts/scp.rb

@@ -13,8 +13,8 @@ module Dployr
             puts "Copying #{source} -> #{target}".yellow
             scp.upload(source, target, :recursive => true, :preserve => true)
           end
-        rescue Exception => e
-          raise Error.new "Cannot copy to remote: #{e}"
+        rescue => e
+          raise "Cannot copy to remote: #{e}"
         end
       end
 

data/lib/dployr/scripts/shell.rb

@@ -20,12 +20,11 @@ module Dployr
         Net::SSH.start(@ip, @username, :keys => [@private_key_path]) do |ssh|
           command = @script["remote_path"]
           arguments = @script["args"]
+          arguments = arguments.join ' ' if arguments.is_a? Array
+          total_command = command
+          total_command = command + ' ' + arguments if arguments
 
           puts "Running remote script '#{command} #{arguments}'".yellow
-          total_command = command
-          if arguments
-            total_command =  command + ' ' + arguments
-          end
           result = ssh_exec!(ssh, total_command)
           if result[:exit_code] > 0
             raise "Exit code #{result[:exit_code]} when running script '#{total_command}'".yellow
@@ -54,7 +53,7 @@ module Dployr
             end
 
             channel.on_extended_data do |ch,type,data|
-              stderr_data+=data
+              stderr_data += data
               #print "[#{@host}] #{data}".red
               print "#{data}".red
             end
@@ -63,7 +62,7 @@ module Dployr
               exit_code = data.read_long
               @channel.close
             end
-            
+
           end
         end
         ssh.loop

data/lib/dployr/scripts/ssh.rb

@@ -15,7 +15,7 @@ module Dployr
 
       def run
         puts "ssh -i #{@private_key_path} #{@username}@#{@ip}"
-        system("ssh -i #{@private_key_path} #{@username}@#{@ip}")
+        system "ssh -i #{@private_key_path} #{@username}@#{@ip}"
       end
 
     end

data/lib/dployr/version.rb

@@ -1,3 +1,3 @@
 module Dployr
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dployr
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Tomas Aparicio
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog