soror 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bff2dc21e2da2264062e8b5df495aa0d6de4a07
-  data.tar.gz: 1929169d3c2f4062dcc9b37c2f6e53e0bb296106
+  metadata.gz: ab8b39b3eccef7a690c16da4975c4a9dd59632b7
+  data.tar.gz: 0356f90edb7ba6d14c788e66fe058cb39fb7378b
 SHA512:
-  metadata.gz: 3986d1d96c69b3de84749185b37f14e6b2d95e41b38a4833aadc002cc316c7311965e36a167bfb78193daa2ac712bc28ca0be27198d25dbf88705e0ab6d0b1b8
-  data.tar.gz: 3f1fcb90291200f467b253d60a12b80d57d7491f8f2207e6b09b4974ecc19bdf4468c44afe169e03a8025c48f1a7b615eb9aed2d9c99a766945434befe9163be
+  metadata.gz: 109c87056a530122720b520f07a2576bc93382a39678bd610b66f285cb149fc92ff685b4397f1f4e087d763dc15925a7ba4c1a7dcecdfb8a64783553f0e870d3
+  data.tar.gz: 4b389288e835f0daa08ef2caf9c74c481bc3a61c15dda009a85db6efd74bdf3c903b01a347abdb525cacccdf3d626aa363b5b213dc473b90ba8e0ddaf77c258d

data/README.md

@@ -12,11 +12,15 @@ gem 'soror'
 
 And then execute:
 
-    $ bundle
+```
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install soror
+```
+$ gem install soror
+```
 
 ## Usage
 
@@ -42,7 +46,7 @@ In addition, Soror supports [a new and standardized way to manage credentials](h
 ```
 $ soror --help
 Usage: soror [options]
-        --tags='KEY=VAL,KEY=VAL,...'
+    -t, --tags='KEY=VAL,KEY=VAL,...'
     -a, --attributes=ATTR,ATTR,...
         --[no-]header
         --profile-name=NAME

data/bin/soror

@@ -7,11 +7,6 @@ Version = Soror::VERSION
 
 options = { header: true, attributes: [], config: {}, credentials: {}, tag: {} }
 OptionParser.new do |opt|
-  opt.on('-t', '--tag=\'KEY=VALUE\'', /\A[^=]+=[^=]+\z/) do |v|
-    warn '[DEPRECATION] The option `--tag` will be removed, and `-t` will be assigned to `--tags`. Please use `--tags` instead.'
-    key, val = v.split('=')
-    options[:tag][key] = val
-  end
   opt.on(%q{--tags='KEY=VAL,KEY=VAL,...'}, Array) do |a|
     a.map{ |s| s.split('=') }.each{ |k, v| options[:tag][k] = v }
   end

data/lib/soror.rb

@@ -1,13 +1,34 @@
-require 'aws-sdk'
+require 'aws-sdk-ec2'
 require 'forwardable'
-require 'soror/ec2'
 require 'soror/version'
-require 'yaml'
 
-module Soror
+class Soror
   class << self
     extend Forwardable
+
     def_delegators Aws, :config, :config=
-    def_delegators Soror::EC2::Instance, :search_by
+    def_delegators new, :search_by
+  end
+
+  def initialize
+    @ec2 = Aws::EC2::Client.new
+  end
+
+  def search_by(tags)
+    filters = [{ name: 'instance-state-name', values: ['running'] }]
+    tags.each do |k, v|
+      filters << { name: "tag:#{k}", values: [v] }
+    end
+
+    @ec2.describe_instances(filters: filters).reservations.map(&:instances).flatten
+  end
+
+  module EC2
+    class Instance
+      # Deprecated
+      def self.search_by(tags)
+        Soror.search_by(tags)
+      end
+    end
   end
 end

data/lib/soror/version.rb

@@ -1,3 +1,3 @@
 module Soror
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/soror.gemspec

@@ -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", '~> 2'
+  spec.add_runtime_dependency "aws-sdk-ec2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soror
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - kirikiriyamama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 description: Search for EC2 instances by tags
 email:
 - kirikiriyamama@icloud.com
@@ -67,8 +67,6 @@ files:
 - Rakefile
 - bin/soror
 - lib/soror.rb
-- lib/soror/ec2.rb
-- lib/soror/ec2/instance.rb
 - lib/soror/version.rb
 - soror.gemspec
 homepage: https://github.com/kirikiriyamama/soror
@@ -91,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Search for EC2 instances by tags

data/lib/soror/ec2.rb

@@ -1,13 +0,0 @@
-require 'soror/ec2/instance'
-
-module Soror
-  module EC2
-    def client
-      @@client ||= Aws::EC2::Client.new
-    end
-
-    def resource
-      @@resource ||= Aws::EC2::Resource.new(client: client)
-    end
-  end
-end

data/lib/soror/ec2/instance.rb

@@ -1,19 +0,0 @@
-module Soror
-  module EC2
-    class Instance
-      class << self
-        include Soror::EC2
-
-        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
-  end
-end