releasecop 0.0.13 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acbb3de308ca2133630425cc039aa7dde8115aa91b89b2c299bd8f8cc12b018b
-  data.tar.gz: 179650ad314f35f899824cecd2a6c4f77650dc012717336722bac0675f0acc0c
+  metadata.gz: 688d27f9f3caa8116455a3a9efa09907995143c815c78c242291fb2213414c83
+  data.tar.gz: f70f81672b5436f91e48eac60d65ce3a14a182a451f37ab53634613f7788b1fe
 SHA512:
-  metadata.gz: 86c215ffcf3846120061fb3698f46e314ab4cdd1f8beaf25a2e75c7f45e34597bdc51aadc4ccb9afd394168d66960fd86cc296227d31f2b09d3ea4365aacf385
-  data.tar.gz: afa204f77d712debbe88ddc59335d6bd5eb9fd401abacc57071a0b024a8b3174de854d5602bab031b427f12fee5756bb06a07abab04c166fdfd743ffe4d8830d
+  metadata.gz: 8a2db437039bf5d9428743adc2aa818bfe3f65e37836b206aeb0d04f0a4b18dda5f6be76a1b1c0378d6c89b9a0ed6efc3a7e01144f53c30535f4109de7d6c0d2
+  data.tar.gz: f39a326831ef4f38b54e5c5b9bc001ec109e8df49d2678986d33e103926da8319fbe2439d5f5479971892a1e86f1410e574cb2647155f587c52a16f79354bcfc

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 ------------
 * Your contribution here...
 
+0.0.16 (2022-07-27)
+------------
+* Update README to document both master and main branch approaches.
+* Require fileutils (fixes uninitialized constant Releasecop::Cli::FileUtils (NameError))
+
+0.0.15 (2019-04-05)
+---
+* Update for compatibility with hokusai >=0.5.4 (now incompatible with earlier versions) (57ee7ae56)
+
+0.0.14 (2019-01-07)
+---
+* Fix `tag_pattern`-matching to respect annotated tags (c7eda3599)
+
 0.0.13 (2018-11-15)
 ---
 * Add email to diff output (081d270)

data/README.md

@@ -22,8 +22,8 @@ In the manifest, each project lists the environments to which code is deployed _
           {"name": "production", "git": "git@heroku.com:charge-production.git"}
         ],
         "heat": [
-          {"name": "master", "git": "git@github.com:artsy/heat.git"},
-          {"name": "master-succeeded", "git": "git@github.com:artsy/heat.git", "branch": "master-succeeded"},
+          {"name": "main", "git": "git@github.com:artsy/heat.git", "branch": "main"},
+          {"name": "succeeded", "git": "git@github.com:artsy/heat.git", "branch": "succeeded"},
           {"name": "production", "git": "git@github.com:artsy/heat.git", "branch": "production"}
         ]
       }
@@ -39,8 +39,8 @@ Example output:
       staging is up-to-date with master
       production is up-to-date with staging
     heat...
-      master-succeeded is up-to-date with master
-      production is behind master-succeeded by:
+      succeeded is up-to-date with main
+      production is behind succeeded by:
         4557f60 2015-03-24 Upgrade to 3.9 (timsmith)
         f33acc4 2015-03-25 Add support for avatars (janeR)
     2 project(s) checked. 1 environment(s) out-of-date.
