docker-deploy 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be91539004a67fa213f2b5c2149bb1a89ddb4ac4
-  data.tar.gz: af40b92261584748ebeb054b8b0c4f10c22b207a
+  metadata.gz: 0435a79eec7d832534bd04cea705966e574ce363
+  data.tar.gz: a70b934b9c33bc3e0b23189b3ac1cf7eaced8f6a
 SHA512:
-  metadata.gz: 5d8dd51c9ba0ba78cad337fad556e943db52edbfb14f6bd81a7658f4c6a8a03f02086e82ee52a1a404d202df078e7a4b823448c9b3069ab8a101b3cbffdae1b8
-  data.tar.gz: a935045a142c753f4a6add279c4347504680e0b23614559b39d823ca827e76797f742e3b0d39bd48c7e7b05bb9c56de0c9bf56bb8efd7add12afe10dfb29845c
+  metadata.gz: ab66dcafe582866d4a4ecb42daffa23fd8b2e07d8d4c4c2c41f5070aa8b70487f54db577110ad0810cc257e02d75813f71c35ff891ab6fc6c8608522285995e7
+  data.tar.gz: 5915dc05e964e77ba1aadffa0114d50aa7d696c806502bca8c9fc319e05390a67d2a0c6d93ef39074caf3beb6f844a3d9b3b77bf59385bb554ad5f1d8a466c9b

data/lib/infrastructure/google_cloud_platform/google_cloud_platform.rb

@@ -5,36 +5,37 @@ class GoogleCloudPlatform
     def initialize(project_name, app_name, credentials)
         @project_name = project_name
         @app_name = app_name
-        @storage = Gcloud.storage "#{project_name}" "#{credentials}"
-        @bucket = self.get_bucket
+        # assume we already logged in (GCE instance or GCloud SDK)
+        puts project_name
+
+        @storage = Gcloud.storage project_name, credentials
+        buckets = @storage.buckets
+        buckets.each do |bucket|
+            if bucket.name == @app_name
+                @bucket = bucket
+            end
+        end
+
+        unless @bucket
+            @bucket = @storage.create_bucket @app_name, retries: 3
+        end
     end
 
-    def self.get_yaml_filename(duty, latest=false)
+    def get_yaml_filename(duty, latest=false)
         branch = `git rev-parse --abbrev-ref HEAD`.strip
         commit = 'latest'
         unless latest
             commit = `git rev-parse --short HEAD`.strip
         end
 
-        return "#{@app_name}-#{branch}-#{commit}_#{duty}.yaml"
+        "#{@app_name}-#{branch}-#{commit}_#{duty}.yaml"
     end
 
-    private
-    def self.get_bucket
-        buckets = @storage.buckets
-        buckets.each do |bucket|
-            if bucket.name == @app_name
-                return bucket
-            end
-        end
-
-        return @storage.create_bucket @app_name, retries: 3
-    end
-
-    def self.generate_startup_script
+    def generate_startup_script
         branch = `git rev-parse --abbrev-ref HEAD`.strip
 
-        dist = %w{#!/bin/bash
+        dist = <<-EOF
+#!/bin/bash
 
 gsutil cp gs://<app_name>/docker-compose/<primary_yaml> .
 gsutil cp gs://<app_name>/docker-compose/<backup_yaml> .
@@ -46,7 +47,7 @@ docker-compose up -p <app_name> -f <primary_yaml> -d
 # Pull Backup containers and start them
 docker-compose pull -p <app_name> -f <backup_yaml>
 docker-compose up -p <app_name> -f <backup_yaml> -d
-        }
+EOF
 
         dist = dist.gsub('<app_name>', @app_name)
         dist = dist.gsub('<primary_yaml>', self.get_yaml_filename('primary', true))
@@ -60,15 +61,16 @@ docker-compose up -p <app_name> -f <backup_yaml> -d
         puts "Generated: #{filename} \n Contents: #{dist}"
 
         puts "Putting #{filename} on Google Cloud Storage"
-        return @bucket.create_file filename "scripts/#{filename}"
+        @bucket.create_file filename, "scripts/#{filename}"
     end
 
-    def self.put_production_yaml(filename)
+    def put_production_yaml(filename)
         puts "Putting #{filename} on Google Cloud Storage"
-        return @bucket.create_file filename "docker-compose/#{filename}"
+
+        @bucket.create_file filename, "docker-compose/#{filename}"
     end
 
-    def self.make_latest_production_yaml(duty)
+    def make_latest_production_yaml(duty)
         existing_file = @bucket.find_file "docker-compose/#{self.get_yaml_filename(duty)}"
 
         puts "Making #{existing_file} latest"

data/lib/infrastructure/infrastructure.rb

@@ -1,7 +1,12 @@
 class Infrastructure
 
-    def self.google_cloud_platform(project_name, app_name, credentials=nil)
-        GoogleCloudPlatform(project_name, app_name, credentials)
+    def self.google_cloud_platform(project_name, app_name)
+        credentials = ENV['GOOGLE_CLOUD_KEYFILE']
+        unless credentials
+            puts 'Google Cloud credentials file not set. Run export GOOGLE_CLOUD_KEYFILE=<your_keyfile>.json'
+            exit 1
+        end
+        GoogleCloudPlatform.new(project_name, app_name, credentials)
     end
 end
 

metadata

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