opsicle 2.11.3 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 295427c9908b48e688459e853bff54e60ec3b00e
-  data.tar.gz: 4e007d5493977059139c416a8d693616135a1b70
+  metadata.gz: ea2a588c2e4f763a774f40d63bbbb7c929a8f8e4
+  data.tar.gz: e3daa455afa7f0c2e8e35daa91ab6f92358181b4
 SHA512:
-  metadata.gz: ff75ee6a9affba502c440a5346542f010e903c960b6a25412f9870e20f493e18724bee7170dca94e4dd698d72eceff2fe4e96260dc94111220807aeafebcb31f
-  data.tar.gz: 8eeb17bb28133dd5085369a3dfbbdf9cbac5a4cc91da4ac2b626c9e27446baeed46d51edd1833cbe8f315704c4082ef793d491be92c8cccc17958c2a9619ba28
+  metadata.gz: 5b1febacf955033ad6e38c3bcb7b768e22e8d034500588b3cf448eccc43c391f5837b95edf1582348e2f028f20ae16d3d55580d6aeb10bd769a481242fa8fe5a
+  data.tar.gz: 8f3fc3fd905f2ecb8fae152b389860a5da4195928218cb0985fa831ab85215de83cdb6a47c49e80978630eb83da1481b7df27908deef1bb01c8b361bc2a9e8fc

data/lib/opsicle/commands/add_tags.rb

@@ -1,5 +1,6 @@
 require 'gli'
 require "opsicle/user_profile"
+require "opsicle/opsworks_adapter"
 require "opsicle/manageable_layer"
 require "opsicle/manageable_instance"
 require "opsicle/manageable_stack"
@@ -9,10 +10,9 @@ module Opsicle
 
     def initialize(environment)
       @client = Client.new(environment)
-      @opsworks = @client.opsworks
-      @ec2 = @client.ec2
+      @opsworks_adapter = OpsworksAdapter.new(@client)
       stack_id = @client.config.opsworks_config[:stack_id]
-      @stack = ManageableStack.new(@client.config.opsworks_config[:stack_id], @opsworks)
+      @stack = ManageableStack.new(stack_id, @opsworks_adapter.client)
       @cli = HighLine.new
     end
 
@@ -30,11 +30,11 @@ module Opsicle
 
     def select_layer
       puts "\nLayers:\n"
-      ops_layers = @opsworks.describe_layers({ :stack_id => @stack.id }).layers
+      ops_layers = @opsworks_adapter.get_layers(@stack.id)
 
       layers = []
       ops_layers.each do |layer|
-        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks, @ec2, @cli)
+        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks_adapter.client, @client.ec2, @cli)
       end
 
       layers.each_with_index { |layer, index| puts "#{index.to_i + 1}) #{layer.name}" }

data/lib/opsicle/commands/clone_instance.rb

@@ -10,9 +10,9 @@ module Opsicle
 
     def initialize(environment)
       @client = Client.new(environment)
-      @opsworks_adapater = OpsworksAdapter.new(@client)
+      @opsworks_adapter = OpsworksAdapter.new(@client)
       stack_id = @client.config.opsworks_config[:stack_id]
-      @stack = ManageableStack.new(stack_id, @opsworks_adapater.client)
+      @stack = ManageableStack.new(stack_id, @opsworks_adapter.client)
       @cli = HighLine.new
     end
 
@@ -36,11 +36,11 @@ module Opsicle
 
     def select_layer
       puts "\nLayers:\n"
-      ops_layers = @opsworks_adapater.get_layers(@stack.id)
+      ops_layers = @opsworks_adapter.get_layers(@stack.id)
 
       layers = []
       ops_layers.each do |layer|
-        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks_adapater.client, @client.ec2, @cli)
+        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks_adapter.client, @client.ec2, @cli)
       end
 
       layers.each_with_index { |layer, index| puts "#{index.to_i + 1}) #{layer.name}" }

data/lib/opsicle/commands/create_instance.rb

@@ -1,5 +1,6 @@
 require 'gli'
 require "opsicle/user_profile"
+require "opsicle/opsworks_adapter"
 require "opsicle/manageable_layer"
 require "opsicle/manageable_stack"
 require "opsicle/creatable_instance"
