opsicle 0.7.1 → 0.8.0

data/bin/opsicle

@@ -147,10 +147,12 @@ arg_name '<environment>'
 arg_name '<recipe>'
 command 'execute-recipes' do |c|
   c.switch [:m, :monitor], :desc => "Run the Stack Monitor on deploy", :default_value => true
+  c.switch [:e, :eip], :desc => "Executes recipes on a single instance with an elastic IP", :default_value => false
   c.switch [:t, :track],   :desc => "Tracks to deploy and exits when completed. Exits with non-zero if the deploy fails."
   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.flag [:a, :ip_addresses], :desc => 'The specific ip addresses of instance to execute recipes on', :type => Array
   c.action do |global_options, options, args|
     raise ArgumentError, "Environment is required" unless args.first
 

data/lib/opsicle/commands/execute_recipes.rb

@@ -18,7 +18,8 @@ module Opsicle
       command_args = {}
       command_args["recipes"] = options[:recipes]
       command_opts = {}
-      command_opts["instance_ids"] = determine_instance_ids(options) if options[:instance_ids] || options[:layers]
+      command_opts["instance_ids"] = determine_instance_ids(options)
+      command_opts.reject! {|key,value| value.nil?}
 
       response = client.run_command('execute_recipes', command_args, command_opts)
       launch_stack_monitor(response, options)
@@ -28,9 +29,39 @@ module Opsicle
       if options[:instance_ids]
         options[:instance_ids]
       elsif options[:layers]
-        Opsicle::Layer.instance_ids(client, options[:layers])
+        determine_from_layers(options[:layers])
+      elsif options[:ip_addresses]    
+        determine_from_ips(options[:ip_addresses])
+      elsif options[:eip]
+        determine_from_eip
       end
     end
 
+    def determine_from_ips(ips)
+      if instances = Opsicle::Instances.find_by_ip(client, ips)  
+        instances.map { |instance| instance[:instance_id] }
+      else
+        raise NoInstanceError, "Unable to find instances with given IP"
+      end
+    end
+
+    def determine_from_eip
+      if instance = Opsicle::Instances.find_by_eip(client).first
+        Array(instance[:instance_id])
+      else
+        raise NoInstanceError, "Unable to find instances with elastic IPs"
+      end
+    end
+
+    def determine_from_layers(layers)
+      if instances = Opsicle::Layer.instance_ids(client, layers)
+        instances
+      else
+        raise NoInstanceError, "Unable to find instances in specified layers"
+      end
+    end
+
+    NoInstanceError = Class.new(StandardError)
+
   end
 end

data/lib/opsicle/config.rb

@@ -15,8 +15,8 @@ module Opsicle
 
     def aws_config
       return @aws_config if @aws_config
-      fog_confg = load_config(File.expand_path(FOG_CONFIG_PATH))
-      @aws_config = { access_key_id: fog_confg[:aws_access_key_id], secret_access_key: fog_confg[:aws_secret_access_key] }
+      fog_config = load_config(File.expand_path(FOG_CONFIG_PATH))
+      @aws_config = { access_key_id: fog_config[:aws_access_key_id], secret_access_key: fog_config[:aws_secret_access_key] }
     end
 
     def opsworks_config

data/lib/opsicle/instances.rb

@@ -1,6 +1,11 @@
 module Opsicle
   class Instances
 
+    attr_accessor :client
+    class <<self
+      attr_accessor :client
+    end
+
     def initialize(client)
       @client = client
     end
@@ -9,11 +14,28 @@ module Opsicle
       instances(reload: true)
     end
 
+    def self.find_by_ip(client, ips)
+      instances = new(client).data.reject { |instance| instances_matching_ips(instance, ips) }
+      instances.empty? ? nil : instances 
+    end
+
+    def self.instances_matching_ips(instance, ip_addresses)
+      instance_ips = [instance[:public_ip], instance[:elastic_ip], instance[:private_ip]].compact
+      (ip_addresses & instance_ips).empty?
+    end
+
+    private_class_method :instances_matching_ips
+
+    def self.find_by_eip(client)
+      instances =  new(client).data.reject { |instance| instance[:elastic_ip] == nil }
+      instances.empty? ? nil : instances 
+    end
+
     def instances(options={})
       # Only call the API again if you need to
       @instances = nil if options[:reload]
