docker-publish 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 603e9552a43527a5befd9f7dd8077cab7693615b
-  data.tar.gz: 11cbe4ff2ee9a4e46fe7a0484fc41a2388d04b01
+  metadata.gz: ece2c1e991dbe762ca4d4c492fded71a2abed48f
+  data.tar.gz: d340a2140194cc2479c36aaf11dcc711480e8b30
 SHA512:
-  metadata.gz: ae492d4d47e98671a6e645aa6af0150f303e4d7892a6474a0bb98fabeac3e510c1120d1d0efcfe5cbc4d6552bba2b04c338936f2f08bc5e931a836b9a3d784e1
-  data.tar.gz: bad2e64239a7808f90baea8813fe1274dbbebc1765fca7fba22ce27cc8c42b5e07c9ea7116e9f11ec3c40df503801dcb3e0824a9b64e449c4165dc6142c6e903
+  metadata.gz: 79d878520d704d43758b431c6bb16b50d5e3aee6721a850933ad703637d57b385c1297a57fb9a0aa7453778759252884e02732dd1156bd1cb27ea3550deedf77
+  data.tar.gz: 49af2e42a9c0dc1fa9a59d9df38683f20a5015f5a049495829cc1cf39d505f32fd14a2bccd5ddc6864a0b3999a020ba90e4aa6119920969e1c0e65682373dd44

data/lib/deploy/docker_compose.rb

@@ -10,11 +10,10 @@ class DockerCompose
     # @param [string] duty
     # @param [int] port
     # @param [string] image_tag
-    def generate_compose_yaml(dist_file_path, duty, port, image_tag)
-        branch = `git rev-parse --abbrev-ref HEAD`.strip
-        commit = `git rev-parse --short HEAD`.strip
+    # @return [File]
+    def generate_compose_yaml(dist_file_path, duty, port, image_tag, out_filename)
         path = File.dirname(dist_file_path)
-        file_path = "#{path}/#{@app_name}-#{branch}-#{commit}_#{duty}.yaml"
+        file_path = "#{path}/#{out_filename}"
 
         dist = File.read(dist_file_path)
 
@@ -25,9 +24,9 @@ class DockerCompose
         out_file.puts(dist)
         out_file.close
 
-        puts "Generated: #{file_path} \n Contents: #{dist}"
+        puts "Generated: #{file_path}"
 
-        file_path
+        out_file
     end
 
 

data/lib/docker_publish.rb

@@ -5,7 +5,7 @@ class DockerPublish
     end
 
     def self.deploy
-
+        Deploy
     end
 
     def self.infrastructure

data/lib/infrastructure/google_cloud_platform/google_cloud_platform.rb

@@ -6,44 +6,55 @@ class GoogleCloudPlatform
         @project_name = project_name
         @app_name = app_name
         @credentials = ENV['GOOGLE_CLOUD_KEYFILE']
-        unless credentials
+        unless @credentials
             puts 'Google Cloud credentials file not set. Run export GOOGLE_CLOUD_KEYFILE=<your_keyfile>.json'
             exit 1
         end
         @google_cloud_storage = GoogleCloudStorage.new(@project_name, @app_name, @credentials)
+
+        @branch = `git rev-parse --abbrev-ref HEAD`.strip
+        @commit = `git rev-parse --short HEAD`.strip
     end
 
     # @return [string]
     def get_container_tag
-        branch = `git rev-parse --abbrev-ref HEAD`.strip
-        commit = `git rev-parse --short HEAD`.strip
-
-        tag = "gcr.io/#{@project_name}/#{@app_name}:#{branch}-#{commit}"
+        tag = "gcr.io/#{@project_name}/#{@app_name}:#{@branch}-#{@commit}"
 
         puts tag
 
         tag
     end
 
-    # @return [string]
-    def generate_startup_script
-        branch = `git rev-parse --abbrev-ref HEAD`.strip
+    def get_compose_filename(duty, latest=false)
+        filename = "#{@branch}-"
+        if latest
+            filename << 'latest'
+        else
+            filename << "#{@commit}"
+        end
+        filename << "_#{duty}.yaml"
 
-        dist = File.read('infrastructure/google_cloud_platform/startup.sh.dist')
+        filename
+    end
+
+    # @return [File]
+    def generate_startup_script
+        dist_file_path = File.join(File.dirname(__FILE__), 'startup.sh.dist')
+        dist = File.read(dist_file_path)
 
         dist = dist.gsub('<bucket_name>', @app_name)
         dist = dist.gsub('<app_name>', @app_name)
-        dist = dist.gsub('<primary_yaml>', self.get_yaml_filename('primary', true))
-        dist = dist.gsub('<backup_yaml>', self.get_yaml_filename('backup', true))
+        dist = dist.gsub('<primary_yaml>', get_compose_filename('primary', true))
+        dist = dist.gsub('<backup_yaml>', get_compose_filename('backup', true))
 
-        filename = "#{branch}-startup.sh"
+        filename = "#{@branch}-startup.sh"
         out_file = File.new(filename, 'w')
         out_file.puts(dist)
         out_file.close
 
-        puts "Generated: #{filename} \n Contents: #{dist}"
+        puts "Generated: #{filename}"
 
-        filename
+        out_file
     end
 
     # @return [GoogleCloudStorage]

data/lib/infrastructure/google_cloud_platform/google_cloud_storage.rb

@@ -26,21 +26,23 @@ class GoogleCloudStorage
         @storage.create_bucket @app_name, retries: 3
     end
 
+    public
     # @param [string] filepath
     # @param [string] storage_path
     # @return [File]
     def put_file(filepath, storage_path)
-        puts "Putting #{filename} on Google Cloud Storage"
+        puts "Putting #{filepath} to #{storage_path} on Google Cloud Storage"
         @bucket.create_file filepath, storage_path
     end
 
+    public
     # @param [string] existing_filepath
     # @param [string] new_filepath
     # @return [File]
     def copy_file(existing_filepath, new_filepath)
         existing_file = @bucket.find_file existing_filepath
 
-        puts "Copying #{existing_filepath} to #{new_filepath}"
+        puts "Copying #{existing_filepath} to #{new_filepath} on Google Cloud Storage"
         existing_file.copy new_filepath
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-publish
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - VJ Patel