opsicle 2.9.6 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ff947af2b5f1a1919e06d19faffb47932ee2c2c
-  data.tar.gz: 99884d6bfc1d0839ff529424a77d0fb5bc6bd9f5
+  metadata.gz: f351c978f6ecef8f39e1bcaedf071d57766f8fca
+  data.tar.gz: fb2f615938ab86f7fc8cd431670511ffe0f78f01
 SHA512:
-  metadata.gz: f0ad402becc5859c41c0d10c30af93701322672d6879a8406ca2e42a2e02a5d979515747e33c9b767cf3892f972472727fc5289d10bba0b8edb2f9b9503c52db
-  data.tar.gz: df3728df0e6712f61882db4971013001587857197be932c6745d1b3a4d7f2b9bd5fa79e7876b300223fc67e28cb382b03ced38bcb357d8285b810ec4928bb84c
+  metadata.gz: 7d9d7ff9546d924d2bcd8f29786c7d6e8368485f8173a77f013a11dd142dc2f96f1df8337d000f0b5cd300b0a781fa7d36e13f70d805f505ab1070e2d5e4157f
+  data.tar.gz: 264695840f0389211f6f3bbc6252d16c2cd1078d3f5bb3e9d1dd5ddce19d6d39ff3484f4f8b2be8e0f6d5a34f897959527584e2dde3c183be3de0e4948e31fb3

data/bin/opsicle

@@ -203,6 +203,51 @@ command 'clone-instance' do |c|
   end
 end
 
+desc "Create an instance in the given environment stack"
+arg_name '<environment>'
+command 'create-instance' do |c|
+  c.action do |global_options, options, args|
+    raise ArgumentError, "Environment is required" unless args.first
+    Opsicle::CreateInstance.new(args.first).execute global_options.merge options
+  end
+end
+
+desc "Delete stopped instances in the given environment stack"
+arg_name '<environment>'
+command 'delete-instance' do |c|
+  c.action do |global_options, options, args|
+    raise ArgumentError, "Environment is required" unless args.first
+    Opsicle::DeleteInstance.new(args.first).execute global_options.merge options
+  end
+end
+
+desc "Stop instances in the given environment stack(only instances without EIPs)"
+arg_name '<environment>'
+command 'stop-instance' do |c|
+  c.action do |global_options, options, args|
+    raise ArgumentError, "Environment is required" unless args.first
+    Opsicle::StopInstance.new(args.first).execute global_options.merge options
+  end
+end
+
+desc "Move EIPs between instances"
+arg_name '<environment>'
+command 'move-eip' do |c|
+  c.action do |global_options, options, args|
+    raise ArgumentError, "Environment is required" unless args.first
+    Opsicle::MoveEip.new(args.first).execute global_options.merge options
+  end
+end
+
+desc "Add tags to existing instances in the given environment stack"
+arg_name '<environment>'
+command 'add-tags' do |c|
+  c.action do |global_options, options, args|
+    raise ArgumentError, "Environment is required" unless args.first
+    Opsicle::AddTags.new(args.first).execute global_options.merge options
+  end
+end
+
 desc "List all instances in the given environment stack"
 arg_name '<environment>'
 command :instances do |c|
@@ -212,7 +257,6 @@ command :instances do |c|
   end
 end
 
-
 desc "Update properties on a OpsWorks resource."
 arg_name '<environment> <type>'
 command 'update' do |c|

data/lib/opsicle/commands.rb

@@ -1,15 +1,20 @@
 require 'opsicle/client'
 
-require "opsicle/commands/deploy"
+require "opsicle/commands/add_tags"
 require "opsicle/commands/chef_update"
 require "opsicle/commands/clone_instance"
+require "opsicle/commands/create_instance"
+require "opsicle/commands/delete_instance"
+require "opsicle/commands/deploy"
 require "opsicle/commands/execute_recipes"
+require "opsicle/commands/failure_log"
+require "opsicle/commands/legacy_credential_converter"
 require "opsicle/commands/list"
 require "opsicle/commands/list_instances"
-require "opsicle/commands/update"
+require "opsicle/commands/move_eip"
 require "opsicle/commands/ssh"
-require "opsicle/commands/ssh_key"
 require "opsicle/commands/ssh_clean_keys"
+require "opsicle/commands/ssh_key"
+require "opsicle/commands/stop_instance"
+require "opsicle/commands/update"
 require "opsicle/commands/user_profile_info"
-require "opsicle/commands/legacy_credential_converter"
-require "opsicle/commands/failure_log"

data/lib/opsicle/commands/add_tags.rb

@@ -0,0 +1,59 @@
+require 'gli'
+require "opsicle/user_profile"
+require "opsicle/manageable_layer"
+require "opsicle/manageable_instance"
+require "opsicle/manageable_stack"
+
+module Opsicle
+  class AddTags
+
+    def initialize(environment)
+      @client = Client.new(environment)
+      @opsworks = @client.opsworks
+      @ec2 = @client.ec2
+      stack_id = @client.config.opsworks_config[:stack_id]
+      @stack = ManageableStack.new(@client.config.opsworks_config[:stack_id], @opsworks)
+      @cli = HighLine.new
+    end
+
+    def execute(options={})
+      puts "Stack ID = #{@stack.id}"
+      layer = select_layer
+      all_instances = layer.get_cloneable_instances
+      instances_to_add_tags = select_instances(all_instances)
+      add_tags_to_instances(instances_to_add_tags)
+    end
+
+    def add_tags_to_instances(instances)
+      instances.each { |instance| instance.add_tags({add_tags_mode: true}) }
+    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)
+      puts "\nInstances:\n"
+      instances.each_with_index { |instance, index| puts "#{index.to_i + 1}) #{instance.status} - #{instance.hostname}" }
+      instance_indices_string = @cli.ask("Instances? (enter as a comma separated list)\n", String)
+      instance_indices_list = instance_indices_string.split(/,\s*/)
+      instance_indices_list.map! { |instance_index| instance_index.to_i - 1 }
+
+      return_array = []
+      instance_indices_list.each do |index|
+        return_array << instances[index]
+      end
+      return_array
+    end
+  end
+end

