onetime 0.4.1 → 0.5.0

data/CHANGES.txt

@@ -1,5 +1,15 @@
 ONETIME, CHANGES
 
+#### 0.5.0 (2013-02-12) ###############################
+
+* ADDED: Support for getting secrets based on the URI
+* ADDED: Command alias 'get' for 'secret'
+* ADDED: Explicit support for string format
+* FIXED: Confusion around csv support (there is no csv support)
+* CHANGE: Disabled checking for tty. Just assume string format.
+* CHANGE: 'secret' command returns just the secret message by default (not yaml)
+
+
 #### 0.4.1 (2013-02-12) ###############################
 
 * CHANGE: All releases will now be signed. See "Installation" in the readme.

data/README.md

@@ -1,4 +1,4 @@
-# One-Time Secret #
+# One-Time Secret 0.5 #
 
 **Keep sensitive info out of your chat logs & email.**
 
@@ -35,6 +35,18 @@ And you can read from a file:
     https://onetimesecret.com/secret/er5djg1wodsp5m32oyym489bnuhsfp6
 
 
+### onetime get ###
+
+You can retrieve a secret too:
+
+    $ onetime get er5djg1wodsp5m32oyym489bnuhsfp6
+    [...SECRET...]
+
+The URI works too:
+
+    $ onetime get https://onetimesecret.com/secret/er5djg1wodsp5m32oyym489bnuhsfp6
+    [...SECRET...]
+
 ## Output Format ##
 
 `onetime` also supports YAML, JSON, and to a limited extent CSV outputs. Specify the format using the `-f ` global option:

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/bin/onetime

@@ -3,6 +3,7 @@
 base_path = File.expand_path File.join(File.dirname(__FILE__), '..')
 $:.unshift File.join(base_path, 'lib')
 
+require 'uri'
 require 'onetime/api'
 require 'drydock'
 
@@ -19,6 +20,7 @@ class Onetime::CLI
     global :f, :format, String, "Output format (json or yaml)"
     global :j, :json, "Shorthand for -f json"
     global :y, :yaml, "Shorthand for -f yaml"
+    global :s, :string, "Shorthand for -f string (default)"
 
     global :D, :debug do
       OT::API.debug_output STDERR
@@ -34,22 +36,11 @@ class Onetime::CLI
       @api = OT::API.new obj.global.custid, obj.global.apikey
       obj.global.format = 'yaml' if obj.global.yaml
       obj.global.format = 'json' if obj.global.json
+      obj.global.format = 'string' if obj.global.string
       obj.global.format = nil if obj.global.format == 'string'
       if obj.global.format && !['json', 'yaml', 'csv'].member?(obj.global.format)
         raise RuntimeError, "Unsupported format: #{obj.global.format}"
       end
-      if !STDOUT.tty? && !obj.global.format
-        raise RuntimeError, "No tty. Must specify an output format. See #{$0} generate -h"
-      end
-    end
-
-    after do |obj|
-      case obj.global.format
-      when 'json'
-        puts @res.to_json
-      when 'yaml'
-        puts @res.to_yaml
-      end
     end
 
     usage "onetime status"
@@ -60,7 +51,12 @@ class Onetime::CLI
       elsif @api.response.code != 200
         raise RuntimeError, @res['message']
       end
-      unless obj.global.format
+      case obj.global.format
+      when 'json'
+        puts @res.to_json
+      when 'yaml'
+        puts @res.to_yaml
+      else
         msg = @api.anonymous ? 'Anonymous' : @api.custid
         STDERR.puts '# Host: %s' % OT::API.base_uri
         STDERR.puts '# Account: %s' % msg
@@ -79,7 +75,12 @@ class Onetime::CLI
       elsif @api.response.code != 200
         raise RuntimeError, @res['message']
       end
-      unless obj.global.format
+      case obj.global.format
+      when 'json'
+        puts @res.to_json
+      when 'yaml'
+        puts @res.to_yaml
+      else
         puts @res.to_yaml
       end
     end
@@ -93,16 +94,26 @@ class Onetime::CLI
       raise RuntimeError, "Usage: #{$0} secret <KEY>" unless obj.argv.key
       opts = {}
       opts[:passphrase] = obj.option.passphrase if obj.option.passphrase
+      base_uri = URI.parse Onetime::API.base_uri
+      if obj.argv.key =~ /#{base_uri.hostname}\/secret\/([a-zA-Z0-9]+)/
+        obj.argv.key = $1
+      end
       @res = @api.post '/secret/%s' % [obj.argv.key], opts
       if @res.nil?
         raise RuntimeError, 'Could not complete request'
       elsif @api.response.code != 200
         raise RuntimeError, @res['message']
       end
-      unless obj.global.format
+      case obj.global.format
+      when 'json'
+        puts @res.to_json
+      when 'yaml'
         puts @res.to_yaml
+      else
+        puts @res[:value] if @res
       end
     end
+    command_alias :secret, :get
 
     usage "onetime share"
     usage "onetime share [-t 3600] [-p PASSPHRASE]"
@@ -134,7 +145,12 @@ class Onetime::CLI
         raise RuntimeError, @res['message']
       end
       uri = OT::API.web_uri('secret', @res[:secret_key])
-      if obj.global.format == 'csv' || obj.global.format.nil?
+      case obj.global.format
+      when 'json'
+        puts @res.to_json
+      when 'yaml'
+        puts @res.to_yaml
+      else
         if @res[:recipient] && !@res[:recipient].compact.empty?
           STDERR.puts '# Secret link sent to: %s' % @res[:recipient].join(',')
         else
@@ -158,10 +174,14 @@ class Onetime::CLI
         raise RuntimeError, @res['message']
       end
       uri, secret_value = OT::API.web_uri('secret', @res[:secret_key]), @res[:value]
-      STDERR.puts @res.inspect if obj.global.debug
-      if obj.global.format == 'csv'
+      case obj.global.format
+      when 'json'
+        puts @res.to_json
+      when 'yaml'
+        puts @res.to_yaml
+      when 'csv'
         puts [secret_value,uri].join ','
-      elsif obj.global.format.nil?
+      else
         msg = 'Your secret (hit return to continue): %s' % secret_value
         if @res[:recipient] && !@res[:recipient].compact.empty?
           uri = "\e[K\r# Secret link sent to: %s" % [@res[:recipient].join(',').ljust(40, ' ')]

data/onetime.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "onetime"
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/onetime",
+    "gem-public_cert.pem",
     "lib/onetime/api.rb",
     "onetime.gemspec"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onetime
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors: