capistrano-gcp-autoscaling 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5b766ad469f8c906f13da23d04beae1336aec3459a4023cfc40e54db12c86ae
-  data.tar.gz: b1fc5d6f4c8f768dfe6e791f0968eb6654ac09790737e3738180e77a2a5717cb
+  metadata.gz: 57d248d5241932baf5c918ed91c93e1d8581f96902c5a504f1c141bb082e4d65
+  data.tar.gz: fb20b4f0143561c33ddd219f6013e67add91213cb441f06dcb78bb3537fdea18
 SHA512:
-  metadata.gz: 39d7a7fc7769b109957284fe4db36ee3c452411854d6a94ff05ec092ce7968f5128ae31cbb34e6fc9881d0e660164c142f3a84260234f932d88ba1da7dd0302a
-  data.tar.gz: 236f104dcc7de7c5fed2eac6a39fdb4a43361a5023221b9bab4c539981a66657e634e98e05f366fe85ed0a4ddabcdeec155f5df312ba4e04915c81ff98a1f1ed
+  metadata.gz: db9fbdde1ce12f0d18b70adf69534e6fbf8bb7b2af31f2d8c751724f7b32dce5267fd937a02615c322cf3f082b38d7ef93154a93d028bac73763395185749423
+  data.tar.gz: '098c3dc99733a06b6903ffdea67f0d4ba299ea27e5dc890b943a51986751b3dd367f7b334644d3738484a4a528e40176b8263d7c1089317a338d42dbe534acec'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-gcp-autoscaling (0.1.3)
+    capistrano-gcp-autoscaling (0.2.0)
       capistrano (~> 3.0)
       google-api-client (~> 0.8)
       googleauth (>= 0.6)
@@ -9,64 +9,93 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    airbrussh (1.3.1)
+    activesupport (5.2.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    airbrussh (1.4.0)
       sshkit (>= 1.6.1, != 1.7.0)
     ast (2.4.0)
-    capistrano (3.11.0)
+    capistrano (3.16.0)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    concurrent-ruby (1.1.5)
-    declarative (0.0.10)
-    declarative-option (0.1.0)
+    concurrent-ruby (1.1.9)
+    declarative (0.0.20)
     diff-lcs (1.3)
-    faraday (0.15.4)
+    faraday (1.4.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-    google-api-client (0.28.7)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
+    gems (1.2.0)
+    google-api-client (0.53.0)
+      google-apis-core (~> 0.1)
+      google-apis-generator (~> 0.1)
+    google-apis-core (0.2.1)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.10.0)
+      googleauth (~> 0.14)
       httpclient (>= 2.8.1, < 3.0)
-      mime-types (~> 3.0)
+      mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-      signet (~> 0.10)
-    googleauth (0.8.1)
-      faraday (~> 0.12)
+      rexml
+      signet (~> 0.14)
+      webrick
+    google-apis-discovery_v1 (0.1.0)
+      google-apis-core (~> 0.1)
+    google-apis-generator (0.1.2)
+      activesupport (>= 5.0)
+      gems (~> 1.2)
+      google-apis-core (~> 0.1)
+      google-apis-discovery_v1 (~> 0.0)
+      thor (>= 0.20, < 2.a)
+    googleauth (0.15.1)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.7)
+      signet (~> 0.14)
     httpclient (2.8.3)
-    i18n (1.6.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.2)
-    jwt (2.1.0)
-    memoist (0.16.0)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
-    multi_json (1.13.1)
-    multipart-post (2.0.0)
-    net-scp (2.0.0)
-      net-ssh (>= 2.6.5, < 6.0.0)
-    net-ssh (5.2.0)
-    os (1.0.0)
+    jwt (2.2.3)
+    memoist (0.16.2)
+    mini_mime (1.1.0)
+    minitest (5.14.4)
+    multi_json (1.15.0)
+    multipart-post (2.1.1)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
+    net-ssh (6.1.0)
+    os (1.1.1)
     parallel (1.15.0)
     parser (2.6.2.0)
       ast (~> 2.4.0)
     psych (3.1.0)
