dployr 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccf10af60294e8d7c5e2edbe34f4bc1b2c2c3ea4
-  data.tar.gz: d1d72ea9459501658813c121fb4c3f05450d3d29
+  metadata.gz: 5c5a14e300cb3831bedf130b3a12975e13fbbad8
+  data.tar.gz: 29fa5cbb80af3b030fd181f5231cbb062f85290e
 SHA512:
-  metadata.gz: 89d38a44d6797a60ae5e8593ca958244648dbeff3e33926c2e6e5f689626e05ea2b59f6a0922e26fd83ae1aeb3f73eec6a397b38e0098ab5cf38ed9a8d1c9284
-  data.tar.gz: 6ee5b85aef80f2a1c915ea3195139e9312bdcca676721ae37c843c578a452a8fd6d6b9777e6058bf9a789af6b49ebe4311cb2100d75009b17ccc24ef65cd7560
+  metadata.gz: 65d4d90a2364345c3c259062413ef105330ca17830480c56d95347be455011133d067ee8467f67e4dcd93c46dee524a5bb03ca8b7b0ceaa18566489620dd96fc
+  data.tar.gz: 0376ef3eda087804224485fbdbcab63fbe78fa88d5320058b9a017a405926fbafcf43af9bb1713a0fe3c414ab445e4c335d8b73baa8f19f508d7fb27fcf64122

data/README.md

@@ -1,7 +1,5 @@
 # dployr [![Build Status](https://secure.travis-ci.org/innotech/dployr.svg?branch=master)][travis] [![Dependency Status](https://gemnasium.com/innotech/dployr.svg)][gemnasium] [![Gem](https://badge.fury.io/rb/dployr.svg)][gem]
 
-> Multicloud management and deployment made simple
-
 > **Alpha project, use it by your own risk**
 
 <table>
@@ -19,10 +17,10 @@
 and deployment** across different providers
 
 You can setup all your project cloud infraestructure from a
-simple configuration file and deploy it into multiple clouds easily
+simple [configuration file](#configuration) and deploy it into multiple clouds easily
 
 Through Dployr you can take full control about the multiple stages phases
-which covers the full deployment infrastructure workflow,
+which covers the complete 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)

data/dployr.gemspec

@@ -4,8 +4,8 @@ require 'dployr/version'
 Gem::Specification.new do |s|
   s.name        = "dployr"
   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.summary     = "Multicloud management and deployment made simple"
+  s.description = "Multicloud management and deployment made simple from a single configuration file with a featured CLI and programmatic API, supporting deployment stages, local scripts and remote scripts execution and more"
   s.authors     = ["Tomas Aparicio", "German Ramos"]
   s.email       = ["nerds@innotechapp.com"]
   s.homepage    = "https://github.com/innotech/dployr"

data/lib/dployr/commands/base.rb

@@ -39,17 +39,15 @@ module Dployr
         end
       end
 
-      def get_region_config(options)
-        @dployr.config.get_region options[:name], options[:provider], options[:region]
-      end
-
-      private
-
       def get_config
         @config = get_region_config @options
         @p_attrs = @config[:attributes]
       end
 
+      def get_region_config(options)
+        @dployr.config.get_region options[:name], options[:provider], options[:region]
+      end
+
     end
   end
 end

data/lib/dployr/configuration.rb

@@ -125,6 +125,26 @@ module Dployr
       attrs
     end
 
+    # Pending refactor
+    def get_inherited_attributes(config, provider, region)
+      config = merge_defaults(config)
+      attrs = config[:attributes].is_a?(Hash) ? deep_copy(config[:attributes]) : {}
+
+      if current = get_by_key(config, :providers)
+        attrs.merge! current[:attributes] if current[:attributes].is_a? Hash
+        if current = get_by_key(current, provider)
+          attrs.merge! get_by_key(current, :attributes) if get_by_key(current, :attributes).is_a? Hash
+          if (regions = get_by_key current, :regions).is_a? Hash
+            attrs.merge! get_by_key(regions, :attributes) if get_by_key(regions, :attributes).is_a? Hash
+            if (region = get_by_key regions, region).is_a? Hash
+              attrs.merge! get_by_key(region, :attributes) if get_by_key(region, :attributes).is_a? Hash
+            end
+          end
+        end
+      end
+      attrs
+    end
+
     def merge_config(instance, attributes = {})
       config = merge_defaults instance.get_values
       config[:attributes] =
