opsicle 2.6.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62234a4db3f58fa24aff77217786dd4be48d0763
-  data.tar.gz: ac69c2625a780fdd78ceaaf38e3299fe2c1807c0
+  metadata.gz: 1e61d35388f34cdb0123201879ba2a6e0b8737d6
+  data.tar.gz: ba08ee8d2d71fdf3dcefd6e5ba89dfd098f196c6
 SHA512:
-  metadata.gz: c38462e8b4c1cc7205bc71a73936e6e9df19845cfed644ea18078339d872a7e132ee9be688e03ea587642b83ba0d2a4a8b23da5caa09a26a4dfa67752548fd26
-  data.tar.gz: 702c9a75c1e83385437d41a5603c62f7b0d57564228444f4e1a8e1e056793eb05bc4df66d10f10a4e8573c2f445526733484f777964717b80be567ef1ee25aba
+  metadata.gz: e1ec727a15e561239139e17f484a67c4708d8c42102187f47d2df59fd3722e5b547c50e7837c8cae10281d48ad3d94ff7976b797f9a1a6f6995b7ffa9e92a9ed
+  data.tar.gz: f450d31f77ef707f45bc55c921a895a12769374de33d9ec1789d40c10d6b45ae63edcb7596596ef4ea251a1a8a85fd286ce37cd2dadf2bb79c18a5d376c93068

data/bin/opsicle

@@ -196,6 +196,7 @@ end
 desc "Clone instances in the given environment stack"
 arg_name '<environment>'
 command 'clone-instance' do |c|
+  c.switch [:d, :'with-defaults'], desc: "Clone the instances with no overrides", default_value: false
   c.action do |global_options, options, args|
     raise ArgumentError, "Environment is required" unless args.first
     Opsicle::CloneInstance.new(args.first).execute global_options.merge options

data/lib/opsicle/cloneable_instance.rb

@@ -1,8 +1,30 @@
 module Opsicle
   class CloneableInstance
-    attr_accessor :hostname, :status, :layer, :ami_id, :instance_type, :agent_version, :stack_id, :layer_ids,
-                  :auto_scaling_type, :os, :ssh_key_name, :availability_zone, :virtualization_type, :subnet_id,
-                  :architecture, :root_device_type, :install_updates_on_boot, :ebs_optimized, :tenancy, :opsworks, :cli
+    attr_accessor(
+      :hostname,
+      :status,
+      :layer,
+      :ami_id,
+      :instance_type,
+      :instance_id,
+      :new_instance_id,
+      :agent_version,
+      :stack_id,
+      :layer_ids,
+      :auto_scaling_type,
+      :os,
+      :ssh_key_name,
+      :availability_zone,
+      :virtualization_type,
+      :subnet_id,
+      :architecture,
+      :root_device_type,
+      :install_updates_on_boot,
+      :ebs_optimized,
+      :tenancy,
+      :opsworks,
+      :cli
+    )
 
     def initialize(instance, layer, opsworks, cli)
       self.hostname = instance.hostname
@@ -26,44 +48,65 @@ module Opsicle
       self.tenancy = instance.tenancy
       self.opsworks = opsworks
       self.cli = cli
+      self.instance_id = instance.instance_id
+      self.new_instance_id = nil
     end
 
     def clone(options)
       puts "\nCloning an instance..."
-      
-      new_instance_hostname = make_new_hostname(self.hostname)
+
+      new_instance_hostname = make_new_hostname
       ami_id = verify_ami_id
       agent_version = verify_agent_version
       subnet_id = verify_subnet_id
       instance_type = verify_instance_type
 
       create_new_instance(new_instance_hostname, instance_type, ami_id, agent_version, subnet_id)
+      start_new_instance
     end
 
-    def make_new_hostname(old_hostname)
-      all_sibling_hostnames = self.layer.instances.collect { |instance| instance.hostname }
 
-      if old_hostname =~ /\d\d\z/
-        new_instance_hostname = increment_hostname(old_hostname, all_sibling_hostnames)
-      else
-        new_instance_hostname = old_hostname << "-clone"
-      end
-        
+    def clone_with_defaults(options)
+      puts "\nCloning an instance..."
+      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)
+      puts "\nNew instance is starting…"
+    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 increment_hostname(hostname, all_sibling_hostnames)
-      until hostname_unique?(hostname, all_sibling_hostnames) do
-        hostname = hostname.gsub(/(\d\d\z)/) { "#{($1.to_i + 1).to_s.rjust(2, '0')}" }
+    def auto_generated_hostname
+      if hostname =~ /\d\d\z/
+        increment_hostname
+      else
+        hostname << "-clone"
       end
-      hostname
     end
 
-    def hostname_unique?(hostname, all_sibling_hostnames)
-      !all_sibling_hostnames.include?(hostname)
+    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 verify_ami_id
@@ -179,8 +222,21 @@ module Opsicle
         agent_version: agent_version,
         tenancy: self.tenancy,
       })
-      self.layer.add_new_instance(new_instance.instance_id)
-      puts "\nNew instance has been created: #{new_instance.instance_id}"
+      self.new_instance_id = new_instance.instance_id
+      self.layer.add_new_instance(new_instance_id)
+      puts "\nNew 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…"
+      end
+    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/commands/clone_instance.rb

@@ -19,16 +19,20 @@ module Opsicle
       puts "Stack ID = #{@stack.id}"
       layer = select_layer
       all_instances = layer.get_cloneable_instances
