cloud_powers 0.2.7.22 → 0.2.7.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de10bce1d27f8f3e36f3ab6a1113a23ad5bed4be
-  data.tar.gz: 23596a2a01d2e8bb51491891e1dd1055010b0e84
+  metadata.gz: 97dc22c7470b4936967a4e45da7b3bf962dd2697
+  data.tar.gz: 0b0a347337a1f910bb10c46f8da3e785b3e6af21
 SHA512:
-  metadata.gz: cae627f2df35cca72af7135fad2bd4b912e1ceb92f66fbd0a7fb87dd8bcbbc527902685e6e33e20af18374c5470405aba03063f535d413ce69411de90207cb77
-  data.tar.gz: e6e8235e93cf78c2787ab97535edb0d6991280bae5feeb59748cdbde44d15230b4d9d744c6e256a8b12cc4afac30245db386e3974e1d5b770682248723ace0be
+  metadata.gz: f93ff5427fba0268c10899d3103c220167d4461eb5606c89f5d175cf460f1975f7a9e30dd8ffcff7e4899eee3c1b08c3d53f71e6d39f3bc0fa60c027438539fb
+  data.tar.gz: a3cdab518b3ad93891227d615fab39ec9ddcb32d1825e7ed37d4ec3f106cd647809153053fbe09d76868b103e0ed568e8cb6f9dd15bfa18dc4d1429a5818de9b

data/.gitignore

