soror 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42d441c4bd3902be3e288411d4cc568e9e8a1988
-  data.tar.gz: 31f9696ef46faf3d88dc5dcd3e8a73300c62ee25
+  metadata.gz: 034997ba85838ff60db49c955ea8b4f4405f5c33
+  data.tar.gz: 56411d4aa19bb9b7b8ee338f3ad7d2c986b39998
 SHA512:
-  metadata.gz: eeee8b20d3f49371f18cbc1b6231181138b9d6b0a0a1cd3fdeed4ee44a24c48e669d2a734431c1c865b74ce400049285250ef01a2d9e14ab13b949fc9285371c
-  data.tar.gz: 323ee560c02571ffdc90c8cae872fdcdf8c0e1f6f99e02ad8121ac9b63300e36151790aedf0ffd2828f5f2c3ccb889872571412dad04a65a7fd3a5437e6d2157
+  metadata.gz: 668a7efefa9faaed4c4382d1f832f84ac7bc3f83ff8052f9a2660fa8119399c3cfcf4980b6acc7afa07036f800f5d781a8da146072e9ad549fb4bd785bbc0902
+  data.tar.gz: 500a4bc5dfabb60a656e30773c3a2c4449899c4dc5b134ae57f0ad3c920f868745b9ff7547b082aed2002f152f586fa2000743c1e47bf0f0125d8d2f8d2d3047

data/README.md

@@ -1,6 +1,6 @@
 # Soror
 
-Soror is EC2 instances searcher, EC2 instances are searched by tags
+Search for EC2 instances by tags :mag_right:
 
 ## Installation
 
@@ -22,15 +22,15 @@ Or install it yourself as:
 
 ```ruby
 # Search for EC2 instances which have the tag `{ "Key": "name", "Value": "soror" }`
-# You can use methods of AWS::EC2::Instance to an element of return value
-# See http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/EC2/Instance.html
-Soror::EC2::Instance.search_by(name: 'soror') #=> [<AWS::EC2::Instance>, ...]
+# You can use methods of Aws::EC2::Instance to an element of return value
+# See http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Instance.html
+Soror::EC2::Instance.search_by(name: 'soror') #=> [<Aws::EC2::Instance>, ...]
 ```
 
 ### Configuration
 
 ```ruby
-Soror.config(access_key_id: 'xxxxx', secret_access_key: 'xxxxx', region: 'ap-northeast-1')
+Soror.config = { access_key_id: 'xxxxx', secret_access_key: 'xxxxx', region: 'ap-northeast-1' }
 ```
 
 Or put the configuration file on your home directory as:
@@ -43,12 +43,6 @@ region: 'ap-northeast-1'
 EOS
 ```
 
-### Memoization
-
-```ruby
-Soror.start_memoizing
-```
-
 ## CLI
 
 ```

data/bin/soror

@@ -22,7 +22,6 @@ fail OptionParser::MissingArgument, '--attributes' if options[:attributes].nil?
 fail OptionParser::InvalidArgument, '--attributes' if options[:attributes].empty?
 
 Soror.config(options[:config])
-Soror.start_memoizing
 
 instances = Soror::EC2::Instance.search_by(options[:tag])
 exit! if instances.empty?

data/lib/soror/ec2/instance.rb

@@ -1,14 +1,17 @@
 module Soror
   module EC2
     class Instance
-      extend Soror::EC2
+      class << self
+        include Soror::EC2
 
-      def self.search_by(tags)
-        warn %q{[DEPRECATION] `Soror::EC2::Instance.search_by` won't be memoized. If you want to memoize, use `Soror.start_memoizing`.}
-        AWS.memoize do
-          ec2.instances.
-            filter('instance-state-name', 'running').
-            select{ |i| tags.all?{ |k, v| i.tags[k.to_s] == v.to_s } }
+        def search_by(tags)
+          filters = [].tap do |array|
+            array << { name: 'instance-state-name', values: ['running'] }
+            tags.each do |k, v|
+              array << { name: "tag:#{k}", values: [v] }
+            end
+          end
+          resource.instances(filters: filters).to_a
         end
       end
     end

data/lib/soror/ec2.rb

@@ -2,8 +2,12 @@ require 'soror/ec2/instance'
 
 module Soror
   module EC2
-    def ec2
-      @@ec2 ||= AWS::EC2.new
+    def client
+      @@client ||= Aws::EC2::Client.new
+    end
+
+    def resource
+      @@resource ||= Aws::EC2::Resource.new(client: client)
     end
   end
 end

data/lib/soror/version.rb

@@ -1,3 +1,3 @@
 module Soror
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/soror.rb

@@ -1,16 +1,38 @@
-require 'aws-sdk-v1'
+require 'aws-sdk'
 require 'forwardable'
 require 'soror/ec2'
 require 'soror/version'
 require 'yaml'
 
+unless {}.respond_to?(:symbolize_keys)
+  class Hash
+    def symbolize_keys
+      dup.symbolize_keys!
+    end
+
+    def symbolize_keys!
+      keys.each do |key|
+        self[(key.to_sym rescue key) || key] = delete(key)
+      end
+      self
+    end
+  end
+end
+
 module Soror
   class << self
     extend Forwardable
-    def_delegators AWS, :config, :start_memoizing, :stop_memoizing
+    def_delegators Aws, :config=
+
+    def config(hash)
+      warn '[DEPRECATION] `Soror.config` will be removed. Please use `Soror.config=` instead.'
+      hash.symbolize_keys.each{ |k, v| Aws.config[k] = v }
+    end
   end
 end
 
 File.expand_path('~/.soror').tap do |path|
-  File.exists?(path) && Soror.config(YAML.load_file(path))
+  if File.exists?(path)
+    Soror.config = YAML.load_file(path).symbolize_keys
+  end
 end

data/soror.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Soror::VERSION
   spec.authors       = ["kirikiriyamama"]
   spec.email         = ["kirikiriyamama@icloud.com"]
-  spec.summary       = %q{Soror is EC2 instances seacher}
+  spec.summary       = %q{Search for EC2 instances by tags}
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/kirikiriyamama/soror"
   spec.license       = "MIT"
@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 
-  spec.add_runtime_dependency "aws-sdk-v1"
+  spec.add_runtime_dependency "aws-sdk", '~> 2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soror
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - kirikiriyamama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,20 +39,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Soror is EC2 instances seacher
+        version: '2'
+description: Search for EC2 instances by tags
 email:
 - kirikiriyamama@icloud.com
 executables:
@@ -94,5 +94,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Soror is EC2 instances seacher
+summary: Search for EC2 instances by tags
 test_files: []