@@ -76,7 +76,7 @@ Many teams create git tags corresponding to each milestone or release. The `tag_
 ```json
 {
     "causality": [
-      {"name": "master", "git": "git@github.com:artsy/causality.git" },
+      {"name": "main", "git": "git@github.com:artsy/causality.git", "branch": "main" },
       {"name": "staging", "git": "git@github.com:artsy/causality.git", "tag_pattern": "staging-*"},
       {"name": "production", "git": "git@github.com:artsy/causality.git", "tag_pattern": "release-*"}
     ]
@@ -85,5 +85,8 @@ Many teams create git tags corresponding to each milestone or release. The `tag_
 
 The most recent commit matching each tag expression is presumed to correspond with the state of each environment. Tag patterns follow `git` conventions, so, e.g., `staging-*` will be treated as `/refs/tags/staging-*`.
 
+### A note about default branch names
+
+For backwards compatibility, `releasecop` assumes a default branch name of `master`. To override this behavior, set the `RELEASECOP_DEFAULT_BRANCH` environment variable (to e.g. `main`).
 
 Copyright (c) 2015-2018 Joey Aghion, Artsy

data/lib/releasecop/comparison.rb

@@ -2,6 +2,8 @@ module Releasecop
   class Comparison
     attr_accessor :lines, :behind, :ahead
 
+    PRETTY_FORMAT = '%h %ad %s (%an, %ae)'
+
     def initialize(ahead, behind)
       @ahead = ahead
       @behind = behind
@@ -18,7 +20,7 @@ module Releasecop
     private
 
     def log
-      `git log #{@behind.for_rev_range}..#{@ahead.for_rev_range} --pretty=format:"%h %ad %s (%an, %ae)" --date=short --no-merges`
+      `git log #{@behind.for_rev_range}..#{@ahead.for_rev_range} --pretty=format:"#{PRETTY_FORMAT}" --date=short --no-merges`
     end
   end
 end

data/lib/releasecop/manifest_item.rb

@@ -7,7 +7,7 @@ module Releasecop
       @repo_name = repo_name
       @git = item['git']
       @name = item['name']
-      @branch = item['branch'] || 'master'
+      @branch = item['branch'] || ENV['RELEASECOP_DEFAULT_BRANCH'] || 'master'
       @options = item.select { |k, _v| OPTION_KEYS.include?(k) }
     end
 
@@ -24,13 +24,15 @@ module Releasecop
     private
 
     def find_hokusai_sha
-      images_output = with_aws_env { `hokusai registry images` }
-      tags = images_output.lines.grep(/\d{4}.* | .* | .*/).map{|l| l.split(' | ').last.split(',').map(&:strip)}
-      tags.detect{|t| t.include?(@options['hokusai']) }.detect{|t| t[/^[0-9a-f]{40}$/]}
+      images_output = with_aws_env { `hokusai registry images --limit 1000` } # list as many items as possible
+      tags = images_output.lines.grep(/\d{4}.* \| .*/).map do |l| # lines listing images
+        l.split(' | ').last.gsub(/\e\[(\d+)(\;\d+)*m/, '').split(',').map(&:strip) # tags
+      end
+      tags.detect{|t| t.include?(@options['hokusai']) }.detect{|t| t[/^[0-9a-f]{40}$/]} # first SHA-seeming tag matching environment
     end
 
     def find_tag_pattern_sha
-      `git for-each-ref --format='%(objectname)' --count=1 --sort=-authordate --sort=-committerdate 'refs/tags/#{@options['tag_pattern']}'`.strip
+      `git for-each-ref --format='%(objectname)' --count=1 --sort=-authordate --sort=-committerdate --sort=-creatordate 'refs/tags/#{@options['tag_pattern']}'`.strip
     end
 
     # not thread-safe

data/lib/releasecop/version.rb

@@ -1,3 +1,3 @@
 module Releasecop
-  VERSION = "0.0.13"
+  VERSION = "0.0.16"
 end

data/lib/releasecop.rb

@@ -1,3 +1,4 @@
+
 require "releasecop/version"
 require 'thor'
 require 'shellwords'
@@ -6,6 +7,7 @@ require 'releasecop/manifest_item'
 require "releasecop/comparison"
 require "releasecop/result"
 require "releasecop/checker"
+require 'fileutils'
 require "releasecop/cli"
 
 module Releasecop

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: releasecop
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.16
 platform: ruby
 authors:
 - Joey Aghion
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2022-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - joey@aghion.com
 executables:
@@ -93,7 +93,7 @@ homepage: https://github.com/joeyAghion/releasecop
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,9 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.14
+signing_key:
 specification_version: 4
 summary: Given a list of projects and environments pipelines, report which environments
   are "behind" and by which commits.