dployr 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cb69bcafe1f40f150073a9ceedd816ab18edbe6
-  data.tar.gz: 986eee01920f5d35961069fa0d250d24d8685182
+  metadata.gz: c470db55ac45d9fd7194b76fda8213aec26cbbd6
+  data.tar.gz: ba15cc25e47219751fc78170796b7c3c0014a6ec
 SHA512:
-  metadata.gz: b2874793ccd7fd16b02f20fcc40ed355b3ef77b3190c7a2760619c27fe64ef00e7639eb23dc1bebf542afcc12e50936359627638d2931e22bafcf51b5ac52101
-  data.tar.gz: 8e0275679ba5c03b65b2b4ff29adcd304bc4cb0cf20634f0fbcb5415ab14f907adfbbed2e6013acb9ce793084f4439b2af95d4940431ed0cc87d57c5ef13245b
+  metadata.gz: 812edd49fc33adeb9416e23040b7bf11c1057583e8019f708f8848eceed131405579c4cc5e8a80e242274f06209ae77bb3ecade5254d1687248b6ecefb734944
+  data.tar.gz: b34bb3786b51d1442a0034db7836c3092d77c08359ed91f90e9acc686b20e797ea9dbbacc597b97cef9d83a1ea35653c81f777bfaf05a893e3e9db6e32308c5b

data/README.md

@@ -105,7 +105,7 @@ Notation: `${HOME}`
 #### Example
 
 Featured example configuration file (YAML)
-```yaml
+```yml
 ---
 default:
   attributes:

data/lib/dployr/commands/base.rb

@@ -1,6 +1,9 @@
 require 'logger'
 require 'dployr/init'
 require 'dployr/commands/utils'
+require 'dployr/compute/aws'
+require 'dployr/compute/gce'
+require 'dployr/compute/baremetal'
 
 module Dployr
   module Commands
@@ -15,6 +18,13 @@ module Dployr
         @name = options[:name]
         @log = Logger.new STDOUT
         @attrs = parse_attributes @options[:attributes]
+        if !options[:public_ip]
+          options[:public_ip] = false
+        end
+        @provider = options[:provider].upcase
+        create
+        @config = get_region_config options
+        @p_attrs = @config[:attributes]
       end
 
       def create

data/lib/dployr/commands/config.rb

@@ -7,7 +7,6 @@ module Dployr
       def initialize(options)
         super options
         begin
-          create
           render_file
         rescue Exception => e
           @log.error e

data/lib/dployr/commands/execute.rb

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

data/lib/dployr/commands/info.rb

@@ -8,20 +8,12 @@ module Dployr
       def initialize(options)
         super options
         begin
-          create
-          config = get_region_config options
-
-          @name = config[:attributes]["name"]
-          @provider = options[:provider].upcase
-          @region = options[:region]
-
-          @client = Dployr::Compute.const_get(@provider.to_sym).new @region
-
-          @info = @client.get_info @name
+          @client = Dployr::Compute.const_get(@provider.to_sym).new(@options, @p_attrs)
+          @info = @client.get_info
           if @info
-            puts @info.to_yaml
+            puts @info.attributes.to_yaml
           else
-            raise "#{@name} not found"
+            raise "#{@p_attrs["name"]} not found"
           end
           
         rescue Exception => e

data/lib/dployr/commands/provision_test.rb

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

data/lib/dployr/commands/ssh.rb

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

data/lib/dployr/commands/start.rb

@@ -1,6 +1,4 @@
 require 'dployr/commands/base'
-require 'dployr/compute/aws'
-require 'dployr/compute/gce'
 
 module Dployr
   module Commands
@@ -9,21 +7,13 @@ module Dployr
       def initialize(options)
         super options
         begin
-          create
-          config = get_region_config options
-
-          @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
+          @client = Dployr::Compute.const_get(@provider.to_sym).new(@options, @p_attrs)
 