-      instances_to_clone = select_instances(all_instances)
-
-      instances_to_clone.each do |instance|
-        instance.clone(options)
-      end
-      
+      instance_to_clone = select_instances(all_instances)
+      clone_instances(instance_to_clone, options)
       layer.ami_id = nil
       layer.agent_version = nil
     end
 
+    def clone_instances(instances, options)
+      if options[:'with-defaults']
+        instances.each { |instance| instance.clone_with_defaults(options) }
+      else
+        instances.each { |instance| instance.clone(options) }
+      end
+    end
+
     def select_layer
       puts "\nLayers:\n"
       ops_layers = @opsworks.describe_layers({ :stack_id => @stack.id }).layers
@@ -49,7 +53,7 @@ module Opsicle
       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]

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "2.6.0"
+  VERSION = "2.8.0"
 end

data/spec/opsicle/cloneable_instance_spec.rb

@@ -14,7 +14,7 @@ module Opsicle
                                        :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')
+                                       :ebs_optimized => 'ebs_optimized', :tenancy => 'tenancy', :instance_id => 'some-id')
       @layer = double('layer1', :name => 'layer-1', :layer_id => 12345, :instances => [@instance], :ami_id => nil, :agent_version => nil)
       allow(@layer).to receive(:ami_id=)
       allow(@layer).to receive(:ami_id)
@@ -38,11 +38,10 @@ module Opsicle
     context "#make_new_hostname" do
       it "should make a unique incremented hostname" do
         instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
-        expect(instance).to receive(:increment_hostname).and_return('example-hostname-03')
         instance1 = double('instance', :hostname => 'example-hostname-01')
         instance2 = double('instance', :hostname => 'example-hostname-02')
         allow(@layer).to receive(:instances).and_return([instance1, instance2])
-        instance.make_new_hostname('example-hostname-01')
+        expect(instance.make_new_hostname).to eq('example-hostname-03')
       end
 
       it "should make a unique incremented hostname" do
@@ -51,8 +50,8 @@ module Opsicle
         instance2 = double('instance', :hostname => 'example-hostname-02')
         instance3 = double('instance', :hostname => 'example-hostname-03')
         instance4 = double('instance', :hostname => 'example-hostname-04')
-        expect(@layer).to receive(:instances).and_return([instance1, instance2, instance3, instance4])
-        expect(instance.make_new_hostname('example-hostname-01')).to eq('example-hostname-05')
+        allow(@layer).to receive(:instances).and_return([instance1, instance2, instance3, instance4])
+        expect(instance.make_new_hostname).to eq('example-hostname-05')
       end
     end
 
@@ -61,7 +60,7 @@ module Opsicle
         instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
         expect(instance).to receive(:hostname_unique?).and_return('example-hostname-03')
         allow(@opsworks).to receive(:describe_agent_version).with({})
-        instance.increment_hostname('example-hostname-01', ['example-hostname-01', 'example-hostname-02'])
+        expect(instance.increment_hostname).to eq('example-hostname-01')
       end
     end
 
@@ -86,6 +85,13 @@ module Opsicle
         expect(instance).to receive(:create_new_instance)
         instance.clone({})
       end
+
+      it "should start new instance" do
+        instance = CloneableInstance.new(@instance, @layer, @opsworks, @cli)
+        allow(instance).to receive(:ask_to_start_instance).and_return(true)
+        expect(instance).to receive(:start_new_instance)
+        instance.clone({})
+      end
     end
 
     context '#verify_agent_version' do

data/spec/opsicle/cloneable_layer_spec.rb

@@ -14,7 +14,7 @@ module Opsicle
                                        :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')
+                                       :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,
@@ -23,7 +23,7 @@ module Opsicle
                                        :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')
+                                       :ebs_optimized => 'ebs_optimized', :tenancy => 'tenancy', :instance_id => 'some-id')
       @instance3 = double('instance3', :hostname => 'example-hostname-03', :status => 'stopped',
                                        :ami_id => 'ami_id', :instance_type => 'instance_type',
                                        :agent_version => 'agent_version', :stack_id => 1234567890,
@@ -32,7 +32,7 @@ module Opsicle
                                        :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')
+                                       :ebs_optimized => 'ebs_optimized', :tenancy => 'tenancy', :instance_id => 'some-id')
       @instances = double('instances', :instances => [@instance1, @instance2])
       @new_instance = double('new_instance', :instances => [@instance3])
       @opsworks = double('opsworks', :describe_instances => @instances)

data/spec/opsicle/commands/clone_instance_spec.rb

@@ -14,7 +14,7 @@ module Opsicle
                                        :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')
+                                       :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,
@@ -23,7 +23,7 @@ module Opsicle
                                        :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')
+                                       :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])
@@ -32,7 +32,8 @@ module Opsicle
       @stack = double('stack')
       @stacks = double('stacks', :stacks => [@stack])
       @opsworks = double('opsworks', :describe_instances => @instances, :describe_layers => @layers,
-                                     :create_instance => @new_instance, :describe_stacks => @stacks)
+                                     :create_instance => @new_instance, :describe_stacks => @stacks,
+                                     :start_instance => @new_instance)
       @config = double('config', :opsworks_config => {:stack_id => 1234567890})
       @client = double('client', :config => @config, :opsworks => @opsworks)
       allow(Client).to receive(:new).with(:environment).and_return(@client)
@@ -54,8 +55,9 @@ module Opsicle
       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 instances you are 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
-    
+
     context "#execute" do
       it "lists all current layers" do
         expect(@opsworks).to receive(:describe_layers)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -282,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: An opsworks specific abstraction on top of the aws sdk