opsicle 2.9.2 → 2.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7abeccd9dc63b305500303749e789670236d08fe
-  data.tar.gz: 668eb7af2ab47cebe1c75c809000dc76048664cf
+  metadata.gz: 68fb538f3c30323d782949bb6873d25f954e1a4c
+  data.tar.gz: d60460ab9f7ff89eae00eb3a554f9d70ca129488
 SHA512:
-  metadata.gz: 43fd4966ef360687cc369586445cb4b4390a7039c4f64a6725f3076a8cfcc2c4220e7142180f715c507f1549a7fbd1a2b1d49972e92b95ab63e9cde814b6432b
-  data.tar.gz: 98c560052930f4dbfe6673d3893ff404f513a084e4a539e39221502e4687ca086e28dfe9be0c515c64aabafffe3546af77b6709bef812d1fd13fc9cb7496e4ce
+  metadata.gz: 3e26a5fe8ff33488e2b687629857243b8bd082d481f249627b45bf5e2147cfa37f994b3d29626276b4c558bc380556abff165f519963ba1e9e54b7c09079750a
+  data.tar.gz: db8290a71cb8e17b738b0b1814993a7c1787f5a602f29b3aca6d0ce969f63556d33420ffdde93e614e2878c98a95b24660550af939fcff7276e49a469d0fb587

data/lib/opsicle/cloneable_instance.rb

@@ -135,12 +135,13 @@ module Opsicle
           if ami_id == "Provide a different AMI ID."
             ami_id = ask_for_new_option('AMI ID')
           end
+
+          self.layer.ami_id = ami_id   # only set AMI ID for whole layer if they override it
         else
           ami_id = self.ami_id
         end
       end
 
-      self.layer.ami_id = ami_id
       ami_id
     end
 
@@ -154,12 +155,13 @@ 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
         end
       end
 
-      self.layer.agent_version = agent_version
       agent_version
     end
 
@@ -187,12 +189,13 @@ 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
         end
       end
 
-      self.layer.subnet_id = subnet_id
       subnet_id
     end
 
@@ -215,7 +218,7 @@ module Opsicle
 
     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 instances you are cloning.\n1) Yes\n2) No", Integer)
+        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

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "2.9.2"
+  VERSION = "2.9.3"
 end

data/spec/opsicle/commands/clone_instance_spec.rb

@@ -52,13 +52,13 @@ module Opsicle
       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 instances you are cloning.\n1) Yes\n2) No", Integer).and_return(2)
+      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 instances you are cloning.\n1) Yes\n2) No", Integer).and_return(2)
+      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 instances you are cloning.\n1) Yes\n2) No", Integer).and_return(2)
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.9.3
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk