rops 1.0.8 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4aaa2c9386c4426ae0e64d6c9136e208683d396af5175436e29105bd53be14f9
-  data.tar.gz: 2ca5c4ff6f0ff34ccdadc1a09113a3d5e4ea61d9022bc8476bb37190ccab92ab
+  metadata.gz: 5a9aa4788d53d39e653cf9ebe46f3082962b2efecdef76f32fe4ac034fbc5699
+  data.tar.gz: b47e1bc75453e0e60e596f33893d651ed080e605135b46c73832ebd38291072a
 SHA512:
-  metadata.gz: 4764f72f23aaa3c3a7694328cabfcea48b509fa109ae9af4487dc8b965b6c4060bb7a59d501a31eee9377983a6837da118c7fb75d1a1b497008a16678d72f17d
-  data.tar.gz: c3249a2060872d2606b4118c8a21b173a5aeec58d19d81d2d38f2d21ce3995280f59e3cf0d23100e470b3facb57a416c343d84cca9f09271a1b768d208ab7828
+  metadata.gz: ad8c81d3214a90a5f59cf12cbdfd5457d0bb2a999bd6b6908617a4b881a6baf4f487ccbcec48de9209974f8c5bcda10fc68cfaef4b0321c3148b6cf889995202
+  data.tar.gz: a2898286981115871142e4058a04442c79c16dfee9ccb98d2afa49613dca4db4196fdc8e0fa7cef0cbb349b2635632b5ad9e34766de3b046f69f5c68401e1db4

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    rops (1.0.8)
-      activesupport (~> 6.1.4)
+    rops (1.2.0)
+      activesupport (~> 7.0.3)
       dry-cli (~> 0.7.0)
       git (~> 1.9.1)
       hashdiff (~> 1.0.1)
@@ -12,26 +12,24 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     dry-cli (0.7.0)
     git (1.9.1)
       rchardet (~> 1.8)
     hashdiff (1.0.1)
-    i18n (1.8.10)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
+    minitest (5.16.2)
     net-ssh (6.1.0)
     ptools (1.4.2)
     rchardet (1.8.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   x86_64-linux

data/bin/rops

@@ -9,6 +9,7 @@ require 'hashdiff'
 
 require 'core_ext'
 require 'deployer'
+require 'version'
 
 module Record360
   module Operations
@@ -38,6 +39,14 @@ module Record360
 
     protected
 
+      def format_commit(commit)
+        message = commit.message
+        if message.include?("\n")
+          message = message.split("\n").first + " ..."
+        end
+        "#{commit.date} [#{commit.sha[0,8]}] #{message}"
+      end
+
       def print_statuses(context, spec_statuses = nil)
         spec_statuses ||= deployer.specs_running(context)
         return  if spec_statuses.blank?
@@ -139,6 +148,49 @@ module Record360
       end
     end
 
+    class ReadyTag < Dry::CLI::Command
+      desc "Mark your latest commit that's ready for production"
+      argument :commit, desc: "Commit to tag as ready for production"
+      include Common
+
+      def call(commit: nil, **args)
+        super(branch: commit, **args)
+        repo = deployer.send(:git)
+        name, email = repo.config.values_at('user.name', 'user.email')
+        if name.blank?
+          puts "Unable to find user name in Git config.  Run `git config --global user.name \"FIRST_NAME LAST_NAME\"`"
+          exit(-1)
+        elsif email.blank?
+          puts "Unable to find user email in Git config.  Run `git config --global user.email \"EMAIL_ADDRESS\"`"
+          exit(-1)
+        end
+        tag = 'ready-' + name.split(' ').first.downcase
+
+        if commit
+          c = repo.object(commit)
+          unless c.author.email == email
+            puts "Commit author #{c.author.name.inspect} does not match #{name.inspect}, you can only tag your own commit"
+            exit(-1)
+          end
+          repo.tag(tag, c, f: true)
+          puts "New tag set to: ", format_commit(c)
+
+        elsif repo.tags.map(&:name).include?(tag)
+          commits = repo.log.author(name).between("#{tag}^", 'master')
+          commits[0...-1].each do |c|
+            puts "   " + format_commit(c)
+          end
+          puts "=> " + format_commit(commits.last)
+        else
+          puts "No #{tag.inspect} tag found"
+          repo.log.author(name).to_a[0..9].each do |c|
+            puts format_commit(c)
+          end
+          puts "..."
+        end
+      end
+    end
+
     class CurrentStatus < Dry::CLI::Command
       desc "Display status of all running specs"
       argument :context, desc: "Kubernetes context"
@@ -235,10 +287,19 @@ module Record360
       end
     end
 
+    class Version < Dry::CLI::Command
+      desc "output version information and exit"
+      def call
+        puts VERSION
+      end
+    end
+
+    register 'ready',  ReadyTag
     register 'status', CurrentStatus
     register 'build',  BuildImage
     register 'push',   PushImage
     register 'deploy', DeployImage
+    register 'version', Version
   end
 end
 

data/lib/deployer.rb

@@ -9,7 +9,7 @@ class Deployer
   CONFIG_DEFAULTS = {
     'repository' => nil,
     'default_branch' => 'master',
-    'registry' => 'r360',
+    'registry' => 'docker.io/r360',
     'default_context' => 'staging',
     'production_context' => 'production',
     'images' => []
@@ -43,11 +43,7 @@ class Deployer
     @branch.delete_prefix!('g')  if @branch.match(/^g\h{8}$/)
     @commit = git.object(@branch).sha
 
-    short_id = @commit[0, 8]
-    @image_tag = "g#{short_id}"
-    if (@branch != default_branch) && !@branch.start_with?(short_id)
-      @image_tag += "-#{@branch}"
-    end
+    @image_tag = @commit[0, 8]
     images.each do |image|
       image.commit = commit
       image.tag = image_tag

data/lib/version.rb

@@ -0,0 +1,5 @@
+module Record360
+  module Operations
+    VERSION = '1.3.0'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rops
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.3.0
 platform: ruby
 authors:
 - Steve Sloan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2022-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-cli
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 7.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.4
+        version: 7.0.3
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +113,7 @@ files:
 - lib/git_ext.rb
 - lib/image.rb
 - lib/site.rb
+- lib/version.rb
 homepage: https://github.com/Record360/rops
 licenses:
 - MIT
@@ -132,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Record360 Operations tool