data/lib/opsicle/commands/clone_instance.rb

@@ -1,8 +1,8 @@
 require 'gli'
 require "opsicle/user_profile"
-require "opsicle/cloneable_layer"
-require "opsicle/cloneable_instance"
-require "opsicle/cloneable_stack"
+require "opsicle/manageable_layer"
+require "opsicle/manageable_instance"
+require "opsicle/manageable_stack"
 
 module Opsicle
   class CloneInstance
@@ -12,7 +12,7 @@ module Opsicle
       @opsworks = @client.opsworks
       @ec2 = @client.ec2
       stack_id = @client.config.opsworks_config[:stack_id]
-      @stack = CloneableStack.new(@client.config.opsworks_config[:stack_id], @opsworks)
+      @stack = ManageableStack.new(@client.config.opsworks_config[:stack_id], @opsworks)
       @cli = HighLine.new
     end
 
@@ -40,10 +40,10 @@ module Opsicle
 
       layers = []
       ops_layers.each do |layer|
-        layers << CloneableLayer.new(layer.name, layer.layer_id, @stack, @opsworks, @ec2, @cli)
+        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}"}
+      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

data/lib/opsicle/commands/create_instance.rb

@@ -0,0 +1,46 @@
+require 'gli'
+require "opsicle/user_profile"
+require "opsicle/manageable_layer"
+require "opsicle/manageable_instance"
+require "opsicle/manageable_stack"
+
+module Opsicle
+  class CreateInstance
+
+    def initialize(environment)
+      @client = Client.new(environment)
+      @opsworks = @client.opsworks
+      @ec2 = @client.ec2
+      stack_id = @client.config.opsworks_config[:stack_id]
+      @stack = ManageableStack.new(@client.config.opsworks_config[:stack_id], @opsworks)
+      @cli = HighLine.new
+    end
+
+    def execute(options={})
+      puts "Stack ID = #{@stack.id}"
+      layer = select_layer
+      layer.get_cloneable_instances
+      create_instance(layer, options)
+      layer.ami_id = nil
+      layer.agent_version = nil
+    end
+
+    def create_instance(layer, options)
+      CreatableInstance.new(layer, @stack, @opsworks, @ec2, @cli).create(options)
+    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
+  end
+end

data/lib/opsicle/commands/delete_instance.rb

@@ -0,0 +1,55 @@
+require 'gli'
+require "opsicle/user_profile"
+require "opsicle/manageable_layer"
+require "opsicle/manageable_instance"
+require "opsicle/manageable_stack"
+
+module Opsicle
+  class DeleteInstance
+
+    def initialize(environment)
+      @client = Client.new(environment)
+      @opsworks = @client.opsworks
+      @ec2 = @client.ec2
+      stack_id = @client.config.opsworks_config[:stack_id]
+      @stack = ManageableStack.new(@client.config.opsworks_config[:stack_id], @opsworks)
+      @cli = HighLine.new
+    end
+
+    def execute(options={})
+      puts "Stack ID = #{@stack.id}"
+      instances_to_delete = select_instances
+      instances_to_delete.each do |instance|
+        begin
+          @opsworks.delete_instance(instance_id: instance.instance_id)
+          puts "Successfully deleted #{instance.hostname}"
+        rescue
+          puts "Failed to delete #{instance.hostname}"
+        end
+      end
+    end
+
+    def deleteable_instances
+      @stack.deleteable_instances
+
+    end
+
+    def select_instances
+      instances = deleteable_instances
+      return_array = []
+      if instances.empty?
+        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}" }
+        instance_indices_string = @cli.ask("Which instances would you like to delete? (enter as a comma separated list)\n", String)
+        instance_indices_list = instance_indices_string.split(/,\s*/)
+        instance_indices_list.map! { |instance_index| instance_index.to_i - 1 }
+        instance_indices_list.each do |index|
+          return_array << instances[index]
+        end
+      end
+      return_array
+    end
+  end
+end

data/lib/opsicle/commands/move_eip.rb

@@ -0,0 +1,24 @@
+require 'gli'
+require "opsicle/user_profile"
+require "opsicle/manageable_layer"
+require "opsicle/manageable_instance"
+require "opsicle/manageable_stack"
+
+module Opsicle
+  class MoveEip
+
+    def initialize(environment)
+      @client = Client.new(environment)
+      @opsworks = @client.opsworks
+      @ec2 = @client.ec2
+      stack_id = @client.config.opsworks_config[:stack_id]
+      @cli = HighLine.new
+      @stack = ManageableStack.new(@client.config.opsworks_config[:stack_id], @opsworks, @cli)
+    end
+
+    def execute(options={})
+      puts "Stack ID = #{@stack.id}"
+      @stack.move_eip
+    end
+  end
+end

data/lib/opsicle/commands/stop_instance.rb

@@ -0,0 +1,54 @@
+require 'gli'
+require "opsicle/user_profile"
+require "opsicle/manageable_layer"
+require "opsicle/manageable_instance"
+require "opsicle/manageable_stack"
+
+module Opsicle
+  class StopInstance
+
+    def initialize(environment)
+      @client = Client.new(environment)
+      @opsworks = @client.opsworks
+      @ec2 = @client.ec2
+      stack_id = @client.config.opsworks_config[:stack_id]
+      @stack = ManageableStack.new(@client.config.opsworks_config[:stack_id], @opsworks)
+      @cli = HighLine.new
+    end
+
+    def execute(options={})
+      puts "Stack ID = #{@stack.id}"
+      instances_to_stop = select_instances
+      instances_to_stop.each do |instance|
+        begin
+          @opsworks.stop_instance(instance_id: instance.instance_id)
+          puts "Stopping instance #{instance.hostname}..."
+        rescue
+          puts "Failed to stop #{instance.hostname}"
+        end
+      end
+    end
+
+    def stoppable_instances
+      @stack.stoppable_instances
+    end
+
+    def select_instances
+      instances = stoppable_instances
+      return_array = []
+      if instances.empty?
+        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}" }
+        instance_indices_string = @cli.ask("Which instances would you like to stop? (enter as a comma separated list)\n", String)
+        instance_indices_list = instance_indices_string.split(/,\s*/)
+        instance_indices_list.map! { |instance_index| instance_index.to_i - 1 }
+        instance_indices_list.each do |index|
+          return_array << instances[index]
+        end
+      end
+      return_array
+    end
+  end
+end

data/lib/opsicle/commands/update.rb

@@ -54,4 +54,4 @@ module Opsicle
     end
 
   end
-end
+end

data/lib/opsicle/config.rb

@@ -36,6 +36,10 @@ module Opsicle
       env_config
     end
 
+    def mfa_required
+      return opsworks_config[:mfa_required] || $use_mfa
+    end
+
     def get_mfa_token
       return @token if @token
       @token = Output.ask("Enter MFA token: "){ |q|  q.validate = /^\d{6}$/ }
@@ -81,9 +85,9 @@ module Opsicle
 
       iam = Aws::IAM::Client.new
 
-       # this will be an array of 0 or 1 because iam.list_mfa_devices.mfa_devices will only return 0 or 1 device per user;
-       # if user doesn't have MFA enabled, then this loop won't even execute
-      if $use_mfa
+      # this will be an array of 0 or 1 because iam.list_mfa_devices.mfa_devices will only return 0 or 1 device per user;
+      # if user doesn't have MFA enabled, then this loop won't even execute
+      if mfa_required
         iam.list_mfa_devices.mfa_devices.each do |mfadevice|
           mfa_serial_number = mfadevice.serial_number
           get_mfa_token
@@ -112,6 +116,5 @@ module Opsicle
 
     MissingConfig = Class.new(StandardError)
     MissingEnvironment = Class.new(StandardError)
-
   end
 end

data/lib/opsicle/creatable_instance.rb

@@ -0,0 +1,200 @@
+module Opsicle
+  class CreatableInstance
+    attr_accessor :layer, :stack, :new_instance_id, :opsworks, :ec2, :cli
+
+    def initialize(layer, stack, opsworks, ec2, cli)
+      self.layer = layer
+      self.stack = stack
+      self.opsworks = opsworks
+      self.ec2 = ec2
+      self.cli = cli
+      self.new_instance_id = nil
+    end
+
+    def create(options)
+      puts "\nCreating an instance..."
+
+      new_instance_hostname = make_new_hostname
+      puts ""
+      ami_id = select_ami_id
+      puts ""
+      agent_version = select_agent_version
+      puts ""
+      subnet_id = select_subnet_id
+      puts ""
+      instance_type = ask_for_new_option('instance type')
+      puts ""
+
+      create_new_instance(new_instance_hostname, instance_type, ami_id, agent_version, subnet_id)
+      start_new_instance
+    end
+
+    def make_new_hostname
+      new_instance_hostname = auto_generated_hostname
+      puts "\nAutomatically generated hostname: #{new_instance_hostname}\n"
+      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
+    end
+
+    def auto_generated_hostname
+      if hostname =~ /\d\d\z/
+        increment_hostname
+      end
+    end
+
+    def sibling_hostnames
+      self.layer.instances.collect { |instance| instance.hostname }
+    end
+
+    def increment_hostname
+      name = hostname
+      until hostname_unique?(name) do
+        name = name.gsub(/(\d\d\z)/) { "#{($1.to_i + 1).to_s.rjust(2, '0')}" }
+      end
+      name
+    end
+
+    def sibling_hostnames
+      self.layer.instances.map(&:hostname)
+    end
+
+    def hostname_unique?(name)
+      !sibling_hostnames.include?(name)
+    end
+
+    def find_subnet_name(subnet)
+      tags = subnet.tags
+      tag = nil
+      tags.each { |t| tag = t if t.key == 'Name' }
+      tag.value if tag
+    end
+
+    def select_ami_id
+      instances = @opsworks.describe_instances(stack_id: @stack.id).instances
+      ami_ids = instances.collect { |i| i.ami_id }.uniq
+      ami_ids << "Provide a different AMI ID."
+      ami_id = ask_for_possible_options(ami_ids, "AMI ID")
+
+      if ami_id == "Provide a different AMI ID."
+        ami_id = ask_for_new_option('AMI ID')
+      end
+
+      self.layer.ami_id = ami_id
+
+      ami_id
+    end
+
+    def select_agent_version
+      agents = @opsworks.describe_agent_versions(stack_id: @stack.id).agent_versions
+      version_ids = agents.collect { |i| i.version }.uniq
+      agent_version = ask_for_possible_options(version_ids, "agent version")
+      self.layer.agent_version = agent_version
+      agent_version
+    end
+
+    def select_subnet_id
+      ec2_subnets = ec2.describe_subnets.subnets
+      subnets = []
+
+      ec2_subnets.each do |subnet|
+        if subnet.vpc_id == stack.vpc_id
+          subnet_name = find_subnet_name(subnet)
+          zone_name = subnet.availability_zone
+          subnet_id = subnet.subnet_id
+          subnets << "\"#{subnet_name}\" #{zone_name} (#{subnet_id})"
+        end
+      end
+
+      subnets = subnets.sort
+      subnet_id = ask_for_possible_options(subnets, "subnet ID")
+      subnet_id = subnet_id.scan(/(subnet-[a-z0-9]*)/).first.first if subnet_id
+
+      self.layer.subnet_id = subnet_id
+      subnet_id
+    end
+
+    def os
+      self.layer.instances.first.os
+    end
+
+    def ask_for_possible_options(arr, description)
+      arr.each_with_index { |id, index| puts "#{index.to_i + 1}) #{id}"}
+      id_index = @cli.ask("Which #{description}?\n", Integer) { |q| q.in = 1..arr.length.to_i } - 1
+      arr[id_index]
+    end
+
+    def ask_for_new_option(description)
+      @cli.ask("Please write in the new #{description} and press ENTER:")
+    end
+
+    def ask_for_overriding_permission(description, overriding_all)
+      if overriding_all
+        ans = @cli.ask("Do you wish to override this #{description}? By overriding, you are choosing to override the current #{description} for all of the following instances you're cloning.\n1) Yes\n2) No", Integer)
+      else
+        ans = @cli.ask("Do you wish to override this #{description}?\n1) Yes\n2) No", Integer)
+      end
+      ans == 1
+    end
+
+    def create_new_instance(new_instance_hostname, instance_type, ami_id, agent_version, subnet_id)
+      new_instance = @opsworks.create_instance({
+        stack_id: self.stack.id, # required
+        layer_ids: [self.layer.layer_id], # required
+        instance_type: instance_type, # required
+        hostname: new_instance_hostname,
+        ami_id: ami_id,
+        subnet_id: subnet_id,
+        agent_version: agent_version,
+        os: os
+      })
+      self.new_instance_id = new_instance.instance_id
+      self.layer.add_new_instance(new_instance_id)
+      puts "New instance #{new_instance_hostname} has been created: #{new_instance_id}"
+    end
+
+    def start_new_instance
+      if ask_to_start_instance
+        @opsworks.start_instance(instance_id: self.new_instance_id)
+        puts "\nNew instance is starting…"
+        add_tags
+      end
+    end
+
+    def add_tags
+      if ask_to_add_tags
+        tags = []
+
+        tag_count.times do
+          tags << define_tag
+        end
+
+        ec2_instance_id = @opsworks.describe_instances(instance_ids: [new_instance_id]).instances.first.ec2_instance_id
+        @ec2.create_tags(resources: [ ec2_instance_id ], tags: tags)
+      end
+    end
+
+    def define_tag
+      tag_key = ask_for_new_option('tag name')
+      tag_value = ask_for_new_option('tag value')
+      { key: tag_key, value: tag_value }
+    end
+
+    def tag_count
+      @cli.ask("How many tags do you wish to add? Please write in the number as an integer and press ENTER:").to_i
+    end
+
+    def ask_to_add_tags
+      ans = @cli.ask("Do you wish to add EC2 tags to this instance?\n1) Yes\n2) No", Integer)
+      ans == 1
+    end
+
+    def ask_to_start_instance
+      ans = @cli.ask("Do you wish to start this new instance?\n1) Yes\n2) No", Integer)
+      ans == 1
+    end
+  end
+end

