engineyard-cloud-client 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 38d0b4d513e1f5735a9c3e4d60a8e590ea126dd2
-  data.tar.gz: 891e1ee6848c9874b8f511a847c424ab042bfcd8
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjViMTczODE3OGU1ZTdjMTE1NTI4NmJiYmI2NmVkOGI3NTU1NzI4MQ==
+  data.tar.gz: !binary |-
+    MTBiYWNjYjM1ZTc2Yjg5NDI3ZjcxYmY0ODA3Y2M5MTg5YTAxYTgxZg==
 SHA512:
-  metadata.gz: a875c2e52ce80abd14da0635e0b5397e0e0a9ea614afbd1d830ce5256964b2fe431d850c93aaf25d3bb64965028d864f81d10423375f90472a62add04a38a823
-  data.tar.gz: b0d4ff350dceab7f37c04c678b2851555fbf265949a36952fedb64cf0e0947a30a3228137e2a8ecce1178d650087b43d45c71435d7557a297faea7ddf650da0d
+  metadata.gz: !binary |-
+    YjA0NDkyYjdhMWYzNjNkOWYxNDMwYzk0ODg3MGZiNGE5ZGNiZTUxMDI0YjIy
+    ZjQ0ODExNzQxOGE2Njk2YjZjMDk2NDY1ZGJkMTBhODZiM2ZkYzM3ZGZmOTk0
+    NzY4MzJmMGE0MWEzMGY2ODYyY2Q1OTljMDhkZjI4YmJhNTVjYTg=
+  data.tar.gz: !binary |-
+    MjI1M2YxYTljMGE0NGQ2MjFkZjUxOTRhNzg4NmFjMjJmODE1NTUzOTE1ODVi
+    ZjdkZWQ4NWVkNzgyMmJmYjdiZjEwZDdhN2MwMWQwZjQxMTljNzU0ODg2ZDcy
+    NGVjNzhkYzczZGExYWJlMzk2ZTZmNjJlM2VlNTUxZjkxYzRhZGE=

data/ChangeLog.md

@@ -4,6 +4,11 @@
 
   *
 
+## v2.1.0 (2014-04-16)
+
+  * `Environment#instances_by_role` and `Environment#select_instances` for filtering instances by role and name.
+  * Add `App#hierarchy_name` which returns a nice string representation of the application hierchy: `account / app`
+
 ## v2.0.1 (2013-11-21)
 
   * Fix RbConfig deprecation warning

data/README.md

