ssssh 1.0.2 → 1.0.3.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eef52cc397abec11348e1c17be44d31adf552a56
-  data.tar.gz: a1673a612e4cac2b428e55d04a5dcef21ea58335
+  metadata.gz: 6a5c9d4c0908c44b114bf15b7a6dc03d3283f4b1
+  data.tar.gz: 05188a2034589b493874968956b9dcb1de4b9399
 SHA512:
-  metadata.gz: ccfab41aa8f45b245b2c87d1011736efcb87f628b18a23fa793c42df933dbf350c9c1c6d433d83f906bee6a45fa9c96fa57deaabcb0175c630a55a36e1b94dd8
-  data.tar.gz: e44a896cc694db6b11f768c827e30350d4bca6fb4b7a33931765b4f7ad1eece187e3a8e6e0321bd8f87243767c6dd74a59560e9ffda16047b94c85666ee1aac4
+  metadata.gz: 99882112b0dd4d6fd72c60c8c0cb98d08e38e672952829dea604d4e77f96fcda6b321305e0936c3d7bf6a027aeb3476fd3f16e60dba8d2ba08fe32ad0eb33dc3
+  data.tar.gz: 8c43e7b844bca55baccb46603ee45e71ed6610474245536ea8ac3a99f0e0123d2288c0976b3ee553e9ce0e822ab32a1d4c6d6544a4546c516c38223fb8a91360

data/bin/ssssh

@@ -4,12 +4,13 @@ require "aws-sdk-core"
 require "base64"
 require "clamp"
 require "logger"
+require "multi_json"
 require "ssssh/version"
 
 Clamp do
 
   option ["--region"], "REGION", "AWS region",
-         :environment_variable => "AWS_REGION"
+         :environment_variable => "AWS_REGION", :required => true
   option "--access-key", "KEY", "AWS access key",
          :environment_variable => "AWS_ACCESS_KEY_ID",
          :attribute_name => :access_key_id
@@ -63,7 +64,7 @@ Clamp do
   protected
 
   def default_region
-    ENV["AWS_REGION"] || ENV["AWS_DEFAULT_REGION"]
+    ENV["AWS_REGION"] || ENV["AWS_DEFAULT_REGION"] || ec2_instance_metadata["region"]
   end
 
   def logger
@@ -73,6 +74,7 @@ Clamp do
   end
 
   def aws_config
+    # signal_error "No --region specified" unless region
     {
       :access_key_id => access_key_id,
       :secret_access_key => secret_access_key,
@@ -82,6 +84,18 @@ Clamp do
     }.reject { |k,v| v.nil? || v == "" }
   end
 
+  def ec2_instance_metadata
+    uri = URI("http://169.254.169.254/latest/dynamic/instance-identity/document")
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.open_timeout = 1
+    document = http.start do
+      http.request_get(uri.path).body
+    end
+    MultiJson.load(document)
+  rescue Net::OpenTimeout
+    {}
+  end
+
   def with_kms
     yield Aws::KMS::Client.new(aws_config)
   rescue Aws::KMS::Errors::ServiceError => e

data/lib/ssssh/version.rb

@@ -1,3 +1,3 @@
 module Ssssh
-  VERSION = "1.0.2"
+  VERSION = "1.0.3.beta1"
 end

data/ssssh.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "aws-sdk-core", "~> 2.0"
   spec.add_runtime_dependency "clamp", ">= 0.6.4"
+  spec.add_runtime_dependency "multi_json"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssssh
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3.beta1
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.4
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,9 +112,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2