awsquery 0.3.1 → 0.3.2

data/bin/awsquery

@@ -10,8 +10,30 @@ options = {
   :state => 'running',
   :verbose => false,
   :json => false,
+  :limit => false,
 }
 
+module AwsOptions extend self
+  def access_key_id
+    ENV['ACCESS_KEY_ID'] || credentials['AWSAccessKeyId']
+  end
+
+  def secret_access_key
+    ENV['SECRET_ACCESS_KEY'] || credentials['AWSSecretKey']
+  end
+
+  def credentials
+    @credentials ||= load_credentials ENV['AWS_CREDENTIAL_FILE']
+  end
+
+  def load_credentials(filename)
+    File.read(filename).lines.inject({}) do |m, line|
+      k, v = line.chomp.split("=", 2)
+      m.tap { |m| m[k] = v }
+    end
+  end
+end
+
 OptionParser.new do |opts|
   opts.banner = "Usage: awsquery.rb [options]"
   opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
@@ -23,12 +45,15 @@ OptionParser.new do |opts|
   opts.on("-j", "Output in JSON") do |j|
     options[:json] = j
   end
+  opts.on("-1", "Only return one result") do |l|
+    options[:limit] = l
+  end
 end.parse!
 
 compute = Fog::Compute.new(
   :provider => 'AWS',
-  :aws_access_key_id => ENV['ACCESS_KEY_ID'],
-  :aws_secret_access_key => ENV['SECRET_ACCESS_KEY']
+  :aws_access_key_id => AwsOptions.access_key_id,
+  :aws_secret_access_key => AwsOptions.secret_access_key
 )
 
 # apply basic filters
@@ -43,6 +68,10 @@ ARGV.each do |arg|
   servers.reject! { |s| !s.tags.key? key or s.tags[key] != value }
 end
 
+if options[:limit]
+  servers = [servers.first]
+end
+
 # output either json or lines
 if options[:json]
   jj servers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awsquery
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70272187403920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272187403920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70272187402960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272187402960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubydns
-  requirement: &70272187401980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272187401980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A collection of tools for querying AWS hosts based on metadata and manipulating
   them
 email:
@@ -79,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Query AWS hosts based on metadata