-          puts "Looking for #{@name} in #{@region}...".yellow
-          @ip = @client.get_ip(@name, options[:public_ip])
+          puts "Looking for #{@p_attrs["name"]} in #{@options[:region]}...".yellow
+          @ip = @client.get_ip
 
-          Dployr::Scripts::Default_Hooks.new @ip, config, "start", self
+          Dployr::Scripts::Default_Hooks.new @ip, @config, "start", self
         rescue Exception => e
           @log.error e
           exit 1
@@ -34,8 +24,8 @@ module Dployr
         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
+          @ip = @client.start
+          puts "Startded instance for #{@p_attrs["name"]} in #{@options[:region]} with IP #{@ip} succesfully".yellow
         end
         @ip
       end

data/lib/dployr/commands/stop_destroy.rb

@@ -8,27 +8,20 @@ module Dployr
       def initialize(options, action)
         super options
         begin
-          create
-          config = get_region_config options
-
-          @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
+          @client = Dployr::Compute.const_get(@provider.to_sym).new(@options, @p_attrs)
 
-          puts "Looking for #{@name} in #{@region}...".yellow
-          @ip = @client.get_ip(@name, options[:public_ip])
+          puts "Looking for #{@p_attrs["name"]} in #{@options[:region]}...".yellow
+          @ip = @client.get_ip
           if @ip
-            puts "#{@name} found with IP #{@ip}".yellow
+            puts "#{@p_attrs["name"]} found with IP #{@ip}".yellow
           else
-            puts "#{@name} not found".yellow
+            puts "#{@p_attrs["name"]} not found".yellow
           end
 
-          Dployr::Scripts::Default_Hooks.new @ip, config, action, self
+          Dployr::Scripts::Default_Hooks.new @ip, @config, action, self
         rescue Exception => e
           @log.error e
           exit 1
@@ -36,9 +29,9 @@ module Dployr
       end
 
       def action
-        puts "#{@action.capitalize}ing #{@name} in #{@region}...".yellow
-        @client.send(@action.to_sym, @name)
-        puts "#{@name} #{@action}ed sucesfully".yellow
+        puts "#{@action.capitalize}ing #{@p_attrs["name"]} in #{@options[:region]}...".yellow
+        @client.send(@action.to_sym)
+        puts "#{@p_attrs["name"]} #{@action}ed sucesfully".yellow
         @ip
       end
 

data/lib/dployr/compute/aws.rb

@@ -7,20 +7,22 @@ module Dployr
       
       include Dployr::Compute::Common
       
-      def initialize(region)
-        @options = {
-          region: region[0..-2],
+      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_secret_access_key: ENV["AWS_SECRET_KEY"],
         }
-        @compute = Fog::Compute.new @options
+        @compute = Fog::Compute.new @aws_options
+        @attrs = attrs
+        @options = options
       end
 
-      def get_ip(name, public)
-        instance = get_instance(name, ["running"]) # TODO: add starting states
+      def get_ip()
+        instance = get_instance(["running"]) # TODO: add starting states
         if instance
-          if public
+          if @options[:public_ip]
             return instance.public_ip_address
           else
             return instance.private_ip_address
@@ -28,43 +30,43 @@ module Dployr
         end
       end
       
-      def get_info(name)
-        get_instance(name, ["running", "stopped", "stopping"])
+      def get_info()
+        get_instance(["running", "stopped", "stopping"])
       end
 
-      def destroy(name)
-        instance = get_instance(name, ["running", "stopped", "stopping"])
+      def destroy()
+        instance = get_instance(["running", "stopped", "stopping"])
         if instance
           instance.destroy
         else
-          raise "Instance #{name} not found"
+          raise "Instance #{@attrs["name"]} not found"
         end
       end
 
-      def halt(name)
-        instance = get_instance(name, ["running"])
+      def halt()
+        instance = get_instance(["running"])
         if instance
           instance.stop
         else
-          raise "Instance #{name} not found"
+          raise "Instance #{@attrs["name"]} not found"
         end
       end
 
-      def start(attributes, region)
-        server = get_instance(attributes["name"], ["stopped", "stopping"])
+      def start()
+        server = get_instance(["stopped", "stopping"])
         if server
-          puts "Starting stopped instance for #{attributes["name"]} in #{region}...".yellow
+          puts "Starting stopped instance for #{@attrs["name"]} in #{@options[:region]}...".yellow
           server.start
         else
-          puts "Creating new instance for #{attributes["name"]} in #{region}...".yellow
+          puts "Creating new instance for #{@attrs["name"]} in #{@options[: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"] }
+            availability_zone: @options[:region],
+            flavor_id: @attrs["instance_type"],
+            image_id: @attrs["ami"],
+            key_name: @attrs["keypair"],
+            subnet_id: @attrs["subnet_id"],
+            security_group_ids: @attrs["security_groups"],
+            tags: { Name: @attrs["name"] }
           }
           puts options.to_yaml
           server = @compute.servers.create(options)
@@ -72,35 +74,35 @@ module Dployr
         print "Wait for instance to get online".yellow
         server.wait_for { print ".".yellow; ready? }
         print "\n"
-        elastic_ip(attributes, server)
-        wait_ssh(attributes, server)
+        elastic_ip(server)
+        wait_ssh(@attrs, server, @options[:public_ip])
       end
       
       private
       
-      def get_instance(name, states)
+      def get_instance(states)
         servers = @compute.servers.all
         servers.each do |instance|
-          if instance.tags["Name"] == name and states.include? instance.state
+          if instance.tags["Name"] == @attrs["name"] and states.include? instance.state
             return instance
           end
         end
         nil
       end
       
-      def elastic_ip(attributes, server)
-        if attributes["public_ip"]
-          if attributes["public_ip"] == "new"
+      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)
             allocation_id = response[:body]["allocationId"]
-            attributes["public_ip"] = response[:body]["publicIp"]
+            @attrs["public_ip"] = response[:body]["publicIp"]
           else
-            puts "Looking for elastic ip #{attributes["public_ip"]}...".yellow
-            eip = @compute.addresses.get(attributes["public_ip"])
+            puts "Looking for elastic ip #{@attrs["public_ip"]}...".yellow
+            eip = @compute.addresses.get(@attrs["public_ip"])
             allocation_id = eip.allocation_id
           end
-          puts "Associating elastic ip #{attributes["public_ip"]}...".yellow
+          puts "Associating elastic ip #{@attrs["public_ip"]}...".yellow
           @compute.associate_address(server.id,nil,nil,allocation_id)
         end
       end

data/lib/dployr/compute/baremetal.rb

@@ -0,0 +1,48 @@
+require 'fog'
+require 'dployr/compute/common'
+require 'ostruct'
+
+module Dployr
+  module Compute
+    class BAREMETAL
+      
+      include Dployr::Compute::Common
+      
+      def initialize(options, attrs)
+        @options = options
+        @attrs = attrs
+      end
+
+      def get_ip()
+        if @options["public_ip"]
+          return @attrs["public_ip"]
+        else
+          return @attrs["private_ip"]
+        end
+      end
+      
+      def get_info()
+        result = OpenStruct.new
+        result.attributes = {
+          public_ip: @attrs["public_ip"],
+          private_ip: @attrs["private_ip"],
+        }
+        return result
+      end
+
+      def destroy()
+        puts "Could not destroy baremetal machine".yellow
+      end
+
+      def halt()
+        puts "Could not halt baremetal machine".yellow
+      end
+
+      def start()
+        puts "Could not start baremetal machine".yellow
+        wait_ssh(attributes, server, @options["public_ip"])
+      end
+
+    end
+  end
+end

data/lib/dployr/compute/common.rb

@@ -6,13 +6,18 @@ module Dployr
       
       module_function
 
-      def wait_ssh(attributes, server)
-        print "Wait for ssh to get ready...".yellow
+      def wait_ssh(attrs, server, use_public_ip)
+        if use_public_ip
+              @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(server.private_ip_address, attributes["username"], :keys => attributes["private_key_path"]) do |ssh|
+            Net::SSH.start(@ip, attrs["username"], :keys => attrs["private_key_path"]) do |ssh|
               print "\n"
-              return server.private_ip_address
+              return @ip
             end
           rescue Exception => e
             print ".".yellow

data/lib/dployr/compute/gce.rb

@@ -5,141 +5,111 @@ module Dployr
   module Compute
     class GCE
 
-        include Dployr::Compute::Common
-        
-        def initialize(region)
-          @options = {
-            provider: 'Google',
-            google_project: ENV["GOOGLE_PROJECT_ID"],
-            google_client_email: ENV["GOOGLE_CLIENT_EMAIL"],
-            google_key_location: ENV["GOOGLE_KEY_LOCATION"]
-          }
-          @compute = Fog::Compute.new @options
-        end
-
-        # https://developers.google.com/compute/docs/instances
-        # private
-        def get_instance(name, states)
-          servers = @compute.servers.all
-          servers.each do |instance|
-            if instance.name == name and states.include? instance.state
-              return instance
-            end
-          end
-          return nil
-        end
+      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"],
+        }
+        @compute = Fog::Compute.new @gce_options
+        @attrs = attrs
+        @options = options
+      end
 
-        def get_ip(name, public)
-          instance = get_instance(name, ["PROVISIONING", "STAGING", "RUNNING"])
-          if instance
-            if public
-              return instance.public_ip_address
-            else
-              return instance.private_ip_address
-            end
+      def get_ip()
+        instance = get_instance(["PROVISIONING", "STAGING", "RUNNING"])
+        if instance
+          if @options[:public_ip]
+            return instance.public_ip_address
+          else
+            return instance.private_ip_address
           end
         end
-        
-        def get_info(name)
-          get_instance(name,["RUNNING", "STOPPED"])
-        end
+      end
+      
+      def get_info()
+        get_instance(["RUNNING", "STOPPED"])
+      end
 
-        def destroy(name)
-          instance = get_instance(name, ["RUNNING", "STOPPED"])
-          if instance
-            puts "Destroying instance #{name}...".yellow
-            instance.destroy(async = false)
-            puts "Destroying disk #{name}...".yellow
-            disk = @compute.disks.get(name)
-            disk.destroy
-            # Bug in fog. It return "persistent-disk-0" instead of boot disk name (usually the same name of the machine)
-            # instance.disks.each do |disk|
-            #   gdisk = @compute.disks.get(disk["deviceName"])
-            #   gdisk.destroy
-            # end
-            return   
-          end
-          raise "Instance #{name} not found"
+      def destroy()
+        instance = get_instance(["RUNNING", "STOPPED"])
+        if instance
+          puts "Destroying instance #{@attrs["name"]}...".yellow
+          instance.destroy(async = false)
+          puts "Destroying disk #{@attrs["name"]}...".yellow
+          disk = @compute.disks.get(@attrs["name"])
+          disk.destroy
+          # Bug in fog. It return "persistent-disk-0" instead of boot disk name (usually the same name of the machine)
+          # instance.disks.each do |disk|
+          #   gdisk = @compute.disks.get(disk["deviceName"])
+          #   gdisk.destroy
+          # end
+          return   
         end
+        raise "Instance #{@attrs["name"]} not found"
+      end
 
-        def halt(name)
-          instance = get_instance(name, ["RUNNING"])
-          if instance
-            instance.disks.each do |disk|
-              if disk["autoDelete"] == true
-                raise "Cannot halt instance with autoDelete disks"
-              end
+      def halt()
+        instance = get_instance(["RUNNING"])
+        if instance
+          instance.disks.each do |disk|
+            if disk["autoDelete"] == true
+              raise "Cannot halt instance with autoDelete disks"
             end