data/lib/opsicle/{cloneable_instance.rb → manageable_instance.rb}

@@ -1,5 +1,5 @@
 module Opsicle
-  class CloneableInstance
+  class ManageableInstance
     attr_accessor(
       :hostname,
       :status,
@@ -75,6 +75,7 @@ module Opsicle
       new_hostname = auto_generated_hostname
       create_new_instance(new_hostname, instance_type, ami_id, agent_version, subnet_id)
       opsworks.start_instance(instance_id: new_instance_id)
+      add_tags
       puts "\nNew instance is starting…"
     end
 
@@ -155,7 +156,7 @@ module Opsicle
           agents = @opsworks.describe_agent_versions(stack_id: self.stack_id).agent_versions
           version_ids = agents.collect { |i| i.version }.uniq
           agent_version = ask_for_possible_options(version_ids, "agent version")
-    
+
           self.layer.agent_version = agent_version   # only set agent version for whole layer if they override
         else
           agent_version = self.agent_version
@@ -189,7 +190,7 @@ module Opsicle
           subnets = subnets.sort
           subnet_id = ask_for_possible_options(subnets, "subnet ID")
           subnet_id = subnet_id.scan(/(subnet-[a-z0-9]*)/).first.first if subnet_id
-         
+
           self.layer.subnet_id = subnet_id   # only set the subnet ID for whole layer if they override it
         else
           subnet_id = self.subnet_id
@@ -254,9 +255,40 @@ module Opsicle
       if ask_to_start_instance
         @opsworks.start_instance(instance_id: self.new_instance_id)
         puts "\nNew instance is starting…"
+        add_tags
+      end
+    end
+
+    def add_tags(options={})
+      raise ArgumentError, 'The instance must be running to add tags' if options[:add_tags_mode] && @status != "online"
+
+      if ask_to_add_tags
+        tags = []
+
+        tag_count.times do
+          tags << define_tag
+        end
+
+        ec2_instance_id = @opsworks.describe_instances(instance_ids: [new_instance_id || instance_id]).instances.first.ec2_instance_id
+        @ec2.create_tags(resources: [ ec2_instance_id ], tags: tags)
       end
     end
 
+    def define_tag
+      tag_key = ask_for_new_option('tag name')
+      tag_value = ask_for_new_option('tag value')
+      { key: tag_key, value: tag_value }
+    end
+
+    def tag_count
+      @cli.ask("How many tags do you wish to add? Please write in the number as an integer and press ENTER:").to_i
+    end
+
+    def ask_to_add_tags
+      ans = @cli.ask("\nDo you wish to add EC2 tags to this instance?\n1) Yes\n2) No", Integer)
+      ans == 1
+    end
+
     def ask_to_start_instance
       ans = @cli.ask("Do you wish to start this new instance?\n1) Yes\n2) No", Integer)
       ans == 1

data/lib/opsicle/{cloneable_layer.rb → manageable_layer.rb}

@@ -1,5 +1,5 @@
 module Opsicle
-  class CloneableLayer
+  class ManageableLayer
     attr_accessor :name, :layer_id, :stack, :instances, :opsworks, :ec2, :cli, :agent_version, :ami_id, :subnet_id
 
     def initialize(name, layer_id, stack, opsworks, ec2, cli)
@@ -15,14 +15,14 @@ module Opsicle
     def get_cloneable_instances
       ops_instances = @opsworks.describe_instances({ :layer_id => layer_id }).instances
       ops_instances.each do |instance|
-        self.instances << CloneableInstance.new(instance, self, stack, @opsworks, @ec2, @cli)
+        self.instances << ManageableInstance.new(instance, self, stack, @opsworks, @ec2, @cli)
       end
       self.instances
     end
 
     def add_new_instance(instance_id)
       instance = @opsworks.describe_instances({ :instance_ids => [instance_id] }).instances.first
-      self.instances << CloneableInstance.new(instance, self, stack, @opsworks, @ec2, @cli)
+      self.instances << ManageableInstance.new(instance, self, stack, @opsworks, @ec2, @cli)
     end
   end
 end

data/lib/opsicle/manageable_stack.rb

@@ -0,0 +1,83 @@
+module Opsicle
+  class ManageableStack
+    attr_accessor :id, :opsworks, :stack, :vpc_id, :eips, :cli
+
+    def initialize(stack_id, opsworks, cli=nil)
+      self.id = stack_id
+      self.opsworks = opsworks
+      self.cli = cli
+      self.stack = get_stack
+      self.vpc_id = self.stack.vpc_id
+      self.eips = nil
+    end
+
+    def get_stack
+      @opsworks.describe_stacks({ :stack_ids => [self.id.to_s] }).stacks.first
+    end
+
+    def get_eips
+      self.eips = @opsworks.describe_elastic_ips(stack_id: self.id.to_s).elastic_ips
+    end
+
+    def gather_eip_information
+      eip_information = []
+
+      @eips.each do |eip|
+        instance_id = eip.instance_id
+        instance = @opsworks.describe_instances(instance_ids: [instance_id]).instances.first
+        instance_name = instance.hostname
+        layer_id = instance.layer_ids.first
+        layer = @opsworks.describe_layers(layer_ids: [layer_id]).layers.first
+        layer_name = layer.name
+        eip_information << { eip: eip, ip_address: eip.ip, instance_name: instance_name, layer_id: layer_id }
+      end
+
+      eip_information
+    end
+
+    def ask_which_eip_to_move(eip_information)
+      puts "\nHere are all of the EIPs for this stack:"
+      eip_information.each_with_index { |h, index| puts "#{index.to_i + 1}) #{h[:ip_address]} connected to #{h[:instance_name]}" }
+      eip_index = @cli.ask("Which EIP would you like to move?\n", Integer) { |q| q.in = 1..eip_information.length.to_i } - 1
+      eip_information[eip_index]
+    end
+
+    def ask_which_target_instance(moveable_eip)
+      puts "\nHere are all of the instances in the current instance's layer:"
+      instances = @opsworks.describe_instances(layer_id: moveable_eip[:layer_id]).instances
+      instances = instances.select { |instance| instance.elastic_ip.nil? && instance.auto_scaling_type.nil? }
+      instances.each_with_index { |instance, index| puts "#{index.to_i + 1}) #{instance.status} - #{instance.hostname}" }
+      instance_index = @cli.ask("What is your target instance?\n", Integer) { |q| q.in = 1..instances.length.to_i } - 1
+      instances[instance_index].instance_id
+    end
+
+    def transfer_eip(moveable_eip, target_instance_id)
+      @opsworks.associate_elastic_ip({ elastic_ip: moveable_eip[:ip_address], instance_id: target_instance_id })
+      puts "\nEIP #{moveable_eip[:ip_address]} was moved to instance #{target_instance_id}"
+    end
+
+    def move_eip
+      get_eips
+      eip_information = gather_eip_information
+      moveable_eip = ask_which_eip_to_move(eip_information)
+      target_instance_id = ask_which_target_instance(moveable_eip)
+      transfer_eip(moveable_eip, target_instance_id)
+    end
+
+    def instances
+      @opsworks.describe_instances(stack_id: self.id).instances
+    end
+
+    def deleteable_instances
+      instances.select{ |instance| instance.auto_scaling_type.nil?  && instance.status == "stopped" }
+    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) }
+    end
+  end
+end

