orgupdatematrix 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a133c88cdee73f8ad7ebc7b124f1c1bc16480617d71a4e64a9a230f0dc7c353c
-  data.tar.gz: f3c46ca639b4e9746d6b2b0c18714a7d307f9921692b3dc21cb2f28669ce410d
+  metadata.gz: 22b7ebb74cac46f5103f0139dc3dcc3dbb10ca14586c81cdb68319cd47673cfe
+  data.tar.gz: 1d2e00daf8c7c7d0ebb74638b8c4ef938a3125cf14cf9d826580561a7ceb8f26
 SHA512:
-  metadata.gz: 99a2cc31681e33e8ed180fda5bd362d099251658c1287b7a50b69ee997e0d5e3f28476514c5b59cf0cc5591e8f270cca97a255f8d2c820e38442e525d214234e
-  data.tar.gz: 66c51f0c3b175a7ba47c8ff2ca4e93f496c9931e09b3957369bd39fd2090569fa1e390420c09f25931134de8e6579f3148abcedebad5c73306d2fb0c86821004
+  metadata.gz: 9ba57407f4254f3551d94811d1530fd77c1a3d2788c6780812d45d433b39af9ef89f1ed5666b39291b29226805a08f58c1f6549a03778ce9ce9be8ba5ae4a1b0
+  data.tar.gz: a261e70bfc2324ce988173385e5fc45c469230839ab9797a3da79d3bd2f5635de54dc11f22707ea3f379bfb3e20cdd2f2f8018fde897956fed158f7db0fd72cf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orgupdatematrix (0.1.1)
+    orgupdatematrix (0.2.0)
       octokit (~> 4)
       octopoller
 
@@ -12,11 +12,11 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    multipart-post (2.1.0)
+    multipart-post (2.1.1)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     octopoller (0.1.0)
-    public_suffix (3.0.3)
+    public_suffix (3.1.0)
     rake (10.5.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)

data/README.md

@@ -32,6 +32,12 @@ Add an `:app_url` variable to each deploy env file such as `deploy/environments/
   set :app_url, 'https://staging.my-application.com'
 ```
 
+Add the `matrix` role to the servers you want to report from:
+
+```
+  server 'staging.my-application.com', user: 'deploy', roles: %w{web matrix}
+```
+
 Auth: generate a GitHub [personal access token](https://github.com/settings/tokens) and supply it at deploy time:
 
 ```
@@ -47,12 +53,12 @@ Add the following task to your Capistrano config eg. `deploy/config.rb`:
       'my_var1' => 'value1',
       'my_var2' => 'value2'
     }
-    on roles(:web) do
+    on roles(:matrix) do
       within repo_path do
         info 'Updating deploy matrix!'
         commit = capture(:git, 'rev-list', '-n', '1', fetch(:branch)).chomp
         updater = OrgUpdateMatrix::Updater.new('GitHubUser/RepoName', 'file-path.yml', ENV['GITHUB_API_TOKEN'])
-        updater.update(fetch(:application), fetch(:stage), fetch(:branch), commit, fetch(:app_url), fetch(:repo_url))
+        updater.update(fetch(:application), fetch(:stage), fetch(:branch), commit, fetch(:app_url), fetch(:repo_url), fetch(:extra_env))
       end
     end
   end
@@ -70,7 +76,7 @@ app_name:
     commit: 6209dc2138df2ecb808559d8f1c5bc41bfd17d0d
     updated: 2019-05-09 03:51:50 UTC
     app_url: https://staging.my-application.com
-    github_url: https///github.com/MyUser/AppRepo.git
+    github_url: https://github.com/MyUser/AppRepo.git
     extras:
       my_var1: value1
       my_var2: value2

data/lib/orgupdatematrix.rb

@@ -20,10 +20,18 @@ module OrgUpdateMatrix
       puts("#{' ' * indent}#{message}")
     end
 
-    def update(app, stage, branch, commit, app_url, repo_url, extras = nil)
-      file = get_file_contents
+    def sort_data(hash)
+      hash.sort.to_h.each { |app, stage| hash[app] = stage.sort.to_h }
+    end
+
+    def update_yaml(file, app, stage, state)
       data = YAML::load(Base64.decode64(file.content))
+      data[app] ||= {}
+      data[app][stage] = state
+      sort_data(data)
+    end
 
+    def update(app, stage, branch, commit, app_url, repo_url, extras = nil)
       app = app.to_s
       stage = stage.to_s
       state = {
@@ -31,26 +39,24 @@ module OrgUpdateMatrix
         'commit' => commit,
         'updated' => Time.now.utc.to_s,
         'app_url' => app_url,
-        'github_url' => repo_url.gsub('git@', 'https://').gsub(':', '/'),
+        'github_url' => repo_url.gsub('git@', 'https://').gsub(/(\w):(\w)/, '\1/\2'),
       }
-
-      data[app] ||= {}
-      data[app][stage] = state
-      data[app][stage]['extras'] = extras if extras
+      state['extras'] = extras if extras
 
       log("app: #{app}", 9)
       log("stage: #{stage}", 9)
       state.each { |key, value| log("#{key}: #{value}", 9) }
+      message = "update deploy matrix: #{app}:#{stage}"
 
       Octopoller.poll(wait: :exponentially, retries: 6) do
         begin
-          message = "update deploy matrix: #{app}:#{stage}"
+          file = get_file_contents
+          data = update_yaml(file, app, stage, state)
           result = @client.update_contents(@repo, @file_path, message, file[:sha], data.to_yaml)
           log('Update complete!') if result[:commit]
         rescue StandardError => e
           log("Error: #{e.message}")
           log('Retrying with latest commit...')
-          file = get_file_contents
           :re_poll
         end
       end

data/lib/orgupdatematrix/version.rb

@@ -1,3 +1,3 @@
 module OrgUpdateMatrix
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orgupdatematrix
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Mark Luntzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit