cps-property-generator 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0cc064b6d0d8fafe9847384a929bd11f5bb9a54
-  data.tar.gz: 62a7bc3e50dfd64f1573098a37c762470d7ac481
+  metadata.gz: 2f659265beb057cc6e807215df12702562307e50
+  data.tar.gz: 58a223834ecda08eea38a5f9a21ad6cbdf39f37d
 SHA512:
-  metadata.gz: a447cbbe279d63222df061d4154b07d177ff433a54949a8d94d136ddbb37ae7893d689845460b68f10a144253ab29c0c4bf9b2e908d317f281ae242c5c09eb5b
-  data.tar.gz: a22afe3b1933db8c83a9b43f16da69b6fefdcd364182a8f733da9588b7a84e1b98ddb0399a07cc84374658c36106ff724f7b959e22c2beb94ca0b75f67760439
+  metadata.gz: dbda7d164c992be4eab086b2f770dee1c8adbefe259ae6c12da695ba09d6f3c8ffbaa90a76e51e7572cb2143d7c26609c3ac39231d59a4af964daff555267e07
+  data.tar.gz: bf99d2880a883f34fc8047a61fff2b55c51307faa71d450780a30f01ef29f40d882c622e3d547df0e27e7d3ca127e4f73b12ce886c338c7971948e23f05284ff

data/bin/cps-property-generator

@@ -13,17 +13,19 @@ class GeneratorCLI < ::Thor
   option 'upload_account', banner: 'UPLOAD_ACCOUNT', type: :string, desc: 'The account you are uploading properties to'
   option 'upload_region', banner: 'UPLOAD_REGION', type: :string, desc: 'The region your property bucket is in'
   option 'upload_bucket', banner: 'UPLOAD_BUCKET', type: :string, desc: 'The bucket you are uploading properties to.'
+  option 'upload_all', banner: 'UPLOAD_ALL', type: :boolean, desc: 'Whether to upload all envs and accounts to a single bucket', :default => false
 
   def generate
 
     generator = PropertyGenerator::Generator.new(options)
     out = generator.generate
     if options['upload']
-      if options['upload_account'].nil? || options['upload_region'].nil? && options['upload_bucket'].nil?
-        puts 'Please specify upload configs'
-      else
-        generator.upload(out, options)
-      end
+      abort('Did not specify an upload bucket') if options['upload_bucket'].nil?
+      abort('Did not specify an upload region') if options['upload_region'].nil?
+
+      abort('Did not specify upload configs') if !options['upload_all'] && options['upload_account'].nil?
+
+      generator.upload(out, options)
     end
   end
 

data/lib/generator/generator.rb

@@ -37,22 +37,33 @@ module PropertyGenerator
     end
 
     def upload(out, config)
-      account = config['upload_account']
+      upload_bucket = config['upload_bucket']
+      upload_region = config['upload_region']
 
-      if !@accounts.include?(account.to_i)
-        abort("The specified account (#{account}) is not configured, please add it to config/config.yml")
-      end
+      if config['upload_all']
+        _upload_files(out.sort) do |file|
+          file_region = file.split("/")[-2]
+          file_account = file.split("/")[-3]
 
-      upload_account = config['upload_account']
-      upload_region = config['upload_region']
-      upload_bucket = config['upload_bucket']
+          PropertyGenerator.sync(upload_region, file_account, upload_bucket, file, file_region)
+        end
+      else
+        upload_account = config['upload_account']
+        abort("The specified account (#{upload_account}) is not configured, please add it to config/config.yml") unless @accounts.include?(upload_account)
+
+        upload_out = out.select { |file| file.include?("#{upload_account}") && file.include?("#{upload_region}") }
+        _upload_files(upload_out) do |file|
+          file_region = file.split("/")[-2]
+          PropertyGenerator.sync(upload_region, upload_account, upload_bucket, file, file_region)
+        end
+      end
+    end
 
-      upload_out = out.select { |file| file.include?("#{upload_account}") && file.include?("#{upload_region}") }
-      upload_out.each_slice(20) do |file_slice|
+    def _upload_files(files)
+      files.each_slice(20) do |file_slice|
         file_slice.map do |file|
           Thread.new do
-            file_region = file.split("/")[-2]
-            PropertyGenerator.sync(upload_region, upload_account, upload_bucket, file, file_region)
+            yield file
           end
         end.each(&:join)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cps-property-generator
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.20
 platform: ruby
 authors:
 - Bryan Call