data/lib/opsicle/version.rb

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

data/spec/opsicle/commands/clone_instance_spec.rb

@@ -61,6 +61,7 @@ module Opsicle
       allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this subnet ID? By overriding, you are choosing to override the current subnet ID for all of the following instances you're cloning.\n1) Yes\n2) No", Integer).and_return(2)
       allow_any_instance_of(HighLine).to receive(:ask).with("Which subnet ID?\n", Integer).and_return(1)
       allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to start this new instance?\n1) Yes\n2) No", Integer).and_return(1)
+      allow_any_instance_of(HighLine).to receive(:ask).with("\nDo you wish to add EC2 tags to this instance?\n1) Yes\n2) No", Integer).and_return(2)
     end
 
     context "#execute" do

data/spec/opsicle/commands/delete_instance_spec.rb

@@ -0,0 +1,81 @@
+require "spec_helper"
+require "opsicle"
+require 'gli'
+require "opsicle/user_profile"
+
+module Opsicle
+  describe DeleteInstance do
+    before do
+      @instance1 = double('instance1', :hostname => 'example-hostname-01', :status => 'active',
+                                       :ami_id => 'ami_id', :instance_type => 'instance_type',
+                                       :agent_version => 'agent_version', :stack_id => 1234567890,
+                                       :layer_ids => [12345, 67890], :auto_scaling_type => 'auto_scaling_type',
+                                       :os => 'os', :ssh_key_name => 'ssh_key_name',
+                                       :availability_zone => 'availability_zone', :virtualization_type => 'virtualization_type',
+                                       :subnet_id => 'subnet_id', :architecture => 'architecture',
+                                       :root_device_type => 'root_device_type', :install_updates_on_boot => 'install_updates_on_boot',
+                                       :ebs_optimized => 'ebs_optimized', :tenancy => 'tenancy', :instance_id => 'some-id')
+      @instance2 = double('instance2', :hostname => 'example-hostname-02', :status => 'active',
+                                       :ami_id => 'ami_id', :instance_type => 'instance_type',
+                                       :agent_version => 'agent_version', :stack_id => 1234567890,
+                                       :layer_ids => [12345, 67890], :auto_scaling_type => 'auto_scaling_type',
+                                       :os => 'os', :ssh_key_name => 'ssh_key_name',
+                                       :availability_zone => 'availability_zone', :virtualization_type => 'virtualization_type',
+                                       :subnet_id => 'subnet_id', :architecture => 'architecture',
+                                       :root_device_type => 'root_device_type', :install_updates_on_boot => 'install_updates_on_boot',
+                                       :ebs_optimized => 'ebs_optimized', :tenancy => 'tenancy', :instance_id => 'some-id')
+      @instances = double('instances', :instances => [@instance1, @instance2])
+      @layer1 = double('layer1', :name => 'layer-1', :layer_id => 12345, :instances => [@instance1, @instance2])
+      @layer2 = double('layer2', :name => 'layer-2', :layer_id => 67890, :instances => [@instance1, @instance2])
+      @layers = double('layers', :layers => [@layer1, @layer2])
+      @new_instance = double('new_instance', :instance_id => 1029384756)
+      @stack = double('stack', :vpc_id => "vpc-123456")
+      @stacks = double('stacks', :stacks => [@stack])
+      @opsworks = double('opsworks', :describe_instances => @instances, :describe_layers => @layers,
+                                     :create_instance => @new_instance, :describe_stacks => @stacks,
+                                     :start_instance => @new_instance)
+      @ec2 = double('ec2')
+      @config = double('config', :opsworks_config => {:stack_id => 1234567890})
+      @client = double('client', :config => @config, :opsworks => @opsworks, :ec2 => @ec2)
+      allow(@instances).to receive(:each_with_index)
+      @agent_version_1 = double('agent_version', :version => '3434-20160316181345')
+      @agent_version_2 = double('agent_version', :version => '3435-20160406115841')
+      @agent_version_3 = double('agent_version', :version => '3436-20160418214624')
+      @agent_versions = double('agent_versions', :agent_versions => [@agent_version_1, @agent_version_2, @agent_version_3])
+      allow(@opsworks).to receive(:describe_agent_versions).and_return(@agent_versions)
+      tag1 = double('tag', :value => 'Subnet', :key => 'Name')
+      @tags = [tag1]
+      @current_subnet = double('subnet', :tags => @tags, :availability_zone => 'us-east-1b')
+      allow(Aws::EC2::Subnet).to receive(:new).and_return(@current_subnet)
+      allow_any_instance_of(HighLine).to receive(:ask).with("Layer?\n", Integer).and_return(2)
+      allow_any_instance_of(HighLine).to receive(:ask).with("Instances? (enter as a comma separated list)\n", String).and_return('2')
+      allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this hostname?\n1) Yes\n2) No", Integer).and_return(2)
+      allow_any_instance_of(HighLine).to receive(:ask).with("Please write in the new instance's hostname and press ENTER:").and_return('example-hostname')
+      allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this AMI ID? By overriding, you are choosing to override the current AMI ID for all of the following instances you're cloning.\n1) Yes\n2) No", Integer).and_return(2)
+      allow_any_instance_of(HighLine).to receive(:ask).with("Which AMI ID?\n", Integer).and_return(1)
+      allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this agent version? By overriding, you are choosing to override the current agent version for all of the following instances you're cloning.\n1) Yes\n2) No", Integer).and_return(2)
+      allow_any_instance_of(HighLine).to receive(:ask).with("Which agent version?\n", Integer).and_return(1)
+      allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this instance type?\n1) Yes\n2) No", Integer).and_return(2)
+      allow_any_instance_of(HighLine).to receive(:ask).with("Please write in the new instance type press ENTER:").and_return('t2.micro')
+      allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this subnet ID? By overriding, you are choosing to override the current subnet ID for all of the following instances you're cloning.\n1) Yes\n2) No", Integer).and_return(2)
+      allow_any_instance_of(HighLine).to receive(:ask).with("Which subnet ID?\n", Integer).and_return(1)
+      allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to start this new instance?\n1) Yes\n2) No", Integer).and_return(1)
+    end
+
+    subject{DeleteInstance.new("staging")}
+
+    # context "#execute" do
+    #   it "lists deleteable instances" do
+    #     allow(subject).to receive("staging"){[@instance1]}
+    #     expect(@stack).to receive(:deleteable_instances)
+    #     subject.execute
+    #   end
+    #
+    #   it "deletes the selected instance" do
+    #     allow(subject).to receive("staging"){[@instance1]}
+    #     expect(@opsworks).to receive(:delete_instance)
+    #     subject.execute
+    #   end
+    # end
+  end
+end

data/spec/opsicle/{cloneable_instance_spec.rb → manageable_instance_spec.rb}

@@ -4,7 +4,7 @@ require 'gli'
 require "opsicle/user_profile"
 
 module Opsicle
-  describe CloneableInstance do
+  describe ManageableInstance do
     before do
       @instance = double('instance1', :hostname => 'example-hostname-01', :status => 'active',
                                        :ami_id => 'ami_id', :instance_type => 'instance_type',
@@ -49,7 +49,7 @@ module Opsicle
 
     context "#make_new_hostname" do
       it "should make a unique incremented hostname" do
-        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
+        instance = ManageableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         instance1 = double('instance', :hostname => 'example-hostname-01')
         instance2 = double('instance', :hostname => 'example-hostname-02')
         allow(@layer).to receive(:instances).and_return([instance1, instance2])
@@ -57,7 +57,7 @@ module Opsicle
       end
 
       it "should make a unique incremented hostname" do
-        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
+        instance = ManageableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         instance1 = double('instance', :hostname => 'example-hostname-01')
         instance2 = double('instance', :hostname => 'example-hostname-02')
         instance3 = double('instance', :hostname => 'example-hostname-03')
@@ -69,7 +69,7 @@ module Opsicle
 
     context "#increment_hostname" do
       it "should increment the hostname" do
-        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
+        instance = ManageableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(instance).to receive(:hostname_unique?).and_return('example-hostname-03')
         allow(@opsworks).to receive(:describe_agent_version).with({})
         expect(instance.increment_hostname).to eq('example-hostname-01')
@@ -78,13 +78,13 @@ module Opsicle
 
     context "#clone" do
       it "should grab instances and make new hostname" do
-        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
+        instance = ManageableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(instance).to receive(:make_new_hostname).and_return('example-hostname-03')
         instance.clone({})
       end
 
       it "should get information from old instance" do
-        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
+        instance = ManageableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(instance).to receive(:verify_ami_id)
         expect(instance).to receive(:verify_agent_version)
         expect(instance).to receive(:verify_instance_type)
@@ -93,13 +93,13 @@ module Opsicle
       end
 
       it "should create new instance" do
-        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
+        instance = ManageableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(instance).to receive(:create_new_instance)
         instance.clone({})
       end
 
       it "should start new instance" do
-        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
+        instance = ManageableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         allow(instance).to receive(:ask_to_start_instance).and_return(true)
         expect(instance).to receive(:start_new_instance)
         instance.clone({})
@@ -109,7 +109,7 @@ module Opsicle
     context '#verify_agent_version' do
       it "should check the agent version and ask if the user wants a new agent version" do
         @cli = double('cli', :ask => 1)
-        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
+        instance = ManageableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         allow(@layer).to receive(:agent_version).and_return(nil)
         allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this version? By overriding, you are choosing to override the current agent version for all instances you are cloning.\n1) Yes\n2) No", Integer).and_return(1)
         expect(instance).to receive(:ask_for_possible_options)
