opsicle 0.5.1 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjgxNjkzMWVjMmJlYTllZWFjNjI0NTQzMjRlODFiNzYwMTM2Y2NlYQ==
+    MGY1ZDM5ZDM1MDU0OTY0M2Y1NmZiODY1MTQzZmQ4MDBjODc0MTMxNg==
   data.tar.gz: !binary |-
-    YzdlMDkyYzMxMzI1ZDg0ZjYyNDllZTk4YmZjZDdkZDc1NGQ1YWE4Ng==
+    NjhkZWQzNmRhY2I0ZDJjMWM0Y2RkYTYyN2MxY2Y4OTlmNzZmOTE0Nw==
 SHA512:
   metadata.gz: !binary |-
-    NjUwYzNhMzVmMjMwY2I3NGEyY2VhYzZiMTRkYjc4ZTNhYjU5Nzg5N2I5ZTgx
-    ZDAyODY1Yjc2ODQ2ZmJkNWYwZGI0Y2ZjMDAwZGJiYWRmMDJiYTg1OTU5YjEy
-    MjhmNzcxMjVjZTU1OWZmZDFhZWFhYWJiNGEzNTljNjQzYzA4MTY=
+    Y2JkYzEyN2I5MTUyMzc4MThiMmExYmJkODc0ZTljOWU5ZDQwMGQ4ZWYyYjA4
+    YzU3NjJmZGRhMTFlYWFmMmIwZjFmNzMyNmZmZDAxOGU1ZDViNzU1M2JhZWQ4
+    NmNmOWRmMjU0MTU4OTYyNDBkM2NlOTg0ZDdkNGIyMWIxMjljYmY=
   data.tar.gz: !binary |-
-    YTNiZTgzMTgxMDY2N2Q4ZjM3ZTMzMmY3NjEzMjExNTU3YTUyODBhNjA4OGZi
-    NzIxMjZhZGFlMjIyZDExZmYzZmViNzQxY2RkZDk2Y2M4ODkxMDQ2MzUxZDVm
-    YjhmOTgwODViZGVmZWQ3NTFkOWI5NzZhZDc2ZGFlZjg1MmU1N2Y=
+    NWFkZmU4MDcyZTRkMzZlNTU3MWFhZTNhNmY1YTcyZWExYjlkNzQ0MTExYTVm
+    NzY3YWJmY2RlNTNmZjZjODFkNGJhYzhjNDk4ODRmYzg5ODVkZWY1YmI3OGYy
+    OWEzNGNjZjJiNWRiZDUyOWQxNGNkMzdjODJiZDhhMjllYzg4ZjA=

data/bin/opsicle

@@ -140,6 +140,7 @@ command 'execute-recipes' do |c|
   c.switch [:m, :monitor], :desc => "Run the Stack Monitor on deploy", :default_value => true
   c.flag [:r, :recipes], :desc => 'The recipes to execute', :type => Array, :required => true
   c.flag [:i, :instance_ids], :desc => 'The specific instances to execute recipes on', :type => Array
+  c.flag [:l, :layers], :desc => 'The specific layers to execute recipes on', :type => Array
   c.action do |global_options, options, args|
     raise ArgumentError, "Environment is required" unless args.first
 

data/lib/opsicle.rb

@@ -8,4 +8,4 @@ require "opsicle/output"
 require "opsicle/version"
 require "opsicle/commands"
 require "opsicle/monitor"
-
+require "opsicle/layer"

data/lib/opsicle/commands/execute_recipes.rb

@@ -17,12 +17,20 @@ module Opsicle
       #http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/OpsWorks/Client.html#create_deployment-instance_method
       command_args = {}
       command_args["recipes"] = options[:recipes]
-
       command_opts = {}
-      command_opts["instance_ids"] = options[:instance_ids] if options[:instance_ids]
+      command_opts["instance_ids"] = determine_instance_ids(options) if options[:instance_ids] || options[:layers]
 
       response = client.run_command('execute_recipes', command_args, command_opts)
       launch_stack_monitor(response, options)
     end
+      
+    def determine_instance_ids(options)
+      if options[:instance_ids]
+        options[:instance_ids]
+      elsif options[:layers]
+        Opsicle::Layer.instance_ids(client, options[:layers])
+      end
+    end
+
   end
 end

data/lib/opsicle/layer.rb

@@ -0,0 +1,48 @@
+module Opsicle
+  class Layer
+
+    attr_accessor :id, :name, :client
+    class <<self
+      attr_accessor :client
+    end
+
+    def initialize(client, options = {})
+      @client = client
+      @id = options[:id]
+      @name = options[:name]
+    end
+
+    # Public - Gets all the instance ids for a  layer
+    #
+    # Return - An array of instance ids
+    def get_instance_ids
+      client.api_call('describe_instances', layer_id: id)[:instances].map{ |s| s[:instance_id] }
+    end
+
+    # Private - Gets layer info from OpsWorks
+    #
+    # Return - An array of layer objects
+    def self.get_info
+      get_layers.map do |layer|
+        new(client, id: layer[:layer_id], name: layer[:shortname])
+      end
+    end
+    private_class_method :get_info
+
+    def self.get_layers
+      client.api_call('describe_layers', stack_id: client.config.opsworks_config[:stack_id])[:layers]
+    end
+    # Public - gets all the layer ids for the given layers
+    #
+    # client - a new Client
+    # layers - an array of layer shortnames
+    #
+    # Return - An array of instance ids belonging to the input layers
+    def self.instance_ids(client, layers)
+      @client = client
+      get_info.map{ |layer| layer.get_instance_ids[0] if layers.include?(layer.name) }.uniq.compact
+    end
+
+  end
+end
+

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/spec/opsicle/commands/execute_recipes_spec.rb