-    public_suffix (3.0.3)
+    public_suffix (4.0.6)
     rainbow (3.0.0)
-    rake (10.5.0)
-    representable (3.0.4)
+    rake (13.0.1)
+    representable (3.1.1)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
+    rexml (3.2.5)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -91,27 +120,34 @@ GEM
     rubocop-rspec (1.32.0)
       rubocop (>= 0.60.0)
     ruby-progressbar (1.10.0)
-    signet (0.11.0)
+    ruby2_keywords (0.0.4)
+    signet (0.14.1)
       addressable (~> 2.3)
-      faraday (~> 0.9)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    sshkit (1.18.2)
+    sshkit (1.21.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
+    thor (1.1.0)
+    thread_safe (0.3.6)
+    trailblazer-option (0.1.1)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
     uber (0.1.0)
     unicode-display_width (1.5.0)
+    webrick (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (>= 2.1.4)
   capistrano-gcp-autoscaling!
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 0.66)
   rubocop-rspec (~> 1.32)
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/README.md

@@ -33,6 +33,7 @@ Read the documentation (https://cloud.google.com/iam/docs/creating-managing-serv
 ```ruby
 set :gcp_project_id, nil
 set :gcp_region, nil
+set :gcp_zone, nil
 set :gcp_scope, 'https://www.googleapis.com/auth/compute'
 set :gcp_private_key, ENV['GCP_PRIVATE_KEY']
 set :gcp_client_email, ENV['GCP_CLIENT_EMAIL']
@@ -48,6 +49,12 @@ instance_group_manager 'my-instance-group-manager1', user: 'apps', roles: %i(app
 instance_group_manager 'my-instance-group-manager2' do |_instance, index|
   index.zero? ? { user: 'apps', roles: %i(app web db) } : { user: 'apps', roles: %i(app web) }
 end
+
+instance_group 'my-instance-group1', user: 'apps', roles: %i(app web db)
+
+instance_group 'my-instance-group2' do |_instance, index|
+  index.zero? ? { user: 'apps', roles: %i(app web db) } : { user: 'apps', roles: %i(app web) }
+end
 ```
 
 ## Development

data/capistrano-gcp-autoscaling.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'capistrano-gcp-autoscaling'
   spec.version       = Capistrano::Gcp::Autoscaling::VERSION
   spec.authors       = ['Aleksei Vorobyov']
-  spec.email         = ['effypad@gmail.com']
+  spec.email         = ['a3.vorobyov@gmail.com']
 
   spec.summary       = 'Capistrano plugin for deploying to GCP instance groups'
   spec.description   = spec.summary
@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '>= 2.1.4'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.66'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.32'

data/lib/capistrano/gcp/autoscaling.rb

@@ -4,6 +4,7 @@ require 'googleauth'
 require 'google/apis/compute_v1'
 require 'capistrano/gcp/autoscaling/core/compute_service'
 require 'capistrano/gcp/autoscaling/core/instance'
+require 'capistrano/gcp/autoscaling/core/instance_group'
 require 'capistrano/gcp/autoscaling/core/instance_group_manager'
 
 load File.expand_path('tasks/autoscaling.rake', __dir__)
@@ -29,3 +30,16 @@ def instance_group_manager(group_manager_name, properties = {})
     server instance.network_ip, block_given? ? yield(instance, index) : properties
   end
 end
+
+def instance_group(group_name, properties = {})
+  instance_group = Capistrano::Gcp::Autoscaling::Core::InstanceGroup.new(
+    compute_service,
+    gcp_project_id: fetch(:gcp_project_id),
+    gcp_zone: fetch(:gcp_zone),
+    group_name: group_name
+  )
+
+  instance_group.instances.each_with_index do |instance, index|
+    server instance.network_ip, block_given? ? yield(instance, index) : properties
+  end
+end

data/lib/capistrano/gcp/autoscaling/core/instance_group.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Capistrano
+  module Gcp
+    module Autoscaling
+      module Core
+        class InstanceGroup
+          def initialize(compute_service, options = {})
+            @compute_service = compute_service
+            @options = options
+          end
+
+          def instances
+            group.items.map(&method(:instance_for)).select(&:available?).sort_by(&:created_at)
+          end
+
+          private
+
+          attr_reader :compute_service, :options
+
+          def instance_for(managed_instance)
+            Capistrano::Gcp::Autoscaling::Core::Instance.new(
+              compute_service,
+              managed_instance,
+              gcp_project_id: options.fetch(:gcp_project_id)
+            )
+          end
+
+          def group
+            compute_service.list_instance_group_instances(
+              options.fetch(:gcp_project_id), options.fetch(:gcp_zone), options.fetch(:group_name)
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/capistrano/gcp/autoscaling/core/instance_group_manager.rb

@@ -4,29 +4,14 @@ module Capistrano
   module Gcp
     module Autoscaling
       module Core
-        class InstanceGroupManager
-          def initialize(compute_service, options = {})
-            @compute_service = compute_service
-            @options = options
-          end
-
+        class InstanceGroupManager < Capistrano::Gcp::Autoscaling::Core::InstanceGroup
           def instances
-            group_manager.managed_instances.map(&method(:instance_for)).select(&:available?).sort_by(&:created_at)
+            group.managed_instances.map(&method(:instance_for)).select(&:available?).sort_by(&:created_at)
           end
 
           private
 
-          attr_reader :compute_service, :options
-
-          def instance_for(managed_instance)
-            Capistrano::Gcp::Autoscaling::Core::Instance.new(
-              compute_service,
-              managed_instance,
-              gcp_project_id: options.fetch(:gcp_project_id)
-            )
-          end
-
-          def group_manager
+          def group
             compute_service.list_region_instance_group_manager_managed_instances(
               options.fetch(:gcp_project_id),
               options.fetch(:gcp_region),

data/lib/capistrano/gcp/autoscaling/version.rb

@@ -3,7 +3,7 @@
 module Capistrano
   module Gcp
     module Autoscaling
-      VERSION = '0.1.3'.freeze
+      VERSION = '0.2.0'.freeze
     end
   end
 end

data/lib/capistrano/gcp/tasks/autoscaling.rake

@@ -4,6 +4,7 @@ namespace :load do
   task :defaults do
     set :gcp_project_id, nil
     set :gcp_region, nil
+    set :gcp_zone, nil
     set :gcp_scope, 'https://www.googleapis.com/auth/compute'
     set :gcp_private_key, ENV['GCP_PRIVATE_KEY']
     set :gcp_client_email, ENV['GCP_CLIENT_EMAIL']

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-gcp-autoscaling
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Aleksei Vorobyov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ dependencies:
         version: '0.6'
 description: Capistrano plugin for deploying to GCP instance groups
 email:
-- effypad@gmail.com
+- a3.vorobyov@gmail.com
 executables:
 - console
 - setup
@@ -145,6 +145,7 @@ files:
 - lib/capistrano/gcp/autoscaling.rb
 - lib/capistrano/gcp/autoscaling/core/compute_service.rb
 - lib/capistrano/gcp/autoscaling/core/instance.rb
+- lib/capistrano/gcp/autoscaling/core/instance_group.rb
 - lib/capistrano/gcp/autoscaling/core/instance_group_manager.rb
 - lib/capistrano/gcp/autoscaling/version.rb
 - lib/capistrano/gcp/tasks/autoscaling.rake
@@ -152,7 +153,7 @@ homepage: https://github.com/a3vorobyov/capistrano-gcp-autoscaling
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -167,9 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Capistrano plugin for deploying to GCP instance groups
 test_files: []