@@ -117,7 +117,7 @@ module Opsicle
       end
 
       it "should see if the layer already has overwritten the agent version" do
-        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
+        instance = ManageableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(@layer).to receive(:agent_version)
         instance.verify_agent_version
       end
@@ -126,7 +126,7 @@ module Opsicle
     context '#verify_subnet_id' do
       it "should check the subnet id and ask if the user wants a new subnet id" do
         @cli = double('cli', :ask => 1)
-        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
+        instance = ManageableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         allow(@layer).to receive(:subnet_id).and_return(nil)
         allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this id? By overriding, you are choosing to override the current agent version for all instances you are cloning.\n1) Yes\n2) No", Integer).and_return(1)
         expect(instance).to receive(:ask_for_possible_options)
@@ -134,7 +134,7 @@ module Opsicle
       end
 
       it "should see if the layer already has overwritten the subnet id" do
-        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
+        instance = ManageableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(@layer).to receive(:subnet_id)
         instance.verify_subnet_id
       end
@@ -143,7 +143,7 @@ module Opsicle
     context '#verify_ami_id' do
       it "should check the ami id and ask if the user wants a new ami" do
         @cli = double('cli', :ask => 1)
-        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
+        instance = ManageableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         allow(@layer).to receive(:ami_id).and_return(nil)
         allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this AMI? By overriding, you are choosing to override the current AMI for all instances you are cloning.\n1) Yes\n2) No", Integer).and_return(1)
         expect(@cli).to receive(:ask)
@@ -152,7 +152,7 @@ module Opsicle
       end
 
       it "should see if the layer already has overwritten the ami id" do
-        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
+        instance = ManageableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(@layer).to receive(:ami_id)
         instance.verify_ami_id
       end
@@ -161,7 +161,7 @@ module Opsicle
     context '#verify_instance_type' do
       it "should check the agent version and ask if the user wants a new agent version" do
         @cli = double('cli', :ask => 1)
-        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
+        instance = ManageableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         allow(@layer).to receive(:ami_id).and_return(nil)
         allow_any_instance_of(HighLine).to receive(:ask).with("Do you wish to override this instance type?\n1) Yes\n2) No", Integer).and_return(1)
         expect(@cli).to receive(:ask).twice
@@ -171,13 +171,13 @@ module Opsicle
 
     context "#create_new_instance" do
       it "should create an instance" do
-        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
+        instance = ManageableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(@opsworks).to receive(:create_instance)
         instance.create_new_instance('hostname', 'type', 'ami', 'agent_version', 'subnet_id')
       end
 
       it "should take information from old instance" do
-        instance = CloneableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
+        instance = ManageableInstance.new(@instance, @layer, @stack, @opsworks, @ec2, @cli)
         expect(instance).to receive(:stack_id)
         expect(instance).to receive(:layer_ids)
         expect(instance).to receive(:auto_scaling_type)

data/spec/opsicle/{cloneable_layer_spec.rb → manageable_layer_spec.rb}

@@ -4,7 +4,7 @@ require 'gli'
 require "opsicle/user_profile"
 
 module Opsicle
