dployr 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c470db55ac45d9fd7194b76fda8213aec26cbbd6
-  data.tar.gz: ba15cc25e47219751fc78170796b7c3c0014a6ec
+  metadata.gz: 84dbc231d29673da035d182bf6198848a4b0bbe1
+  data.tar.gz: 504c80fb2ea79996efa2b155affc7f1fcced00a6
 SHA512:
-  metadata.gz: 812edd49fc33adeb9416e23040b7bf11c1057583e8019f708f8848eceed131405579c4cc5e8a80e242274f06209ae77bb3ecade5254d1687248b6ecefb734944
-  data.tar.gz: b34bb3786b51d1442a0034db7836c3092d77c08359ed91f90e9acc686b20e797ea9dbbacc597b97cef9d83a1ea35653c81f777bfaf05a893e3e9db6e32308c5b
+  metadata.gz: 8d1d4eb41cf77fc668a7e785a4c6228f9f15ce64add9cc1c434a10311964fe789b21031ef9a09c4930b932878a6962897732f1f3f03d18746e361c155ac90fb2
+  data.tar.gz: 102f3eb0359b547f595fc64e13cb3ba9db54b27a26101eef0eb27dc2113c75e15d1af101119f1affb0d797fc8f8ab8075bc5663c05307b9ead3e32c2f1c38cee

data/dployr.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "fog", "~> 1.21"
   s.add_dependency "deep_merge", "~> 1.0"
-  s.add_dependency "net-ssh", "~> 2.8.0"
+  s.add_dependency "net-ssh", "~> 2.9.0"
   s.add_dependency "net-scp", "~> 1.2.0"
   s.add_dependency "colorize", "~> 0.7.2"
 

data/lib/dployr/cli.rb

@@ -45,11 +45,15 @@ opt_parser = OptionParser.new do |opt|
   opt.on("-r", "--region REGION", "region to use (allow multiple values comma-separated)") do |v|
     options[:region] = v
   end
-  
+
   opt.on("-i", "--public-ip", "use public ip instead of private ip to when access instances") do |v|
     options[:public_ip] = v
   end
 
+  opt.on("--debug", "enable debug mode") do
+    options[:debug] = true
+  end
+
   opt.on("-v",  "-V", "--version", "version") do
     puts Dployr::VERSION
     exit 0
@@ -65,31 +69,47 @@ 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"
-  Dployr::Commands::Start.new options
+  run :Start, options
 when "halt"
-  Dployr::Commands::StopDestroy.new options, "halt"
+  run :StopDestroy, options, "halt"
 when "destroy"
-  Dployr::Commands::StopDestroy.new options, "destroy"
+  run :StopDestroy, options, "destroy"
 when "status"
   puts "Command currently not available"
 when "info"
-  Dployr::Commands::Info.new options
+  run :Info, options
 when "provision"
-  Dployr::Commands::ProvisionTest.new options, "provision"
+  run :ProvisionTest, options, "provision"
 when "test"
-  Dployr::Commands::ProvisionTest.new options, "test"
+  run :ProvisionTest, options, "test"
 when "deploy"
-  Dployr::Commands::Start.new options
-  Dployr::Commands::ProvisionTest.new options, "provision"
-  Dployr::Commands::ProvisionTest.new options, "test"
+  run :Start, options
+  run :ProvisionTest, options, "provision"
+  run :ProvisionTest, options, "test"
 when "execute"
-  Dployr::Commands::Execute.new options, ARGV[1..-1]
+  run :Execute, options, ARGV[1..-1]
 when "ssh"
-  Dployr::Commands::Ssh.new options
+  run :Ssh, options
 when "config"
-  Dployr::Commands::Config.new options
+  run :Config, options
 when "init"
   Dployr::Config::Create.write_file
 else

data/lib/dployr/commands/base.rb

@@ -11,27 +11,22 @@ module Dployr
 
       include Dployr::Commands::Utils
 
-      attr_reader :options, :name, :log, :attrs, :dployr
-
       def initialize(options)
         @options = options
         @name = options[:name]
         @log = Logger.new STDOUT
         @attrs = parse_attributes @options[:attributes]
-        if !options[:public_ip]
-          options[:public_ip] = false
-        end
+        @options[:public_ip] = false if !options[:public_ip]
         @provider = options[:provider].upcase
         create
-        @config = get_region_config options
-        @p_attrs = @config[:attributes]
+        get_config
       end
 
       def create
         begin
           @dployr = Dployr::Init.new @attrs
           @dployr.load_config @options[:file]
-        rescue Exception => e
+        rescue => e
           raise "Cannot load the config: #{e}"
         end
       end
@@ -48,6 +43,13 @@ module Dployr
         @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
+
     end
   end
 end

data/lib/dployr/commands/config.rb

@@ -6,12 +6,7 @@ module Dployr
 
       def initialize(options)
         super options
-        begin
-          render_file
-        rescue Exception => e
-          @log.error e
-          exit 1
-        end
+        render_file
       end
 
       private
@@ -19,13 +14,7 @@ module Dployr
       def render_file
         raise "Dployrfile was not found" if @dployr.file_path.nil?
         raise "Configuration is missing" unless @dployr.config.exists?
-
-        begin
-          print_config
-        rescue Exception => e
-          puts "Cannot generate the config: #{e}"
-          exit 1
-        end
+        print_config
       end
 
       def print_config

data/lib/dployr/commands/info.rb

@@ -15,7 +15,6 @@ module Dployr
           else
             raise "#{@p_attrs["name"]} not found"
           end
-          
         rescue Exception => e
           self.log.error e
           exit 1

data/lib/dployr/compute/baremetal.rb

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

data/lib/dployr/configuration.rb

@@ -37,7 +37,7 @@ module Dployr
     def get_config(name, attributes = {})
       instance = get_instance name
       attributes = @attributes.merge (attributes or {})
-      raise Error.new "Instance '#{name.to_s}' do not exists" if instance.nil?
+      raise "Instance do not exists" if instance.nil?
       render_config name, instance, attributes
     end
 
@@ -54,7 +54,9 @@ module Dployr
       if config.is_a? Hash
         config = config[get_real_key(config, :providers)]
         if config.is_a? Hash
-          return config[get_real_key(config, provider)]
+          provider_data = config[get_real_key(config, provider)]
+          raise "Provider #{provider} for #{name} do not exists" unless provider_data
+          provider_data
         end
       end
     end
@@ -63,7 +65,9 @@ module Dployr
       provider = get_provider name, provider, attributes
       if provider.is_a? Hash
         regions = get_by_key provider, :regions
-        return get_by_key regions, region
+        region_data = get_by_key regions, region
+        raise "Region #{region} for #{name} do not exists" unless region_data
+        region_data
       end
     end
 
@@ -75,17 +79,12 @@ module Dployr
     private
 
     def render_config(name, instance, attributes)
-      attributes = replace_variables attributes
       config = merge_config instance, attributes
       config = replace_name name, config
       config = replace_variables config, attributes
       config
     end
 
-    def replace_name(name, config)
-      replace_keywords 'name', name, config
-    end
-
     def create_instance(name = 'unnamed', config)
       Dployr::Config::Instance.new do |i|
         i.name = name
@@ -93,17 +92,26 @@ module Dployr
       end if config.is_a? Hash
     end
 
+    def replace_name(name, config)
+      replace_keywords 'name', name, config
+    end
+
     def replace_variables(config, attributes = {})
       if config.is_a? Hash
         attrs = get_all_attributes config
         attrs.merge! attributes if attributes.is_a? Hash
-        traverse_map config do |str, key|
-          replace_env_vars template(str, attrs)
-        end
+        config = replace config, attrs
       end
       config
     end
 
+    def replace(hash, origin)
+      traverse_map hash do |str|
+        replace_env_vars template(str, origin)
+      end
+      hash
+    end
+
     def get_all_attributes(config)
       attrs = {}
       config.each do |key, value|
@@ -113,6 +121,7 @@ module Dployr
           attrs.merge! get_all_attributes value
         end
       end if config.is_a? Hash
+      attrs = replace attrs, attrs
       attrs
     end
 

data/lib/dployr/utils.rb

@@ -13,7 +13,7 @@ module Dployr
     end
 
     def get_by_key(hash, key)
-      if hash.is_a? Hash
+      if hash.is_a? Hash and key
         hash[key] or hash[key.to_sym] or hash[key.to_s]
       end
     end

data/lib/dployr/version.rb

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

data/spec/configuration_spec.rb

@@ -14,37 +14,39 @@ describe Dployr::Configuration do
     end
 
     describe "default values" do
