cartup 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b529da15184419a5a526234a6fc53217ed14555
-  data.tar.gz: 6bf24022197f7ca8bf0fc3103ed6c9eef194329a
+  metadata.gz: 07ccbcdd9ed3075dbdc3c386e44d1b9e2d3acb05
+  data.tar.gz: accb83bb6d39c95b43281a3f1d450dac969d9f9c
 SHA512:
-  metadata.gz: d14623ba35b5b2b389bef2e477e3b62276be420534b6948980b0dc65813ad3dfa7e3d3df7fa08fe314b77803c4df25e19a07eaeb6b62d28b8701677053e1b92a
-  data.tar.gz: 91db41918a0847b6aed2f71da4ee53aba8736d72ff8529971a452afd2b40c3ee2ad7eb920b14263621f3533825a1ef138048f480bda65d0be36737862ec4b573
+  metadata.gz: e2c1282c12a805c0c5e598c499255ebf0f07f0532c2c32fba7b1c7013f5c697b687a7f328822c7bedd42c621f45fd086317455795c20488b001d27db0cb76cce
+  data.tar.gz: 590d99cb165314db8c92b71ec4cb195536bf4513a184ccd90c3c1cc3c5d9155c8ba8488fc20e8777153765c23ee8093ffdf4485bf60c235d351e4c9dc9384d97

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cartup (1.0.0)
+    cartup (1.0.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/CartBinaryUploader/version.rb

@@ -1,3 +1,3 @@
 module CartBinaryUploader
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/lib/cartup.rb

@@ -25,7 +25,7 @@ module CartBinaryUploader
   end
 
   def self.setup config
-    if !config.project.google?
+    if !config.project.google.nil?
       CartLogger.log_info 'Starting with google cloud'
       setup_google_cloud config
     else

data/lib/storage/google_cloud_storage.rb

@@ -29,8 +29,8 @@ module CartBinaryUploader
       @bucket = @storage.bucket @bucket_name
     end
 
-    def create_file(file_path)
-      @bucket_object = @bucket.create_file(file_path, file_path)
+    def upload_file(file_path)
+      @bucket_object = @bucket.upload_file(file_path, file_path)
       @bucket_object.signed_url(method: 'GET', expires: 3.154e+8)
     end
 
@@ -44,13 +44,6 @@ module CartBinaryUploader
       json_file.download from_file
       json_file
     end
-
-    def upload_json(json_path)
-      CartLogger.log_info 'Starting upload file to google cloud'
-      @bucket.create_file(json_path, json_path)
-      CartLogger.log_info 'Uploaded complete'
-    end
-
   end
 end
 

data/lib/storage/s3_cloud_storage.rb

@@ -43,11 +43,11 @@ module CartBinaryUploader
       @bucket = @storage.bucket(@bucket_name)
     end
 
-    def create_file(file_path)
-      puts "Creating #{file_path} on s3"
+    def upload_file(file_path)
+      CartLogger.log_info "Creating #{file_path} on s3"
       @bucket_object = @bucket.object(file_path)
       @bucket_object.upload_file("./#{file_path}", acl:'public-read')
-      puts "Object #{file_path} created with url #{@bucket_object.public_url}"
+      CartLogger.log_info "Object #{file_path} created with url #{@bucket_object.public_url}"
       @bucket_object.public_url
     end
 
@@ -64,11 +64,5 @@ module CartBinaryUploader
     def download_config_json_file(from_file)
       @bucket.object(from_file)
     end
-
-    def upload_json(json_path)
-      CartLogger.log_info 'Starting upload json file to s3 cloud'
-      create_file(json_path)
-      CartLogger.log_info 'Uploaded complete'
-    end
   end
 end

data/lib/storage/storage_type.rb

@@ -16,6 +16,10 @@ module CartBinaryUploader
     attr_accessor :json_file
     attr_accessor :bucket_object
 
+    attr_accessor :framework_name_source
+    attr_accessor :framework_name_destination
+    attr_accessor :json_file_path
+
     def initialize(bucket_name,
                    framework_name,
                    framework_version)
@@ -23,62 +27,75 @@ module CartBinaryUploader
       @framework_name = framework_name
       @framework_version = framework_version
 
-      CartLogger.log_info "Creating storage"
+      CartLogger.log_info 'Updating storage resource file names'
+      create_files_names_resource
+      CartLogger.log_info 'Creating storage'
       create_storage
       CartLogger.log_info "Creating bucket name: #{@bucket_name}"
       create_bucket
     end
 
     def create_storage
-      throw :not_implemented, "The current method not implemented"
+      throw :not_implemented, 'The current method not implemented'
     end
 
     def create_bucket
-      throw :not_implemented, "The current method not implemented"
+      throw :not_implemented, 'The current method not implemented'
     end
 
-    def upload_framework
-      CartLogger.log_info "Prepering to upload file to cloud"
-      framework_name_source = @framework_name + FRAMEWORK_EXTENSION_NAME + JSON_EXTENSION_ZIP
-      framework_name_destination = @framework_name + FRAMEWORK_EXTENSION_NAME + "." + @framework_version + JSON_EXTENSION_ZIP
-      json_path = @framework_name + JSON_EXTENSION_NAME
+    def create_files_names_resource
+      @framework_name_source = @framework_name + FRAMEWORK_EXTENSION_NAME + JSON_EXTENSION_ZIP
+      @framework_name_destination = @framework_name + FRAMEWORK_EXTENSION_NAME + "." + @framework_version + JSON_EXTENSION_ZIP
+      @json_file_path = @framework_name + JSON_EXTENSION_NAME
+    end
 
-      CartLogger.log_info "Framework Source: #{framework_name_source}"
-      CartLogger.log_info "Framework Destination: #{framework_name_destination}"
-      CartLogger.log_info "JSON Path: #{json_path}"
+    def upload_framework
+      CartLogger.log_info 'Prepering to upload file to cloud'
+      CartLogger.log_info "Framework Source: #{@framework_name_source}"
+      CartLogger.log_info "Framework Destination: #{@framework_name_destination}"
+      CartLogger.log_info "JSON Path: #{@json_file_path}"
+      CartLogger.log_info "Verifying if the version file #{@framework_name_destination} already exists"
 
-      CartLogger.log_info "Verifying if the version file #{framework_name_destination} already exists"
-      unless file_on_storage_cloud framework_name_destination
+      unless file_on_storage_cloud(@framework_name_destination)
         CartLogger.log_info "File version #{@framework_version} not exists yet, starting generate file on cloud"
+        sync_json_framework_version
+        create_framework_with_version_name
 
-        if file_on_storage_cloud(json_path)
-          @json_file = download_config_json_file(json_path)
-          if @json_file.nil?
-            throw :could_not_download_json_file, "JSON With name: #{json_path}"
-          end
-        else
-          CartLogger.log_warn "Creating empty json because it not exsits yet on cloud"
-          create_empty_json_file(json_path)
-        end
-
-        copy_local_file(framework_name_source, framework_name_destination)
-
-        shared_url = create_file(framework_name_destination)
-
-        json_object = load_json_object json_path
-        json_object[@framework_version] = shared_url
+        shared_url = upload_file(@framework_name_destination)
+        json_object = load_json_object(@json_file_path)
 
-        save_json_object(json_path, json_object)
+        update_json_with_url(json_object, shared_url)
+        save_json_object(@json_file_path, json_object)
 
         CartLogger.log_info 'Starting upload file to storage cloud'
-        upload_json json_path
+        upload_file(@json_file_path)
         CartLogger.log_info 'Uploaded complete'
       else
         throw :the_version_file_already_exists, "The current version: #{@framework_version} already exists on cloud"
       end
     end
 
-    def create_file(file_path)
+    def update_json_with_url(json_object, url)
+      json_object[@framework_version] = url
+    end
+
+    def create_framework_with_version_name
+      copy_local_file(@framework_name_source, @framework_name_destination)
+    end
+
+    def sync_json_framework_version
+      if file_on_storage_cloud(@json_file_path)
+        @json_file = download_config_json_file(@json_file_path)
+        if @json_file.nil?
+          throw :could_not_download_json_file, "JSON With name: #{@json_file_path}"
+        end
+      else
+        CartLogger.log_warn "Creating empty json because it not exsits yet on cloud"
+        create_empty_json_file(@json_file_path)
+      end
+    end
+
+    def upload_file(file_path)
       throw :not_implemented, "The current method not implemented"
     end
 
@@ -98,7 +115,7 @@ module CartBinaryUploader
       throw :not_implemented, "The current method not implemented"
     end
 
-    def upload_json jsonPath
+    def upload_json(json_path)
       throw :not_implemented, "The current method not implemented"
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartup
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Douglas Mendes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3