-  describe CloneableLayer do
+  describe ManageableLayer do
     before do
       @instance1 = double('instance1', :hostname => 'example-hostname-01', :status => 'active',
                                        :ami_id => 'ami_id', :instance_type => 'instance_type',
@@ -42,31 +42,31 @@ module Opsicle
 
     context "#get_cloneable_instances" do
       it "should gather opsworks instances for that layer" do
-        layer = CloneableLayer.new('layer-name', 12345, @stack, @opsworks, @ec2, @cli)
+        layer = ManageableLayer.new('layer-name', 12345, @stack, @opsworks, @ec2, @cli)
         expect(@opsworks).to receive(:describe_instances).and_return(@instances)
         expect(@instances).to receive(:instances)
         layer.get_cloneable_instances
       end
 
-      it "should make a new CloneableInstance for each instance" do
-        layer = CloneableLayer.new('layer-name', 12345, @stack, @opsworks, @ec2, @cli)
-        expect(CloneableInstance).to receive(:new).twice
+      it "should make a new ManageableInstance for each instance" do
+        layer = ManageableLayer.new('layer-name', 12345, @stack, @opsworks, @ec2, @cli)
+        expect(ManageableInstance).to receive(:new).twice
         layer.get_cloneable_instances
       end
     end
 
     context "#add_new_instance" do
       it "should accurately find a new instance via instance_id" do
-        layer = CloneableLayer.new('layer-name', 12345, @stack, @opsworks, @ec2, @cli)
+        layer = ManageableLayer.new('layer-name', 12345, @stack, @opsworks, @ec2, @cli)
         expect(@opsworks).to receive(:describe_instances).and_return(@new_instance)
         expect(@new_instance).to receive(:instances)
         layer.add_new_instance('456-789')
       end
 
       it "should add the new instance to the instances array" do
-        layer = CloneableLayer.new('layer-name', 12345, @stack, @opsworks, @ec2, @cli)
+        layer = ManageableLayer.new('layer-name', 12345, @stack, @opsworks, @ec2, @cli)
         expect(@opsworks).to receive(:describe_instances).and_return(@new_instance)
-        expect(CloneableInstance).to receive(:new).once
+        expect(ManageableInstance).to receive(:new).once
         layer.add_new_instance('456-789')
       end
     end

data/spec/opsicle/{cloneable_stack_spec.rb → manageable_stack_spec.rb}

@@ -4,7 +4,7 @@ require 'gli'
 require "opsicle/user_profile"
 
 module Opsicle
-  describe CloneableStack do
+  describe ManageableStack do
     before do
     @stack = double('stack', :vpc_id => 'vpc-123456')
       @stacks = double('stacks', :stacks => [@stack])
@@ -13,7 +13,7 @@ module Opsicle
 
     context "#get_stack" do
       it "should gather opsworks instances for that layer" do
-        stack = CloneableStack.new(12345, @opsworks)
+        stack = ManageableStack.new(12345, @opsworks)
         expect(@opsworks).to receive(:describe_stacks).and_return(@stacks)
         expect(@stacks).to receive(:stacks)
         stack.get_stack

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 2.9.6
+  version: 2.10.0
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -191,24 +191,27 @@ files:
 - bin/opsicle
 - lib/opsicle.rb
 - lib/opsicle/client.rb
-- lib/opsicle/cloneable_instance.rb
-- lib/opsicle/cloneable_layer.rb
-- lib/opsicle/cloneable_stack.rb
 - lib/opsicle/commands.rb
+- lib/opsicle/commands/add_tags.rb
 - lib/opsicle/commands/chef_update.rb
 - lib/opsicle/commands/clone_instance.rb
+- lib/opsicle/commands/create_instance.rb
+- lib/opsicle/commands/delete_instance.rb
 - lib/opsicle/commands/deploy.rb
 - lib/opsicle/commands/execute_recipes.rb
 - lib/opsicle/commands/failure_log.rb
 - lib/opsicle/commands/legacy_credential_converter.rb
 - lib/opsicle/commands/list.rb
 - lib/opsicle/commands/list_instances.rb
+- lib/opsicle/commands/move_eip.rb
 - lib/opsicle/commands/ssh.rb
 - lib/opsicle/commands/ssh_clean_keys.rb
 - lib/opsicle/commands/ssh_key.rb
+- lib/opsicle/commands/stop_instance.rb
 - lib/opsicle/commands/update.rb
 - lib/opsicle/commands/user_profile_info.rb
 - lib/opsicle/config.rb
+- lib/opsicle/creatable_instance.rb
 - lib/opsicle/credential_converter_helper.rb
 - lib/opsicle/deploy_helper.rb
 - lib/opsicle/deployment.rb
@@ -216,6 +219,9 @@ files:
 - lib/opsicle/errors.rb
 - lib/opsicle/instances.rb
 - lib/opsicle/layer.rb
+- lib/opsicle/manageable_instance.rb
+- lib/opsicle/manageable_layer.rb
+- lib/opsicle/manageable_stack.rb
 - lib/opsicle/monitor.rb
 - lib/opsicle/monitor/app.rb
 - lib/opsicle/monitor/panel.rb
@@ -235,11 +241,9 @@ files:
 - lib/opsicle/user_profile.rb
 - lib/opsicle/version.rb
 - spec/opsicle/client_spec.rb
-- spec/opsicle/cloneable_instance_spec.rb
-- spec/opsicle/cloneable_layer_spec.rb
-- spec/opsicle/cloneable_stack_spec.rb
 - spec/opsicle/commands/chef_update_spec.rb
 - spec/opsicle/commands/clone_instance_spec.rb
+- spec/opsicle/commands/delete_instance_spec.rb
 - spec/opsicle/commands/deploy_spec.rb
 - spec/opsicle/commands/execute_recipes_spec.rb
 - spec/opsicle/commands/failure_log_spec.rb
@@ -253,6 +257,9 @@ files:
 - spec/opsicle/errors_spec.rb
 - spec/opsicle/instances_spec.rb
 - spec/opsicle/layer_spec.rb
+- spec/opsicle/manageable_instance_spec.rb
+- spec/opsicle/manageable_layer_spec.rb
+- spec/opsicle/manageable_stack_spec.rb
 - spec/opsicle/monitor/app_spec.rb
 - spec/opsicle/monitor/panel_spec.rb
 - spec/opsicle/monitor/screen_spec.rb
@@ -282,17 +289,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: An opsworks specific abstraction on top of the aws sdk
 test_files:
 - spec/opsicle/client_spec.rb
-- spec/opsicle/cloneable_instance_spec.rb
-- spec/opsicle/cloneable_layer_spec.rb
-- spec/opsicle/cloneable_stack_spec.rb
 - spec/opsicle/commands/chef_update_spec.rb
 - spec/opsicle/commands/clone_instance_spec.rb
+- spec/opsicle/commands/delete_instance_spec.rb
 - spec/opsicle/commands/deploy_spec.rb
 - spec/opsicle/commands/execute_recipes_spec.rb
 - spec/opsicle/commands/failure_log_spec.rb
@@ -306,6 +311,9 @@ test_files:
 - spec/opsicle/errors_spec.rb
 - spec/opsicle/instances_spec.rb
 - spec/opsicle/layer_spec.rb
+- spec/opsicle/manageable_instance_spec.rb
+- spec/opsicle/manageable_layer_spec.rb
+- spec/opsicle/manageable_stack_spec.rb
 - spec/opsicle/monitor/app_spec.rb
 - spec/opsicle/monitor/panel_spec.rb
 - spec/opsicle/monitor/screen_spec.rb

data/lib/opsicle/cloneable_stack.rb

@@ -1,16 +0,0 @@
-module Opsicle
-  class CloneableStack
-    attr_accessor :id, :opsworks, :stack, :vpc_id
-
-    def initialize(stack_id, opsworks)
-      self.id = stack_id
-      self.opsworks = opsworks
-      self.stack = get_stack
-      self.vpc_id = self.stack.vpc_id
-    end
-
-    def get_stack
-      @opsworks.describe_stacks({ :stack_ids => [self.id.to_s] }).stacks.first
-    end
-  end
-end