@@ -9,10 +10,9 @@ module Opsicle
 
     def initialize(environment)
       @client = Client.new(environment)
-      @opsworks = @client.opsworks
-      @ec2 = @client.ec2
+      @opsworks_adapter = OpsworksAdapter.new(@client)
       stack_id = @client.config.opsworks_config[:stack_id]
-      @stack = ManageableStack.new(@client.config.opsworks_config[:stack_id], @opsworks)
+      @stack = ManageableStack.new(stack_id, @opsworks_adapter.client)
       @cli = HighLine.new
     end
 
@@ -26,16 +26,16 @@ module Opsicle
     end
 
     def create_instance(layer, options)
-      CreatableInstance.new(layer, @stack, @opsworks, @ec2, @cli).create(options)
+      CreatableInstance.new(layer, @stack, @opsworks_adapter.client, @client.ec2, @cli).create(options)
     end
 
     def select_layer
       puts "\nLayers:\n"
-      ops_layers = @opsworks.describe_layers({ :stack_id => @stack.id }).layers
+      ops_layers = @opsworks_adapter.get_layers(@stack.id)
 
       layers = []
       ops_layers.each do |layer|
-        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks, @ec2, @cli)
+        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks_adapter.client, @client.ec2, @cli)
       end
 
       layers.each_with_index { |layer, index| puts "#{index.to_i + 1}) #{layer.name}" }

data/lib/opsicle/commands/delete_instance.rb

@@ -1,5 +1,6 @@
 require 'gli'
 require "opsicle/user_profile"
+require "opsicle/opsworks_adapter"
 require "opsicle/manageable_layer"
 require "opsicle/manageable_instance"
 require "opsicle/manageable_stack"
@@ -9,10 +10,9 @@ module Opsicle
 
     def initialize(environment)
       @client = Client.new(environment)
-      @opsworks = @client.opsworks
-      @ec2 = @client.ec2
+      @opsworks_adapter = OpsworksAdapter.new(@client)
       stack_id = @client.config.opsworks_config[:stack_id]
-      @stack = ManageableStack.new(@client.config.opsworks_config[:stack_id], @opsworks)
+      @stack = ManageableStack.new(stack_id, @opsworks_adapter.client)
       @cli = HighLine.new
     end
 
@@ -22,7 +22,7 @@ module Opsicle
       instances_to_delete = select_instances(layer)
       instances_to_delete.each do |instance|
         begin
-          @opsworks.delete_instance(instance_id: instance.instance_id)
+          @opsworks_adapter.delete_instance(instance.instance_id)
           puts "Successfully deleted #{instance.hostname}"
         rescue
           puts "Failed to delete #{instance.hostname}"
@@ -36,11 +36,11 @@ module Opsicle
 
     def select_layer
       puts "\nLayers:\n"
-      ops_layers = @opsworks.describe_layers({ :stack_id => @stack.id }).layers
+      ops_layers = @opsworks_adapter.get_layers(@stack_id)
 
       layers = []
       ops_layers.each do |layer|
-        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks, @ec2, @cli)
+        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks_adapter.client, @client.ec2, @cli)
       end
 
       layers.each_with_index { |layer, index| puts "#{index.to_i + 1}) #{layer.name}" }

data/lib/opsicle/commands/move_eip.rb

@@ -1,5 +1,6 @@
 require 'gli'
 require "opsicle/user_profile"
+require "opsicle/opsworks_adapter"
 require "opsicle/manageable_layer"
 require "opsicle/manageable_instance"
 require "opsicle/manageable_stack"
@@ -9,11 +10,10 @@ module Opsicle
 
     def initialize(environment)
       @client = Client.new(environment)
-      @opsworks = @client.opsworks
-      @ec2 = @client.ec2
+      @opsworks_adpater = OpsworksAdapter.new(@client)
       stack_id = @client.config.opsworks_config[:stack_id]
       @cli = HighLine.new
-      @stack = ManageableStack.new(@client.config.opsworks_config[:stack_id], @opsworks, @cli)
+      @stack = ManageableStack.new(stack_id, @opsworks_adpater.client, @cli)
     end
 
     def execute(options={})

data/lib/opsicle/commands/stop_instance.rb

@@ -1,5 +1,6 @@
 require 'gli'
 require "opsicle/user_profile"
+require "opsicle/opsworks_adapter"
 require "opsicle/manageable_layer"
 require "opsicle/manageable_instance"
 require "opsicle/manageable_stack"
@@ -9,10 +10,9 @@ module Opsicle
 
     def initialize(environment)
       @client = Client.new(environment)
-      @opsworks = @client.opsworks
-      @ec2 = @client.ec2
+      @opsworks_adapter = OpsworksAdapter.new(@client)
       stack_id = @client.config.opsworks_config[:stack_id]
-      @stack = ManageableStack.new(@client.config.opsworks_config[:stack_id], @opsworks)
+      @stack = ManageableStack.new(stack_id, @opsworks_adapter.client)
       @cli = HighLine.new
     end
 
@@ -22,7 +22,7 @@ module Opsicle
       instances_to_stop = select_instances(layer)
       instances_to_stop.each do |instance|
         begin
-          @opsworks.stop_instance(instance_id: instance.instance_id)
+          @opsworks_adapter.stop_instance(instance.instance_id)
           puts "Stopping instance #{instance.hostname}..."
         rescue
           puts "Failed to stop #{instance.hostname}"
@@ -36,11 +36,11 @@ module Opsicle
 
     def select_layer
       puts "\nLayers:\n"
-      ops_layers = @opsworks.describe_layers({ :stack_id => @stack.id }).layers
+      ops_layers = @opsworks_adpater.get_layers(@stack.id)
 
       layers = []
       ops_layers.each do |layer|
-        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks, @ec2, @cli)
+        layers << ManageableLayer.new(layer.name, layer.layer_id, @stack, @opsworks_adapter.client, @client.ec2, @cli)
       end
 
       layers.each_with_index { |layer, index| puts "#{index.to_i + 1}) #{layer.name}" }

data/lib/opsicle/opsworks_adapter.rb

@@ -12,4 +12,12 @@ class Opsicle::OpsworksAdapter
   def start_instance(instance_id)
     client.start_instance(instance_id: instance_id)
   end
+
+  def stop_instance(instance_id)
+    client.stop_instance(instance_id: instance_id)
+  end
+
+  def delete_instance(instance_id)
+    client.delete_instance(instance_id: instance_id)
+  end
 end

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "2.11.3"
+  VERSION = "2.12.0"
 end

data/spec/opsicle/opsworks_adapter_spec.rb

@@ -1,9 +1,10 @@
 describe Opsicle::OpsworksAdapter do
   let(:aws_opsworks_client) do
-    double(
-     :aws_opsworks_client,
-     describe_layers: double(:layers, layers: []),
-     start_instance: true
+    double(:aws_opsworks_client,
+      describe_layers: double(:layers, layers: []),
+      start_instance: :started,
+      stop_instance: :stopped,
+      delete_instance: :deleted
     )
   end
   let(:client) { double(:client, opsworks: aws_opsworks_client) }
@@ -16,17 +17,23 @@ describe Opsicle::OpsworksAdapter do
     it "should gather an array of layers for this opsworks client" do
       expect(get_layers).to be_empty
     end
-
-    it "should call describe_layers on the opsworks client" do
-      expect(aws_opsworks_client).to receive(:describe_layers).with(stack_id: :stack_id)
-      get_layers
-    end
   end
 
   describe "#start_instance" do
     it "should call start_instance on the opsworks client" do
-      expect(aws_opsworks_client).to receive(:start_instance).with(instance_id: :instance_id)
-      subject.start_instance(:instance_id)
+      expect(subject.start_instance(:instance_id)).to eq(:started)
+    end
+  end
+
+  describe "#stop_instance" do
+    it "should call stop_instance on the opsworks client" do
+      expect(subject.stop_instance(:instance_id)).to eq(:stopped)
+    end
+  end
+
+  describe "#delete_instance" do
+    it "should call delete_instance on the opsworks client" do
+      expect(subject.delete_instance(:instance_id)).to eq(:deleted)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 2.11.3
+  version: 2.12.0
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk