opsicle 2.10.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f351c978f6ecef8f39e1bcaedf071d57766f8fca
-  data.tar.gz: fb2f615938ab86f7fc8cd431670511ffe0f78f01
+  metadata.gz: 2e28df963a182535bfaf92964eeb32df3950e884
+  data.tar.gz: 7ba69cac271a9c2269afe46fe28e120a7405d92b
 SHA512:
-  metadata.gz: 7d9d7ff9546d924d2bcd8f29786c7d6e8368485f8173a77f013a11dd142dc2f96f1df8337d000f0b5cd300b0a781fa7d36e13f70d805f505ab1070e2d5e4157f
-  data.tar.gz: 264695840f0389211f6f3bbc6252d16c2cd1078d3f5bb3e9d1dd5ddce19d6d39ff3484f4f8b2be8e0f6d5a34f897959527584e2dde3c183be3de0e4948e31fb3
+  metadata.gz: 0197fea7b2f46f0ea103c8c8df2549040acf4f00a87ff220827feb237e21d2edce2cad5587f35f25fe6c21b38e6fa3b35ca8da45f244ac2ee11b42567b3df06d
+  data.tar.gz: 46270627f6c99cb98f4e362aeb93dfac47796c982572b7bea7de5be94062c4f98aec94c49036ffe8525532292f9ce8118a24e1356ef0d6a67c4baf44778a05f7

data/lib/opsicle/aws_instance_manager_helper.rb

@@ -0,0 +1,3 @@
+module AwsInstanceManagerHelper
+
+end

data/lib/opsicle/commands/create_instance.rb

@@ -1,8 +1,8 @@
 require 'gli'
 require "opsicle/user_profile"
 require "opsicle/manageable_layer"
-require "opsicle/manageable_instance"
 require "opsicle/manageable_stack"
+require "opsicle/creatable_instance"
 
 module Opsicle
   class CreateInstance

data/lib/opsicle/commands/delete_instance.rb

@@ -18,7 +18,8 @@ module Opsicle
 
     def execute(options={})
       puts "Stack ID = #{@stack.id}"
-      instances_to_delete = select_instances
+      layer = select_layer
+      instances_to_delete = select_instances(layer)
       instances_to_delete.each do |instance|
         begin
           @opsworks.delete_instance(instance_id: instance.instance_id)
@@ -29,16 +30,29 @@ module Opsicle
       end
     end
 
-    def deleteable_instances
-      @stack.deleteable_instances
+    def deleteable_instances(layer)
+      @stack.deleteable_instances(layer)
+    end
+
+    def select_layer
+      puts "\nLayers:\n"
+      ops_layers = @opsworks.describe_layers({ :stack_id => @stack.id }).layers
+
+      layers = []
+      ops_layers.each do |layer|
+        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks, @ec2, @cli)
+      end
 
+      layers.each_with_index { |layer, index| puts "#{index.to_i + 1}) #{layer.name}" }
+      layer_index = @cli.ask("Layer?\n", Integer) { |q| q.in = 1..layers.length.to_i } - 1
+      layers[layer_index]
     end
 
-    def select_instances
-      instances = deleteable_instances
+    def select_instances(layer)
+      instances = deleteable_instances(layer)
       return_array = []
       if instances.empty?
-        puts "There are no deletable instances"
+        puts "There are no deletable instances."
       else
         puts "\nDeleteable Instances:\n"
         instances.each_with_index { |instance, index| puts "#{index.to_i + 1}) #{instance.status} - #{instance.hostname}" }

data/lib/opsicle/commands/stop_instance.rb

@@ -18,7 +18,8 @@ module Opsicle
 
     def execute(options={})
       puts "Stack ID = #{@stack.id}"
-      instances_to_stop = select_instances
+      layer = select_layer
+      instances_to_stop = select_instances(layer)
       instances_to_stop.each do |instance|
         begin
           @opsworks.stop_instance(instance_id: instance.instance_id)
@@ -29,15 +30,29 @@ module Opsicle
       end
     end
 
-    def stoppable_instances
-      @stack.stoppable_instances
+    def stoppable_instances(layer)
+      @stack.stoppable_instances(layer)
     end
 
-    def select_instances
-      instances = stoppable_instances
+    def select_layer
+      puts "\nLayers:\n"
+      ops_layers = @opsworks.describe_layers({ :stack_id => @stack.id }).layers
+
+      layers = []
+      ops_layers.each do |layer|
+        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks, @ec2, @cli)
+      end
+
+      layers.each_with_index { |layer, index| puts "#{index.to_i + 1}) #{layer.name}" }
+      layer_index = @cli.ask("Layer?\n", Integer) { |q| q.in = 1..layers.length.to_i } - 1
+      layers[layer_index]
+    end
+
+    def select_instances(layer)
+      instances = stoppable_instances(layer)
       return_array = []
       if instances.empty?
-        puts "There are no stoppable instances"
+        puts "There are no stoppable instances."
       else
         puts "\nStoppable Instances:\n"
         instances.each_with_index { |instance, index| puts "#{index.to_i + 1}) #{instance.status} - #{instance.hostname}" }

data/lib/opsicle/creatable_instance.rb

@@ -30,14 +30,14 @@ module Opsicle
     end
 
     def make_new_hostname
-      new_instance_hostname = auto_generated_hostname
-      puts "\nAutomatically generated hostname: #{new_instance_hostname}\n"
+      new_instance_hostname = auto_generated_hostname || nil
+      puts "\nAutomatically generated hostname: #{new_instance_hostname}\n" if new_instance_hostname
       new_instance_hostname = ask_for_new_option("instance's hostname") if ask_for_overriding_permission("hostname", false)
       new_instance_hostname
     end
 
     def hostname
-      self.layer.instances.first.hostname
+      self.layer.instances.first.hostname if self.layer.instances.first
     end
 
     def auto_generated_hostname
@@ -118,7 +118,7 @@ module Opsicle
     end
 
     def os
-      self.layer.instances.first.os
+      self.layer.instances.first.os if self.layer.instances.first
     end
 
     def ask_for_possible_options(arr, description)
@@ -149,7 +149,7 @@ module Opsicle
         ami_id: ami_id,
         subnet_id: subnet_id,
         agent_version: agent_version,
-        os: os
+        os: os || 'Custom'
       })
       self.new_instance_id = new_instance.instance_id
       self.layer.add_new_instance(new_instance_id)

data/lib/opsicle/manageable_stack.rb

@@ -68,16 +68,16 @@ module Opsicle
       @opsworks.describe_instances(stack_id: self.id).instances
     end
 
-    def deleteable_instances
-      instances.select{ |instance| instance.auto_scaling_type.nil?  && instance.status == "stopped" }
+    def deleteable_instances(layer)
+      instances.select{ |instance| instance.auto_scaling_type.nil?  && instance.status == "stopped" && instance.layer_ids.include?(layer.layer_id) }
     end
 
     def stoppable_states
       %w(start_failed stop_failed online running_setup setup_failed booting rebooting)
     end
 
-    def stoppable_instances
-      instances.select{ |instance| instance.elastic_ip.nil?  && stoppable_states.include?(instance.status) }
+    def stoppable_instances(layer)
+      instances.select{ |instance| instance.elastic_ip.nil?  && stoppable_states.include?(instance.status) && instance.layer_ids.include?(layer.layer_id) }
     end
   end
 end

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "2.10.0"
+  VERSION = "2.10.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -190,6 +190,7 @@ files:
 - LICENSE
 - bin/opsicle
 - lib/opsicle.rb
+- lib/opsicle/aws_instance_manager_helper.rb
 - lib/opsicle/client.rb
 - lib/opsicle/commands.rb
 - lib/opsicle/commands/add_tags.rb