-      @instances ||= @client.api_call('describe_instances',
-                                       :stack_id => @client.config.opsworks_config[:stack_id]
+      @instances ||= client.api_call('describe_instances',
+                                       :stack_id => client.config.opsworks_config[:stack_id]
                                       )[:instances]
     end
     private :instances

data/lib/opsicle/version.rb

@@ -1,3 +1,3 @@
 module Opsicle
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

data/spec/opsicle/commands/execute_recipes_spec.rb

@@ -87,8 +87,55 @@ module Opsicle
 
       it "returns the instance_ids when a layer is passed in" do
         options = {:layers => ["main-util"]}
+        expect(subject).to receive(:determine_from_layers)
+        subject.determine_instance_ids(options)
+      end
+
+      it "returns an instance_id when eip is set to true" do
+        options = {:eip => true}
+        expect(subject).to receive(:determine_from_eip)
+        subject.determine_instance_ids(options)
+      end
+
+      it "returns an instance_id when an ip is passed in" do
+        options = {:ip_addresses => true}
+        expect(subject).to receive(:determine_from_ips)
+        subject.determine_instance_ids(options)
+      end
+    end
+
+    context "#determine_from_layer" do
+      let(:layers) {["main-util"]}
+      before do
+        allow(Client).to receive(:new).with('derp').and_return(client)
+      end
+
+      it "returns the instance_ids when a layer is passed in" do
         allow(Opsicle::Layer).to receive(:instance_ids).and_return(["a1b2c3"])
-        expect(subject.determine_instance_ids(options)).to eq(["a1b2c3"])
+        expect(subject.determine_from_layers(layers)).to eq(["a1b2c3"])
+      end
+    end
+
+    context "#determine_from_ips" do
+      let(:ips) {['1.2.3.4','5.6.7.8']}
+      before do
+        allow(Client).to receive(:new).with('derp').and_return(client)
+      end
+
+      it "returns an instance_id when an ip is passed in" do
+        allow(Opsicle::Instances).to receive(:find_by_ip).and_return([{instance_id: "a1b2c3"}, {instance_id: "1234567"}])
+        expect(subject.determine_from_ips(ips)).to eq(["a1b2c3","1234567"])
+      end
+    end
+
+    context "#determine_from_eip" do
+      before do
+        allow(Client).to receive(:new).with('derp').and_return(client)
+      end
+      it "returns an instance_id when eip is set to true" do
+        eip = true
+        allow(Opsicle::Instances).to receive(:find_by_eip).and_return([{instance_id: "a1b2c3"}, {instance_id: "1234567"}])
+        expect(subject.determine_from_eip).to eq(["a1b2c3"])
       end
     end
 

data/spec/opsicle/instances_spec.rb

@@ -0,0 +1,77 @@
+require "spec_helper"
+require "opsicle"
+
+module Opsicle
+  describe Instances do
+    let(:client) { double }
+    let(:config) { double }
+
+    let(:instance1) { {private_ip: "10.0.0.1", elastic_ip: "100.0.0.1", public_ip: "200.0.0.1"} }
+    let(:instance2) { {private_ip: "10.0.0.2", elastic_ip: "100.0.0.2", public_ip: "200.0.0.2"} }
+
+    subject {Opsicle::Instances}
+    before do
+      allow_any_instance_of(subject).to receive(:data).and_return([instance1,instance2])
+    end
+
+    context ".instances_matching_ips" do 
+      it "returns false if no instances have a given ip" do
+        expect(subject.send(:instances_matching_ips, instance1, ["10.0.0.4","100.0.0.4"])).to eq(true)
+      end
+
+      it "returns true if an instance hasa given ip" do
+        expect(subject.send(:instances_matching_ips, instance1, ["10.0.0.1","100.0.0.4"])).to eq(false)
+      end
+    end
+
+    context ".find_by_ip" do
+      before do
+        allow(subject).to receive(:instances_matching_ips)
+      end
+
+      it "returns nil if no instances have a given ip" do
+        allow(subject).to receive(:instances_matching_ips).and_return(true)
+        expect(subject.find_by_ip(client,["10.0.0.4","100.0.0.4"])).to eq(nil)
+      end
+
+      it "returns an instance if an instance has a given private_ip" do
+        allow(subject).to receive(:instances_matching_ips).and_return(false,true)
+        expect(subject.find_by_ip(client,["10.0.0.1","100.0.0.4"])).to eq([instance1])
+      end
+
+      it "returns an instance if an instance has a given public_ip" do
+        allow(subject).to receive(:instances_matching_ips).and_return(true,false)
+        expect(subject.find_by_ip(client,["100.0.0.2","100.0.0.4"])).to eq([instance2])
+      end
+
+      it "returns multiple instances with a given set of ips" do
+        allow(subject).to receive(:instances_matching_ips).and_return(false)
+        expect(subject.find_by_ip(client,["100.0.0.2","200.0.0.1"])).to eq([instance1,instance2])
+      end
+    end
+
+    context ".find_by_eip" do
+      it "returns instances with an elastic_ip" do
+        expect(subject.find_by_eip(client)).to eq([instance1,instance2])
+      end
+
+      context "one instance has an elastic_ip" do
+        let(:instance2) { {private_ip: "10.0.0.2", public_ip: "200.0.0.2"} }
+        it "returns instances with an elastic_ip" do
+          expect(subject.find_by_eip(client)).to eq([instance1])
+        end
+      end
+
+      context "no instances have an elastic_ip" do
+        let(:instance1) { {private_ip: "10.0.0.1", public_ip: "200.0.0.1"} }
+        let(:instance2) { {private_ip: "10.0.0.2", public_ip: "200.0.0.2"} }
+
+        it "returns nil if no instances have a given ip" do
+          expect(subject.find_by_eip(client)).to eq(nil)
+        end
+
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: opsicle
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
+  prerelease: 
 platform: ruby
 authors:
 - Andy Fleener
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -28,6 +31,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,6 +47,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -56,6 +63,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,6 +71,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,6 +79,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -77,6 +87,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -84,6 +95,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -91,6 +103,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -98,6 +111,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -105,6 +119,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -112,6 +127,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -119,6 +135,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,6 +143,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -133,6 +151,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -140,6 +159,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -147,6 +167,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -159,11 +180,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- bin/opsicle
-- lib/opsicle.rb
 - lib/opsicle/client.rb
-- lib/opsicle/commands.rb
 - lib/opsicle/commands/chef_update.rb
 - lib/opsicle/commands/deploy.rb
 - lib/opsicle/commands/execute_recipes.rb
@@ -171,6 +188,7 @@ files:
 - lib/opsicle/commands/list_instances.rb
 - lib/opsicle/commands/ssh.rb
 - lib/opsicle/commands/ssh_key.rb
+- lib/opsicle/commands.rb
 - lib/opsicle/config.rb
 - lib/opsicle/deploy_helper.rb
 - lib/opsicle/deployment.rb
@@ -178,7 +196,6 @@ files:
 - lib/opsicle/errors.rb
 - lib/opsicle/instances.rb
 - lib/opsicle/layer.rb
-- lib/opsicle/monitor.rb
 - lib/opsicle/monitor/app.rb
 - lib/opsicle/monitor/panel.rb
 - lib/opsicle/monitor/panels/deployments.rb
@@ -191,10 +208,14 @@ files:
 - lib/opsicle/monitor/spy/instances.rb
 - lib/opsicle/monitor/subpanel.rb
 - lib/opsicle/monitor/translatable.rb
+- lib/opsicle/monitor.rb
 - lib/opsicle/output.rb
 - lib/opsicle/s3_bucket.rb
 - lib/opsicle/stack.rb
 - lib/opsicle/version.rb
+- lib/opsicle.rb
+- bin/opsicle
+- LICENSE
 - spec/opsicle/client_spec.rb
 - spec/opsicle/commands/chef_update_spec.rb
 - spec/opsicle/commands/deploy_spec.rb
@@ -205,6 +226,7 @@ files:
 - spec/opsicle/commands/ssh_spec.rb
 - spec/opsicle/config_spec.rb
 - spec/opsicle/errors_spec.rb
+- spec/opsicle/instances_spec.rb
 - spec/opsicle/layer_spec.rb
 - spec/opsicle/monitor/app_spec.rb
 - spec/opsicle/monitor/panel_spec.rb
@@ -216,26 +238,27 @@ files:
 homepage: https://github.com/sportngin/opsicle
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: An opsworks specific abstraction on top of the aws sdk
 test_files:
 - spec/opsicle/client_spec.rb
@@ -248,6 +271,7 @@ test_files:
 - spec/opsicle/commands/ssh_spec.rb
 - spec/opsicle/config_spec.rb
 - spec/opsicle/errors_spec.rb
+- spec/opsicle/instances_spec.rb
 - spec/opsicle/layer_spec.rb
 - spec/opsicle/monitor/app_spec.rb
 - spec/opsicle/monitor/panel_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzdlMWE1YmRhMzZmNWJkYWM0MmI0OWRhN2VmODZjMmYxYjA5NDM3NQ==
-  data.tar.gz: !binary |-
-    NGYzZGVhY2RkZjM3NzRiNzdmZWRjZmQ0NTNiNTZjNzNlZDRmMDA3OQ==
-SHA512:
-  metadata.gz: !binary |-
-    Y2QwZjVkN2FiMjA4YWZiZGFjZjkxNmY3ZjU1MWY1ZDdhZDBhMWM2MDYxNmVm
-    NjExMTFiMDJjZDliMDVlNjc5YTYyZDQ1NjU2ZDU1OWJiMmIwNmIyNTk5MGIx
-    YzRkYzE0YTg5NmFkN2U2OTcwNzEwMGZjMjc1ZWJmNGQ4ZTQ4YTI=
-  data.tar.gz: !binary |-
-    OTRjMGNjZTJmODI5YWMyMjY5ZWI3MzMyZWJiNjg1OWE5NjdmZWYyYzQ2NGU5
-    M2NkMzYxZmZjMWY1ZjE0NmVmZDhkYjk0OTk3ODBlMzI2NGJjNzI4ZTVlNTRl
-    Y2ViNzAzNjAyNzM1MTU1ZjgyNzFmYTQ0NjhlYzZiZDc1ZTc4MjQ=