@@ -1,17 +1,15 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-*Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.env
-.byebug_history
-lib/cloud_powers/synapse/.DS_Store
-.DS_Store
-./**/.DS_Store
-lib/tasks
-.idea
+**/.bundle
+**/.yardoc
+**/Gemfile.lock
+**/_yardoc/
+**/coverage/
+**/doc/
+**/pkg/
+**/spec/reports/
+**/tmp/
+**/*.env
+**/.byebug_history
+**/lib/cloud_powers/synapse/.DS_Store
+**/.DS_Store
+**/./**/.DS_Store
+**/*.swp

data/lib/cloud_powers/node.rb

@@ -43,10 +43,11 @@ module Smash
       # * opts +Hash+ (optional)
       #   an optional instance configuration hash can be passed, which will override
       #   the values in the default configuration returned by #instance_config()
-      def spin_up_neurons(opts = {})
+      def spin_up_neurons(opts = {}, tags = [])
         should_wait = opts.delete(:wait) || true
         ids = nil
         begin
+
           response = ec2.run_instances(node_config(opts))
           ids = response.instances.map(&:instance_id)
 
@@ -61,9 +62,10 @@ module Smash
               # redo unless (count += 1 <=3 )
             end
           end
+
+          batch_tag(ids, tags) unless tags.empty?
           ids
 
-          # tag(ids, { key: 'task', value: to_camel(self.class.to_s) })
         rescue Aws::EC2::Errors::DryRunOperation
           ids = (1..(opts[:max_count] || 0)).to_a.map { |n| n.to_s }
           logger.info "waiting for #{ids.count} Neurons to start..."
@@ -71,6 +73,28 @@ module Smash
 
         ids
       end
+
+      # This method adds certain tags to an array of resource ids.
+      #
+      # Parameters
+      # * ids +Array+|+String+ - an Array or a single instance id, as an Array of Strings or a single String
+      # * tags +Array+ - an Array of key, value hash
+      #
+      # Returns
+      # * Returns an empty response.
+      #
+      # Examples
+      #   create_tag('ami-2342354', tags: { key: "stack", value: "production"})
+      #   or
+      #   create_tag(['ami-2432342'], tags: [{ key: 'stack', value: 'production' }])
+      #   or any permutation of those
+
+      def batch_tag(ids, tags)
+        tags_opts = { resources: ids, tags: tags }
+        ec2.create_tags(tags_opts)
+        logger.info "tags for #{ids} created"
+      end
+
     end
   end
 end

data/lib/cloud_powers/self_awareness.rb

@@ -182,6 +182,24 @@ module Smash
         end
       end
 
+
+      # Search through tags on an instances using a regex pattern for your tag's
+      # key/name
+      #
+      # Parameters
+      # * pattern +String+|+Regex+
+      #
+      # Returns
+      # * +String+ - if a tag is found
+      # * +nil+ - if a tag is not found
+      def tag_search(pattern, id = @instance_id)
+        resp = ec2.describe_instances(instance_ids: [id].flatten).reservations.first
+        return nil if resp.nil?
+        resp.instances[0].tags.select do |tag|
+          tag.value if (tag.key =~ %r[#{pattern}])
+        end.collect.map(&:value).first
+      end
+
       # Check self-tags for 'task' and act as an attr_accessor.
       # A different node's tag's can be checked for a task by passing
       # that instance's id as a parameter
@@ -191,16 +209,15 @@ module Smash
       #
       # Returns
       # +String+
+      #
+      # Notes
+      # * See <tt>tag_search()</tt>
       def task_name(id = @instance_id)
         # get @task_name
         return @task_name unless @task_name.nil?
         # set @task_name
         # TODO: get all tasks instead of just the first
-        resp = ec2.describe_instances(instance_ids: [id].flatten).reservations.first
-        return @task_name = nil if resp.nil?
-        @task_name = resp.instances[0].tags.select do |t|
-          t.value if t.key == 'taskType'
-        end.first
+        @task_name = tag_search('task', id)
       end
 
       # This method will return true if:

data/lib/cloud_powers/synapse/websocket/websocclient.rb

@@ -6,49 +6,45 @@ module Smash
       module WebSocClient
 
         def create_websoc_client(opts = {})
+          ws = {}
+          Thread.new(ws) do
+            EM.run do
+              ws = WebSocket::EventMachine::Client.connect(:uri => 'ws://' + opts[:host]  + ':' + opts[:port])
 
-          EM.run do
+              client_name = opts[:client] || 'default_client'
 
-            ws = WebSocket::EventMachine::Client.connect(:uri => 'ws://' + opts[:host]  + ':' + opts[:port])
-            add_to_clients(opts[:name],ws)
+              instance_variable_set(:"@#{client_name}",ws)
 
-            open_callback = opts[:on_open] || Proc.new do
-              puts "Connected"
-            end
+              open_callback = opts[:on_open] || Proc.new do
+                puts "Connected"
+              end
 
-            ws.onopen &open_callback
+              ws.onopen &open_callback
 
-            on_message_callback = opts[:on_message] || Proc.new do |msg, type|
-              puts "Received message: #{msg}"
-            end
+              on_message_callback = opts[:on_message] || Proc.new do |msg, type|
+                puts "Received message: #{msg}"
+              end
 
-            ws.onmessage &on_message_callback
+              ws.onmessage &on_message_callback
 
-            on_error_callback = opts[:on_error] || Proc.new do |error|
-              puts "Error ==> #{error}"
-            end
+              on_error_callback = opts[:on_error] || Proc.new do |error|
+                puts "Error ==> #{error}"
+              end
 
-            ws.onerror &on_error_callback
+              ws.onerror &on_error_callback
 
-            on_close_callback = opts[:on_close] || Proc.new do |code, reason|
-              puts "Disconnected with status code: #{code}"
-              puts "Disconnected with status message: #{reason}"
-            end
+              on_close_callback = opts[:on_close] || Proc.new do |code, reason|
+                puts "Disconnected with status code: #{code}"
+                puts "Disconnected with status message: #{reason}"
+              end
 
-            ws.onclose &on_close_callback
+              ws.onclose &on_close_callback
 
-          end
-
-        end
+            end
 
-        def add_to_clients(name,client)
-          begin
-            @clients[name] = client
-          rescue NoMethodError => e
-            puts e.backtrace
-            puts "no client hash is available"
           end
         end
+
       end
     end
   end

data/lib/cloud_powers/version.rb

@@ -1,3 +1,3 @@
 module CloudPowers
-  VERSION = '0.2.7.22'
+  VERSION = '0.2.7.23'
 end

data/lib/stubs/aws_stubs.rb

@@ -74,6 +74,7 @@ module Smash
       #   for your own custom configuration
       def self.node_stub(opts = {})
         time = opts[:launch_time] || Time.new((Time.now.utc.to_i / 86400 * 86400)) # midnight
+        tags = [{key: 'task', value: 'test'}]
         {
           stub_responses: {
             create_tags: {},
@@ -88,11 +89,11 @@ module Smash
             describe_instances: {
               reservations: [
                 { instances: [
-                  { instance_id: 'asd-1234', state: { code: 200, name: 'running' } },
-                  { instance_id: 'qwe-4323', state: { code: 200, name: 'running' } },
-                  { instance_id: 'tee-4322', state: { code: 200, name: 'running' } },
-                  { instance_id: 'bbf-6969', state: { code: 200, name: 'running' } },
-                  { instance_id: 'lkj-0987', state: { code: 200, name: 'running' } }
+                  { instance_id: 'asd-1234', state: { code: 200, name: 'running' }, tags: tags },
+                  { instance_id: 'qwe-4323', state: { code: 200, name: 'running' }, tags: tags },
+                  { instance_id: 'tee-4322', state: { code: 200, name: 'running' }, tags: tags },
+                  { instance_id: 'bbf-6969', state: { code: 200, name: 'running' }, tags: tags },
+                  { instance_id: 'lkj-0987', state: { code: 200, name: 'running' }, tags: tags }
             ] }] },
             describe_images: {
               images: [
@@ -310,6 +311,21 @@ module Smash
           }
         }.merge(opts)
       end
+
+      # Stub metadata for EC2 tags
+      #
+      # Notes
+      # * defaults can't be overriden or don't have good support for
+      #   for it yet but you can use this hash as a guide
+      #   for your own custom configuration
+      def self.instance_tags_stub(opts = {})
+        {
+          tags: [
+            { key: 'tag_one_key', value: 'tag_one_value' },
+            { key: 'tag_two_key', value: 'tag_two_value' }
+          ]
+        }.merge(opts)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud_powers
 version: !ruby/object:Gem::Version
-  version: 0.2.7.22
+  version: 0.2.7.23
 platform: ruby
 authors:
 - Adam Phillipps
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport-core-ext