ssssh 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fe0419d821e061f0e6193d250b521f3cf38f2bc
-  data.tar.gz: d725bbcded6a0e3a64c4e94d252cdff92bb7fbb7
+  metadata.gz: d67cbed98ca5abfddc7ec818b486df7c1d8ad262
+  data.tar.gz: fb79d035bda7503889e376e2816f0422fbe15da7
 SHA512:
-  metadata.gz: 9f42e0c71cb003cea6e77cbe9f2689e5d192f48b5ad853bede18cbea86a1c75dcda7c55d67fbb637ff84b0a44d9de47172c38c845427141f325ae0fe782ad7b5
-  data.tar.gz: 67395c2bd2284370cd8ab9f7927c55a164ce208b94302e94f60b4a5379d2e0997908721dbfecbe87da79bb7383c361d8508bdbe8caf27ab47d76ddf2174fead6
+  metadata.gz: 6f6ba99c2a19db54020cfd4bfab66c3f609cc897ba6f483b3e47116fccb486d6409e371c42262652188095e3c7b77fb215743de2d24ff38b64b247f91a78b0cf
+  data.tar.gz: ca9d385e84a56e12866f2e1437deb09eb84568449f09420a3209261f1321210dbf777958760b326c89edac1bb3f9360caec01ed7b0e0813279852fb207dfa552

data/bin/ssssh

@@ -4,47 +4,68 @@ require "aws-sdk-core"
 require "base64"
 require "clamp"
 require "logger"
+require "ssssh/version"
 
 Clamp do
 
-  option ["--region"], "REGION", "AWS region\n",
-         :environment_variable => "AWS_REGION",
-         :default => "ap-southeast-2"
-  option "--access-key", "KEY", "AWS access key\n",
+  option ["--region"], "REGION", "AWS region",
+         :environment_variable => "AWS_REGION"
+  option "--access-key", "KEY", "AWS access key",
          :environment_variable => "AWS_ACCESS_KEY_ID",
          :attribute_name => :access_key_id
-  option "--secret-key", "KEY", "AWS secret key\n",
+  option "--secret-key", "KEY", "AWS secret key",
          :environment_variable => "AWS_SECRET_ACCESS_KEY",
          :attribute_name => :secret_access_key
-  option "--session-token", "KEY", "AWS security token\n",
+  option "--session-token", "KEY", "AWS security token",
          :environment_variable => "AWS_SECURITY_TOKEN",
          :attribute_name => :session_token
 
   option "--debug", :flag, "enable debugging"
 
+  option "--version", :flag, "display version" do
+    puts "ssssh-#{Ssssh::VERSION}"
+    exit 0
+  end
+
   subcommand "encrypt", "Encrypt STDIN" do
 
     parameter "KEY_ID", "KMS key-id"
-    parameter "[DATA]", "plaintext data"
+    parameter "[PLAINTEXT]", "plaintext", :default => "STDIN"
 
     def execute
-      plaintext = data || $stdin.read
       puts Base64.encode64(encrypt(plaintext, key_id))
     end
 
+    private
+
+    def default_plaintext
+      $stdin.read
+    end
+
   end
 
   subcommand "decrypt", "Decrypt STDIN" do
 
+    parameter "[CIPHERTEXT]", "encoded ciphertext", :default => "STDIN"
+
     def execute
-      encoded_ciphertext = $stdin.read
-      puts decrypt(Base64.decode64(encoded_ciphertext))
+      puts decrypt(Base64.decode64(ciphertext))
+    end
+
+    private
+
+    def default_ciphertext
+      $stdin.read
     end
 
   end
 
   protected
 
+  def default_region
+    ENV["AWS_REGION"] || ENV["AWS_DEFAULT_REGION"]
+  end
+
   def logger
     @logger ||= ::Logger.new($stderr).tap do |logger|
       logger.level = (debug? ? ::Logger::DEBUG : ::Logger::INFO)

data/lib/ssssh/version.rb

@@ -1,3 +1,3 @@
 module Ssssh
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssssh
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core