crossing 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGQxM2NmNTU1ODNkNTI2N2ExMTk5M2MyNTQ1MGRkMDI3MjgxYWE4MQ==
+    YWJiNDNlMTAyNDZkMDA2NDcyY2E2N2Y1OGRkZTgzMzE1ZTEwZmNmMw==
   data.tar.gz: !binary |-
-    ZGY4YjFjNzBhMDVhZjdkYmE5OTAxZjdiODNhOTE5YzdiODdmZmVmYg==
+    ZGJmOWM4NTNlZGQwYTQ5ZDdjYmRlM2E1ZTk2MDAwOWJiN2RhNjdiOQ==
 SHA512:
   metadata.gz: !binary |-
-    NGI0Yjc1YWRmZDJiYjYwOTkyMGI5NmZhM2E3MDVhNjJlZTU2MTQ0MzkxMzEx
-    YTZiYWEzNTI3NGQ3ZmE3MjYyMTUxYjY3MWIwMzc2ZmI5YWUwNGExYTYyYjU3
-    NjVlYmVkZTcxMDkxZmNmZmJkMTk0ZTQ5NGMwM2VmNzA2OWY5MjA=
+    ZWQ2YjI4YzYzNzIyNDg2OWY0OWRlMzJhYzYwMWU4YzBkYzU3MDAwOTM5OGU4
+    MzI4Zjc4Y2Q3NmJiOTVjZDgxY2I3YzZjZWNhNDk4OTY3MWI3MDE2NjBiY2Fm
+    ODZkZjRhOGI1ZTI4NGNkMTIxNmQyYjhhMTQyYjFmYzllMzBmNTc=
   data.tar.gz: !binary |-
-    NmJmY2NiMTQ0ZDg5YmE2Y2U5ODhhZDJmYmE4NGFjOGM4MGMzOTg2OTIyMTEx
-    YmMxZjdjNDgzNjQ5NjVlZGU5NzNmMjk2MWRhMWI5ZjcyZmMxYzQzYmRkNDk3
-    NzE0NmNlYjQwOWJlY2E2NjM0YjAwMGE3MTA3ZjdhZTI0NmM2OGU=
+    NmI0ZWYwMzBlMzgzZjczYWU5ZTU2OWI2YmE0NjdmMmJiZTA3NzFlZjU3ZmNk
+    MTgyYzk3ODI1NTdhMTI1ZWMxNjlmMGMyNDg5NDk0YmFjNmE0ZmEzYjQ0OTBk
+    YmU3NWNlNGE3YTE4ZWRhOTgwMDNmN2I1YjlmMmY5MGJkYWI1NTg=

data/bin/crossing

@@ -30,12 +30,13 @@ cmd_opts =
     Trollop.options do
       opt :file, 'the name of the file to retrieve', required: true, type: String
       opt :bucket, 'the bucket the file is stored in', required: true, type: String
-      opt :kmskeyid, 'the kms key id of the master KMS key', required: true, type: String
+      opt :kmskeyid, 'the kms key id of the master KMS key', required: false, type: String
     end
   else
     Trollop.die 'usage: crossing [get|put] [parameters]'
   end
 
+cmd_opts[:kmskeyid] ||= '_nokey_decrypt_'
 kms = Aws::KMS::Client.new region: global_opts[:region]
 s3 = Aws::S3::Encryption::Client.new(
   kms_key_id: cmd_opts[:kmskeyid],

data/lib/crossing.rb

@@ -3,7 +3,8 @@ require 'aws-sdk'
 # Documentation incoming
 class Crossing
   def initialize(s3_client)
-    raise 'You did not pass in an S3 client...aborting' if s3_client.nil?
+    raise CrossingMisconfigurationException if s3_client.nil?
+    raise CrossingMisconfigurationException unless s3_client.is_a? Aws::S3::Encryption::Client
     @s3_client = s3_client
   end
 
@@ -14,7 +15,11 @@ class Crossing
       raise CrossingFileNotFoundException, "File not found: #{filename}"
     end
 
-    @s3_client.put_object(bucket: bucket, key: filename.split('/').last, body: file.read)
+    put_content(bucket, filename.split('/').last, file.read)
+  end
+
+  def put_content(bucket, filename, content)
+    @s3_client.put_object(bucket: bucket, key: filename.split('/').last, body: content)
   end
 
   def get(filesystem, bucket, file)
@@ -22,14 +27,21 @@ class Crossing
       raise CrossingFileExistsException, "File #{file} already exists, will not overwrite."
     end
 
-    content = @s3_client.get_object(bucket: bucket, key: file).body.read
+    content = get_content(bucket, file)
     filesystem.write(file, content)
   end
+
+  def get_content(bucket, file)
+    @s3_client.get_object(bucket: bucket, key: file).body.read
+  end
 end
 
 class CrossingError < StandardError
 end
 
+class CrossingMisconfigurationException < CrossingError
+end
+
 class CrossingFileNotFoundException < CrossingError
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crossing
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - John Ulick
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -40,10 +40,18 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.1.2
-description: The native AWS command line does not have an easy way to upload encrypted
-  files to S3. The Ruby SDK has a way to do this, but not everyone wants to use it.
-  This utility allows you to do client side encrypted uploads to S3 from the command
-  line, which is useful for uploads from your CI system to docker containers.
+description: ! 'The native AWS command line does not have an easy way to upload encrypted
+  files
+
+  to S3. The Ruby SDK has a way to do this, but not everyone wants to use it.
+
+  This utility allows you to do client side encrypted uploads to S3 from the
+
+  command line, which is useful for uploads from your CI system to docker
+
+  containers.
+
+'
 email: info@stelligent.com
 executables:
 - crossing