@@ -5,10 +5,10 @@ module Opsicle
   describe ExecuteRecipes do
     subject { ExecuteRecipes.new('derp') }
     let(:recipes) { ['herp'] }
+    let(:client) { double }
+    let(:monitor) { double(:start => nil) }
 
     context "#execute" do
-      let(:client) { double }
-      let(:monitor) { double(:start => nil) }
       before do
         allow(Client).to receive(:new).with('derp').and_return(client)
         allow(client).to receive(:run_command).with('execute_recipes', {"recipes" => ['herp']}, {}).and_return({deployment_id: 'derp'})
@@ -67,5 +67,22 @@ module Opsicle
       end
     end
 
+    context "#determine_instance_ids" do
+      before do
+        allow(Client).to receive(:new).with('derp').and_return(client)
+      end
+
+      it "returns the instance_ids when passed in through options" do
+        options = {:instance_ids => ["abcdefg","1234567"]}
+        expect(subject.determine_instance_ids(options)).to eq(["abcdefg","1234567"])
+      end
+
+      it "returns the instance_ids when a layer is passed in" do
+        options = {:layers => ["main-util"]}
+        allow(Opsicle::Layer).to receive(:instance_ids).and_return(["a1b2c3"])
+        expect(subject.determine_instance_ids(options)).to eq(["a1b2c3"])
+      end
+    end
+
   end
 end

data/spec/opsicle/layer_spec.rb

@@ -0,0 +1,59 @@
+require "spec_helper"
+require "opsicle"
+
+module Opsicle
+  describe Layer do
+    let(:client) { double }
+    let(:config) { double }
+
+    subject { Opsicle::Layer }
+    context "#get_info" do
+      let(:client) { double }
+      let(:layer1) { subject.new(client, :id => 1, :name => "layer1")}
+      let(:layer2) { subject.new(client, :id => 2, :name => "layer2")}
+      let(:layers) { [ { shortname: "layer1", layer_id: 1, name: "Layer 1" }, { shortname: "layer2", layer_id: 2, name: "Layer 2" }] }
+      
+      before do
+        allow(subject).to receive(:get_layers).and_return(layers)
+      end
+
+      it "returns an array of layer_ids from the input layer (singular)" do
+        expect(subject.send(:get_info)[0]).to be_an_instance_of Opsicle::Layer
+        expect(subject.send(:get_info)[1]).to be_an_instance_of Opsicle::Layer
+      end
+
+    end
+
+    context "#get_instance_ids" do
+      let(:response) {{ :instances => [{:stack_id => "aaa", :instance_id => "111"},{:stack_id => "bbb", :instance_id => "222"}]}}
+      before do
+        allow(client).to receive(:api_call).with('describe_instances',layer_id: "opsworkslayer").and_return(response)
+      end
+
+      it "returns an array of instance_ids from the input layer_id" do
+        expect(subject.new(client, id: "opsworkslayer").get_instance_ids).to eq(["111","222"])
+      end
+    end
+
+    context "#instance_ids" do
+      let(:layer1) { double }
+      let(:layer2) { double }
+      before do
+        allow(layer1).to receive(:name).and_return("aaa")
+        allow(layer2).to receive(:name).and_return("bbb")
+        allow(layer1).to receive(:get_instance_ids).and_return(["111","222"])
+        allow(layer2).to receive(:get_instance_ids).and_return(["333","444"])
+        allow(subject).to receive(:get_info).and_return([layer1,layer2])
+      end
+
+      it "returns the instance ids from layer_names" do
+        expect(subject.instance_ids(client, ["aaa","bbb"])).to eq(["111","333"])
+      end
+
+      it "returns the instance ids from layer_names, filters out doubles" do
+        allow(layer2).to receive(:get_instance_ids).and_return(["111","222"])
+        expect(subject.instance_ids(client, ["aaa","bbb"])).to eq(["111"])
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Andy Fleener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -184,6 +184,7 @@ files:
 - lib/opsicle/deployment.rb
 - lib/opsicle/deployments.rb
 - lib/opsicle/instances.rb
+- lib/opsicle/layer.rb
 - lib/opsicle/monitor.rb
 - lib/opsicle/monitor/app.rb
 - lib/opsicle/monitor/panel.rb
@@ -211,6 +212,7 @@ files:
 - spec/opsicle/commands/ssh_key_spec.rb
 - spec/opsicle/commands/ssh_spec.rb
 - spec/opsicle/config_spec.rb
+- spec/opsicle/layer_spec.rb
 - spec/opsicle/monitor/app_spec.rb
 - spec/opsicle/monitor/panel_spec.rb
 - spec/opsicle/monitor/screen_spec.rb
@@ -238,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An opsworks specific abstraction on top of the aws sdk
@@ -252,6 +254,7 @@ test_files:
 - spec/opsicle/commands/ssh_key_spec.rb
 - spec/opsicle/commands/ssh_spec.rb
 - spec/opsicle/config_spec.rb
+- spec/opsicle/layer_spec.rb
 - spec/opsicle/monitor/app_spec.rb
 - spec/opsicle/monitor/panel_spec.rb
 - spec/opsicle/monitor/screen_spec.rb