dployr 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 304f9d5d7f79de110215c48e59f5c3dc39bbe29c
-  data.tar.gz: 3fa3639b3f5058161d5fb1b318d217dcfa1c4a78
+  metadata.gz: ccf10af60294e8d7c5e2edbe34f4bc1b2c2c3ea4
+  data.tar.gz: d1d72ea9459501658813c121fb4c3f05450d3d29
 SHA512:
-  metadata.gz: 6eaaaf925b1c8e8ef30519a4c664577359cc33266cc8db708979f32f903ac5bd0bf58bcf13d624c6059ba0b0c19846914f65d0e07690036004b91d0b016ab79b
-  data.tar.gz: 51a0d39c49c4ce149003d5acd1807879f4a0878f5fb159f8c086d3b7d09a900076f2a153c3db348217a00acd5dfe388a49957505aa8c73e4fda3ee701e26d2ca
+  metadata.gz: 89d38a44d6797a60ae5e8593ca958244648dbeff3e33926c2e6e5f689626e05ea2b59f6a0922e26fd83ae1aeb3f73eec6a397b38e0098ab5cf38ed9a8d1c9284
+  data.tar.gz: 6ee5b85aef80f2a1c915ea3195139e9312bdcca676721ae37c843c578a452a8fd6d6b9777e6058bf9a789af6b49ebe4311cb2100d75009b17ccc24ef65cd7560

data/README.md

@@ -15,13 +15,17 @@
 
 ## About
 
-**Dployr** is a Ruby utility that simplifies cloud management
-and deployment across different providers
+**Dployr** is a Ruby utility that **simplifies cloud management
+and deployment** across different providers
 
-You can setup your project cloud infraestructure from a
-simple configuration file which support built-in rich features
+You can setup all your project cloud infraestructure from a
+simple configuration file and deploy it into multiple clouds easily
 
