lsst-git-lfs-s3 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d6af533fb779c519b48566103bd44ae088246218
-  data.tar.gz: 12182c61344bb1907e4bb12329d051c2eb620a65
+SHA256:
+  metadata.gz: 6eb53e5efae6c631fd91c02f884f1e25bba9be671aec8037b9ff80c567117862
+  data.tar.gz: e9ceaf3f6a6c05badf00465ebcf72cbf961f6479d03198c575f590943d95f57a
 SHA512:
-  metadata.gz: 5730b910a229497f91e4a62ff173c7acfb55ced22c0e8f6ba0bd287513d48d8d401263720f72bca2894b7f90e920002078aad62dfc1d760793a8c34f43f27823
-  data.tar.gz: b9bdf2eeebb5f82b9fdc497ddbbd2cb9fe01292e3e249706a2f5068aa4e48000b9130e92a9e0aac6584c875310710d3da3663bd09fde7c4aafbd82f4646b3e78
+  metadata.gz: 31241f4e27f952be8032de8c20a647fc3f35eec3c7f67b6db999521f8ccd0733c7c22a147410ff9ed748b2022b9e10dea1cfe86e621523b8ab36c889923260f4
+  data.tar.gz: 8d286e25cd66a42f46793add7ceae1cc09ca2b0a839226dd1dad6e240fdec4c00df02c1f774e0bd427ddf444a9eaa3b1f17460dba5eaf5a59c9fee940abc251c

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: '2.4'
+  TargetRubyVersion: '2.5'
 
 Metrics/BlockLength:
   Enabled: false
@@ -42,3 +42,7 @@ Lint/HandleExceptions:
   Enabled: false
 Lint/RescueException:
   Enabled: false
+
+Layout/AlignHash:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table

data/bin/git-lfs-s3

@@ -17,11 +17,11 @@ GitLfsS3::Application.set :logger, Logger.new(STDOUT)
 
 if GitLfsS3::Application.settings.ceph_s3
   Aws.config.update(
-    endpoint: ENV['LFS_CEPH_ENDPOINT'],
-    access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+    endpoint:          ENV['LFS_CEPH_ENDPOINT'],
+    access_key_id:     ENV['AWS_ACCESS_KEY_ID'],
     secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
-    force_path_style: true,
-    region: 'us-east-1',
+    force_path_style:  true,
+    region:            'us-east-1',
     # ssl_ca_bundle: '/usr/local/etc/openssl/cert.pem' # Required for brew
     # install on a mac.
   )

data/git-lfs-s3.gemspec

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 
 lib = File.expand_path('lib', __dir__)
@@ -22,8 +21,8 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'aws-sdk', '~> 2'
   gem.add_dependency 'multi_json', '~> 1'
-  gem.add_dependency 'sinatra', '~> 2'
+  gem.add_dependency 'sinatra', '>= 2.0.2'
 
   gem.add_development_dependency 'rake', '~> 10'
-  gem.add_development_dependency 'rubocop', '~> 0.53.0'
+  gem.add_development_dependency 'rubocop', '~> 0.61.1'
 end

data/lib/git-lfs-s3/application.rb

@@ -46,6 +46,7 @@ module GitLfsS3
 
     def protected!
       return unless authorized?
+
       response['WWW-Authenticate'] = %(Basic realm="Restricted Area")
       throw(:halt, [401, 'Invalid username or password'])
     end
@@ -58,6 +59,7 @@ module GitLfsS3
       # Validate that size >= 0 and oid is a SHA256 hash.
       oid = obj[:oid]
       return unless obj[:size] >= 0
+
       (oid.hex.size <= 32) && (oid.size == 64) && (oid =~ /^[0-9a-f]+$/)
       # XXX what exception needs to be ignored here?
     rescue Exception
@@ -77,9 +79,9 @@ module GitLfsS3
         'authenticated' => authenticated,
         'actions'       => {
           'download' => {
-            'href'          => obj.presigned_url(:get,
-                                                 expires_in: 86_400),
-            'expires_at'    => expire_at,
+            'href'       => obj.presigned_url(:get,
+                                              expires_in: 86_400),
+            'expires_at' => expire_at,
           },
         },
       }
@@ -95,10 +97,10 @@ module GitLfsS3
         'authenticated' => authenticated,
         'actions'       => {
           'upload' => {
-            'href'          => obj.presigned_url(:put,
-                                                 acl: 'public-read',
-                                                 expires_in: 86_400),
-            'expires_at'    => expire_at,
+            'href'       => obj.presigned_url(:put,
+                                              acl:        'public-read',
+                                              expires_in: 86_400),
+            'expires_at' => expire_at,
           },
         },
       }
@@ -107,11 +109,11 @@ module GitLfsS3
     def obj_error(error, message, obj_json)
       # Format a single error object.
       {
-        'oid'         => obj_json[:oid],
-        'size'        => obj_json[:size],
-        'error'       => {
-          'code'        => error,
-          'message'     => message,
+        'oid'   => obj_json[:oid],
+        'size'  => obj_json[:size],
+        'error' => {
+          'code'    => error,
+          'message' => message,
         },
       }
     end
@@ -159,7 +161,7 @@ module GitLfsS3
       status(200)
       resp = {
         'transfer' => 'basic',
-        'objects' => objects
+        'objects'  => objects
       }
       body MultiJson.dump(resp)
     end
@@ -168,7 +170,7 @@ module GitLfsS3
       # Error git-lfs batch response.
       status(status_code)
       resp = {
-        'message' => message,
+        'message'    => message,
         'request_id' => SecureRandom.uuid
       }
       body MultiJson.dump(resp)
@@ -206,10 +208,10 @@ module GitLfsS3
         if object.exists?
           status 200
           resp = {
-            'oid' => params[:oid],
-            'size' => object.size,
+            'oid'    => params[:oid],
+            'size'   => object.size,
             '_links' => {
-              'self' => {
+              'self'     => {
                 'href' => File.join(
                   settings.server_url, 'objects', params[:oid]
                 )

data/lib/git-lfs-s3/aws.rb

@@ -4,8 +4,8 @@ module GitLfsS3
   module AwsHelpers
     def s3
       @s3 ||= Aws::S3::Client.new({
-                                    region: aws_region,
-                                    access_key_id: aws_access_key_id,
+                                    region:            aws_region,
+                                    access_key_id:     aws_access_key_id,
                                     secret_access_key: aws_secret_access_key
                                   })
     end

data/lib/git-lfs-s3/services/upload/upload_required.rb

@@ -13,7 +13,7 @@ module GitLfsS3
         {
           '_links' => {
             'upload' => {
-              'href' => upload_destination,
+              'href'   => upload_destination,
               'header' => upload_headers
             },
             'verify' => {

data/lib/git-lfs-s3/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitLfsS3
-  VERSION = '0.3.9'
+  VERSION = '0.3.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lsst-git-lfs-s3
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-10 00:00:00.000000000 Z
+date: 2018-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -43,16 +43,16 @@ dependencies:
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.61.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.61.1
 description: LSST's Git LFS server
 email:
 - meltingice8917@gmail.com
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: LSST's Git LFS server