-      let(:defaults) do
-        {
-          attributes: {
-            name: "example",
-            instance_type: "m1.small",
-            version: "${DPLOYR}"
-          },
-          scripts: [
-            { path: "configure.sh" }
-          ],
-          providers: {
-            aws: {
-              attributes: {
-                network_id: "be457fca",
-                instance_type: "m1.small",
-                "type-%{name}" => "small"
-              },
-              scripts: [
-                { path: "router.sh", args: ["%{name}", "${region}", "${provider}"] }
-              ],
-              regions: {
-                "eu-west-1a" => {
-                  attributes: {
-                    keypair: "vagrant-aws-ireland"
-                  }
+      defaults = {
+        attributes: {
+          name: "example",
+          instance_type: "m1.small",
+          version: "${DPLOYR}"
+        },
+        scripts: [
+          { path: "configure.sh" }
+        ],
+        providers: {
+          aws: {
+            attributes: {
+              network_id: "be457fca",
+              instance_type: "m1.small",
+              "type-%{name}" => "small",
+              mixed: "%{network_id}-%{instance_type}"
+            },
+            scripts: [
+              {
+                path: "router.sh",
+                args: [ "%{name}", "${region}", "${provider}" ]
+              }
+            ],
+            regions: {
+              "eu-west-1a" => {
+                attributes: {
+                  keypair: "vagrant-aws-ireland"
                 }
               }
             }
           }
         }
-      end
+      }
 
       describe "add default values" do
         before do
@@ -105,12 +107,12 @@ describe Dployr::Configuration do
         attributes: {
           name: "zeus"
         },
-        authentication: {
-          user: "admin",
-          key_path: "path/to/key.pem"
-        },
         scripts: [
-          { path: "setup.sh", args: ["--id ${index}", "--name ${name}"], remote: true }
+          {
+            path: "setup.sh",
+            args: ["--id ${index}", "--name ${name}", "%{name}-%{instance_type}-%{version}", "%{mixed}"],
+            remote: true
+          }
         ],
         providers: {
           aws: {
@@ -250,7 +252,6 @@ describe Dployr::Configuration do
               it "should have inherited scripts" do
                 region[:scripts].should have(2).items
               end
-
             end
           end
 
@@ -267,7 +268,7 @@ describe Dployr::Configuration do
             end
 
             it "should have a valid number of attributes" do
-              zeus[:providers][:aws][:attributes].should have(5).items
+              zeus[:providers][:aws][:attributes].should have(6).items
             end
 
             it "should have a valid instance_type" do
@@ -290,6 +291,10 @@ describe Dployr::Configuration do
               it "should have a type key with valid replacement" do
                 zeus[:providers][:aws][:attributes]["type-zeus"].should eql "small"
               end
+
+              it "should have a mixed attribute with self-referenced values" do
+                zeus[:providers][:aws][:attributes][:mixed].should eql "be457fca-m1.small"
+              end
             end
           end
 
@@ -311,7 +316,7 @@ describe Dployr::Configuration do
             end
 
             it "should have a valid number of arguments" do
-              zeus[:providers][:aws][:scripts][1][:args].should have(2).items
+              zeus[:providers][:aws][:scripts][1][:args].should have(4).items
             end
 
             it "should have a remote property" do
@@ -330,6 +335,14 @@ describe Dployr::Configuration do
               it "should replace the name context value" do
                 zeus[:providers][:aws][:scripts][1][:args][1].should eql "--name zeus"
               end
+
+              it "should replace the multiple attributes" do
+                zeus[:providers][:aws][:scripts][1][:args][2].should eql "zeus-m1.small-0.1.0"
+              end
+
+              it "should replace the self-referenced attribute with other attributes" do
+                zeus[:providers][:aws][:scripts][1][:args][3].should eql "be457fca-m1.small"
+              end
             end
           end
 
@@ -416,7 +429,6 @@ describe Dployr::Configuration do
                   end
                 end
               end
-
             end
           end
         end
@@ -435,7 +447,7 @@ describe Dployr::Configuration do
           @config.should be_a Hash
         end
 
-        it "should have one provider" do
+        it "should have a valid number of keys" do
           @config.should have(3).items
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dployr
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Tomas Aparicio
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dployr
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Multicloud management and deployment with asteroids made simple