@@ -140,11 +160,13 @@ module Dployr
     def merge_providers(config)
       key = get_real_key config, :providers
       if config[key].is_a? Hash
-        config[key].each do |name, provider|
-          provider = replace_keywords 'provider', name, inherit_config(provider, config)
+        config[key].each do |provider_name, provider|
+          provider = replace_keywords 'provider', provider_name, inherit_config(provider, config)
           regions = get_by_key provider, get_real_key(provider, :regions)
           regions.each do |name, region|
             regions[name] = replace_keywords 'region', name, inherit_config(region, provider)
+            attrs = get_inherited_attributes config, provider_name, name
+            regions[name] = replace_variables regions[name], attrs
           end if regions
         end
       end

data/lib/dployr/init.rb

@@ -43,11 +43,12 @@ module Dployr
     end
 
     def load_config(file_path = nil)
-      if file_path
-        @file_path = file_path
-      else
-        @file_path = discover
-      end
+      @file_path =
+        if file_path
+          file_path
+        else
+          discover
+        end
       set_config @file_path
     end
 
@@ -67,7 +68,7 @@ module Dployr
       config = read_yaml file_path
       if config.is_a? Hash
         config.each do |name, config|
-          if name == 'default'
+          if name.to_s == 'default'
             @config.set_default config
           else
             @config.add_instance name, config

data/lib/dployr/version.rb

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

data/spec/configuration_spec.rb

@@ -18,7 +18,9 @@ describe Dployr::Configuration do
         attributes: {
           name: "example",
           instance_type: "m1.small",
-          version: "${DPLOYR}"
+          version: "${DPLOYR}",
+          network_id: "be457fca",
+          mixed: "%{network_id}-%{instance_type}"
         },
         scripts: [
           { path: "configure.sh" }
@@ -28,8 +30,7 @@ describe Dployr::Configuration do
             attributes: {
               network_id: "be457fca",
               instance_type: "m1.small",
-              "type-%{name}" => "small",
-              mixed: "%{network_id}-%{instance_type}"
+              "type-%{name}" => "small"
             },
             scripts: [
               {
@@ -60,7 +61,7 @@ describe Dployr::Configuration do
 
           it "should have valid attributes" do
             config.default.attributes.should be_a Hash
-            config.default.attributes.should have(3).items
+            config.default.attributes.should have(5).items
           end
 
           it "should have scripts" do
@@ -225,7 +226,7 @@ describe Dployr::Configuration do
             }
 
             it "should have a valid number of attributes" do
-              gce[:attributes].should have(3).items
+              gce[:attributes].should have(5).items
             end
 
             it "should have the instance_type attributes" do
@@ -246,7 +247,7 @@ describe Dployr::Configuration do
               }
 
               it "should have a valid number of attributes" do
-                region[:attributes].should have(4).items
+                region[:attributes].should have(6).items
               end
 
               it "should have inherited scripts" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dployr
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Tomas Aparicio
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -109,8 +109,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2'
-description: Multicloud management and deployment with asteroids made simple with
-  a rich programmatic API and featured CLI
+description: Multicloud management and deployment made simple from a single configuration
+  file with a featured CLI and programmatic API, supporting deployment stages, local
+  scripts and remote scripts execution and more
 email:
 - nerds@innotechapp.com
 executables:
@@ -198,7 +199,7 @@ rubyforge_project: dployr
 rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
-summary: Multicloud management and deployment with asteroids made simple
+summary: Multicloud management and deployment made simple
 test_files:
 - spec/commands_config_spec.rb
 - spec/commands_util_spec.rb