-            return instance.destroy
-          end
-          raise "Instance #{name} not found"
-        end
-        
-        def create_disk(name, size_gb, zone_name, image_name)
-          disk = @compute.disks.get(name)
-          if disk != nil
-            puts "Disk #{name} already created. Reusing it.".yellow
-            return disk
-          else
-            puts "Creating new boot disk #{name}...".yellow
-            disk = @compute.disks.create(
-              name: name,
-              size_gb: size_gb,
-              zone_name: zone_name,
-              source_image: image_name
-            )
-          
-            disk.wait_for { disk.ready? }
-            return disk
           end
+          return instance.destroy
         end
+        raise "Instance #{@attrs["name"]} not found"
+      end
 
-        def start(attributes, region)
-          external_ip(attributes, region)
-          server = get_instance(attributes["name"], ["STOPPED"])
-          if server
-            puts "Starting stopped instance for #{attributes["name"]} in #{region}...".yellow
-            server.start
+      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()
+          if defined? @attrs["autodelete_disk"]
+            autodelete_disk  = @attrs["autodelete_disk"]
           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"]
-            else
-              autodelete_disk = false
-            end
-            
-            puts "Creating new instance for #{attributes["name"]} in #{region}...".yellow
-            
-            options = {
-              name: attributes["name"],
-              zone_name: region,
-              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
-            server = @compute.servers.create(options)
+            autodelete_disk = false
           end
-          print "Wait for instance to get online".yellow
-          server.wait_for { print ".".yellow; ready? }
-          print "\n"
-          wait_ssh(attributes, server)
-      end
-      
+          
+          puts "Creating new instance for #{@attrs["name"]} in #{@options[:region]}...".yellow
+          
+          start_options = {
+            name: @attrs["name"],
+            zone_name: @options[:region],
+            machine_type: @attrs["instance_type"],
+            network: @attrs["network"],
+            disks: [disks.get_as_boot_disk(true, autodelete_disk)],
+            external_ip: @attrs["public_ip"]
+          }
+          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
+    
       private
       
-      def external_ip(attributes, region)
-        if attributes["public_ip"] == "new"
+      def external_ip()
+        if @attrs["public_ip"] == "new"
             puts "Looking for previous public_ip...".yellow
-            ip = @compute.insert_address(attributes["name"], region[0..-3])
+            ip = @compute.insert_address(@attrs["name"], @options[:region][0..-3])
             while true
-              ip = @compute.get_address(attributes["name"], region[0..-3])
+              ip = @compute.get_address(@attrs["name"], @options[:region][0..-3])
               if ip[:body]["address"]
-                attributes["public_ip"].replace ip[:body]["address"]
-                puts "Using public_ip #{attributes["public_ip"]}".yellow
+                @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
@@ -147,6 +117,36 @@ module Dployr
             end
           end
       end
+      
+      def create_disk()
+        disk = @compute.disks.get(@attrs["name"])
+        if disk != nil
+          puts "Disk #{@attrs["name"]} already created. Reusing it.".yellow
+          return disk
+        else
+          puts "Creating new boot disk #{@attrs["name"]}...".yellow
+          disk = @compute.disks.create(
+            name: @attrs["name"],
+            size_gb: 10,
+            zone_name: @options[:region],
+            source_image: @attrs["image_name"]
+          )
+        
+          disk.wait_for { disk.ready? }
+          return disk
+        end
+      end
+
+      # https://developers.google.com/compute/docs/instances
+      def get_instance(states)
+        servers = @compute.servers.all
+        servers.each do |instance|
+          if instance.name == @attrs["name"] and states.include? instance.state
+            return instance
+          end
+        end
+        return nil
+      end
 
     end
   end

data/lib/dployr/config/instance.rb

@@ -6,14 +6,13 @@ module Dployr
 
       include Dployr::Utils
 
-      attr_reader :attributes, :providers, :authentication, :scripts, :parents
+      attr_reader :attributes, :providers, :scripts, :parents
       attr_accessor :name
 
       def initialize
         @name = 'unnamed'
         @attributes = {}
-        @authentication = {}
-        @scripts = []
+        @scripts = {}
         @providers = {}
         @parents = []
         yield self if block_given?
@@ -23,7 +22,6 @@ module Dployr
         if config.is_a? Hash
           set_attributes get_by_key config, :attributes if has config, :attributes
           set_providers get_by_key config, :providers if has config, :providers
-          set_auth get_by_key config, :authentication if has config, :authentication
           set_scripts get_by_key config, :scripts if has config, :scripts
           set_parents get_by_key config, :extends if has config, :extends
         end
@@ -32,7 +30,6 @@ module Dployr
       def get_values
         deep_copy({
           attributes: @attributes,
-          authentication: @authentication,
           scripts: @scripts,
           providers: @providers,
           parents: @parents
@@ -55,10 +52,6 @@ module Dployr
         @scripts << script if script.is_a? Hash
       end
 
-      def add_auth(key, value)
-        @authentication[key] = value if key
-      end
-
       def add_provider(name, provider)
         @providers[name] = provider if provider.is_a? Hash
       end
@@ -73,10 +66,6 @@ module Dployr
 
       private
 
-      def set_auth(auth)
-        @authentication = auth if auth.is_a? Hash
-      end
-
       def set_providers(providers)
         @providers = providers if providers.is_a? Hash
       end

data/lib/dployr/configuration.rb

@@ -149,12 +149,12 @@ module Dployr
     end
 
     def inherit_config(child, parent)
-      keys = [ :attributes, :scripts, :authentication ]
+      keys = [ :attributes, :scripts ]
       keys.each do |type|
         current = deep_copy get_by_key(parent, type)
         source = get_by_key child, type
         if current and source
-          raise Error.new "Cannot merge different types: #{parent}" if current.class != source.class
+          raise "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

data/lib/dployr/scripts/default_hooks.rb

@@ -1,24 +1,24 @@
 module Dployr
   module Scripts
     class Default_Hooks
-
+      
       def initialize(ip, config, stage, command)
         @config = config
         @ip = ip
         @stage = stage
 
-        if @config[:scripts]["pre-#{@stage}"]
+        if @config[:scripts].is_a?(Hash) and @config[:scripts]["pre-#{@stage}"]
           Dployr::Scripts::Hook.new @ip, config, "pre-#{@stage}"
         end
         @ip = command.action()
-        if @config[:scripts][@stage]
+        if @config[:scripts].is_a?(Hash) and @config[:scripts][@stage]
           Dployr::Scripts::Hook.new @ip, config, "#{@stage}"
         end
-        if @config[:scripts]["post-#{@stage}"]
+        if @config[:scripts].is_a?(Hash) and @config[:scripts]["post-#{@stage}"]
           Dployr::Scripts::Hook.new @ip, config, "post-#{@stage}"
-        end
-      end
-
+        end 
+      end      
+      
     end
   end
 end

data/lib/dployr/scripts/hook.rb

@@ -18,13 +18,15 @@ module Dployr
         private_key_path = attrs["private_key_path"]
 
         puts "Running stage '#{@stage}':".yellow
-        @instance[:scripts][@stage].each do |script|
-          if script["target"]
-            Dployr::Scripts::Scp.new @ip, host, username, private_key_path, script
-          elsif script["remote_path"]
-            Dployr::Scripts::Shell.new @ip, host, username, private_key_path, script
-          elsif script["local_path"]
-            Dployr::Scripts::Local_Shell.new script
+        if @instance[:scripts].is_a?(Hash) 
+          @instance[:scripts][@stage].each do |script|
+            if script["target"]
+              Dployr::Scripts::Scp.new @ip, host, username, private_key_path, script
+            elsif script["remote_path"]
+              Dployr::Scripts::Shell.new @ip, host, username, private_key_path, script
+            elsif script["local_path"]
+              Dployr::Scripts::Local_Shell.new script
+            end
           end
         end
       end

data/lib/dployr/version.rb

@@ -1,3 +1,3 @@
 module Dployr
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/configuration_spec.rb

@@ -202,20 +202,6 @@ describe Dployr::Configuration do
         end
       end
 
-      describe "autentication" do
-        it "should exists" do
-          zeus[:authentication].should be_a Hash
-        end
-
-        it "should have a valid number of values" do
-          zeus[:authentication].should have(2).items
-        end
-
-        it "should have a valid authentication values" do
-          zeus[:authentication][:user].should eql 'admin'
-        end
-      end
-
       describe "providers" do
         it "should exists" do
           zeus[:providers].should be_a Hash
@@ -265,9 +251,6 @@ describe Dployr::Configuration do
                 region[:scripts].should have(2).items
               end
 
-              it "should have inherited autentication" do
-                region[:authentication].should have(2).items
-              end
             end
           end
 
@@ -275,7 +258,7 @@ describe Dployr::Configuration do
 
         describe "aws" do
           it "should have the expected values" do
-            zeus[:providers][:aws].should have(4).items
+            zeus[:providers][:aws].should have(3).items
           end
 
           describe "attributes" do
@@ -434,23 +417,6 @@ describe Dployr::Configuration do
                 end
               end
 
-              describe "authentication" do
-                it "should exists" do
-                  region[:authentication].should be_a Hash
-                end
-
-                it "should have a valid number" do
-                  region[:authentication].should have(2).items
-                end
-
-                it "should have a valid user" do
-                  region[:authentication][:user].should eql "admin"
-                end
-
-                it "should have a valid key_path" do
-                  region[:authentication][:key_path].should eql "path/to/key.pem"
-                end
-              end
             end
           end
         end
@@ -470,7 +436,7 @@ describe Dployr::Configuration do
         end
 
         it "should have one provider" do
-          @config.should have(4).items
+          @config.should have(3).items
         end
 
         it "should have two regions" do
@@ -512,7 +478,7 @@ describe Dployr::Configuration do
         end
 
         it "should have a valid number of keys" do
-          @config.should have(3).items
+          @config.should have(2).items
         end
 
         it "should have a attributes" do

data/spec/fixtures/german/Dployrfile.yml

@@ -10,13 +10,19 @@ german-template:
         target: /tmp
     provision:
       - remote_path: /tmp/hello/hello.sh
-    post-halt:
-      - local_path: sleep
-        args: "50"
   providers:
+    baremetal:
+      regions:
+        wizzo:
+          attributes:
+            private_ip: 10.111.6.56
     aws:
       attributes:
         instance_type: t1.micro
+      scripts:
+        post-halt:
+        - local_path: sleep
+          args: "50"
       regions:
         sa-east-1a:
           attributes:

data/spec/fixtures/german/real_test.rb

@@ -1,5 +1,6 @@
 #OPTIONS=" -f Dployrfile.yml -n german-template -p aws -r sa-east-1a"
-OPTIONS=" -f Dployrfile.yml -n german-template -p gce -r europe-west1-a"
+#OPTIONS=" -f Dployrfile.yml -n german-template -p gce -r europe-west1-a"
+OPTIONS=" -f Dployrfile.yml -n german-template -p baremetal -r wizzo"
 
 
 BIN="../../../bin/dployr"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dployr
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Tomas Aparicio
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -140,6 +140,7 @@ files:
 - lib/dployr/commands/stop_destroy.rb
 - lib/dployr/commands/utils.rb
 - lib/dployr/compute/aws.rb
+- lib/dployr/compute/baremetal.rb
 - lib/dployr/compute/common.rb
 - lib/dployr/compute/gce.rb
 - lib/dployr/config/constants.rb