-Dployr provides a featured [command-line interface](#command-line-interface) and [programmatic API](#programmatic-api)
+Through Dployr you can take full control about the multiple stages phases
+which covers the full deployment infrastructure workflow,
+such as instances creation, network configuration, provisioning, testing and halting
+
+It provides a featured [command-line interface](#command-line-interface) and [programmatic API](#programmatic-api)
 
 ## Installation
 
@@ -38,25 +42,34 @@ spec.add_dependency 'dployr', '~> 0.0.1'
 gem 'dployr', '>= 0.0.1'
 ```
 
-Requires Ruby 1.9.3+
+It requires Ruby `1.9.3+`
 
 ## Features
 
-- Fully configurable from Ruby or YAML file with rich features like templating
-- Supports deployment to multiple cloud providers
+- Fully configurable from Ruby or YAML file with built-in rich features like templating
+- Simplifies deployment to multiple cloud providers
+- Allows to create the same infraestructe into multiple cloud providers from one command
 - 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...)
+- Allows to run local and remote scripts execution per stage with pre and post hooks
 - Featured command-line and programmatic API
 
 ## Supported providers
 
-Note that as Dployr is still in alpha stage, there are only a few providers supported
+Dployr is still a alpha project, so there are only a few providers supported
 
 - Amazon Web Services (`aws`)
 - Google Compute Engine (`gce`)
 - Baremetal
 
+Upcoming supported providers by priority
+
+- OpenStack
+- Verizon
+- Azure
+- Rackspace
+- XenServer
+
 ## Configuration
 
 Configuration file must be called `Dployrfile`. It can be also a standard Ruby file
@@ -69,13 +82,16 @@ Each configuration level supports the followings members:
 - **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
+- **extends** `String|Array` Allows to inherits from other template
 
 #### Templating
 
-Dployr allows templating features inside configuration values, in order
-to provide an easy and clean way to dynamically replace values and self-referenced variables
-inside the same configuration
+Dployr allows templating powerful features inside configuration values, in order
+to provide an easy, non-redundant and clean way to dynamically replace values for different usage contexts,
+such as specific context cloud provider, deployment region or environment variables
+
+Configuration templates can inherits from others templates,
+so you can reuse environments for multiple projects or environments
 
 Supported template values notations
 
@@ -251,14 +267,15 @@ Dployr API documentation is available from [RubyDoc][rubydoc]
 
 ### Configuration
 
+Example Dployrfile in Ruby which uses the API to configure your project
 ```ruby
 Dployr::configure do |dployr|
 
-  dployr.config.add_instance({
+  dployr.config.add_instance(:zeus, {
     attributes: {
-      name: "example",
       instance_type: "m1.small",
-      version: "${VERSION}"
+      version: "${VERSION}",
+      env: 'dev'
     },
     scripts: [
       { path: "configure.sh" }
@@ -266,18 +283,29 @@ Dployr::configure do |dployr|
     providers: {
       aws: {
         attributes: {
-          network_id: "be457fca",
-          instance_type: "m1.small",
-          "type-%{name}" => "small"
+          ami: 'ami-370daf2a', # centos-base-v7
+          keypair: 'vagrant-aws-saopaulo',
+          security_groups: ['sg-3cf3e45e'],
+          subnet_id: 'subnet-1eebe07c'
+          public_ip: 'new'
         },
         regions: {
           "eu-west-1a" => {
             attributes: {
+              instance_type: "m1.medium",
               keypair: "vagrant-aws-ireland"
             },
-            scripts: [
-              { path: "router.sh", args: ["%{name}", "${region}", "${provider}"] }
-            ]
+            scripts: {
+              start: [
+                { path: "router.sh", args: ["${name}", "${region}", "${provider}"] }
+              ]
+              provision: [
+                { path: "puppet.sh", args: ["${name}", "${region}", "${provider}", '--env %{env}'] }
+              ]
+              post-provision: [
+                { path: "clean.sh" }
+              ]
+            }
           }
         }
       }
@@ -322,9 +350,9 @@ To build a new version of the gem:
 $ rake build
 ````
 
-To publish the new version to Rubygems:
+Publish the new version to Rubygems:
 ```
-$ rake release
+$ gem push pkg/dployr-0.1.0.gem
 ```
 
 ## Contributors

data/lib/dployr/cli.rb

@@ -5,6 +5,22 @@ require 'dployr/version'
 command = ARGV[0]
 options = {}
 
+def run(command, options, arg = nil)
+  begin
+    cmd = Dployr::Commands.const_get command
+    raise "Command not supported: #{command}" unless cmd
+    if arg
+      cmd.new options, arg
+    else
+      cmd.new options
+    end
+  rescue => e
+    puts "Error: #{e}".red
+    puts e.backtrace if e.backtrace and options[:debug]
+    exit 1
+  end
+end
+
 opt_parser = OptionParser.new do |opt|
   opt.banner   = "\n  Usage: dployr <command> [options]"
   opt.separator  ""
@@ -69,22 +85,6 @@ end
 
 opt_parser.parse!
 
-def run(command, options, arg = nil)
-  begin
-    cmd = Dployr::Commands.const_get command
-    raise "Command not supported: #{command}" unless cmd
-    if arg
-      cmd.new options, arg
-    else
-      cmd.new options
-    end
-  rescue => e
-    puts "Error: #{e}".red
-    puts e.backtrace if e.backtrace and options[:debug]
-    exit 1
-  end
-end
-
 case command
 when "start"
   run :Start, options

data/lib/dployr/compute/aws.rb

@@ -78,6 +78,29 @@ module Dployr
         wait_ssh @attrs, server, @options[:public_ip]
       end
 
+      def create_network(network_name, network_range, firewalls, routes)
+        # Routes not used in AWS
+        create_vpc(network_range)                # VPC + INTERNET GATEWAY
+        create_subnet(network_range)             # SUBNET + ROUTE TABLE
+        configure_security_group(firewalls)      # SECURITY GROUP
+      end
+
+      def delete_network(network_name, network_range, firewalls, routes)
+        # Network_name, firewalls and routes not used. We only need "vpc_id"
+        if exist_vpc network_range
+          vpcId = get_vpcId(network_range)
+
+          delete_route_tables(vpcId)
+          delete_subnets(vpcId)
+          delete_network_acls(vpcId)
+          delete_internet_gateways(vpcId)
+          delete_security_groups(vpcId)
+          delete_vpc(vpcId)
+        else
+          puts "\tNetwork #{network_range} not found. Nothing to delete!"
+        end
+      end
+
       private
 
       def get_instance(states)
@@ -107,6 +130,222 @@ module Dployr
         end
       end
 
+      def create_vpc(network_range)
+        if ! exist_vpc(network_range)
+          # Internet Gateway
+          ig = @compute.create_internet_gateway
+          igId = ig.body["internetGatewaySet"][0]["internetGatewayId"]
+          puts "\tInternet Gateway #{igId} created!"
+
+          @attrs["internetGatewayId"] = igId
+
+          # VPC
+          vpc = @compute.create_vpc(network_range)
+          vpcId = vpc.body["vpcSet"][0]["vpcId"]
+          puts "\tVPC #{vpcId} (#{network_range}) created!"
+
+          # Associate both
+          @compute.attach_internet_gateway(igId, vpcId)
+          puts "\t\tBoth associated!"
+        else
+          puts "\tVPC #{network_range} already exists"
+          vpcId = get_vpcId(network_range)
+        end
+
+        @attrs["vpcId"] = vpcId
+      end
+
+      def create_subnet(network_range)
+        if ! exist_subnet(network_range)
+          vpcId = @attrs["vpcId"]
+
+          # SUBNET
+          sn = @compute.create_subnet(vpcId, network_range)
+          snId = sn.body["subnet"]["subnetId"]
+          puts "\tSubnet #{snId} created!"
+
+          @attrs["subnetId"] = snId
+
+          # ROUTE TABLE
+          rt = @compute.create_route_table(vpcId)
+          rtId = rt.body["routeTable"][0]["routeTableId"]
+          puts "\tRoute table #{rtId} created!"
+
+          @attrs["routeTableId"] = rtId
+
+          # Add route for internet gateway
+          igId = @attrs["internetGatewayId"]
+          @compute.create_route(rtId, "0.0.0.0/0", igId, instance_id = nil, network_interface_id = nil)
+
+          # Associate both
+          @compute.associate_route_table(rtId, snId)
+          puts "\t\tBoth associated!"
+        else
+          puts "\tSubnet #{network_range} already exists"
+        end
+      end
+
+      def configure_security_group(firewalls)
+
+        timestamp = Time.now.to_i
+        @attrs["securityGroupName"] = "SG-#{timestamp}"
+        puts "\tConfiguring Security Group: #{@attrs["securityGroupName"]}"
+
+        vpcId = @attrs["vpcId"]
+
+        # Create Security Group
+        sg = @compute.create_security_group( @attrs["securityGroupName"], "dployr", vpcId)
+        @attrs["securityGroupId"] = sg.body["groupId"]
+        puts "\t\tSecurity Group #{@attrs["securityGroupId"]} created!"
+
+        # Create rules
+        if firewalls.respond_to?("each")
+          firewalls.each do |key, value|
+            add_firewall( @attrs["securityGroupId"] , key, value["address"][0], value["protocol"], value["port"])
+          end
+        end
+
+        puts "\tSecurity Group #{@attrs["securityGroupId"]} configured!"
+      end
+
+      def add_firewall(sgId, name, cidrIp, protocol, ports)
+        # Split ports into "from" and "to"
+        words = ports.split("-")
+        if words.length > 1
+          from = words[0].to_i
+          to = words[1].to_i
+        else
+          from = to = words[0].to_i
+        end
+
+        group_name = "SG-plumbing"
+        options = {}
+        options["GroupId"] = "#{sgId}"
+        options["CidrIp"] = "#{cidrIp}"
+        options["FromPort"] = from
+        options["IpProtocol"] = "#{protocol}"
+        options["ToPort"] = to
+
+        # Add rule
+        asg = @compute.authorize_security_group_ingress(group_name, options)
+        puts "\t\tRule #{name} added!"
+      end
+
+      def exist_vpc(name)
+        list = @compute.describe_vpcs.data[:body]
+        items = list["vpcSet"]
+        if items.respond_to?("each")
+          items.each do |item|
+            if item["cidrBlock"] == name
+              return true
+            end
+          end
+        end
+        return false
+      end
+
+      def exist_subnet(name)
+        list = @compute.describe_subnets.data[:body]
+        items = list["subnetSet"]
+        if items.respond_to?("each")
+          items.each do |item|
+            if item["cidrBlock"] == name
+              return true
+            end
+          end
+        end
+        return false
+      end
+
+      def get_vpcId(private_net)
+        list = @compute.describe_vpcs.data[:body]
+        items = list["vpcSet"]
+        if items.respond_to?("each")
+          items.each do |item|
+            if item["cidrBlock"] == private_net
+              return item["vpcId"]
+            end
+          end
+        end
+        return ""
+      end
+
+      # Route Tables
+      # Delete non-default route tables from VPC. Default tables NOT allowed
+      def delete_route_tables(vpcId)
+        rts = @compute.describe_route_tables('vpc-id' => "#{vpcId}").body["routeTableSet"]
+        if rts.respond_to?("each")
+          rts.each do |rt|
+            if ! rt["associationSet"][0]["main"] # non-default
+              @compute.disassociate_route_table( rt["associationSet"][0]["routeTableAssociationId"] )
+              @compute.delete_route_table( rt["routeTableId"] )
+              puts "\tRoute table #{rt["routeTableId"]} deleted!"
+            end
+          end
+        end
+      end
+
+      # Subnets
+      # Delete subnets from VPC.
+      def delete_subnets(vpcId)
+        subnets = @compute.describe_subnets('vpc-id' => "#{vpcId}").body["subnetSet"]
+        if subnets.respond_to?("each")
+          subnets.each do |sn|
+            @compute.delete_subnet( sn["subnetId"] )
+            puts "\tSubnet #{sn["subnetId"]} deleted!"
+          end
+        end
+      end
+
+      # Network ACLs
+      # Delete non-default network ACLs from VPC. Defaul ACLs NOT allowed
+      def delete_network_acls(vpcId)
+        acls = @compute.describe_network_acls('vpc-id' => "#{vpcId}").body["networkAclSet"]
+        if acls.respond_to?("each")
+          acls.each do |acl|
+            if ! acl["default"] # non-default
+              @compute.delete_network_acl( acl["networkAclId"] )
+              puts "\tNetwork ACL #{acl["networkAclId"]} deleted!"
+            end
+          end
+        end
+      end
+
+      # Internet Gateway
+      # Delete internet gateways from VPC.
+      def delete_internet_gateways(vpcId)
+        igws = @compute.describe_internet_gateways('attachment.vpc-id' => "#{vpcId}").body["internetGatewaySet"]
+        if igws.respond_to?("each")
+          igws.each do |igw|
+            @compute.detach_internet_gateway( igw["internetGatewayId"], vpcId )
+            @compute.delete_internet_gateway( igw["internetGatewayId"] )
+            puts "\tInternet gateway #{igw["internetGatewayId"]} deleted!"
+          end
+        end
+      end
+
+      # Security Group
+      # Delete non-default security group from VPC. Default SG NOT allowed
+      def delete_security_groups(vpcId)
+        sgs = @compute.describe_security_groups('vpc-id' => "#{vpcId}").body["securityGroupInfo"]
+        if sgs.respond_to?("each")
+          sgs.each do |sg|
+            if sg["groupName"] != "default" # non-default
+              @compute.delete_security_group( nil, sg["groupId"] )
+              puts "\tSecurity Group #{sg["groupId"]} deleted!"
+            end
+          end
+        end
+      end
+
+      def delete_vpc(vpcId)
+        if @compute.delete_vpc(vpcId)
+          puts "\tVPC #{vpcId} deleted!"
+        else
+          puts "\tError deleting VPC #{vpcId}!"
+        end
+      end
+
     end
   end
 end

data/lib/dployr/scripts/shell.rb

@@ -48,13 +48,11 @@ module Dployr
             end
             channel.on_data do |ch,data|
               stdout_data+=data
-              #print "[#{@host}] #{data}".green
               print "#{data}".green
             end
 
             channel.on_extended_data do |ch,type,data|
               stderr_data += data
-              #print "[#{@host}] #{data}".red
               print "#{data}".red
             end
 

data/lib/dployr/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dployr
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Tomas Aparicio
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -149,7 +149,6 @@ files:
 - lib/dployr/config/instance.rb
 - 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/local_shell.rb

data/lib/dployr/logger.rb

@@ -1,11 +0,0 @@
-module Dployr
-  module Logger
-
-    module_function
-
-    def log(*msg)
-      msg.each { |msg| puts msg }
-    end
-
-  end
-end