@@ -136,6 +136,10 @@ Valid `app_server_stack_name` values: `nginx_unicorn, nginx_passenger3, nginx_no
 
 Instances:
 
+    # filtering by roles and roles with names
+    env.instances_by_role(:app_master, :app, :util) # => [EY::CloudClient::Instance, ...]
+    env.select_instances(util: %w[resque1 resque2 redis])  # => [EY::CloudClient::Instance, ...]
+
     instance = env.instances.first
     instance.class        # => EY::CloudClient::Instance
     instance.id           # => 12345

data/lib/engineyard-cloud-client/models/app.rb

@@ -67,6 +67,10 @@ module EY
         [sort_string(account_name), sort_string(name)]
       end
 
+      def hierarchy_name
+        [account_name, name].join(' / ')
+      end
+
       protected
 
       def set_account(account_attrs)

data/lib/engineyard-cloud-client/models/environment.rb

@@ -170,6 +170,46 @@ module EY
         bridge
       end
 
+      # Select instances by role, with optional name constraints.
+      #
+      # Select the "master" app instance:
+      # select_instances(app_master: true)
+      #
+      # Select the "master" db instance on a solo or multi-instance env:
+      # select_instances(solo: true, db_master: true)
+      #
+      # Select app, app_master, or utils (only if they are named resque or redis):
+      # select_instances(app_master: true, app: true, util: %w[resque redis])
+      #
+      # Select all instances (same as the method #instances):
+      # select_instances(all: true)
+      #
+      # See #instances_by_role for a simpler interface.
+      def select_instances(options)
+        instances_by_role(options.keys).select do |inst|
+          # get the value of the string/symbol key that matches without losing nil/false values
+          val = options.fetch(inst.role.to_sym) { options.fetch(inst.role.to_s, false) }
+
+          case val
+          when true, false then val
+          when inst.name   then true
+          when nil, ''     then [nil, ''].include?(inst.name)
+          when Array       then val.include?(inst.name)
+          else                  false
+          end
+        end
+      end
+
+      # Simple version of select_instances that only selects roles, not names
+      #   instances_by_role(:app_master, :app) # same
+      #   instances_by_role(%w[app_master app]) # same
+      #   select_instances(app_master: true, app: true) # same
+      #
+      def instances_by_role(*roles)
+        roles = roles.flatten.map(&:to_s)
+        instances.select { |inst| roles.include?(inst.role.to_s) }
+      end
+
       def update
         api.put("/environments/#{id}/update_instances")
         true # raises on failure

data/lib/engineyard-cloud-client/version.rb

@@ -1,7 +1,7 @@
 # This file is maintained by a herd of rabid monkeys with Rakes.
 module EY
   class CloudClient
-    VERSION = '2.0.1'
+    VERSION = '2.1.0'
   end
 end
 # Please be aware that the monkeys like tho throw poo sometimes.

data/spec/engineyard-cloud-client/integration/environment_spec.rb

@@ -100,10 +100,12 @@ describe EY::CloudClient::Environment do
       @env.deploy_to_instances.map(&:role).should =~ %w[app_master app util util]
     end
 
+    def expect_instances(instances)
+      expect(instances.map { |i| [i.role, i.name, i.public_hostname] })
+    end
+
     it "sorts instances" do
-      expect(@env.instances.map do |i|
-        [i.role,       i.name,                                i.public_hostname]
-      end).to eq([
+      expect_instances(@env.instances).to eq([
         ["app_master", nil,       "app_master_hostname.compute-1.amazonaws.com"],
         ["app",        nil,              "app_hostname.compute-1.amazonaws.com"],
         ["db_master",  nil,        "db_master_hostname.compute-1.amazonaws.com"],
@@ -114,6 +116,83 @@ describe EY::CloudClient::Environment do
       ])
     end
 
+    it "finds no instances by role solo" do
+      expect(@env.select_instances(solo: true)).to be_empty
+    end
+
+    it "selects instances by solo, app, app_master" do
+      expect_instances(@env.select_instances(solo: true, app: true, app_master: true)).to eq([
+        ["app_master", nil,       "app_master_hostname.compute-1.amazonaws.com"],
+        ["app",        nil,              "app_hostname.compute-1.amazonaws.com"],
+      ])
+    end
+
+    it "selects instances by solo, app, app_master, util" do
+      expect_instances(@env.select_instances(solo: true, app: true, app_master: true, util: true)).to eq([
+        ["app_master", nil,       "app_master_hostname.compute-1.amazonaws.com"],
+        ["app",        nil,              "app_hostname.compute-1.amazonaws.com"],
+        ["util" ,      "fluffy", "util_fluffy_hostname.compute-1.amazonaws.com"],
+        ["util",       "rocky",   "util_rocky_hostname.compute-1.amazonaws.com"],
+      ])
+    end
+
+    it "selects instances by util with name string" do
+      expect_instances(@env.select_instances(util: "rocky")).to eq([
+        ["util",       "rocky",   "util_rocky_hostname.compute-1.amazonaws.com"],
+      ])
+    end
+
+    it "selects instances by util with name array" do
+      expect_instances(@env.select_instances(util: %w[fluffy rocky])).to eq([
+        ["util" ,      "fluffy", "util_fluffy_hostname.compute-1.amazonaws.com"],
+        ["util",       "rocky",   "util_rocky_hostname.compute-1.amazonaws.com"],
+      ])
+    end
+
+    it "selects instances by solo, app, or util with name string" do
+      expect_instances(@env.select_instances(solo: true, app: true, util: "rocky")).to eq([
+        ["app",        nil,              "app_hostname.compute-1.amazonaws.com"],
+        ["util",       "rocky",   "util_rocky_hostname.compute-1.amazonaws.com"],
+      ])
+    end
+
+    it "selects instances by solo, db_master, db_slave" do
+      expect_instances(@env.select_instances(solo: true, db_master: true, db_slave: true)).to eq([
+        ["db_master",  nil,        "db_master_hostname.compute-1.amazonaws.com"],
+        ["db_slave",   "Slave I", "db_slave_1_hostname.compute-1.amazonaws.com"],
+        ["db_slave",   nil,       "db_slave_2_hostname.compute-1.amazonaws.com"],
+      ])
+    end
+
+    it "finds instances by role solo, db_master, or db_slave with the specified name only" do
+      expect_instances(@env.select_instances(solo: true, db_master: true, db_slave: "Slave I")).to eq([
+        ["db_master",  nil,        "db_master_hostname.compute-1.amazonaws.com"],
+        ["db_slave",   "Slave I", "db_slave_1_hostname.compute-1.amazonaws.com"],
+      ])
+    end
+
+    it "finds instances by role solo, db_master, or db_slave with blank name only" do
+      expect_instances(@env.select_instances(solo: true, db_master: true, db_slave: "")).to eq([
+        ["db_master",  nil,        "db_master_hostname.compute-1.amazonaws.com"],
+        ["db_slave",   nil,       "db_slave_2_hostname.compute-1.amazonaws.com"],
+      ])
+    end
+
+    it "selects instances by app, excluding app_master" do
+      expect_instances(@env.select_instances(app: true, app_master: false)).to eq([
+        ["app",        nil,              "app_hostname.compute-1.amazonaws.com"],
+      ])
+    end
+
+    it "finds solo, app, app_master, util" do
+      expect_instances(@env.instances_by_role(:solo, :app, :app_master, :util)).to eq([
+        ["app_master", nil,       "app_master_hostname.compute-1.amazonaws.com"],
+        ["app",        nil,              "app_hostname.compute-1.amazonaws.com"],
+        ["util" ,      "fluffy", "util_fluffy_hostname.compute-1.amazonaws.com"],
+        ["util",       "rocky",   "util_rocky_hostname.compute-1.amazonaws.com"],
+      ])
+    end
+
     it "updates the environment" do
       @env.update.should be_true
     end

data/spec/engineyard-cloud-client/models/app_spec.rb

@@ -53,6 +53,7 @@ describe EY::CloudClient::App do
 
       app.name.should == "myapp"
       app.account.name.should == "myaccount"
+      app.hierarchy_name.should == "myaccount / myapp"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-cloud-client
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - EY Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -56,56 +56,56 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb-matcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -140,56 +140,56 @@ dependencies:
   name: dm-migrations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-aggregates
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-timestamps
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -210,14 +210,14 @@ dependencies:
   name: rabl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -238,28 +238,28 @@ dependencies:
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem connects to the EY Cloud API
@@ -345,17 +345,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: EY Cloud API Client