cyclid 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea995b9c7270ae9d3e38e97ad81397ceb4b73e13
-  data.tar.gz: 7642bb2b0a8703a0199e092858091de720d9bb19
+  metadata.gz: 489faa5033ce922ff61b7ab00b4cd161e7f66ae8
+  data.tar.gz: 2b0c1803c1f1dd3d82c3b906402b8ddbfbdb3c50
 SHA512:
-  metadata.gz: b4e2f3529858bdba00c9be839fff1c6a0a7091355abdf7ec002781c44d0acad9764f37b39f1eb322ea0fe63f5c9141a536cd34dea6126252f0bd8fdcf1464717
-  data.tar.gz: f3e00484f2d3491f56424612bc317b178b936109403ccbca9f802899b62fc5d69f9ceeff8f8720d02771209345c6883af60536749aa0f38d021f38de2feff2b1
+  metadata.gz: a0158078cf6a1b6da24afd01b2250c8171b5477f87c0cd52fd4b552c76a894dc50ced3c682988040b207fa3439404550ae130596ad3f84144df85e304c632429
+  data.tar.gz: cc3c14a58a141da1e819636f0d7eb1451be01d50549b902b5470f00b126241d06b5ba553bd2c55ab24eaf2c5909043781b75189291b391e9ce4bc9b7caebb960

data/app/cyclid/plugins/builder/google.rb

@@ -59,11 +59,15 @@ module Cyclid
             release = 'trusty'
           end
 
+          # Get the instance size, or a default if there isn't one
+          size = args[:size] || 'micro'
+          machine_type = map_machine_type(size)
+
           name = create_name
 
-          source_image, size = find_source_image(distro, release)
-          disk = create_disk(name, size, source_image)
-          instance = create_instance(name, disk)
+          source_image, disk_size = find_source_image(distro, release)
+          disk = create_disk(name, disk_size, source_image)
+          instance = create_instance(name, disk, machine_type)
 
           Cyclid.logger.debug "instance=#{instance.inspect}"
 
@@ -132,6 +136,18 @@ module Cyclid
           "#{base}-#{SecureRandom.hex(16)}"
         end
 
+        # Map the generic size to a machine type
+        def map_machine_type(size)
+          map = { 'default' => @config[:machine_type],
+                  'micro' => 'f1-micro',
+                  'mini' => 'g1-small',
+                  'small' => 'n1-standard-1',
+                  'medium' => 'n1-standard-2',
+                  'large' => 'n1-standard-4' }
+
+          map[size]
+        end
+
         # Map the distro & release to a source image
         def find_source_image(distro, release)
           Cyclid.logger.debug 'attempting to find source image'
@@ -177,11 +193,11 @@ module Cyclid
         end
 
         # Create a compute instance
-        def create_instance(name, disk)
+        def create_instance(name, disk, machine_type)
           Cyclid.logger.info "creating instance #{name}"
           instance = @api.servers.bootstrap(name: name,
                                             disks: [disk],
-                                            machine_type: @config[:machine_type],
+                                            machine_type: machine_type,
                                             zone_name: @config[:zone],
                                             network: @config[:network],
                                             username: @config[:username],

data/app/cyclid/plugins/dispatcher/local.rb

@@ -159,6 +159,8 @@ module Cyclid
             notifier.completion(success)
 
             return success
+          ensure
+            ::ActiveRecord::Base.clear_active_connections!
           end
         end
       end

data/lib/cyclid/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Cyclid
   module Api
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyclid
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Kristian Van Der Vliet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj