blufin-lib 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1ec1457a15378d9f5080b5ec64fb9b95065e4b0
-  data.tar.gz: 35a135254e439143706ee3edb126aca97cad1b68
+  metadata.gz: d670802e60811a458378ed20b28ee75b7691f1d6
+  data.tar.gz: 4b7ed248efce868e4d904003a7028749ff2b68e2
 SHA512:
-  metadata.gz: bace4811e8ebee0304c4e26898913e331388af631151f1bbd2b192e18a8b66b864bd8ff73fab92d77120b91dcb9d45356869f33aaf6b918360e0289b587e6d0e
-  data.tar.gz: '058b1449de28f55ab3fa1647df97a62276c4a53a114c30474d3bcab7a808fe7392fa9654ca7ca82331527bd45d1ab16dd5df46509e07c298fcf2b0cce6d951a9'
+  metadata.gz: c0319aec4d945f390446cef58804bbaadcad7dd6e8d0d02dfef375745ed2903b1e662b6b94d83f926489a65412f6f40a42f46c2123be2f94db39e10c1a1a0cd4
+  data.tar.gz: e015f083e35a9255eeffd566997d6e8fca1b90f7c8a0e6a362fa3aed998ccf800eb92544cac27361a276333051cd8f306a5b7b987c231dfb244266c6e34968c6

data/lib/core/aws.rb

@@ -2,6 +2,37 @@ module Blufin
 
     module AWS
 
+        S3_EXCLUDE = "--exclude '.DS_Store' --exclude '*/.DS_Store' --exclude '*.icloud' --exclude '*/*.icloud'"
+
+        # Uploads a file (or path) to S3. If path, will upload recursively (which is mandatory with s3 sync command).
+        # @return string (S3 URL).
+        def self.upload_s3_data(bucket_name, bucket_path, file_or_path, profile: nil, region: nil, is_file: false, dryrun: false)
+            raise RuntimeError, 'profile cannot be nil.' if profile.nil?
+            raise RuntimeError, 'region cannot be nil.' if region.nil?
+            raise RuntimeError, "File or path not found: #{file_or_path}" unless Blufin::Files::file_exists(file_or_path)
+            file_or_path   = File.expand_path(file_or_path)
+            bucket_path    = Blufin::Strings::remove_surrounding_slashes(bucket_path).strip
+            bucket_path_s3 = bucket_path.length > 0 ? "/#{bucket_path}" : ''
+            s3_url         = "s3://#{bucket_name}#{bucket_path_s3}"
+            begin
+                if is_file
+                    cmd = "aws s3 cp #{file_or_path} #{s3_url} --region #{region}#{App::AWS::get_profile_for_cli}"
+                else
+                    cmd = "aws s3 sync #{file_or_path} #{s3_url} --delete --region #{region}#{App::AWS::get_profile_for_cli}"
+                end
+                if dryrun
+                    cmd = "#{cmd} --dryrun"
+                    Blufin::Terminal::info('Performing Dry Run:', Blufin::Terminal::format_command(cmd))
+                    system("#{cmd} #{S3_EXCLUDE} --exclude '*.blank*'")
+                else
+                    raise RuntimeError unless Blufin::Terminal::execute("#{cmd} #{S3_EXCLUDE} --exclude '*.blank*'", verbose: true, text: cmd)
+                end
+                s3_url
+            rescue
+                Blufin::Terminal::error("Unable to download from S3 bucket: #{Blufin::Terminal::format_highlight(s3_url)}", "Either the bucket doesn't exist, you don't have permissions or something else is wrong.", true, false)
+            end
+        end
+
         # Pulls a file from S3 and saves it to the /tmp folder.
         # To avoid making multiple calls, caching is turned on by default.
         # @return string (path to tmp file).
@@ -18,7 +49,7 @@ module Blufin
             tmp_location = "/tmp/awx-s3-cache-#{bucket_name}#{bucket_path_tmp}"
             # If path/file exists and we're using cached values, simply return.
             if file.nil?
-                return tmp_location if Blufin::Files::path_exists(tmp_location) && use_cache && Blufin::Files::get_files_in_dir(tmp_location).any?
+                return tmp_location if Blufin::Files::path_exists(tmp_location) && use_cache
             else
                 return tmp_location if Blufin::Files::file_exists(tmp_location) && use_cache
             end
@@ -34,7 +65,7 @@ module Blufin
             rescue
                 system("rm -rf #{tmp_location}") if file.nil?
                 system("rm #{tmp_location}") unless file.nil?
-                Blufin::Terminal::error("Unable to download from S3 bucket: #{Blufin::Terminal::format_highlight("s3://#{bucket_name}#{bucket_path_s3}")}", "Either the bucket doesn't exist, you don't have permissions or something else is wrong...", true, false)
+                Blufin::Terminal::error("Unable to download from S3 bucket: #{Blufin::Terminal::format_highlight("s3://#{bucket_name}#{bucket_path_s3}")}", "Either the bucket doesn't exist, you don't have permissions or something else is wrong.", true, false)
             end
 
         end

data/lib/version.rb

@@ -1 +1 @@
-BLUFIN_LIB_VERSION = '1.7.3'
+BLUFIN_LIB_VERSION = '1.7.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blufin-lib
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Albert Rannetsperger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-08 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: kwalify
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Blufin Lib