skyed 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4940c6e2a8a3df68f9e3f68acd1aa8fdae2b12f
-  data.tar.gz: 869c118fc70c08c7af21923620e858f5a7c35ffc
+  metadata.gz: b27a8404cf87eb1e4afb937814581a898bd03770
+  data.tar.gz: 60d273c48e9ae11f7e0a6a30e8fc467da703f0ad
 SHA512:
-  metadata.gz: 6ebb691ec6afb34527190e04ec6fc967faf76ae8cbc712746f5d1b2c9b67ea82ca6045265abbcbaedf0f7e3f0d22ae41012bc4e2399357a713a743ec331f2a43
-  data.tar.gz: f81af1bd091b21664c915e84a8ddd8b41e1629f7f572cf97168983a327baf5800249b8cc6c0c718ac51ac09573402f8cf44a2bb0c66d01a94ad03c65369b919f
+  metadata.gz: f6107f8e6876a9ccada9e29034fdcbde09698248ea34016fd852d062369c75610d9a85bd8651d0253e52833635ceee5a572393b036b3e6c5f820f7abfa116d61
+  data.tar.gz: b815d6ec22244760a8f11f356e4cf58cd750ad1dbb6e5cbc8fe807f8f55c164959089ee588cabb2f5c74811b866d22b0407f3bf9069779fa4eaa7484011e9db2

data/lib/skyed.rb

@@ -11,5 +11,5 @@ require 'skyed/settings'
 
 # Skyed is a set of tools for cloud computing
 module Skyed
-  VERSION = '0.1.9'
+  VERSION = '0.1.11'
 end

data/lib/skyed/aws.rb

@@ -42,15 +42,13 @@ module Skyed
     module RDS
       class << self
         def create_instance_from_snapshot(
-          instance_name,
-          snapshot,
-          _options,
-          rds = nil)
+          instance_name, snapshot, options, rds = nil)
           rds = login if rds.nil?
           rds.restore_db_instance_from_db_snapshot(
             db_instance_identifier: instance_name,
             db_snapshot_identifier: snapshot)[:db_instance]
-          db_instance = wait_for_instance(instance_name, 'available', 0, rds)
+          db_instance = wait_for_instance(
+            instance_name, 'available', options[:wait_interval], rds)
           "#{db_instance[:endpoint][:address]}:#{db_instance[:endpoint][:port]}"
         end
 
@@ -160,6 +158,28 @@ module Skyed
       }
 
       class << self
+        def create_instance(stack_id, layer_id, instance_type, opsworks)
+          instance = opsworks.create_instance(
+            stack_id: stack_id,
+            layer_ids: [layer_id],
+            instance_type: instance_type)
+          opsworks.start_instance(instance_id: instance.instance_id)
+          wait_for_instance_id(
+            instance.instance_id,
+            'online',
+            opsworks)
+        end
+
+        def wait_for_instance_id(instance_id, status, opsworks)
+          instance = opsworks.describe_instances(
+            instance_ids: [instance_id]).instances.first
+          until instance.nil? || instance.status == status
+            sleep(0)
+            instance = opsworks.describe_instances(
+              instance_ids: [instance_id]).instances.first
+          end
+        end
+
         def deregister_instance(hostname, opsworks)
           instance = instance_by_name(
             hostname, Skyed::Settings.stack_id, opsworks)

data/lib/skyed/commands.rb

@@ -1,3 +1,5 @@
+version Skyed::VERSION
+
 desc 'Initialize skyed'
 long_desc 'Sets up skyed configuration for a repository'
 
@@ -89,12 +91,22 @@ command :create do |cmd|
   cmd.flag [:password], default_value: 'password',
                         type: String,
                         desc: 'Master password of the RDS instance'
-  defval = 'rds-launch-wizard'
+  cmd.flag [:s, :stack], default_value: nil,
+                         type: String,
+                         desc: stack_desc
+  cmd.flag [:l, :layer], default_value: nil,
+                         type: String,
+                         desc: layer_desc
+  desc = 'Time to wait for AWS responses'
+  cmd.flag [:w, :wait_interval, 'wait-interval'], default_value: 30,
+                                                  type: Integer,
+                                                  desc: desc
+  defval = 'default'
   desc = 'Name of the DB Security Group'
   cmd.flag [:db_security_group, 'db-security-group'], default_value: defval,
                                                       type: String,
                                                       desc: desc
-  defval = 'default'
+  defval = 'default.postgres9.4'
   desc = 'Name of the DB Parameter Group'
   cmd.flag [:db_parameters_group, 'db-parameters-group'], default_value: defval,
                                                           type: String,

data/lib/skyed/create.rb

@@ -1,9 +1,44 @@
 module Skyed
   # This module encapsulates all the create command steps.
   module Create
+    @non_rds_options = [:rds, :stack, :layer]
     class << self
       def execute(_global_options, options, args)
         Skyed::Init.credentials if Skyed::Settings.empty?
+        execute_rds(options, args) if options[:rds]
+        create_opsworks(options, args) unless options[:rds]
+      end
+
+      def check_create_options(options)
+        msg = 'Specify stack and layer or initialize for local management'
+        fail msg unless options[:stack] && options[:layer]
+      end
+
+      def create_opsworks(options, _args)
+        check_create_options(options)
+        ow = settings(options)
+        Skyed::AWS::OpsWorks.create_instance(
+          Skyed::Settings.stack_id,
+          Skyed::Settings.layer_id,
+          options[:type],
+          ow)
+      end
+
+      def stack(ow, options)
+        stack = Skyed::AWS::OpsWorks.stack(options[:stack], ow)
+        msg = "There's no such stack with id #{options[:stack]}"
+        fail msg unless stack
+        stack[:stack_id]
+      end
+
+      def layer(ow, options)
+        layer = Skyed::AWS::OpsWorks.layer(options[:layer], ow)
+        msg = "There's no such layer with id #{options[:layer]}"
+        fail msg unless layer
+        layer[:layer_id]
+      end
+
+      def execute_rds(options, args)
         endpoint = create_new(options, args) if args.length == 1
         endpoint = restore_new(options, args) if args.length == 2
         puts endpoint
@@ -13,13 +48,25 @@ module Skyed
         Skyed::AWS::RDS.create_instance_from_snapshot(
           args[0],
           args[1],
-          options.select { |k| k != :rds })
+          options.select { |k| ! @non_rds_options.include? k })
       end
 
       def create_new(options, args)
         Skyed::AWS::RDS.create_instance(
           args[0],
-          options.select { |k| k != :rds })
+          options.select { |k| ! @non_rds_options.include? k })
+      end
+
+      def settings(options)
+        ow = login
+        Skyed::Settings.stack_id = stack(ow, options)
+        Skyed::Settings.layer_id = layer(ow, options)
+        ow
+      end
+
+      def login
+        Skyed::Init.credentials if Skyed::Settings.empty?
+        Skyed::AWS::OpsWorks.login
       end
     end
   end

data/lib/skyed/settings.rb

@@ -28,11 +28,14 @@ module Skyed
       end
 
       def method_missing(name, *args)
+        msg = "unknown configuration root #{name}."
+        msg += ' Initialize skyed or export PKEY'
         if name.match(/.*=/)
           @_settings[name.to_s.split('=')[0]] = args[0]
         else
           @_settings[name.to_s] ||
-            fail(NoMethodError, "unknown configuration root #{name}", caller)
+            fail(
+              NoMethodError, msg, caller)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skyed
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Ignasi Fosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git