crossing 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmZkYWM0MWU2YzRlNzE4NzgyMjk4ZTFlMjFlOTYyYzUyZWE1NzBiOQ==
+    NGQxM2NmNTU1ODNkNTI2N2ExMTk5M2MyNTQ1MGRkMDI3MjgxYWE4MQ==
   data.tar.gz: !binary |-
-    MGQ2YzlmNTVhMGVjM2Q3MTIyOGQ0MjQwZjk3ODdhMjVmZDg3YjRjNg==
+    ZGY4YjFjNzBhMDVhZjdkYmE5OTAxZjdiODNhOTE5YzdiODdmZmVmYg==
 SHA512:
   metadata.gz: !binary |-
-    NTMxZDFjY2E2NGM3OTkzNTAyOTI2ZDk4MWE0NDRjNjgxNjY1ZDgxYzU5YTc3
-    ZDkzNDA3OTdkYWZjMGNlNzcxM2JkN2JlN2ZlMDNlMTA0MWYyYWU4NTA3MGRj
-    ZWM4MTFiZjIwMjNlNzc4NTZmZDQwZTU2ZTY2OGU0NmU2NjA5NjM=
+    NGI0Yjc1YWRmZDJiYjYwOTkyMGI5NmZhM2E3MDVhNjJlZTU2MTQ0MzkxMzEx
+    YTZiYWEzNTI3NGQ3ZmE3MjYyMTUxYjY3MWIwMzc2ZmI5YWUwNGExYTYyYjU3
+    NjVlYmVkZTcxMDkxZmNmZmJkMTk0ZTQ5NGMwM2VmNzA2OWY5MjA=
   data.tar.gz: !binary |-
-    MDUwMWM0OTQxMmRiODRmMGZjMWJkNWQ2NWVhYzBlNDEwMzBiNDQ5MTVlYWQ0
-    MDE5OTAwYjJkMTE2ZDM0Mjk1MTI1NGY1NmY4MDQ4YjYwNzRlZWUwYmRkNWI0
-    OWZlZDJlYThlOTZjY2FiNTk1YmI3MGM0NmVmMjM5ZDY2NDYwZGI=
+    NmJmY2NiMTQ0ZDg5YmE2Y2U5ODhhZDJmYmE4NGFjOGM4MGMzOTg2OTIyMTEx
+    YmMxZjdjNDgzNjQ5NjVlZGU5NzNmMjk2MWRhMWI5ZjcyZmMxYzQzYmRkNDk3
+    NzE0NmNlYjQwOWJlY2E2NjM0YjAwMGE3MTA3ZjdhZTI0NmM2OGU=

data/bin/crossing

@@ -1,51 +1,54 @@
 #!/usr/bin/env ruby
-require 'optparse'
-require 'crossing'
-
-options = { bucket: nil, file: nil, key: nil }
-arguments = OptionParser.new do |opts|
-  opts.banner = 'Usage: crossing [options]'
 
-  opts.separator ''
-
-  # Read in arguments
-  opts.on('-b', '--bucket bucket', 'Bucket') do |bucket|
-    options[:bucket] = bucket
-  end
+require 'trollop'
+require 'crossing'
 
-  opts.on('-f', '--file file', 'File') do |file|
-    options[:file] = file
-  end
+SUB_COMMANDS = %w(get put).freeze
+global_opts = Trollop.options do
+  opt :region, 'The region to look for the KMS Key in', default: 'us-east-1'
+  banner 'utility for storing and retrieving files in S3 in a secure manner
+  available commands:
 
-  opts.on('-k', '--key key', 'Key') do |key|
-    options[:key] = key
-  end
+    put -- store a file in S3
+    get -- retrieve a file from S3
 
-  opts.on('-a', '--action action', 'Action') do |action|
-    options[:action] = action
-  end
-
-  opts.on('-h', '--help', 'Displays Help') do
-    puts opts
-    exit
-  end
+  use --help with either command for more information.
+  '
+  stop_on SUB_COMMANDS
 end
 
-arguments.parse!
+cmd = ARGV.shift
+cmd_opts =
+  case cmd
+  when 'put'
+    Trollop.options do
+      opt :file, 'the path to the file to store', required: true, type: String
+      opt :bucket, 'the bucket to store the file in', required: true, type: String
+      opt :kmskeyid, 'the kms key id of the master KMS key', required: true, type: String
+    end
+  when 'get'
+    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
+    end
+  else
+    Trollop.die 'usage: crossing [get|put] [parameters]'
+  end
 
-# options.each do |key|
-#   if options[key].nil?
-#     raise "#{key} is required...aborting"
-#   end
-# end
-kms = Aws::KMS::Client.new
+kms = Aws::KMS::Client.new region: global_opts[:region]
 s3 = Aws::S3::Encryption::Client.new(
-  kms_key_id: options[:key],
+  kms_key_id: cmd_opts[:kmskeyid],
   kms_client: kms
 )
-encrypt = Crossing.new(s3)
-if options[:action] == 'put'
-  encrypt.put(options[:bucket], options[:file], 'This is a test')
+
+crossing = Crossing.new(s3)
+
+case cmd
+when 'put'
+  crossing.put(cmd_opts[:bucket], cmd_opts[:file])
+when 'get'
+  crossing.get(File, cmd_opts[:bucket], cmd_opts[:file])
 else
-  puts "I don't know how to handle that action."
+  raise "unknown subcommand #{cmd}"
 end

data/lib/crossing.rb

@@ -8,10 +8,30 @@ class Crossing
   end
 
   def put(bucket, filename)
-    file = File.new(filename, 'r')
-    @s3_client.put_object(bucket: bucket, key: filename, body: file.read)
+    begin
+      file = File.new(filename, 'r')
+    rescue
+      raise CrossingFileNotFoundException, "File not found: #{filename}"
+    end
+
+    @s3_client.put_object(bucket: bucket, key: filename.split('/').last, body: file.read)
   end
 
-  def get(bucket, file)
+  def get(filesystem, bucket, file)
+    if filesystem.exist?(file)
+      raise CrossingFileExistsException, "File #{file} already exists, will not overwrite."
+    end
+
+    content = @s3_client.get_object(bucket: bucket, key: file).body.read
+    filesystem.write(file, content)
   end
 end
+
+class CrossingError < StandardError
+end
+
+class CrossingFileNotFoundException < CrossingError
+end
+
+class CrossingFileExistsException < CrossingError
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: crossing
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - John Ulick
+- Jonny Sywulak
 - Stelligent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -25,11 +26,25 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !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.
-email: john.ulick@stelligent.com
+email: info@stelligent.com
 executables:
 - crossing
 extensions: []